diff options
Diffstat (limited to 'src/testbed/testbed_logger_api.c')
-rw-r--r-- | src/testbed/testbed_logger_api.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/testbed/testbed_logger_api.c b/src/testbed/testbed_logger_api.c index dab9d6600..091645de3 100644 --- a/src/testbed/testbed_logger_api.c +++ b/src/testbed/testbed_logger_api.c | |||
@@ -144,12 +144,12 @@ struct GNUNET_TESTBED_LOGGER_Handle | |||
144 | /** | 144 | /** |
145 | * Task to call the flush completion callback | 145 | * Task to call the flush completion callback |
146 | */ | 146 | */ |
147 | GNUNET_SCHEDULER_TaskIdentifier flush_completion_task; | 147 | struct GNUNET_SCHEDULER_Task * flush_completion_task; |
148 | 148 | ||
149 | /** | 149 | /** |
150 | * Task to be executed when flushing takes too long | 150 | * Task to be executed when flushing takes too long |
151 | */ | 151 | */ |
152 | GNUNET_SCHEDULER_TaskIdentifier timeout_flush_task; | 152 | struct GNUNET_SCHEDULER_Task * timeout_flush_task; |
153 | }; | 153 | }; |
154 | 154 | ||
155 | 155 | ||
@@ -162,7 +162,7 @@ static void | |||
162 | cancel_timeout_flush (struct GNUNET_TESTBED_LOGGER_Handle *h) | 162 | cancel_timeout_flush (struct GNUNET_TESTBED_LOGGER_Handle *h) |
163 | { | 163 | { |
164 | GNUNET_SCHEDULER_cancel (h->timeout_flush_task); | 164 | GNUNET_SCHEDULER_cancel (h->timeout_flush_task); |
165 | h->timeout_flush_task = GNUNET_SCHEDULER_NO_TASK; | 165 | h->timeout_flush_task = NULL; |
166 | } | 166 | } |
167 | 167 | ||
168 | 168 | ||
@@ -180,14 +180,14 @@ call_flush_completion (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
180 | void *cb_cls; | 180 | void *cb_cls; |
181 | size_t bw; | 181 | size_t bw; |
182 | 182 | ||
183 | h->flush_completion_task = GNUNET_SCHEDULER_NO_TASK; | 183 | h->flush_completion_task = NULL; |
184 | bw = h->bwrote; | 184 | bw = h->bwrote; |
185 | h->bwrote = 0; | 185 | h->bwrote = 0; |
186 | cb = h->cb; | 186 | cb = h->cb; |
187 | h->cb = NULL; | 187 | h->cb = NULL; |
188 | cb_cls = h->cb_cls; | 188 | cb_cls = h->cb_cls; |
189 | h->cb_cls = NULL; | 189 | h->cb_cls = NULL; |
190 | if (GNUNET_SCHEDULER_NO_TASK != h->timeout_flush_task) | 190 | if (NULL != h->timeout_flush_task) |
191 | cancel_timeout_flush (h); | 191 | cancel_timeout_flush (h); |
192 | if (NULL != cb) | 192 | if (NULL != cb) |
193 | cb (cb_cls, bw); | 193 | cb (cb_cls, bw); |
@@ -202,7 +202,7 @@ call_flush_completion (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
202 | static void | 202 | static void |
203 | trigger_flush_notification (struct GNUNET_TESTBED_LOGGER_Handle *h) | 203 | trigger_flush_notification (struct GNUNET_TESTBED_LOGGER_Handle *h) |
204 | { | 204 | { |
205 | if (GNUNET_SCHEDULER_NO_TASK != h->flush_completion_task) | 205 | if (NULL != h->flush_completion_task) |
206 | GNUNET_SCHEDULER_cancel (h->flush_completion_task); | 206 | GNUNET_SCHEDULER_cancel (h->flush_completion_task); |
207 | h->flush_completion_task = GNUNET_SCHEDULER_add_now (&call_flush_completion, h); | 207 | h->flush_completion_task = GNUNET_SCHEDULER_add_now (&call_flush_completion, h); |
208 | } | 208 | } |
@@ -354,7 +354,7 @@ GNUNET_TESTBED_LOGGER_disconnect (struct GNUNET_TESTBED_LOGGER_Handle *h) | |||
354 | struct MessageQueue *mq; | 354 | struct MessageQueue *mq; |
355 | unsigned int lost; | 355 | unsigned int lost; |
356 | 356 | ||
357 | if (GNUNET_SCHEDULER_NO_TASK != h->flush_completion_task) | 357 | if (NULL != h->flush_completion_task) |
358 | GNUNET_SCHEDULER_cancel (h->flush_completion_task); | 358 | GNUNET_SCHEDULER_cancel (h->flush_completion_task); |
359 | lost = 0; | 359 | lost = 0; |
360 | while (NULL != (mq = h->mq_head)) | 360 | while (NULL != (mq = h->mq_head)) |
@@ -425,15 +425,15 @@ timeout_flush (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
425 | GNUNET_TESTBED_LOGGER_FlushCompletion cb; | 425 | GNUNET_TESTBED_LOGGER_FlushCompletion cb; |
426 | void *cb_cls; | 426 | void *cb_cls; |
427 | 427 | ||
428 | h->timeout_flush_task = GNUNET_SCHEDULER_NO_TASK; | 428 | h->timeout_flush_task = NULL; |
429 | cb = h->cb; | 429 | cb = h->cb; |
430 | h->cb = NULL; | 430 | h->cb = NULL; |
431 | cb_cls = h->cb_cls; | 431 | cb_cls = h->cb_cls; |
432 | h->cb_cls = NULL; | 432 | h->cb_cls = NULL; |
433 | if (GNUNET_SCHEDULER_NO_TASK != h->flush_completion_task) | 433 | if (NULL != h->flush_completion_task) |
434 | { | 434 | { |
435 | GNUNET_SCHEDULER_cancel (h->flush_completion_task); | 435 | GNUNET_SCHEDULER_cancel (h->flush_completion_task); |
436 | h->flush_completion_task = GNUNET_SCHEDULER_NO_TASK; | 436 | h->flush_completion_task = NULL; |
437 | } | 437 | } |
438 | if (NULL != cb) | 438 | if (NULL != cb) |
439 | cb (cb_cls, 0); | 439 | cb (cb_cls, 0); |
@@ -456,7 +456,7 @@ GNUNET_TESTBED_LOGGER_flush (struct GNUNET_TESTBED_LOGGER_Handle *h, | |||
456 | { | 456 | { |
457 | h->cb = cb; | 457 | h->cb = cb; |
458 | h->cb_cls = cb_cls; | 458 | h->cb_cls = cb_cls; |
459 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == h->timeout_flush_task); | 459 | GNUNET_assert (NULL == h->timeout_flush_task); |
460 | h->timeout_flush_task = | 460 | h->timeout_flush_task = |
461 | GNUNET_SCHEDULER_add_delayed (timeout, &timeout_flush, h); | 461 | GNUNET_SCHEDULER_add_delayed (timeout, &timeout_flush, h); |
462 | if (NULL == h->buf) | 462 | if (NULL == h->buf) |
@@ -478,12 +478,12 @@ GNUNET_TESTBED_LOGGER_flush (struct GNUNET_TESTBED_LOGGER_Handle *h, | |||
478 | void | 478 | void |
479 | GNUNET_TESTBED_LOGGER_flush_cancel (struct GNUNET_TESTBED_LOGGER_Handle *h) | 479 | GNUNET_TESTBED_LOGGER_flush_cancel (struct GNUNET_TESTBED_LOGGER_Handle *h) |
480 | { | 480 | { |
481 | if (GNUNET_SCHEDULER_NO_TASK != h->flush_completion_task) | 481 | if (NULL != h->flush_completion_task) |
482 | { | 482 | { |
483 | GNUNET_SCHEDULER_cancel (h->flush_completion_task); | 483 | GNUNET_SCHEDULER_cancel (h->flush_completion_task); |
484 | h->flush_completion_task = GNUNET_SCHEDULER_NO_TASK; | 484 | h->flush_completion_task = NULL; |
485 | } | 485 | } |
486 | if (GNUNET_SCHEDULER_NO_TASK != h->timeout_flush_task) | 486 | if (NULL != h->timeout_flush_task) |
487 | cancel_timeout_flush (h); | 487 | cancel_timeout_flush (h); |
488 | h->cb = NULL; | 488 | h->cb = NULL; |
489 | h->cb_cls = NULL; | 489 | h->cb_cls = NULL; |