- give more weight to failure events

4 files changed, 23 insertions, 3 deletions

diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c
index 6894528a7..91da8b5c9 100644
--- a/src/testbed/testbed_api.c
+++ b/src/testbed/testbed_api.c
@@ -939,6 +939,7 @@ handle_op_fail_event (struct GNUNET_TESTBED_Controller *c,
     {
       struct OverlayConnectData *data;
       data = opc->data;
+      data->failed = GNUNET_YES;
       if (NULL != data->cb)
         data->cb (data->cb_cls, opc->op, emsg);
     }
@@ -2594,15 +2595,27 @@ GNUNET_TESTBED_release_time_slot_ (struct GNUNET_TESTBED_Controller *c,
  * @param index the index of the time slot to update
  * @param key the key to identify ownership of the slot
  * @param time the new time
+ * @param failed should this reading be treated as coming from a fail event
  */
 void
 GNUNET_TESTBED_update_time_slot_ (struct GNUNET_TESTBED_Controller *c,
                                   unsigned int index,
                                   void *key,
-                                  struct GNUNET_TIME_Relative time)
+                                  struct GNUNET_TIME_Relative time,
+                                  int failed)
 {
   struct TimeSlot *slot;
 
+  if (GNUNET_YES == failed)
+  {
+    if (1 == c->num_parallel_connects)
+    {
+      GNUNET_TESTBED_set_num_parallel_overlay_connects_ (c, 1);
+      return;
+    }
+    GNUNET_TESTBED_set_num_parallel_overlay_connects_ 
+        (c, c->num_parallel_connects - 1);
+  }
   if (GNUNET_NO == GNUNET_TESTBED_release_time_slot_ (c, index, key))
     return;
   slot = &c->tslots[index];
diff --git a/src/testbed/testbed_api.h b/src/testbed/testbed_api.h
index b82c374ad..7586ed28d 100644
--- a/src/testbed/testbed_api.h
+++ b/src/testbed/testbed_api.h
@@ -564,12 +564,14 @@ GNUNET_TESTBED_get_tslot_ (struct GNUNET_TESTBED_Controller *c, void *key);
  * @param index the index of the time slot to update
  * @param key the key to identify ownership of the slot
  * @param time the new time
+ * @param failed should this reading be treated as coming from a fail event
  */
 void
 GNUNET_TESTBED_update_time_slot_ (struct GNUNET_TESTBED_Controller *c,
                                   unsigned int index,
                                   void *key,
-                                  struct GNUNET_TIME_Relative time);
+                                  struct GNUNET_TIME_Relative time,
+                                  int failed);
 
 
 /**
diff --git a/src/testbed/testbed_api_peers.c b/src/testbed/testbed_api_peers.c
index d558ef06d..1c0e87557 100644
--- a/src/testbed/testbed_api_peers.c
+++ b/src/testbed/testbed_api_peers.c
@@ -379,7 +379,7 @@ oprelease_overlay_connect (void *cls)
   case OPC_STATE_FINISHED:
     duration = GNUNET_TIME_absolute_get_duration (data->tstart);
     GNUNET_TESTBED_update_time_slot_ (opc->c, data->tslot_index,
-                                      data, duration);    
+                                      data, duration, data->failed);
   }
   GNUNET_free (data);
   GNUNET_free (opc);
diff --git a/src/testbed/testbed_api_peers.h b/src/testbed/testbed_api_peers.h
index f02079926..b1f226214 100644
--- a/src/testbed/testbed_api_peers.h
+++ b/src/testbed/testbed_api_peers.h
@@ -224,6 +224,11 @@ struct OverlayConnectData
   struct GNUNET_TIME_Absolute tstart;
 
   /**
+   * Has this operation failed
+   */
+  int failed;
+
+  /**
    * The timing slot index for this operation
    */
   unsigned int tslot_index;