diff options
Diffstat (limited to 'src/testbed/test_testbed_api_testbed_run.c')
-rw-r--r-- | src/testbed/test_testbed_api_testbed_run.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/testbed/test_testbed_api_testbed_run.c b/src/testbed/test_testbed_api_testbed_run.c index dd8a249e9..14e0d4fa4 100644 --- a/src/testbed/test_testbed_api_testbed_run.c +++ b/src/testbed/test_testbed_api_testbed_run.c | |||
@@ -46,7 +46,7 @@ static struct GNUNET_TESTBED_Operation *op; | |||
46 | /** | 46 | /** |
47 | * Abort task identifier | 47 | * Abort task identifier |
48 | */ | 48 | */ |
49 | static GNUNET_SCHEDULER_TaskIdentifier abort_task; | 49 | static struct GNUNET_SCHEDULER_Task * abort_task; |
50 | 50 | ||
51 | /** | 51 | /** |
52 | * Current peer id | 52 | * Current peer id |
@@ -73,7 +73,7 @@ static int wait_forever; | |||
73 | static void | 73 | static void |
74 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 74 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
75 | { | 75 | { |
76 | if (GNUNET_SCHEDULER_NO_TASK != abort_task) | 76 | if (NULL != abort_task) |
77 | GNUNET_SCHEDULER_cancel (abort_task); | 77 | GNUNET_SCHEDULER_cancel (abort_task); |
78 | GNUNET_SCHEDULER_shutdown (); /* Stop scheduler to shutdown testbed run */ | 78 | GNUNET_SCHEDULER_shutdown (); /* Stop scheduler to shutdown testbed run */ |
79 | } | 79 | } |
@@ -89,7 +89,7 @@ static void | |||
89 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 89 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
90 | { | 90 | { |
91 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); | 91 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); |
92 | abort_task = GNUNET_SCHEDULER_NO_TASK; | 92 | abort_task = NULL; |
93 | (void) GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); | 93 | (void) GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); |
94 | } | 94 | } |
95 | 95 | ||
@@ -117,10 +117,10 @@ test_master (void *cls, | |||
117 | result = GNUNET_OK; | 117 | result = GNUNET_OK; |
118 | if (GNUNET_YES == wait_forever) | 118 | if (GNUNET_YES == wait_forever) |
119 | { | 119 | { |
120 | if (GNUNET_SCHEDULER_NO_TASK == abort_task) | 120 | if (NULL == abort_task) |
121 | return; /* abort already scheduled */ | 121 | return; /* abort already scheduled */ |
122 | GNUNET_SCHEDULER_cancel (abort_task); | 122 | GNUNET_SCHEDULER_cancel (abort_task); |
123 | abort_task = GNUNET_SCHEDULER_NO_TASK; | 123 | abort_task = NULL; |
124 | (void) GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, | 124 | (void) GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, |
125 | &do_shutdown, NULL); | 125 | &do_shutdown, NULL); |
126 | return; | 126 | return; |