operation queue renaming

4 files changed, 24 insertions, 18 deletions

diff --git a/src/testbed/testbed.conf.in b/src/testbed/testbed.conf.in
index bed5e7f78..94a8b21a5 100644
--- a/src/testbed/testbed.conf.in
+++ b/src/testbed/testbed.conf.in
@@ -10,4 +10,5 @@ ACCEPT_FROM6 = ::1;
 UNIXPATH = /tmp/gnunet-service-testbed.sock
 UNIX_MATCH_UID = YES
 UNIX_MATCH_GID = YES
-MAX_PARALLEL_PEER_CREATE = 1000
\ No newline at end of file
+MAX_PARALLEL_OPERATIONS = 1000
+MAX_PARALLEL_SERVICE_CONNECTIONS = 1000
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c
index bf459b2bd..42167a5cb 100644
--- a/src/testbed/testbed_api.c
+++ b/src/testbed/testbed_api.c
@@ -1159,16 +1159,16 @@ GNUNET_TESTBED_controller_connect (const struct GNUNET_CONFIGURATION_Handle *cfg
   struct GNUNET_TESTBED_Controller *controller;
   struct GNUNET_TESTBED_InitMessage *msg;
   const char *controller_hostname;
-  unsigned long long max_parallel_peer_create;
+  unsigned long long max_parallel_operations;
 
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_number (cfg, "testbed",
-                                             "MAX_PARALLEL_PEER_CREATE",
-                                             &max_parallel_peer_create))
+                                             "MAX_PARALLEL_OPERATIONS",
+                                             &max_parallel_operations))
   {
     GNUNET_break (0);
     return NULL;
-  }                                                          
+  }
   controller = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_Controller));
   controller->cc = cc;
   controller->cc_cls = cc_cls;
@@ -1198,9 +1198,9 @@ GNUNET_TESTBED_controller_connect (const struct GNUNET_CONFIGURATION_Handle *cfg
   GNUNET_assert (NULL != host);
   GNUNET_TESTBED_mark_host_registered_at_ (host, controller);
   controller->host = host;
-  controller->opq_peer_create =
+  controller->opq_parallel_operations =
     GNUNET_TESTBED_operation_queue_create_ ((unsigned int)
-                                            max_parallel_peer_create);
+                                            max_parallel_operations);
   controller_hostname = GNUNET_TESTBED_host_get_hostname_ (host);
   if (NULL == controller_hostname)
     controller_hostname = "127.0.0.1";
@@ -1279,7 +1279,7 @@ GNUNET_TESTBED_controller_disconnect (struct GNUNET_TESTBED_Controller *controll
   GNUNET_CONFIGURATION_destroy (controller->cfg);
   if (GNUNET_YES == controller->aux_host)
     GNUNET_TESTBED_host_destroy (controller->host);
-  GNUNET_TESTBED_operation_queue_destroy_ (controller->opq_peer_create);
+  GNUNET_TESTBED_operation_queue_destroy_ (controller->opq_parallel_operations);
   GNUNET_free (controller);
 }
 
@@ -1424,7 +1424,8 @@ GNUNET_TESTBED_controller_link_2 (struct GNUNET_TESTBED_Controller *master,
   msg->operation_id = GNUNET_htonll (opc->id);
   opc->op = GNUNET_TESTBED_operation_create_ (opc, &opstart_link_controllers,
                                               &oprelease_link_controllers);
-  GNUNET_TESTBED_operation_queue_insert_ (master->opq_peer_create, opc->op);
+  GNUNET_TESTBED_operation_queue_insert_ (master->opq_parallel_operations,
+                                          opc->op);
   return opc->op;
 }
 
@@ -1535,7 +1536,7 @@ GNUNET_TESTBED_overlay_write_topology_to_file (struct GNUNET_TESTBED_Controller
  */
 struct GNUNET_TESTBED_HelperInit *
 GNUNET_TESTBED_create_helper_init_msg_ (const char *cname,
-                                         const struct GNUNET_CONFIGURATION_Handle *cfg)
+                                        const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   struct GNUNET_TESTBED_HelperInit *msg;
   char *config;
diff --git a/src/testbed/testbed_api.h b/src/testbed/testbed_api.h
index 625f3d1f6..89e6800d7 100644
--- a/src/testbed/testbed_api.h
+++ b/src/testbed/testbed_api.h
@@ -275,9 +275,9 @@ struct GNUNET_TESTBED_Controller
   struct OperationContext *ocq_tail;
 
   /**
-   * Operation queue for simultaneous peer creations
+   * Operation queue for simultaneous operations
    */
-  struct OperationQueue *opq_peer_create;
+  struct OperationQueue *opq_parallel_operations;
 
   /**
    * The operation id counter. use current value and increment
diff --git a/src/testbed/testbed_api_peers.c b/src/testbed/testbed_api_peers.c
index 51ef66bec..25362df0d 100644
--- a/src/testbed/testbed_api_peers.c
+++ b/src/testbed/testbed_api_peers.c
@@ -408,7 +408,8 @@ GNUNET_TESTBED_peer_create_with_id_ (uint32_t unique_id,
   opc->type = OP_PEER_CREATE;
   opc->op = GNUNET_TESTBED_operation_create_ (opc, &opstart_peer_create,
                                               &oprelease_peer_create);
-  GNUNET_TESTBED_operation_queue_insert_ (controller->opq_peer_create, opc->op);
+  GNUNET_TESTBED_operation_queue_insert_ (controller->opq_parallel_operations,
+                                          opc->op);
   return opc->op;
 }
 
@@ -477,7 +478,8 @@ GNUNET_TESTBED_peer_start (struct GNUNET_TESTBED_Peer *peer)
   opc->type = OP_PEER_START;
   opc->op = GNUNET_TESTBED_operation_create_ (opc, &opstart_peer_start,
                                              &oprelease_peer_start);
-  GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_peer_create, opc->op);
+  GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_parallel_operations,
+                                          opc->op);
   return opc->op;  
 }
 
@@ -502,7 +504,8 @@ GNUNET_TESTBED_peer_stop (struct GNUNET_TESTBED_Peer *peer)
   opc->type = OP_PEER_STOP;
   opc->op = GNUNET_TESTBED_operation_create_ (opc, &opstart_peer_stop,
                                               &oprelease_peer_stop);
-  GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_peer_create, opc->op);
+  GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_parallel_operations,
+                                          opc->op);
   return opc->op;
 }
 
@@ -532,7 +535,8 @@ GNUNET_TESTBED_peer_get_information (struct GNUNET_TESTBED_Peer *peer,
   opc->id = opc->c->operation_counter++;
   opc->op = GNUNET_TESTBED_operation_create_ (opc, &opstart_peer_getinfo,
                                              &oprelease_peer_getinfo);
-  GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_peer_create, opc->op);
+  GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_parallel_operations,
+                                          opc->op);
   return opc->op;
 }
 
@@ -576,7 +580,7 @@ GNUNET_TESTBED_peer_destroy (struct GNUNET_TESTBED_Peer *peer)
   opc->type = OP_PEER_DESTROY;
   opc->op = GNUNET_TESTBED_operation_create_ (opc, &opstart_peer_destroy,
                                               &oprelease_peer_destroy);
-  GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_peer_create,
+  GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_parallel_operations,
                                           opc->op);
   return opc->op;
 }
@@ -638,7 +642,7 @@ GNUNET_TESTBED_overlay_connect (void *op_cls,
   opc->type = OP_OVERLAY_CONNECT;
   opc->op = GNUNET_TESTBED_operation_create_ (opc, &opstart_overlay_connect,
                                               &oprelease_overlay_connect);
-  GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_peer_create,
+  GNUNET_TESTBED_operation_queue_insert_ (opc->c->opq_parallel_operations,
                                           opc->op);
   return opc->op;
 }