diff options
Diffstat (limited to 'src/testbed/testbed_api_statistics.c')
-rw-r--r-- | src/testbed/testbed_api_statistics.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/testbed/testbed_api_statistics.c b/src/testbed/testbed_api_statistics.c index e6efc1fb0..6087a0c14 100644 --- a/src/testbed/testbed_api_statistics.c +++ b/src/testbed/testbed_api_statistics.c | |||
@@ -94,7 +94,7 @@ struct GetStatsContext | |||
94 | /** | 94 | /** |
95 | * The task for calling the continuation callback | 95 | * The task for calling the continuation callback |
96 | */ | 96 | */ |
97 | GNUNET_SCHEDULER_TaskIdentifier call_completion_task_id; | 97 | struct GNUNET_SCHEDULER_Task * call_completion_task_id; |
98 | 98 | ||
99 | /** | 99 | /** |
100 | * The number of peers present in the peers array. This number also | 100 | * The number of peers present in the peers array. This number also |
@@ -128,7 +128,7 @@ struct PeerGetStatsContext | |||
128 | /** | 128 | /** |
129 | * Task to mark the statistics service connect operation as done | 129 | * Task to mark the statistics service connect operation as done |
130 | */ | 130 | */ |
131 | GNUNET_SCHEDULER_TaskIdentifier op_done_task_id; | 131 | struct GNUNET_SCHEDULER_Task * op_done_task_id; |
132 | 132 | ||
133 | /** | 133 | /** |
134 | * The index of this peer in the peers array of GetStatsContext | 134 | * The index of this peer in the peers array of GetStatsContext |
@@ -157,8 +157,8 @@ call_completion_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
157 | { | 157 | { |
158 | struct GetStatsContext *sc = cls; | 158 | struct GetStatsContext *sc = cls; |
159 | 159 | ||
160 | GNUNET_assert (sc->call_completion_task_id != GNUNET_SCHEDULER_NO_TASK); | 160 | GNUNET_assert (sc->call_completion_task_id != NULL); |
161 | sc->call_completion_task_id = GNUNET_SCHEDULER_NO_TASK; | 161 | sc->call_completion_task_id = NULL; |
162 | LOG_DEBUG ("Calling get_statistics() continuation callback\n"); | 162 | LOG_DEBUG ("Calling get_statistics() continuation callback\n"); |
163 | sc->cont (sc->cb_cls, sc->main_op, NULL); | 163 | sc->cont (sc->cb_cls, sc->main_op, NULL); |
164 | } | 164 | } |
@@ -179,7 +179,7 @@ op_done_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
179 | struct GNUNET_TESTBED_Operation **op; | 179 | struct GNUNET_TESTBED_Operation **op; |
180 | 180 | ||
181 | sc = peer_sc->sc; | 181 | sc = peer_sc->sc; |
182 | peer_sc->op_done_task_id = GNUNET_SCHEDULER_NO_TASK; | 182 | peer_sc->op_done_task_id = NULL; |
183 | op = &sc->ops[peer_sc->peer_index]; | 183 | op = &sc->ops[peer_sc->peer_index]; |
184 | GNUNET_assert (NULL != *op); | 184 | GNUNET_assert (NULL != *op); |
185 | GNUNET_TESTBED_operation_done (*op); | 185 | GNUNET_TESTBED_operation_done (*op); |
@@ -312,7 +312,7 @@ statistics_da (void *cls, void *op_result) | |||
312 | peer_sc->get_handle = NULL; | 312 | peer_sc->get_handle = NULL; |
313 | } | 313 | } |
314 | GNUNET_STATISTICS_destroy (sh, GNUNET_NO); | 314 | GNUNET_STATISTICS_destroy (sh, GNUNET_NO); |
315 | if (GNUNET_SCHEDULER_NO_TASK != peer_sc->op_done_task_id) | 315 | if (NULL != peer_sc->op_done_task_id) |
316 | GNUNET_SCHEDULER_cancel (peer_sc->op_done_task_id); | 316 | GNUNET_SCHEDULER_cancel (peer_sc->op_done_task_id); |
317 | GNUNET_free (peer_sc); | 317 | GNUNET_free (peer_sc); |
318 | } | 318 | } |
@@ -366,7 +366,7 @@ oprelease_get_stats (void *cls) | |||
366 | unsigned int peer; | 366 | unsigned int peer; |
367 | 367 | ||
368 | LOG_DEBUG ("Cleaning up get_statistics operation\n"); | 368 | LOG_DEBUG ("Cleaning up get_statistics operation\n"); |
369 | if (GNUNET_SCHEDULER_NO_TASK != sc->call_completion_task_id) | 369 | if (NULL != sc->call_completion_task_id) |
370 | GNUNET_SCHEDULER_cancel (sc->call_completion_task_id); | 370 | GNUNET_SCHEDULER_cancel (sc->call_completion_task_id); |
371 | if (NULL != sc->ops) | 371 | if (NULL != sc->ops) |
372 | { | 372 | { |