adaptive parallel overlay connects

5 files changed, 43 insertions, 18 deletions

diff --git a/src/testbed/test_testbed_api.conf b/src/testbed/test_testbed_api.conf
index 6f2a5c950..a3cc6ea63 100644
--- a/src/testbed/test_testbed_api.conf
+++ b/src/testbed/test_testbed_api.conf
@@ -4,7 +4,7 @@ PORT = 12113
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
 NEIGHBOUR_LIMIT = 100
-MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 3
+PARALLEL_OVERLAY_CONNECT_THRESHOLD = 2
 TOPOLOGY = RANDOM
 #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
 
diff --git a/src/testbed/testbed.conf.in b/src/testbed/testbed.conf.in
index 0da161c67..47b798830 100644
--- a/src/testbed/testbed.conf.in
+++ b/src/testbed/testbed.conf.in
@@ -14,4 +14,4 @@ UNIX_MATCH_GID = YES
 MAX_PARALLEL_OPERATIONS = 1000
 MAX_PARALLEL_SERVICE_CONNECTIONS = 1000
 MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 5
-MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 30
+PARALLEL_OVERLAY_CONNECT_THRESHOLD = 16
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c
index 2ad2a868b..e171f21a7 100644
--- a/src/testbed/testbed_api.c
+++ b/src/testbed/testbed_api.c
@@ -605,6 +605,13 @@ handle_peer_conevent (struct GNUNET_TESTBED_Controller *c,
   GNUNET_CONTAINER_DLL_remove (opc->c->ocq_head, opc->c->ocq_tail, opc);
   opc->state = OPC_STATE_FINISHED;
   GNUNET_free (data);
+  /* Increase parallel overlay connects */
+  if (c->num_parallel_connects < c->num_parallel_connects_threshold)
+    c->num_parallel_connects *= 2;
+  else
+    c->num_parallel_connects++;
+  GNUNET_TESTBED_operation_queue_reset_max_active_
+      (c->opq_parallel_overlay_connect_operations, c->num_parallel_connects);
   if (0 !=
       ((GNUNET_TESTBED_ET_CONNECT | GNUNET_TESTBED_ET_DISCONNECT) &
        c->event_mask))
@@ -732,6 +739,16 @@ handle_op_fail_event (struct GNUNET_TESTBED_Controller *c,
     GNUNET_free (data);
     return GNUNET_YES;  /* We do not call controller callback for peer info */
   }
+  if (OP_OVERLAY_CONNECT == opc->type)
+  {
+    /* Decrease the number of parallel overlay connects */
+    c->num_parallel_connects /= 2;
+    c->num_parallel_connects_threshold = c->num_parallel_connects;
+    if (0 == c->num_parallel_connects)
+      c->num_parallel_connects++;
+    GNUNET_TESTBED_operation_queue_reset_max_active_
+        (c->opq_parallel_overlay_connect_operations, c->num_parallel_connects);
+  }
   if ((0 != (GNUNET_TESTBED_ET_OPERATION_FINISHED & c->event_mask)) &&
       (NULL != c->cc))
   {
@@ -1499,7 +1516,7 @@ GNUNET_TESTBED_controller_connect (const struct GNUNET_CONFIGURATION_Handle
   unsigned long long max_parallel_operations;
   unsigned long long max_parallel_service_connections;
   unsigned long long max_parallel_topology_config_operations;
-  unsigned long long max_parallel_overlay_connect_operations;
+  unsigned long long num_parallel_connects_threshold;
 
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_number (cfg, "testbed",
@@ -1527,12 +1544,9 @@ GNUNET_TESTBED_controller_connect (const struct GNUNET_CONFIGURATION_Handle
   }
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_number (cfg, "testbed",
-                                             "MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS",
-                                             &max_parallel_overlay_connect_operations))
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
+                                             "PARALLEL_OVERLAY_CONNECTS_THRESHOLD",
+                                             &num_parallel_connects_threshold))
+    num_parallel_connects_threshold = 16;
   controller = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_Controller));
   controller->cc = cc;
   controller->cc_cls = cc_cls;
@@ -1571,9 +1585,11 @@ GNUNET_TESTBED_controller_connect (const struct GNUNET_CONFIGURATION_Handle
   controller->opq_parallel_topology_config_operations=
       GNUNET_TESTBED_operation_queue_create_ ((unsigned int)
                                               max_parallel_topology_config_operations);
+  controller->num_parallel_connects = 1;
   controller->opq_parallel_overlay_connect_operations=
-      GNUNET_TESTBED_operation_queue_create_ ((unsigned int)
-                                              max_parallel_overlay_connect_operations);
+      GNUNET_TESTBED_operation_queue_create_
+      (controller->num_parallel_connects);
+  controller->num_parallel_connects_threshold = num_parallel_connects_threshold;
   controller_hostname = GNUNET_TESTBED_host_get_hostname_ (host);
   if (NULL == controller_hostname)
     controller_hostname = "127.0.0.1";
diff --git a/src/testbed/testbed_api.h b/src/testbed/testbed_api.h
index f492133e2..e850fcba2 100644
--- a/src/testbed/testbed_api.h
+++ b/src/testbed/testbed_api.h
@@ -277,11 +277,6 @@ struct GNUNET_TESTBED_Controller
   struct OperationQueue *opq_parallel_overlay_connect_operations;
 
   /**
-   * The operation id counter. use current value and increment
-   */
-  uint32_t operation_counter;
-
-  /**
    * The controller event mask
    */
   uint64_t event_mask;
@@ -295,6 +290,22 @@ struct GNUNET_TESTBED_Controller
    * Did we create the host for this?
    */
   int aux_host;
+
+  /**
+   * The number of parallel overlay connects we do currently
+   */
+  unsigned int num_parallel_connects;
+
+  /**
+   * The threshold for the number of parallel overlay connects we do
+   */
+  unsigned int num_parallel_connects_threshold;
+
+  /**
+   * The operation id counter. use current value and increment
+   */
+  uint32_t operation_counter;
+
 };
 
 
diff --git a/src/testbed/testbed_api_peers.c b/src/testbed/testbed_api_peers.c
index b509df40b..472e93dbb 100644
--- a/src/testbed/testbed_api_peers.c
+++ b/src/testbed/testbed_api_peers.c
@@ -731,8 +731,6 @@ GNUNET_TESTBED_overlay_connect (void *op_cls,
   opc->op =
       GNUNET_TESTBED_operation_create_ (opc, &opstart_overlay_connect,
                                         &oprelease_overlay_connect);
-  /* GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_parallel_operations, */
-  /*                                         opc->op); */
   GNUNET_TESTBED_operation_queue_insert_
       (opc->c->opq_parallel_overlay_connect_operations, opc->op);
   GNUNET_TESTBED_operation_begin_wait_ (opc->op);