[GNUnet-SVN] r24368 - gnunet/src/testbed

[gnunet]

Author: harsha
Date: 2012-10-17 18:22:32 +0200 (Wed, 17 Oct 2012)
New Revision: 24368

Modified:
   gnunet/src/testbed/testbed.conf.in
   gnunet/src/testbed/testbed_api.c
   gnunet/src/testbed/testbed_api.h
   gnunet/src/testbed/testbed_api_peers.c
Log:
new operation queue for limiting overlay connects

Modified: gnunet/src/testbed/testbed.conf.in
===================================================================
--- gnunet/src/testbed/testbed.conf.in  2012-10-17 16:06:44 UTC (rev 24367)
+++ gnunet/src/testbed/testbed.conf.in  2012-10-17 16:22:32 UTC (rev 24368)
@@ -12,3 +12,4 @@
 MAX_PARALLEL_OPERATIONS = 1000
 MAX_PARALLEL_SERVICE_CONNECTIONS = 1000
 MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 5
+MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 30

Modified: gnunet/src/testbed/testbed_api.c
===================================================================
--- gnunet/src/testbed/testbed_api.c    2012-10-17 16:06:44 UTC (rev 24367)
+++ gnunet/src/testbed/testbed_api.c    2012-10-17 16:22:32 UTC (rev 24368)
@@ -1566,6 +1566,7 @@
   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;
 
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_number (cfg, "testbed",
@@ -1591,6 +1592,14 @@
     GNUNET_break (0);
     return NULL;
   }
+  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;
+  }
   controller = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_Controller));
   controller->cc = cc;
   controller->cc_cls = cc_cls;
@@ -1628,7 +1637,10 @@
                                               
max_parallel_service_connections);
   controller->opq_parallel_topology_config_operations=
       GNUNET_TESTBED_operation_queue_create_ ((unsigned int)
-                                              
max_parallel_service_connections);
+                                              
max_parallel_topology_config_operations);
+  controller->opq_parallel_overlay_connect_operations=
+      GNUNET_TESTBED_operation_queue_create_ ((unsigned int)
+                                              
max_parallel_overlay_connect_operations);
   controller_hostname = GNUNET_TESTBED_host_get_hostname_ (host);
   if (NULL == controller_hostname)
     controller_hostname = "127.0.0.1";
@@ -1719,6 +1731,8 @@
       (controller->opq_parallel_service_connections);
   GNUNET_TESTBED_operation_queue_destroy_
       (controller->opq_parallel_topology_config_operations);
+  GNUNET_TESTBED_operation_queue_destroy_
+      (controller->opq_parallel_overlay_connect_operations);
   GNUNET_free (controller);
 }
 

Modified: gnunet/src/testbed/testbed_api.h
===================================================================
--- gnunet/src/testbed/testbed_api.h    2012-10-17 16:06:44 UTC (rev 24367)
+++ gnunet/src/testbed/testbed_api.h    2012-10-17 16:22:32 UTC (rev 24368)
@@ -302,6 +302,11 @@
   struct OperationQueue *opq_parallel_topology_config_operations;
 
   /**
+   * Operation queue for simultaneous overlay connect operations
+   */
+  struct OperationQueue *opq_parallel_overlay_connect_operations;
+
+  /**
    * The operation id counter. use current value and increment
    */
   uint32_t operation_counter;

Modified: gnunet/src/testbed/testbed_api_peers.c
===================================================================
--- gnunet/src/testbed/testbed_api_peers.c      2012-10-17 16:06:44 UTC (rev 
24367)
+++ gnunet/src/testbed/testbed_api_peers.c      2012-10-17 16:22:32 UTC (rev 
24368)
@@ -722,6 +722,8 @@
                                         &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);
   return opc->op;
 }