aboutsummaryrefslogtreecommitdiff
path: root/src/testbed/testbed_api.c
diff options
context:
space:
mode:
authorSree Harsha Totakura <totakura@in.tum.de>2012-08-25 10:29:17 +0000
committerSree Harsha Totakura <totakura@in.tum.de>2012-08-25 10:29:17 +0000
commit9233abe82cdf18d40932d590f1c411dff47488e7 (patch)
tree69b9ca3cba9339fb6d5099c276643ef6d03c4930 /src/testbed/testbed_api.c
parentd78b1ed8679e564865d86e8693939c2e9ff60c75 (diff)
downloadgnunet-9233abe82cdf18d40932d590f1c411dff47488e7.tar.gz
gnunet-9233abe82cdf18d40932d590f1c411dff47488e7.zip
operation queue renaming
Diffstat (limited to 'src/testbed/testbed_api.c')
-rw-r--r--src/testbed/testbed_api.c19
1 files changed, 10 insertions, 9 deletions
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
1159 struct GNUNET_TESTBED_Controller *controller; 1159 struct GNUNET_TESTBED_Controller *controller;
1160 struct GNUNET_TESTBED_InitMessage *msg; 1160 struct GNUNET_TESTBED_InitMessage *msg;
1161 const char *controller_hostname; 1161 const char *controller_hostname;
1162 unsigned long long max_parallel_peer_create; 1162 unsigned long long max_parallel_operations;
1163 1163
1164 if (GNUNET_OK != 1164 if (GNUNET_OK !=
1165 GNUNET_CONFIGURATION_get_value_number (cfg, "testbed", 1165 GNUNET_CONFIGURATION_get_value_number (cfg, "testbed",
1166 "MAX_PARALLEL_PEER_CREATE", 1166 "MAX_PARALLEL_OPERATIONS",
1167 &max_parallel_peer_create)) 1167 &max_parallel_operations))
1168 { 1168 {
1169 GNUNET_break (0); 1169 GNUNET_break (0);
1170 return NULL; 1170 return NULL;
1171 } 1171 }
1172 controller = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_Controller)); 1172 controller = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_Controller));
1173 controller->cc = cc; 1173 controller->cc = cc;
1174 controller->cc_cls = cc_cls; 1174 controller->cc_cls = cc_cls;
@@ -1198,9 +1198,9 @@ GNUNET_TESTBED_controller_connect (const struct GNUNET_CONFIGURATION_Handle *cfg
1198 GNUNET_assert (NULL != host); 1198 GNUNET_assert (NULL != host);
1199 GNUNET_TESTBED_mark_host_registered_at_ (host, controller); 1199 GNUNET_TESTBED_mark_host_registered_at_ (host, controller);
1200 controller->host = host; 1200 controller->host = host;
1201 controller->opq_peer_create = 1201 controller->opq_parallel_operations =
1202 GNUNET_TESTBED_operation_queue_create_ ((unsigned int) 1202 GNUNET_TESTBED_operation_queue_create_ ((unsigned int)
1203 max_parallel_peer_create); 1203 max_parallel_operations);
1204 controller_hostname = GNUNET_TESTBED_host_get_hostname_ (host); 1204 controller_hostname = GNUNET_TESTBED_host_get_hostname_ (host);
1205 if (NULL == controller_hostname) 1205 if (NULL == controller_hostname)
1206 controller_hostname = "127.0.0.1"; 1206 controller_hostname = "127.0.0.1";
@@ -1279,7 +1279,7 @@ GNUNET_TESTBED_controller_disconnect (struct GNUNET_TESTBED_Controller *controll
1279 GNUNET_CONFIGURATION_destroy (controller->cfg); 1279 GNUNET_CONFIGURATION_destroy (controller->cfg);
1280 if (GNUNET_YES == controller->aux_host) 1280 if (GNUNET_YES == controller->aux_host)
1281 GNUNET_TESTBED_host_destroy (controller->host); 1281 GNUNET_TESTBED_host_destroy (controller->host);
1282 GNUNET_TESTBED_operation_queue_destroy_ (controller->opq_peer_create); 1282 GNUNET_TESTBED_operation_queue_destroy_ (controller->opq_parallel_operations);
1283 GNUNET_free (controller); 1283 GNUNET_free (controller);
1284} 1284}
1285 1285
@@ -1424,7 +1424,8 @@ GNUNET_TESTBED_controller_link_2 (struct GNUNET_TESTBED_Controller *master,
1424 msg->operation_id = GNUNET_htonll (opc->id); 1424 msg->operation_id = GNUNET_htonll (opc->id);
1425 opc->op = GNUNET_TESTBED_operation_create_ (opc, &opstart_link_controllers, 1425 opc->op = GNUNET_TESTBED_operation_create_ (opc, &opstart_link_controllers,
1426 &oprelease_link_controllers); 1426 &oprelease_link_controllers);
1427 GNUNET_TESTBED_operation_queue_insert_ (master->opq_peer_create, opc->op); 1427 GNUNET_TESTBED_operation_queue_insert_ (master->opq_parallel_operations,
1428 opc->op);
1428 return opc->op; 1429 return opc->op;
1429} 1430}
1430 1431
@@ -1535,7 +1536,7 @@ GNUNET_TESTBED_overlay_write_topology_to_file (struct GNUNET_TESTBED_Controller
1535 */ 1536 */
1536struct GNUNET_TESTBED_HelperInit * 1537struct GNUNET_TESTBED_HelperInit *
1537GNUNET_TESTBED_create_helper_init_msg_ (const char *cname, 1538GNUNET_TESTBED_create_helper_init_msg_ (const char *cname,
1538 const struct GNUNET_CONFIGURATION_Handle *cfg) 1539 const struct GNUNET_CONFIGURATION_Handle *cfg)
1539{ 1540{
1540 struct GNUNET_TESTBED_HelperInit *msg; 1541 struct GNUNET_TESTBED_HelperInit *msg;
1541 char *config; 1542 char *config;