aboutsummaryrefslogtreecommitdiff
path: root/src/testbed/testbed_api_testbed.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/testbed/testbed_api_testbed.c')
-rw-r--r--src/testbed/testbed_api_testbed.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/testbed/testbed_api_testbed.c b/src/testbed/testbed_api_testbed.c
index 2f5fc70e8..2d420c3e3 100644
--- a/src/testbed/testbed_api_testbed.c
+++ b/src/testbed/testbed_api_testbed.c
@@ -338,7 +338,7 @@ struct GNUNET_TESTBED_RunHandle
338 */ 338 */
339static uint32_t 339static uint32_t
340rcop_key (void *rcop) 340rcop_key (void *rcop)
341{ 341{
342 return * ((uint32_t *) &rcop); 342 return * ((uint32_t *) &rcop);
343} 343}
344 344
@@ -397,10 +397,10 @@ static struct RunContextOperation *
397search_rcop (struct GNUNET_TESTBED_RunHandle *rc, struct GNUNET_TESTBED_Operation *op) 397search_rcop (struct GNUNET_TESTBED_RunHandle *rc, struct GNUNET_TESTBED_Operation *op)
398{ 398{
399 struct SearchContext sc; 399 struct SearchContext sc;
400 400
401 sc.query = op; 401 sc.query = op;
402 sc.result = NULL; 402 sc.result = NULL;
403 if (GNUNET_SYSERR == 403 if (GNUNET_SYSERR ==
404 GNUNET_CONTAINER_multihashmap32_get_multiple (rc->rcop_map, 404 GNUNET_CONTAINER_multihashmap32_get_multiple (rc->rcop_map,
405 rcop_key (op), 405 rcop_key (op),
406 &search_iterator, 406 &search_iterator,
@@ -481,7 +481,7 @@ cleanup (void *cls)
481 481
482 482
483/** 483/**
484 * Iterator for cleaning up elements from rcop_map 484 * Iterator for cleaning up elements from rcop_map
485 * 485 *
486 * @param cls the RunContext 486 * @param cls the RunContext
487 * @param key the 32-bit key 487 * @param key the 32-bit key
@@ -546,7 +546,7 @@ rc_cleanup_operations (struct GNUNET_TESTBED_RunHandle *rc)
546 rc->topology_operation = NULL; 546 rc->topology_operation = NULL;
547 } 547 }
548 /* cancel any exiting operations */ 548 /* cancel any exiting operations */
549 GNUNET_assert (GNUNET_SYSERR != 549 GNUNET_assert (GNUNET_SYSERR !=
550 GNUNET_CONTAINER_multihashmap32_iterate (rc->rcop_map, 550 GNUNET_CONTAINER_multihashmap32_iterate (rc->rcop_map,
551 &rcop_cleanup_iterator, 551 &rcop_cleanup_iterator,
552 rc)); 552 rc));
@@ -568,7 +568,7 @@ cancel_interrupt_task (struct GNUNET_TESTBED_RunHandle *rc)
568 568
569/** 569/**
570 * This callback will be called when all the operations are completed 570 * This callback will be called when all the operations are completed
571 * (done/cancelled) 571 * (done/cancelled)
572 * 572 *
573 * @param cls run context 573 * @param cls run context
574 */ 574 */
@@ -624,9 +624,9 @@ interrupt (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
624 /* reschedule */ 624 /* reschedule */
625 rc->interrupt_task = GNUNET_SCHEDULER_add_delayed 625 rc->interrupt_task = GNUNET_SCHEDULER_add_delayed
626 (GNUNET_TIME_UNIT_FOREVER_REL, &interrupt, rc); 626 (GNUNET_TIME_UNIT_FOREVER_REL, &interrupt, rc);
627 rc_cleanup_operations (rc); 627 rc_cleanup_operations (rc);
628 if ( (GNUNET_NO == rc->shutdown) 628 if ( (GNUNET_NO == rc->shutdown)
629 && (NULL != c) 629 && (NULL != c)
630 && (0 != (size = GNUNET_CONTAINER_multihashmap32_size (c->opc_map)))) 630 && (0 != (size = GNUNET_CONTAINER_multihashmap32_size (c->opc_map))))
631 { 631 {
632 LOG (GNUNET_ERROR_TYPE_WARNING, "Shutdown postponed as there are " 632 LOG (GNUNET_ERROR_TYPE_WARNING, "Shutdown postponed as there are "
@@ -917,7 +917,7 @@ call_cc:
917 { 917 {
918 unsigned long long number; 918 unsigned long long number;
919 unsigned int cap; 919 unsigned int cap;
920 GNUNET_assert (GNUNET_OK == 920 GNUNET_assert (GNUNET_OK ==
921 GNUNET_CONFIGURATION_get_value_number (rc->cfg, TESTBED_CONFIG_SECTION, 921 GNUNET_CONFIGURATION_get_value_number (rc->cfg, TESTBED_CONFIG_SECTION,
922 SCALE_FREE_CAP, 922 SCALE_FREE_CAP,
923 &number)); 923 &number));
@@ -1199,7 +1199,7 @@ static void
1199timeout_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 1199timeout_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
1200{ 1200{
1201 struct GNUNET_TESTBED_RunHandle *rc = cls; 1201 struct GNUNET_TESTBED_RunHandle *rc = cls;
1202 1202
1203 rc->timeout_task = GNUNET_SCHEDULER_NO_TASK; 1203 rc->timeout_task = GNUNET_SCHEDULER_NO_TASK;
1204 LOG (GNUNET_ERROR_TYPE_ERROR, _("Shutting down testbed due to timeout while setup.\n")); 1204 LOG (GNUNET_ERROR_TYPE_ERROR, _("Shutting down testbed due to timeout while setup.\n"));
1205 GNUNET_SCHEDULER_shutdown (); 1205 GNUNET_SCHEDULER_shutdown ();
@@ -1246,7 +1246,7 @@ GNUNET_TESTBED_run (const char *host_filename,
1246{ 1246{
1247 struct GNUNET_TESTBED_RunHandle *rc; 1247 struct GNUNET_TESTBED_RunHandle *rc;
1248 char *topology; 1248 char *topology;
1249 struct CompatibilityCheckContext *hc; 1249 struct CompatibilityCheckContext *hc;
1250 struct GNUNET_TIME_Relative timeout; 1250 struct GNUNET_TIME_Relative timeout;
1251 unsigned long long number; 1251 unsigned long long number;
1252 unsigned int hid; 1252 unsigned int hid;