diff options
Diffstat (limited to 'src/testbed/testbed_api_testbed.c')
-rw-r--r-- | src/testbed/testbed_api_testbed.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/testbed/testbed_api_testbed.c b/src/testbed/testbed_api_testbed.c index de99fb5a3..b3b2c3987 100644 --- a/src/testbed/testbed_api_testbed.c +++ b/src/testbed/testbed_api_testbed.c | |||
@@ -263,7 +263,7 @@ struct GNUNET_TESTBED_RunHandle | |||
263 | /** | 263 | /** |
264 | * Task run upon shutdown interrupts | 264 | * Task run upon shutdown interrupts |
265 | */ | 265 | */ |
266 | struct GNUNET_SCHEDULER_Task * interrupt_task; | 266 | struct GNUNET_SCHEDULER_Task *interrupt_task; |
267 | 267 | ||
268 | /** | 268 | /** |
269 | * The event mask for the controller | 269 | * The event mask for the controller |
@@ -620,8 +620,7 @@ interrupt (void *cls) | |||
620 | unsigned int size; | 620 | unsigned int size; |
621 | 621 | ||
622 | /* reschedule */ | 622 | /* reschedule */ |
623 | rc->interrupt_task = GNUNET_SCHEDULER_add_delayed | 623 | rc->interrupt_task = GNUNET_SCHEDULER_add_shutdown (&interrupt, rc); |
624 | (GNUNET_TIME_UNIT_FOREVER_REL, &interrupt, rc); | ||
625 | rc_cleanup_operations (rc); | 624 | rc_cleanup_operations (rc); |
626 | if ( (GNUNET_NO == rc->shutdown) && | 625 | if ( (GNUNET_NO == rc->shutdown) && |
627 | (NULL != c) && | 626 | (NULL != c) && |
@@ -988,7 +987,8 @@ host_registration_completion (void *cls, const char *emsg) | |||
988 | GNUNET_SCHEDULER_shutdown (); | 987 | GNUNET_SCHEDULER_shutdown (); |
989 | return; | 988 | return; |
990 | } | 989 | } |
991 | rc->register_hosts_task = GNUNET_SCHEDULER_add_now (®ister_hosts, rc); | 990 | rc->register_hosts_task = GNUNET_SCHEDULER_add_now (®ister_hosts, |
991 | rc); | ||
992 | } | 992 | } |
993 | 993 | ||
994 | 994 | ||
@@ -1415,10 +1415,11 @@ GNUNET_TESTBED_run (const char *host_filename, | |||
1415 | } | 1415 | } |
1416 | rc->rcop_map = GNUNET_CONTAINER_multihashmap32_create (256); | 1416 | rc->rcop_map = GNUNET_CONTAINER_multihashmap32_create (256); |
1417 | rc->timeout_task = | 1417 | rc->timeout_task = |
1418 | GNUNET_SCHEDULER_add_delayed (timeout, &timeout_task, rc); | 1418 | GNUNET_SCHEDULER_add_delayed (timeout, &timeout_task, rc); |
1419 | GNUNET_assert (NULL == rc->interrupt_task); | ||
1419 | rc->interrupt_task = | 1420 | rc->interrupt_task = |
1420 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &interrupt, | 1421 | GNUNET_SCHEDULER_add_shutdown (&interrupt, |
1421 | rc); | 1422 | rc); |
1422 | return; | 1423 | return; |
1423 | 1424 | ||
1424 | error_cleanup: | 1425 | error_cleanup: |