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.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/testbed/testbed_api_testbed.c b/src/testbed/testbed_api_testbed.c
index 2be565e63..981a6a9e5 100644
--- a/src/testbed/testbed_api_testbed.c
+++ b/src/testbed/testbed_api_testbed.c
@@ -253,17 +253,17 @@ struct GNUNET_TESTBED_RunHandle
253 /** 253 /**
254 * Host registration task 254 * Host registration task
255 */ 255 */
256 GNUNET_SCHEDULER_TaskIdentifier register_hosts_task; 256 struct GNUNET_SCHEDULER_Task * register_hosts_task;
257 257
258 /** 258 /**
259 * Task to be run of a timeout 259 * Task to be run of a timeout
260 */ 260 */
261 GNUNET_SCHEDULER_TaskIdentifier timeout_task; 261 struct GNUNET_SCHEDULER_Task * timeout_task;
262 262
263 /** 263 /**
264 * Task run upon shutdown interrupts 264 * Task run upon shutdown interrupts
265 */ 265 */
266 GNUNET_SCHEDULER_TaskIdentifier 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
@@ -455,7 +455,7 @@ cleanup (struct GNUNET_TESTBED_RunHandle *rc)
455{ 455{
456 unsigned int hid; 456 unsigned int hid;
457 457
458 GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == rc->register_hosts_task); 458 GNUNET_assert (NULL == rc->register_hosts_task);
459 GNUNET_assert (NULL == rc->reg_handle); 459 GNUNET_assert (NULL == rc->reg_handle);
460 GNUNET_assert (NULL == rc->peers); 460 GNUNET_assert (NULL == rc->peers);
461 GNUNET_assert (NULL == rc->hclist); 461 GNUNET_assert (NULL == rc->hclist);
@@ -524,15 +524,15 @@ rc_cleanup_operations (struct GNUNET_TESTBED_RunHandle *rc)
524 rc->hclist = NULL; 524 rc->hclist = NULL;
525 } 525 }
526 /* Stop register hosts task if it is running */ 526 /* Stop register hosts task if it is running */
527 if (GNUNET_SCHEDULER_NO_TASK != rc->register_hosts_task) 527 if (NULL != rc->register_hosts_task)
528 { 528 {
529 GNUNET_SCHEDULER_cancel (rc->register_hosts_task); 529 GNUNET_SCHEDULER_cancel (rc->register_hosts_task);
530 rc->register_hosts_task = GNUNET_SCHEDULER_NO_TASK; 530 rc->register_hosts_task = NULL;
531 } 531 }
532 if (GNUNET_SCHEDULER_NO_TASK != rc->timeout_task) 532 if (NULL != rc->timeout_task)
533 { 533 {
534 GNUNET_SCHEDULER_cancel (rc->timeout_task); 534 GNUNET_SCHEDULER_cancel (rc->timeout_task);
535 rc->timeout_task = GNUNET_SCHEDULER_NO_TASK; 535 rc->timeout_task = NULL;
536 } 536 }
537 if (NULL != rc->reg_handle) 537 if (NULL != rc->reg_handle)
538 { 538 {
@@ -561,7 +561,7 @@ static void
561cancel_interrupt_task (struct GNUNET_TESTBED_RunHandle *rc) 561cancel_interrupt_task (struct GNUNET_TESTBED_RunHandle *rc)
562{ 562{
563 GNUNET_SCHEDULER_cancel (rc->interrupt_task); 563 GNUNET_SCHEDULER_cancel (rc->interrupt_task);
564 rc->interrupt_task = GNUNET_SCHEDULER_NO_TASK; 564 rc->interrupt_task = NULL;
565} 565}
566 566
567 567
@@ -730,7 +730,7 @@ static void
730call_master (struct GNUNET_TESTBED_RunHandle *rc) 730call_master (struct GNUNET_TESTBED_RunHandle *rc)
731{ 731{
732 GNUNET_SCHEDULER_cancel (rc->timeout_task); 732 GNUNET_SCHEDULER_cancel (rc->timeout_task);
733 rc->timeout_task = GNUNET_SCHEDULER_NO_TASK; 733 rc->timeout_task = NULL;
734 if (NULL != rc->test_master) 734 if (NULL != rc->test_master)
735 rc->test_master (rc->test_master_cls, rc, rc->num_peers, rc->peers, 735 rc->test_master (rc->test_master_cls, rc, rc->num_peers, rc->peers,
736 rc->links_succeeded, rc->links_failed); 736 rc->links_succeeded, rc->links_failed);
@@ -1006,7 +1006,7 @@ register_hosts (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
1006 struct RunContextOperation *rcop; 1006 struct RunContextOperation *rcop;
1007 unsigned int slave; 1007 unsigned int slave;
1008 1008
1009 rc->register_hosts_task = GNUNET_SCHEDULER_NO_TASK; 1009 rc->register_hosts_task = NULL;
1010 if (rc->reg_hosts == rc->num_hosts) 1010 if (rc->reg_hosts == rc->num_hosts)
1011 { 1011 {
1012 DEBUG ("All hosts successfully registered\n"); 1012 DEBUG ("All hosts successfully registered\n");
@@ -1199,7 +1199,7 @@ timeout_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
1199{ 1199{
1200 struct GNUNET_TESTBED_RunHandle *rc = cls; 1200 struct GNUNET_TESTBED_RunHandle *rc = cls;
1201 1201
1202 rc->timeout_task = GNUNET_SCHEDULER_NO_TASK; 1202 rc->timeout_task = NULL;
1203 LOG (GNUNET_ERROR_TYPE_ERROR, _("Shutting down testbed due to timeout while setup.\n")); 1203 LOG (GNUNET_ERROR_TYPE_ERROR, _("Shutting down testbed due to timeout while setup.\n"));
1204 GNUNET_SCHEDULER_shutdown (); 1204 GNUNET_SCHEDULER_shutdown ();
1205 if (NULL != rc->test_master) 1205 if (NULL != rc->test_master)