diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-04-09 23:14:03 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-04-09 23:14:03 +0000 |
commit | 29e6158507a0758192075ac6ece7ba8e75ddc49a (patch) | |
tree | b91ded48da322f8ba4c9bb0f5504228aa036c2d1 /src/testbed | |
parent | 5dfcb058ab5db9ae0c4b147d8a99c64ca0980028 (diff) | |
download | gnunet-29e6158507a0758192075ac6ece7ba8e75ddc49a.tar.gz gnunet-29e6158507a0758192075ac6ece7ba8e75ddc49a.zip |
small API change: do no longer pass rarely needed GNUNET_SCHEDULER_TaskContext to all scheduler tasks; instead, allow the relatively few tasks that need it to obtain the context via GNUNET_SCHEDULER_get_task_context()
Diffstat (limited to 'src/testbed')
38 files changed, 123 insertions, 189 deletions
diff --git a/src/testbed/gnunet-daemon-latency-logger.c b/src/testbed/gnunet-daemon-latency-logger.c index 84d8e223a..9652721a1 100644 --- a/src/testbed/gnunet-daemon-latency-logger.c +++ b/src/testbed/gnunet-daemon-latency-logger.c | |||
@@ -131,11 +131,10 @@ free_iterator (void *cls, | |||
131 | * Shutdown | 131 | * Shutdown |
132 | * | 132 | * |
133 | * @param cls NULL | 133 | * @param cls NULL |
134 | * @param tc task context from scheduler | ||
135 | * @return | 134 | * @return |
136 | */ | 135 | */ |
137 | static void | 136 | static void |
138 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 137 | do_shutdown (void *cls) |
139 | { | 138 | { |
140 | shutdown_task = NULL; | 139 | shutdown_task = NULL; |
141 | GNUNET_ATS_performance_done (ats); | 140 | GNUNET_ATS_performance_done (ats); |
diff --git a/src/testbed/gnunet-daemon-testbed-blacklist.c b/src/testbed/gnunet-daemon-testbed-blacklist.c index ed1c061a0..0e0c7ebd5 100644 --- a/src/testbed/gnunet-daemon-testbed-blacklist.c +++ b/src/testbed/gnunet-daemon-testbed-blacklist.c | |||
@@ -121,10 +121,9 @@ cleanup_map () | |||
121 | * Shutdown task to cleanup our resources and exit. | 121 | * Shutdown task to cleanup our resources and exit. |
122 | * | 122 | * |
123 | * @param cls NULL | 123 | * @param cls NULL |
124 | * @param tc scheduler task context | ||
125 | */ | 124 | */ |
126 | static void | 125 | static void |
127 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 126 | do_shutdown (void *cls) |
128 | { | 127 | { |
129 | cleanup_map (); | 128 | cleanup_map (); |
130 | if (NULL != bh) | 129 | if (NULL != bh) |
diff --git a/src/testbed/gnunet-daemon-testbed-underlay.c b/src/testbed/gnunet-daemon-testbed-underlay.c index c4dbc5178..ce0cc46d9 100644 --- a/src/testbed/gnunet-daemon-testbed-underlay.c +++ b/src/testbed/gnunet-daemon-testbed-underlay.c | |||
@@ -286,10 +286,9 @@ unload_keys () | |||
286 | * Shutdown task to cleanup our resources and exit. | 286 | * Shutdown task to cleanup our resources and exit. |
287 | * | 287 | * |
288 | * @param cls NULL | 288 | * @param cls NULL |
289 | * @param tc scheduler task context | ||
290 | */ | 289 | */ |
291 | static void | 290 | static void |
292 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 291 | do_shutdown (void *cls) |
293 | { | 292 | { |
294 | if (NULL != transport) | 293 | if (NULL != transport) |
295 | { | 294 | { |
diff --git a/src/testbed/gnunet-helper-testbed.c b/src/testbed/gnunet-helper-testbed.c index 4cde1b4d0..b43f10983 100644 --- a/src/testbed/gnunet-helper-testbed.c +++ b/src/testbed/gnunet-helper-testbed.c | |||
@@ -156,10 +156,9 @@ static int status; | |||
156 | * Task to shut down cleanly | 156 | * Task to shut down cleanly |
157 | * | 157 | * |
158 | * @param cls NULL | 158 | * @param cls NULL |
159 | * @param tc the task context | ||
160 | */ | 159 | */ |
161 | static void | 160 | static void |
162 | shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 161 | shutdown_task (void *cls) |
163 | { | 162 | { |
164 | LOG_DEBUG ("Shutting down\n"); | 163 | LOG_DEBUG ("Shutting down\n"); |
165 | shutdown_task_id = NULL; | 164 | shutdown_task_id = NULL; |
@@ -219,16 +218,17 @@ shutdown_now (void) | |||
219 | * Task to write to the standard out | 218 | * Task to write to the standard out |
220 | * | 219 | * |
221 | * @param cls the WriteContext | 220 | * @param cls the WriteContext |
222 | * @param tc the TaskContext | ||
223 | */ | 221 | */ |
224 | static void | 222 | static void |
225 | write_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 223 | write_task (void *cls) |
226 | { | 224 | { |
227 | struct WriteContext *wc = cls; | 225 | struct WriteContext *wc = cls; |
228 | ssize_t bytes_wrote; | 226 | ssize_t bytes_wrote; |
227 | const struct GNUNET_SCHEDULER_TaskContext *tc; | ||
229 | 228 | ||
230 | GNUNET_assert (NULL != wc); | 229 | GNUNET_assert (NULL != wc); |
231 | write_task_id = NULL; | 230 | write_task_id = NULL; |
231 | tc = GNUNET_SCHEDULER_get_task_context (); | ||
232 | if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason)) | 232 | if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason)) |
233 | { | 233 | { |
234 | GNUNET_free (wc->data); | 234 | GNUNET_free (wc->data); |
@@ -263,19 +263,20 @@ write_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
263 | * process died). | 263 | * process died). |
264 | * | 264 | * |
265 | * @param cls closure, NULL if we need to self-restart | 265 | * @param cls closure, NULL if we need to self-restart |
266 | * @param tc context | ||
267 | */ | 266 | */ |
268 | static void | 267 | static void |
269 | child_death_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 268 | child_death_task (void *cls) |
270 | { | 269 | { |
271 | const struct GNUNET_DISK_FileHandle *pr; | 270 | const struct GNUNET_DISK_FileHandle *pr; |
272 | char c[16]; | 271 | char c[16]; |
273 | enum GNUNET_OS_ProcessStatusType type; | 272 | enum GNUNET_OS_ProcessStatusType type; |
274 | unsigned long code; | 273 | unsigned long code; |
275 | int ret; | 274 | int ret; |
275 | const struct GNUNET_SCHEDULER_TaskContext *tc; | ||
276 | 276 | ||
277 | pr = GNUNET_DISK_pipe_handle (sigpipe, GNUNET_DISK_PIPE_END_READ); | 277 | pr = GNUNET_DISK_pipe_handle (sigpipe, GNUNET_DISK_PIPE_END_READ); |
278 | child_death_task_id = NULL; | 278 | child_death_task_id = NULL; |
279 | tc = GNUNET_SCHEDULER_get_task_context (); | ||
279 | if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY)) | 280 | if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY)) |
280 | { | 281 | { |
281 | child_death_task_id = | 282 | child_death_task_id = |
@@ -518,15 +519,16 @@ error: | |||
518 | * Task to read from stdin | 519 | * Task to read from stdin |
519 | * | 520 | * |
520 | * @param cls NULL | 521 | * @param cls NULL |
521 | * @param tc the task context | ||
522 | */ | 522 | */ |
523 | static void | 523 | static void |
524 | read_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 524 | read_task (void *cls) |
525 | { | 525 | { |
526 | char buf[GNUNET_SERVER_MAX_MESSAGE_SIZE]; | 526 | char buf[GNUNET_SERVER_MAX_MESSAGE_SIZE]; |
527 | ssize_t sread; | 527 | ssize_t sread; |
528 | const struct GNUNET_SCHEDULER_TaskContext *tc; | ||
528 | 529 | ||
529 | read_task_id = NULL; | 530 | read_task_id = NULL; |
531 | tc = GNUNET_SCHEDULER_get_task_context (); | ||
530 | if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason)) | 532 | if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason)) |
531 | return; | 533 | return; |
532 | sread = GNUNET_DISK_file_read (stdin_fd, buf, sizeof (buf)); | 534 | sread = GNUNET_DISK_file_read (stdin_fd, buf, sizeof (buf)); |
diff --git a/src/testbed/gnunet-service-test-barriers.c b/src/testbed/gnunet-service-test-barriers.c index 444cb4a6d..281172cbf 100644 --- a/src/testbed/gnunet-service-test-barriers.c +++ b/src/testbed/gnunet-service-test-barriers.c | |||
@@ -46,10 +46,9 @@ struct GNUNET_TESTBED_BarrierWaitHandle *wh; | |||
46 | * Dummy task callback to keep us running forever | 46 | * Dummy task callback to keep us running forever |
47 | * | 47 | * |
48 | * @param cls NULL | 48 | * @param cls NULL |
49 | * @param tc scheduler task context | ||
50 | */ | 49 | */ |
51 | static void | 50 | static void |
52 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 51 | do_shutdown (void *cls) |
53 | { | 52 | { |
54 | if (NULL != wh) | 53 | if (NULL != wh) |
55 | GNUNET_TESTBED_barrier_wait_cancel (wh); | 54 | GNUNET_TESTBED_barrier_wait_cancel (wh); |
@@ -80,12 +79,14 @@ barrier_wait_cb (void *cls, const char *name, int status) | |||
80 | * Task to wait for the barrier | 79 | * Task to wait for the barrier |
81 | * | 80 | * |
82 | * @param cls NULL | 81 | * @param cls NULL |
83 | * @param tc scheduler task context | ||
84 | * @return | 82 | * @return |
85 | */ | 83 | */ |
86 | static void | 84 | static void |
87 | do_wait (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 85 | do_wait (void *cls) |
88 | { | 86 | { |
87 | const struct GNUNET_SCHEDULER_TaskContext *tc; | ||
88 | |||
89 | tc = GNUNET_SCHEDULER_get_task_context (); | ||
89 | if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason)) | 90 | if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason)) |
90 | return; | 91 | return; |
91 | wh = GNUNET_TESTBED_barrier_wait (TEST_BARRIER_NAME, &barrier_wait_cb, NULL); | 92 | wh = GNUNET_TESTBED_barrier_wait (TEST_BARRIER_NAME, &barrier_wait_cb, NULL); |
diff --git a/src/testbed/gnunet-service-testbed-logger.c b/src/testbed/gnunet-service-testbed-logger.c index bd52b8d52..ab5b17460 100644 --- a/src/testbed/gnunet-service-testbed-logger.c +++ b/src/testbed/gnunet-service-testbed-logger.c | |||
@@ -119,10 +119,9 @@ handle_log_msg (void *cls, struct GNUNET_SERVER_Client *client, | |||
119 | * Task to clean up and shutdown nicely | 119 | * Task to clean up and shutdown nicely |
120 | * | 120 | * |
121 | * @param cls NULL | 121 | * @param cls NULL |
122 | * @param tc the TaskContext from scheduler | ||
123 | */ | 122 | */ |
124 | static void | 123 | static void |
125 | shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 124 | shutdown_task (void *cls) |
126 | { | 125 | { |
127 | struct MessageQueue *mq_entry; | 126 | struct MessageQueue *mq_entry; |
128 | 127 | ||
@@ -155,7 +154,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
155 | * @param client identification of the client; NULL | 154 | * @param client identification of the client; NULL |
156 | * for the last call when the server is destroyed | 155 | * for the last call when the server is destroyed |
157 | */ | 156 | */ |
158 | static void | 157 | static void |
159 | client_disconnected (void *cls, struct GNUNET_SERVER_Client *client) | 158 | client_disconnected (void *cls, struct GNUNET_SERVER_Client *client) |
160 | { | 159 | { |
161 | if (NULL == client) | 160 | if (NULL == client) |
diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c index 68878b69b..e4fe87fcd 100644 --- a/src/testbed/gnunet-service-testbed.c +++ b/src/testbed/gnunet-service-testbed.c | |||
@@ -405,11 +405,9 @@ GST_forwarded_operation_reply_relay (void *cls, | |||
405 | * Task to free resources when forwarded operation has been timedout | 405 | * Task to free resources when forwarded operation has been timedout |
406 | * | 406 | * |
407 | * @param cls the ForwardedOperationContext | 407 | * @param cls the ForwardedOperationContext |
408 | * @param tc the task context from scheduler | ||
409 | */ | 408 | */ |
410 | void | 409 | void |
411 | GST_forwarded_operation_timeout (void *cls, | 410 | GST_forwarded_operation_timeout (void *cls) |
412 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
413 | { | 411 | { |
414 | struct ForwardedOperationContext *fopc = cls; | 412 | struct ForwardedOperationContext *fopc = cls; |
415 | 413 | ||
@@ -776,10 +774,9 @@ GST_clear_fopcq () | |||
776 | * Task to clean up and shutdown nicely | 774 | * Task to clean up and shutdown nicely |
777 | * | 775 | * |
778 | * @param cls NULL | 776 | * @param cls NULL |
779 | * @param tc the TaskContext from scheduler | ||
780 | */ | 777 | */ |
781 | static void | 778 | static void |
782 | shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 779 | shutdown_task (void *cls) |
783 | { | 780 | { |
784 | struct MessageQueue *mq_entry; | 781 | struct MessageQueue *mq_entry; |
785 | uint32_t id; | 782 | uint32_t id; |
diff --git a/src/testbed/gnunet-service-testbed.h b/src/testbed/gnunet-service-testbed.h index 825056880..b19d3c516 100644 --- a/src/testbed/gnunet-service-testbed.h +++ b/src/testbed/gnunet-service-testbed.h | |||
@@ -590,8 +590,7 @@ GST_forwarded_operation_reply_relay (void *cls, | |||
590 | * @param tc the task context from scheduler | 590 | * @param tc the task context from scheduler |
591 | */ | 591 | */ |
592 | void | 592 | void |
593 | GST_forwarded_operation_timeout (void *cls, | 593 | GST_forwarded_operation_timeout (void *cls); |
594 | const struct GNUNET_SCHEDULER_TaskContext *tc); | ||
595 | 594 | ||
596 | 595 | ||
597 | /** | 596 | /** |
diff --git a/src/testbed/gnunet-service-testbed_barriers.c b/src/testbed/gnunet-service-testbed_barriers.c index e1992cccb..5b081ed12 100644 --- a/src/testbed/gnunet-service-testbed_barriers.c +++ b/src/testbed/gnunet-service-testbed_barriers.c | |||
@@ -672,10 +672,9 @@ wbarrier_status_cb (void *cls, const char *name, | |||
672 | * subcontrollers to barrier init message | 672 | * subcontrollers to barrier init message |
673 | * | 673 | * |
674 | * @param cls barrier | 674 | * @param cls barrier |
675 | * @param tc scheduler task context | ||
676 | */ | 675 | */ |
677 | static void | 676 | static void |
678 | fwd_tout_barrier_init (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 677 | fwd_tout_barrier_init (void *cls) |
679 | { | 678 | { |
680 | struct Barrier *barrier = cls; | 679 | struct Barrier *barrier = cls; |
681 | 680 | ||
diff --git a/src/testbed/gnunet-service-testbed_connectionpool.c b/src/testbed/gnunet-service-testbed_connectionpool.c index e06538ac7..0fa2a6456 100644 --- a/src/testbed/gnunet-service-testbed_connectionpool.c +++ b/src/testbed/gnunet-service-testbed_connectionpool.c | |||
@@ -333,11 +333,9 @@ destroy_pooled_connection (struct PooledConnection *entry) | |||
333 | * Expire a #PooledConnection object | 333 | * Expire a #PooledConnection object |
334 | * | 334 | * |
335 | * @param cls the #PooledConnection object | 335 | * @param cls the #PooledConnection object |
336 | * @param tc scheduler task context | ||
337 | */ | 336 | */ |
338 | static void | 337 | static void |
339 | expire (void *cls, | 338 | expire (void *cls) |
340 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
341 | { | 339 | { |
342 | struct PooledConnection *entry = cls; | 340 | struct PooledConnection *entry = cls; |
343 | 341 | ||
@@ -429,10 +427,9 @@ search_waiting (const struct PooledConnection *entry, | |||
429 | * further schedules itself if there are similar waiting objects which can be notified. | 427 | * further schedules itself if there are similar waiting objects which can be notified. |
430 | * | 428 | * |
431 | * @param cls the #PooledConnection object | 429 | * @param cls the #PooledConnection object |
432 | * @param tc the task context from scheduler | ||
433 | */ | 430 | */ |
434 | static void | 431 | static void |
435 | connection_ready (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 432 | connection_ready (void *cls) |
436 | { | 433 | { |
437 | struct PooledConnection *entry = cls; | 434 | struct PooledConnection *entry = cls; |
438 | struct GST_ConnectionPool_GetHandle *gh; | 435 | struct GST_ConnectionPool_GetHandle *gh; |
diff --git a/src/testbed/gnunet-service-testbed_cpustatus.c b/src/testbed/gnunet-service-testbed_cpustatus.c index 066c680b3..cda669caa 100644 --- a/src/testbed/gnunet-service-testbed_cpustatus.c +++ b/src/testbed/gnunet-service-testbed_cpustatus.c | |||
@@ -646,7 +646,7 @@ get_nproc () | |||
646 | 646 | ||
647 | 647 | ||
648 | static void | 648 | static void |
649 | sample_load_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 649 | sample_load_task (void *cls) |
650 | { | 650 | { |
651 | struct GNUNET_TIME_Absolute now; | 651 | struct GNUNET_TIME_Absolute now; |
652 | char *str; | 652 | char *str; |
@@ -655,8 +655,10 @@ sample_load_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
655 | int ld_disk; | 655 | int ld_disk; |
656 | unsigned int mem_usage; | 656 | unsigned int mem_usage; |
657 | unsigned int nproc; | 657 | unsigned int nproc; |
658 | const struct GNUNET_SCHEDULER_TaskContext *tc; | ||
658 | 659 | ||
659 | sample_load_task_id = NULL; | 660 | sample_load_task_id = NULL; |
661 | tc = GNUNET_SCHEDULER_get_task_context (); | ||
660 | if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason)) | 662 | if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason)) |
661 | return; | 663 | return; |
662 | ld_cpu = cpu_get_load (); | 664 | ld_cpu = cpu_get_load (); |
diff --git a/src/testbed/gnunet-service-testbed_links.c b/src/testbed/gnunet-service-testbed_links.c index 9fbc3197e..a2692e8a6 100644 --- a/src/testbed/gnunet-service-testbed_links.c +++ b/src/testbed/gnunet-service-testbed_links.c | |||
@@ -585,10 +585,9 @@ send_controller_link_response (struct GNUNET_SERVER_Client *client, | |||
585 | * The Link Controller forwarding task | 585 | * The Link Controller forwarding task |
586 | * | 586 | * |
587 | * @param cls the LCFContext | 587 | * @param cls the LCFContext |
588 | * @param tc the Task context from scheduler | ||
589 | */ | 588 | */ |
590 | static void | 589 | static void |
591 | lcf_proc_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); | 590 | lcf_proc_task (void *cls); |
592 | 591 | ||
593 | 592 | ||
594 | /** | 593 | /** |
@@ -634,21 +633,18 @@ registration_error: | |||
634 | * The Link Controller forwarding task | 633 | * The Link Controller forwarding task |
635 | * | 634 | * |
636 | * @param cls the LCFContext | 635 | * @param cls the LCFContext |
637 | * @param tc the Task context from scheduler | ||
638 | */ | 636 | */ |
639 | static void | 637 | static void |
640 | lcf_proc_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); | 638 | lcf_proc_task (void *cls); |
641 | 639 | ||
642 | 640 | ||
643 | /** | 641 | /** |
644 | * Task to free resources when forwarded link controllers has been timedout | 642 | * Task to free resources when forwarded link controllers has been timedout |
645 | * | 643 | * |
646 | * @param cls the LCFContext | 644 | * @param cls the LCFContext |
647 | * @param tc the task context from scheduler | ||
648 | */ | 645 | */ |
649 | static void | 646 | static void |
650 | lcf_forwarded_operation_timeout (void *cls, | 647 | lcf_forwarded_operation_timeout (void *cls) |
651 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
652 | { | 648 | { |
653 | struct LCFContext *lcf = cls; | 649 | struct LCFContext *lcf = cls; |
654 | 650 | ||
@@ -668,10 +664,9 @@ lcf_forwarded_operation_timeout (void *cls, | |||
668 | * The Link Controller forwarding task | 664 | * The Link Controller forwarding task |
669 | * | 665 | * |
670 | * @param cls the LCFContext | 666 | * @param cls the LCFContext |
671 | * @param tc the Task context from scheduler | ||
672 | */ | 667 | */ |
673 | static void | 668 | static void |
674 | lcf_proc_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 669 | lcf_proc_task (void *cls) |
675 | { | 670 | { |
676 | struct LCFContext *lcf = cls; | 671 | struct LCFContext *lcf = cls; |
677 | struct LCFContextQueue *lcfq; | 672 | struct LCFContextQueue *lcfq; |
@@ -852,11 +847,9 @@ trigger_notifications (struct Neighbour *n); | |||
852 | * neighbour | 847 | * neighbour |
853 | * | 848 | * |
854 | * @param cls the neighbour | 849 | * @param cls the neighbour |
855 | * @param tc scheduler task context | ||
856 | */ | 850 | */ |
857 | static void | 851 | static void |
858 | neighbour_connect_notify_task (void *cls, | 852 | neighbour_connect_notify_task (void *cls) |
859 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
860 | { | 853 | { |
861 | struct Neighbour *n = cls; | 854 | struct Neighbour *n = cls; |
862 | struct NeighbourConnectNotification *h; | 855 | struct NeighbourConnectNotification *h; |
@@ -1118,11 +1111,9 @@ GST_free_nccq () | |||
1118 | * Task to be run upon timeout while attempting to connect to the neighbour | 1111 | * Task to be run upon timeout while attempting to connect to the neighbour |
1119 | * | 1112 | * |
1120 | * @param cls the NeighbourConnectCtxt created in GST_handle_link_controllers() | 1113 | * @param cls the NeighbourConnectCtxt created in GST_handle_link_controllers() |
1121 | * @param tc the scheduler task context | ||
1122 | */ | 1114 | */ |
1123 | static void | 1115 | static void |
1124 | timeout_neighbour_connect (void *cls, | 1116 | timeout_neighbour_connect (void *cls) |
1125 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
1126 | { | 1117 | { |
1127 | struct NeighbourConnectCtxt *ncc = cls; | 1118 | struct NeighbourConnectCtxt *ncc = cls; |
1128 | 1119 | ||
diff --git a/src/testbed/gnunet-service-testbed_oc.c b/src/testbed/gnunet-service-testbed_oc.c index 6bb4ec4fb..34bf8e047 100644 --- a/src/testbed/gnunet-service-testbed_oc.c +++ b/src/testbed/gnunet-service-testbed_oc.c | |||
@@ -362,12 +362,9 @@ GST_cleanup_focc (struct ForwardedOverlayConnectContext *focc) | |||
362 | * Timeout task for cancelling a forwarded overlay connect connect | 362 | * Timeout task for cancelling a forwarded overlay connect connect |
363 | * | 363 | * |
364 | * @param cls the ForwardedOverlayConnectContext | 364 | * @param cls the ForwardedOverlayConnectContext |
365 | * @param tc the task context from the scheduler | ||
366 | */ | 365 | */ |
367 | static void | 366 | static void |
368 | forwarded_overlay_connect_timeout (void *cls, | 367 | forwarded_overlay_connect_timeout (void *cls) |
369 | const struct GNUNET_SCHEDULER_TaskContext | ||
370 | *tc) | ||
371 | { | 368 | { |
372 | struct ForwardedOperationContext *fopc = cls; | 369 | struct ForwardedOperationContext *fopc = cls; |
373 | struct RegisteredHostContext *rhc; | 370 | struct RegisteredHostContext *rhc; |
@@ -379,7 +376,7 @@ forwarded_overlay_connect_timeout (void *cls, | |||
379 | LOG_DEBUG ("Overlay linking between peers %u and %u failed\n", focc->peer1, | 376 | LOG_DEBUG ("Overlay linking between peers %u and %u failed\n", focc->peer1, |
380 | focc->peer2); | 377 | focc->peer2); |
381 | GST_cleanup_focc (focc); | 378 | GST_cleanup_focc (focc); |
382 | GST_forwarded_operation_timeout (fopc, tc); | 379 | GST_forwarded_operation_timeout (fopc); |
383 | if (NULL != rhc->focc_dll_head) | 380 | if (NULL != rhc->focc_dll_head) |
384 | GST_process_next_focc (rhc); | 381 | GST_process_next_focc (rhc); |
385 | } | 382 | } |
@@ -573,11 +570,9 @@ cleanup_occ (struct OverlayConnectContext *occ) | |||
573 | * Task for cleaing up overlay connect context structure | 570 | * Task for cleaing up overlay connect context structure |
574 | * | 571 | * |
575 | * @param cls the overlay connect context | 572 | * @param cls the overlay connect context |
576 | * @param tc the task context | ||
577 | */ | 573 | */ |
578 | static void | 574 | static void |
579 | do_cleanup_occ (void *cls, | 575 | do_cleanup_occ (void *cls) |
580 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
581 | { | 576 | { |
582 | struct OverlayConnectContext *occ = cls; | 577 | struct OverlayConnectContext *occ = cls; |
583 | 578 | ||
@@ -590,11 +585,9 @@ do_cleanup_occ (void *cls, | |||
590 | * Task which will be run when overlay connect request has been timed out | 585 | * Task which will be run when overlay connect request has been timed out |
591 | * | 586 | * |
592 | * @param cls the OverlayConnectContext | 587 | * @param cls the OverlayConnectContext |
593 | * @param tc the TaskContext | ||
594 | */ | 588 | */ |
595 | static void | 589 | static void |
596 | timeout_overlay_connect (void *cls, | 590 | timeout_overlay_connect (void *cls) |
597 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
598 | { | 591 | { |
599 | struct OverlayConnectContext *occ = cls; | 592 | struct OverlayConnectContext *occ = cls; |
600 | 593 | ||
@@ -777,29 +770,27 @@ occ_cache_get_handle_ats_rocc_cb (void *cls, | |||
777 | * peer 1. | 770 | * peer 1. |
778 | * | 771 | * |
779 | * @param cls the OverlayConnectContext | 772 | * @param cls the OverlayConnectContext |
780 | * @param tc the TaskContext from scheduler | ||
781 | */ | 773 | */ |
782 | static void | 774 | static void |
783 | send_hello (void *cls, | 775 | send_hello (void *cls); |
784 | const struct GNUNET_SCHEDULER_TaskContext *tc); | ||
785 | 776 | ||
786 | 777 | ||
787 | /** | 778 | /** |
788 | * Task that is run when hello has been sent | 779 | * Task that is run when hello has been sent If tc->reason = |
780 | * #GNUNET_SCHEDULER_REASON_TIMEOUT then sending HELLO failed; if | ||
781 | * #GNUNET_SCHEDULER_REASON_READ_READY is succeeded | ||
789 | * | 782 | * |
790 | * @param cls the overlay connect context | 783 | * @param cls the overlay connect context |
791 | * @param tc the scheduler task context; if tc->reason = | ||
792 | * #GNUNET_SCHEDULER_REASON_TIMEOUT then sending HELLO failed; if | ||
793 | * #GNUNET_SCHEDULER_REASON_READ_READY is succeeded | ||
794 | */ | 784 | */ |
795 | static void | 785 | static void |
796 | occ_hello_sent_cb (void *cls, | 786 | occ_hello_sent_cb (void *cls) |
797 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
798 | { | 787 | { |
799 | struct OverlayConnectContext *occ = cls; | 788 | struct OverlayConnectContext *occ = cls; |
800 | struct LocalPeer2Context *lp2c; | 789 | struct LocalPeer2Context *lp2c; |
801 | struct Peer *peer2; | 790 | struct Peer *peer2; |
791 | const struct GNUNET_SCHEDULER_TaskContext *tc; | ||
802 | 792 | ||
793 | tc = GNUNET_SCHEDULER_get_task_context (); | ||
803 | GNUNET_assert (OCC_TYPE_LOCAL == occ->type); | 794 | GNUNET_assert (OCC_TYPE_LOCAL == occ->type); |
804 | GNUNET_assert (NULL != occ->timeout_task); | 795 | GNUNET_assert (NULL != occ->timeout_task); |
805 | lp2c = &occ->p2ctx.local; | 796 | lp2c = &occ->p2ctx.local; |
@@ -881,18 +872,18 @@ send_hello_thru_rocc (struct OverlayConnectContext *occ) | |||
881 | * send_hello_thru_rocc() | 872 | * send_hello_thru_rocc() |
882 | * | 873 | * |
883 | * @param cls the OverlayConnectContext | 874 | * @param cls the OverlayConnectContext |
884 | * @param tc the TaskContext from scheduler | ||
885 | */ | 875 | */ |
886 | static void | 876 | static void |
887 | send_hello (void *cls, | 877 | send_hello (void *cls) |
888 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
889 | { | 878 | { |
890 | struct OverlayConnectContext *occ = cls; | 879 | struct OverlayConnectContext *occ = cls; |
891 | struct LocalPeer2Context *lp2c; | 880 | struct LocalPeer2Context *lp2c; |
892 | char *other_peer_str; | 881 | char *other_peer_str; |
882 | const struct GNUNET_SCHEDULER_TaskContext *tc; | ||
893 | 883 | ||
894 | occ->send_hello_task = NULL; | 884 | occ->send_hello_task = NULL; |
895 | GNUNET_assert (NULL != occ->timeout_task); | 885 | GNUNET_assert (NULL != occ->timeout_task); |
886 | tc = GNUNET_SCHEDULER_get_task_context (); | ||
896 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) | 887 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) |
897 | return; | 888 | return; |
898 | GNUNET_assert (NULL != occ->hello); | 889 | GNUNET_assert (NULL != occ->hello); |
@@ -1652,11 +1643,9 @@ cleanup_rocc (struct RemoteOverlayConnectCtx *rocc) | |||
1652 | * Task to timeout rocc and cleanit up | 1643 | * Task to timeout rocc and cleanit up |
1653 | * | 1644 | * |
1654 | * @param cls the RemoteOverlayConnectCtx | 1645 | * @param cls the RemoteOverlayConnectCtx |
1655 | * @param tc the TaskContext from scheduler | ||
1656 | */ | 1646 | */ |
1657 | static void | 1647 | static void |
1658 | timeout_rocc_task (void *cls, | 1648 | timeout_rocc_task (void *cls) |
1659 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
1660 | { | 1649 | { |
1661 | struct RemoteOverlayConnectCtx *rocc = cls; | 1650 | struct RemoteOverlayConnectCtx *rocc = cls; |
1662 | 1651 | ||
@@ -1698,26 +1687,23 @@ cache_transport_peer_connect_notify (void *cls, | |||
1698 | * whose identity is in RemoteOverlayConnectCtx | 1687 | * whose identity is in RemoteOverlayConnectCtx |
1699 | * | 1688 | * |
1700 | * @param cls the RemoteOverlayConnectCtx | 1689 | * @param cls the RemoteOverlayConnectCtx |
1701 | * @param tc the TaskContext from scheduler | ||
1702 | */ | 1690 | */ |
1703 | static void | 1691 | static void |
1704 | attempt_connect_task (void *cls, | 1692 | attempt_connect_task (void *cls); |
1705 | const struct GNUNET_SCHEDULER_TaskContext *tc); | ||
1706 | 1693 | ||
1707 | 1694 | ||
1708 | /** | 1695 | /** |
1709 | * Task that is run when hello has been sent | 1696 | * Task that is run when hello has been sent If tc->reason = |
1697 | * #GNUNET_SCHEDULER_REASON_TIMEOUT then sending HELLO failed; if | ||
1698 | * #GNUNET_SCHEDULER_REASON_READ_READY is succeeded | ||
1710 | * | 1699 | * |
1711 | * @param cls the overlay connect context | 1700 | * @param cls the overlay connect context |
1712 | * @param tc the scheduler task context; if tc->reason = | ||
1713 | * #GNUNET_SCHEDULER_REASON_TIMEOUT then sending HELLO failed; if | ||
1714 | * #GNUNET_SCHEDULER_REASON_READ_READY is succeeded | ||
1715 | */ | 1701 | */ |
1716 | static void | 1702 | static void |
1717 | rocc_hello_sent_cb (void *cls, | 1703 | rocc_hello_sent_cb (void *cls) |
1718 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
1719 | { | 1704 | { |
1720 | struct RemoteOverlayConnectCtx *rocc = cls; | 1705 | struct RemoteOverlayConnectCtx *rocc = cls; |
1706 | const struct GNUNET_SCHEDULER_TaskContext *tc; | ||
1721 | 1707 | ||
1722 | rocc->ohh = NULL; | 1708 | rocc->ohh = NULL; |
1723 | GNUNET_assert (NULL == rocc->attempt_connect_task_id); | 1709 | GNUNET_assert (NULL == rocc->attempt_connect_task_id); |
@@ -1725,6 +1711,7 @@ rocc_hello_sent_cb (void *cls, | |||
1725 | rocc->op_id, | 1711 | rocc->op_id, |
1726 | GNUNET_i2s (&rocc->a_id), | 1712 | GNUNET_i2s (&rocc->a_id), |
1727 | rocc->peer->id); | 1713 | rocc->peer->id); |
1714 | tc = GNUNET_SCHEDULER_get_task_context (); | ||
1728 | if (GNUNET_SCHEDULER_REASON_TIMEOUT == tc->reason) | 1715 | if (GNUNET_SCHEDULER_REASON_TIMEOUT == tc->reason) |
1729 | { | 1716 | { |
1730 | GNUNET_break (0); | 1717 | GNUNET_break (0); |
@@ -1754,11 +1741,9 @@ rocc_hello_sent_cb (void *cls, | |||
1754 | * whose identity is in RemoteOverlayConnectCtx | 1741 | * whose identity is in RemoteOverlayConnectCtx |
1755 | * | 1742 | * |
1756 | * @param cls the RemoteOverlayConnectCtx | 1743 | * @param cls the RemoteOverlayConnectCtx |
1757 | * @param tc the TaskContext from scheduler | ||
1758 | */ | 1744 | */ |
1759 | static void | 1745 | static void |
1760 | attempt_connect_task (void *cls, | 1746 | attempt_connect_task (void *cls) |
1761 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
1762 | { | 1747 | { |
1763 | struct RemoteOverlayConnectCtx *rocc = cls; | 1748 | struct RemoteOverlayConnectCtx *rocc = cls; |
1764 | 1749 | ||
diff --git a/src/testbed/gnunet-service-testbed_peers.c b/src/testbed/gnunet-service-testbed_peers.c index a5f1abe4d..ba20d6d6b 100644 --- a/src/testbed/gnunet-service-testbed_peers.c +++ b/src/testbed/gnunet-service-testbed_peers.c | |||
@@ -211,16 +211,14 @@ peer_list_remove (struct Peer *peer) | |||
211 | * timed out | 211 | * timed out |
212 | * | 212 | * |
213 | * @param cls the FowardedOperationContext | 213 | * @param cls the FowardedOperationContext |
214 | * @param tc the TaskContext from the scheduler | ||
215 | */ | 214 | */ |
216 | static void | 215 | static void |
217 | peer_create_forward_timeout (void *cls, | 216 | peer_create_forward_timeout (void *cls) |
218 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
219 | { | 217 | { |
220 | struct ForwardedOperationContext *fopc = cls; | 218 | struct ForwardedOperationContext *fopc = cls; |
221 | 219 | ||
222 | GNUNET_free (fopc->cls); | 220 | GNUNET_free (fopc->cls); |
223 | GST_forwarded_operation_timeout (fopc, tc); | 221 | GST_forwarded_operation_timeout (fopc); |
224 | } | 222 | } |
225 | 223 | ||
226 | 224 | ||
diff --git a/src/testbed/gnunet-testbed-profiler.c b/src/testbed/gnunet-testbed-profiler.c index 350b7379d..308ec0386 100644 --- a/src/testbed/gnunet-testbed-profiler.c +++ b/src/testbed/gnunet-testbed-profiler.c | |||
@@ -107,10 +107,9 @@ static int noninteractive; | |||
107 | * Shutdown nicely | 107 | * Shutdown nicely |
108 | * | 108 | * |
109 | * @param cls NULL | 109 | * @param cls NULL |
110 | * @param tc the task context | ||
111 | */ | 110 | */ |
112 | static void | 111 | static void |
113 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 112 | do_shutdown (void *cls) |
114 | { | 113 | { |
115 | shutdown_task = NULL; | 114 | shutdown_task = NULL; |
116 | if (NULL != abort_task) | 115 | if (NULL != abort_task) |
@@ -131,10 +130,9 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
131 | * abort task to run on test timed out | 130 | * abort task to run on test timed out |
132 | * | 131 | * |
133 | * @param cls NULL | 132 | * @param cls NULL |
134 | * @param tc the task context | ||
135 | */ | 133 | */ |
136 | static void | 134 | static void |
137 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 135 | do_abort (void *cls) |
138 | { | 136 | { |
139 | LOG (GNUNET_ERROR_TYPE_WARNING, "Aborting\n"); | 137 | LOG (GNUNET_ERROR_TYPE_WARNING, "Aborting\n"); |
140 | abort_task = NULL; | 138 | abort_task = NULL; |
diff --git a/src/testbed/gnunet_testbed_mpi_spawn.c b/src/testbed/gnunet_testbed_mpi_spawn.c index 3fb50cb8f..191f658b7 100644 --- a/src/testbed/gnunet_testbed_mpi_spawn.c +++ b/src/testbed/gnunet_testbed_mpi_spawn.c | |||
@@ -74,7 +74,7 @@ static struct GNUNET_SCHEDULER_Task * child_death_task_id; | |||
74 | * The shutdown task | 74 | * The shutdown task |
75 | */ | 75 | */ |
76 | static void | 76 | static void |
77 | shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 77 | shutdown_task (void *cls) |
78 | { | 78 | { |
79 | shutdown_task_id = NULL; | 79 | shutdown_task_id = NULL; |
80 | if (0 != child_exit_code) | 80 | if (0 != child_exit_code) |
@@ -96,7 +96,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
96 | 96 | ||
97 | 97 | ||
98 | static void | 98 | static void |
99 | terminate_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 99 | terminate_task (void *cls) |
100 | { | 100 | { |
101 | static int hard_kill; | 101 | static int hard_kill; |
102 | 102 | ||
@@ -131,16 +131,18 @@ terminate_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
131 | * process died). | 131 | * process died). |
132 | * | 132 | * |
133 | * @param cls closure, NULL if we need to self-restart | 133 | * @param cls closure, NULL if we need to self-restart |
134 | * @param tc context | ||
135 | */ | 134 | */ |
136 | static void | 135 | static void |
137 | child_death_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 136 | child_death_task (void *cls) |
138 | { | 137 | { |
139 | const struct GNUNET_DISK_FileHandle *pr; | 138 | const struct GNUNET_DISK_FileHandle *pr; |
140 | char c[16]; | 139 | char c[16]; |
140 | const struct GNUNET_SCHEDULER_TaskContext *tc; | ||
141 | |||
141 | 142 | ||
142 | pr = GNUNET_DISK_pipe_handle (sigpipe, GNUNET_DISK_PIPE_END_READ); | 143 | pr = GNUNET_DISK_pipe_handle (sigpipe, GNUNET_DISK_PIPE_END_READ); |
143 | child_death_task_id = NULL; | 144 | child_death_task_id = NULL; |
145 | tc = GNUNET_SCHEDULER_get_task_context (); | ||
144 | if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY)) | 146 | if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY)) |
145 | { | 147 | { |
146 | child_death_task_id = | 148 | child_death_task_id = |
@@ -179,10 +181,9 @@ destroy_hosts(struct GNUNET_TESTBED_Host **hosts, unsigned int nhosts) | |||
179 | * The main scheduler run task | 181 | * The main scheduler run task |
180 | * | 182 | * |
181 | * @param cls NULL | 183 | * @param cls NULL |
182 | * @param tc scheduler task context | ||
183 | */ | 184 | */ |
184 | static void | 185 | static void |
185 | run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 186 | run (void *cls) |
186 | { | 187 | { |
187 | struct GNUNET_TESTBED_Host **hosts; | 188 | struct GNUNET_TESTBED_Host **hosts; |
188 | const struct GNUNET_CONFIGURATION_Handle *null_cfg; | 189 | const struct GNUNET_CONFIGURATION_Handle *null_cfg; |
diff --git a/src/testbed/test_gnunet_helper_testbed.c b/src/testbed/test_gnunet_helper_testbed.c index ebcfd5a37..7a2dce8a5 100644 --- a/src/testbed/test_gnunet_helper_testbed.c +++ b/src/testbed/test_gnunet_helper_testbed.c | |||
@@ -80,10 +80,9 @@ static int result; | |||
80 | * Shutdown nicely | 80 | * Shutdown nicely |
81 | * | 81 | * |
82 | * @param cls NULL | 82 | * @param cls NULL |
83 | * @param tc the task context | ||
84 | */ | 83 | */ |
85 | static void | 84 | static void |
86 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 85 | do_shutdown (void *cls) |
87 | { | 86 | { |
88 | if (NULL != abort_task) | 87 | if (NULL != abort_task) |
89 | GNUNET_SCHEDULER_cancel (abort_task); | 88 | GNUNET_SCHEDULER_cancel (abort_task); |
@@ -99,10 +98,9 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
99 | * abort task to run on test timed out | 98 | * abort task to run on test timed out |
100 | * | 99 | * |
101 | * @param cls NULL | 100 | * @param cls NULL |
102 | * @param tc the task context | ||
103 | */ | 101 | */ |
104 | static void | 102 | static void |
105 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 103 | do_abort (void *cls) |
106 | { | 104 | { |
107 | abort_task = NULL; | 105 | abort_task = NULL; |
108 | LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); | 106 | LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); |
@@ -118,9 +116,9 @@ do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
118 | * Continuation function. | 116 | * Continuation function. |
119 | * | 117 | * |
120 | * @param cls closure | 118 | * @param cls closure |
121 | * @param result GNUNET_OK on success, | 119 | * @param result #GNUNET_OK on success, |
122 | * GNUNET_NO if helper process died | 120 | * #GNUNET_NO if helper process died |
123 | * GNUNET_SYSERR during GNUNET_HELPER_stop | 121 | * #GNUNET_SYSERR during GNUNET_HELPER_stop() |
124 | */ | 122 | */ |
125 | static void | 123 | static void |
126 | cont_cb (void *cls, int result) | 124 | cont_cb (void *cls, int result) |
@@ -141,7 +139,7 @@ cont_cb (void *cls, int result) | |||
141 | * @param client identification of the client | 139 | * @param client identification of the client |
142 | * @param message the actual message | 140 | * @param message the actual message |
143 | * | 141 | * |
144 | * @return GNUNET_OK on success, GNUNET_SYSERR to stop further processing | 142 | * @return #GNUNET_OK on success, #GNUNET_SYSERR to stop further processing |
145 | */ | 143 | */ |
146 | static int | 144 | static int |
147 | mst_cb (void *cls, void *client, const struct GNUNET_MessageHeader *message) | 145 | mst_cb (void *cls, void *client, const struct GNUNET_MessageHeader *message) |
diff --git a/src/testbed/test_testbed_api.c b/src/testbed/test_testbed_api.c index 01207c0d4..fdf9d80f9 100644 --- a/src/testbed/test_testbed_api.c +++ b/src/testbed/test_testbed_api.c | |||
@@ -136,7 +136,7 @@ static enum Test sub_test; | |||
136 | * @param tc the task context | 136 | * @param tc the task context |
137 | */ | 137 | */ |
138 | static void | 138 | static void |
139 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 139 | do_shutdown (void *cls) |
140 | { | 140 | { |
141 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Shutting down...\n"); | 141 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Shutting down...\n"); |
142 | if (NULL != abort_task) | 142 | if (NULL != abort_task) |
@@ -178,11 +178,11 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
178 | * @param tc the task context | 178 | * @param tc the task context |
179 | */ | 179 | */ |
180 | static void | 180 | static void |
181 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 181 | do_abort (void *cls) |
182 | { | 182 | { |
183 | LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); | 183 | LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); |
184 | abort_task = NULL; | 184 | abort_task = NULL; |
185 | do_shutdown (cls, tc); | 185 | do_shutdown (cls); |
186 | } | 186 | } |
187 | 187 | ||
188 | 188 | ||
diff --git a/src/testbed/test_testbed_api_2peers_1controller.c b/src/testbed/test_testbed_api_2peers_1controller.c index 0bee03de9..1e15d07aa 100644 --- a/src/testbed/test_testbed_api_2peers_1controller.c +++ b/src/testbed/test_testbed_api_2peers_1controller.c | |||
@@ -186,10 +186,9 @@ static enum Stage result; | |||
186 | * Shutdown nicely | 186 | * Shutdown nicely |
187 | * | 187 | * |
188 | * @param cls NULL | 188 | * @param cls NULL |
189 | * @param tc the task context | ||
190 | */ | 189 | */ |
191 | static void | 190 | static void |
192 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 191 | do_shutdown (void *cls) |
193 | { | 192 | { |
194 | if (NULL != abort_task) | 193 | if (NULL != abort_task) |
195 | GNUNET_SCHEDULER_cancel (abort_task); | 194 | GNUNET_SCHEDULER_cancel (abort_task); |
@@ -210,14 +209,13 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
210 | * abort task to run on test timed out | 209 | * abort task to run on test timed out |
211 | * | 210 | * |
212 | * @param cls NULL | 211 | * @param cls NULL |
213 | * @param tc the task context | ||
214 | */ | 212 | */ |
215 | static void | 213 | static void |
216 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 214 | do_abort (void *cls) |
217 | { | 215 | { |
218 | LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); | 216 | LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); |
219 | abort_task = NULL; | 217 | abort_task = NULL; |
220 | do_shutdown (cls, tc); | 218 | do_shutdown (cls); |
221 | } | 219 | } |
222 | 220 | ||
223 | 221 | ||
@@ -237,10 +235,9 @@ op_comp_cb (void *cls, struct GNUNET_TESTBED_Operation *op, const char *emsg); | |||
237 | * task for delaying a connect | 235 | * task for delaying a connect |
238 | * | 236 | * |
239 | * @param cls NULL | 237 | * @param cls NULL |
240 | * @param tc the task context | ||
241 | */ | 238 | */ |
242 | static void | 239 | static void |
243 | do_delayed_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 240 | do_delayed_connect (void *cls) |
244 | { | 241 | { |
245 | delayed_connect_task = NULL; | 242 | delayed_connect_task = NULL; |
246 | FAIL_TEST (NULL == common_operation); | 243 | FAIL_TEST (NULL == common_operation); |
diff --git a/src/testbed/test_testbed_api_3peers_3controllers.c b/src/testbed/test_testbed_api_3peers_3controllers.c index 5919cbefa..a728048f3 100644 --- a/src/testbed/test_testbed_api_3peers_3controllers.c +++ b/src/testbed/test_testbed_api_3peers_3controllers.c | |||
@@ -254,10 +254,9 @@ static enum Stage result; | |||
254 | * Shutdown nicely | 254 | * Shutdown nicely |
255 | * | 255 | * |
256 | * @param cls NULL | 256 | * @param cls NULL |
257 | * @param tc the task context | ||
258 | */ | 257 | */ |
259 | static void | 258 | static void |
260 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 259 | do_shutdown (void *cls) |
261 | { | 260 | { |
262 | if (NULL != abort_task) | 261 | if (NULL != abort_task) |
263 | GNUNET_SCHEDULER_cancel (abort_task); | 262 | GNUNET_SCHEDULER_cancel (abort_task); |
@@ -288,10 +287,9 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
288 | * abort task to run on test timed out | 287 | * abort task to run on test timed out |
289 | * | 288 | * |
290 | * @param cls NULL | 289 | * @param cls NULL |
291 | * @param tc the task context | ||
292 | */ | 290 | */ |
293 | static void | 291 | static void |
294 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 292 | do_abort (void *cls) |
295 | { | 293 | { |
296 | LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); | 294 | LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); |
297 | abort_task = NULL; | 295 | abort_task = NULL; |
@@ -300,7 +298,7 @@ do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
300 | GNUNET_SCHEDULER_cancel (delayed_connect_task); | 298 | GNUNET_SCHEDULER_cancel (delayed_connect_task); |
301 | delayed_connect_task = NULL; | 299 | delayed_connect_task = NULL; |
302 | } | 300 | } |
303 | do_shutdown (cls, tc); | 301 | do_shutdown (cls); |
304 | } | 302 | } |
305 | 303 | ||
306 | static void | 304 | static void |
@@ -328,10 +326,9 @@ op_comp_cb (void *cls, struct GNUNET_TESTBED_Operation *op, const char *emsg); | |||
328 | * task for delaying a connect | 326 | * task for delaying a connect |
329 | * | 327 | * |
330 | * @param cls NULL | 328 | * @param cls NULL |
331 | * @param tc the task context | ||
332 | */ | 329 | */ |
333 | static void | 330 | static void |
334 | do_delayed_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 331 | do_delayed_connect (void *cls) |
335 | { | 332 | { |
336 | delayed_connect_task = NULL; | 333 | delayed_connect_task = NULL; |
337 | if (NULL != common_operation) | 334 | if (NULL != common_operation) |
diff --git a/src/testbed/test_testbed_api_barriers.c b/src/testbed/test_testbed_api_barriers.c index 0a0f482d9..8ee9c41af 100644 --- a/src/testbed/test_testbed_api_barriers.c +++ b/src/testbed/test_testbed_api_barriers.c | |||
@@ -62,10 +62,9 @@ static int result; | |||
62 | * Shutdown this test case when it takes too long | 62 | * Shutdown this test case when it takes too long |
63 | * | 63 | * |
64 | * @param cls NULL | 64 | * @param cls NULL |
65 | * @param tc scheduler task context | ||
66 | */ | 65 | */ |
67 | static void | 66 | static void |
68 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 67 | do_shutdown (void *cls) |
69 | { | 68 | { |
70 | shutdown_task = NULL; | 69 | shutdown_task = NULL; |
71 | if (NULL != barrier) | 70 | if (NULL != barrier) |
diff --git a/src/testbed/test_testbed_api_controllerlink.c b/src/testbed/test_testbed_api_controllerlink.c index 78d4d3bc7..fd876a07f 100644 --- a/src/testbed/test_testbed_api_controllerlink.c +++ b/src/testbed/test_testbed_api_controllerlink.c | |||
@@ -300,7 +300,7 @@ static enum Stage result; | |||
300 | if (NULL != abort_task) \ | 300 | if (NULL != abort_task) \ |
301 | GNUNET_SCHEDULER_cancel (abort_task); \ | 301 | GNUNET_SCHEDULER_cancel (abort_task); \ |
302 | abort_task = NULL; \ | 302 | abort_task = NULL; \ |
303 | GNUNET_SCHEDULER_add_now (do_shutdown, NULL); \ | 303 | GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); \ |
304 | return; \ | 304 | return; \ |
305 | } \ | 305 | } \ |
306 | } while (0) | 306 | } while (0) |
@@ -310,10 +310,9 @@ static enum Stage result; | |||
310 | * Shutdown nicely | 310 | * Shutdown nicely |
311 | * | 311 | * |
312 | * @param cls NULL | 312 | * @param cls NULL |
313 | * @param tc the task context | ||
314 | */ | 313 | */ |
315 | static void | 314 | static void |
316 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 315 | do_shutdown (void *cls) |
317 | { | 316 | { |
318 | if (NULL != abort_task) | 317 | if (NULL != abort_task) |
319 | GNUNET_SCHEDULER_cancel (abort_task); | 318 | GNUNET_SCHEDULER_cancel (abort_task); |
@@ -349,14 +348,13 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
349 | * abort task to run on test timed out | 348 | * abort task to run on test timed out |
350 | * | 349 | * |
351 | * @param cls NULL | 350 | * @param cls NULL |
352 | * @param tc the task context | ||
353 | */ | 351 | */ |
354 | static void | 352 | static void |
355 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 353 | do_abort (void *cls) |
356 | { | 354 | { |
357 | LOG (GNUNET_ERROR_TYPE_WARNING, "Aborting\n"); | 355 | LOG (GNUNET_ERROR_TYPE_WARNING, "Aborting\n"); |
358 | abort_task = NULL; | 356 | abort_task = NULL; |
359 | do_shutdown (cls, tc); | 357 | do_shutdown (cls); |
360 | } | 358 | } |
361 | 359 | ||
362 | 360 | ||
@@ -392,7 +390,7 @@ registration_cont (void *cls, const char *emsg); | |||
392 | * @return | 390 | * @return |
393 | */ | 391 | */ |
394 | static void | 392 | static void |
395 | delay_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 393 | delay_task (void *cls) |
396 | { | 394 | { |
397 | delay_task_id = NULL; | 395 | delay_task_id = NULL; |
398 | switch (result) | 396 | switch (result) |
@@ -644,8 +642,8 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event) | |||
644 | result = SUCCESS; | 642 | result = SUCCESS; |
645 | GNUNET_TESTBED_operation_done (op); | 643 | GNUNET_TESTBED_operation_done (op); |
646 | op = NULL; | 644 | op = NULL; |
647 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply | 645 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, |
648 | (GNUNET_TIME_UNIT_SECONDS, 1), &do_shutdown, | 646 | &do_shutdown, |
649 | NULL); | 647 | NULL); |
650 | break; | 648 | break; |
651 | default: | 649 | default: |
diff --git a/src/testbed/test_testbed_api_hosts.c b/src/testbed/test_testbed_api_hosts.c index a355ddd0c..2141dc46f 100644 --- a/src/testbed/test_testbed_api_hosts.c +++ b/src/testbed/test_testbed_api_hosts.c | |||
@@ -67,10 +67,9 @@ struct GNUNET_SCHEDULER_Task * shutdown_id; | |||
67 | * The shutdown task | 67 | * The shutdown task |
68 | * | 68 | * |
69 | * @param cls NULL | 69 | * @param cls NULL |
70 | * @param tc the task context | ||
71 | */ | 70 | */ |
72 | static void | 71 | static void |
73 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 72 | do_shutdown (void *cls) |
74 | { | 73 | { |
75 | GNUNET_TESTBED_host_destroy (host); | 74 | GNUNET_TESTBED_host_destroy (host); |
76 | while (0 != num_hosts) | 75 | while (0 != num_hosts) |
diff --git a/src/testbed/test_testbed_api_operations.c b/src/testbed/test_testbed_api_operations.c index b522262ba..f2fc4e6e3 100644 --- a/src/testbed/test_testbed_api_operations.c +++ b/src/testbed/test_testbed_api_operations.c | |||
@@ -262,10 +262,9 @@ release_cb (void *cls); | |||
262 | * Task to simulate artificial delay and change the test stage | 262 | * Task to simulate artificial delay and change the test stage |
263 | * | 263 | * |
264 | * @param cls NULL | 264 | * @param cls NULL |
265 | * @param tc the task context | ||
266 | */ | 265 | */ |
267 | static void | 266 | static void |
268 | step (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 267 | step (void *cls) |
269 | { | 268 | { |
270 | GNUNET_assert (NULL != step_task); | 269 | GNUNET_assert (NULL != step_task); |
271 | step_task = NULL; | 270 | step_task = NULL; |
diff --git a/src/testbed/test_testbed_api_peer_reconfiguration.c b/src/testbed/test_testbed_api_peer_reconfiguration.c index 8b429e8fa..315d8a3f3 100644 --- a/src/testbed/test_testbed_api_peer_reconfiguration.c +++ b/src/testbed/test_testbed_api_peer_reconfiguration.c | |||
@@ -89,10 +89,9 @@ enum { | |||
89 | * Abort task | 89 | * Abort task |
90 | * | 90 | * |
91 | * @param cls NULL | 91 | * @param cls NULL |
92 | * @param tc scheduler task context | ||
93 | */ | 92 | */ |
94 | static void | 93 | static void |
95 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 94 | do_abort (void *cls) |
96 | { | 95 | { |
97 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Aborting\n"); | 96 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Aborting\n"); |
98 | abort_task = NULL; | 97 | abort_task = NULL; |
diff --git a/src/testbed/test_testbed_api_peers_manage_services.c b/src/testbed/test_testbed_api_peers_manage_services.c index d478fd1ea..170f4a067 100644 --- a/src/testbed/test_testbed_api_peers_manage_services.c +++ b/src/testbed/test_testbed_api_peers_manage_services.c | |||
@@ -103,10 +103,9 @@ enum { | |||
103 | * Abort task | 103 | * Abort task |
104 | * | 104 | * |
105 | * @param cls NULL | 105 | * @param cls NULL |
106 | * @param tc scheduler task context | ||
107 | */ | 106 | */ |
108 | static void | 107 | static void |
109 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 108 | do_abort (void *cls) |
110 | { | 109 | { |
111 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Aborting\n"); | 110 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Aborting\n"); |
112 | abort_task = NULL; | 111 | abort_task = NULL; |
diff --git a/src/testbed/test_testbed_api_statistics.c b/src/testbed/test_testbed_api_statistics.c index dc8e4c4be..20598b565 100644 --- a/src/testbed/test_testbed_api_statistics.c +++ b/src/testbed/test_testbed_api_statistics.c | |||
@@ -87,10 +87,9 @@ static unsigned int num_seen_peers; | |||
87 | * Abort task | 87 | * Abort task |
88 | * | 88 | * |
89 | * @param cls NULL | 89 | * @param cls NULL |
90 | * @param tc scheduler task context | ||
91 | */ | 90 | */ |
92 | static void | 91 | static void |
93 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 92 | do_abort (void *cls) |
94 | { | 93 | { |
95 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Test timed out -- Aborting\n"); | 94 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Test timed out -- Aborting\n"); |
96 | abort_task = NULL; | 95 | abort_task = NULL; |
diff --git a/src/testbed/test_testbed_api_test.c b/src/testbed/test_testbed_api_test.c index 80e92eb90..61d3f2aba 100644 --- a/src/testbed/test_testbed_api_test.c +++ b/src/testbed/test_testbed_api_test.c | |||
@@ -70,10 +70,9 @@ static int result; | |||
70 | * Shutdown nicely | 70 | * Shutdown nicely |
71 | * | 71 | * |
72 | * @param cls NULL | 72 | * @param cls NULL |
73 | * @param tc the task context | ||
74 | */ | 73 | */ |
75 | static void | 74 | static void |
76 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 75 | do_shutdown (void *cls) |
77 | { | 76 | { |
78 | shutdown_task = NULL; | 77 | shutdown_task = NULL; |
79 | if (NULL != abort_task) | 78 | if (NULL != abort_task) |
@@ -93,7 +92,7 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
93 | GNUNET_SCHEDULER_cancel (abort_task); \ | 92 | GNUNET_SCHEDULER_cancel (abort_task); \ |
94 | abort_task = NULL; \ | 93 | abort_task = NULL; \ |
95 | if (NULL == shutdown_task) \ | 94 | if (NULL == shutdown_task) \ |
96 | shutdown_task = GNUNET_SCHEDULER_add_now (do_shutdown, NULL); \ | 95 | shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); \ |
97 | return; \ | 96 | return; \ |
98 | } \ | 97 | } \ |
99 | } while (0) | 98 | } while (0) |
@@ -103,16 +102,15 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
103 | * abort task to run on test timed out | 102 | * abort task to run on test timed out |
104 | * | 103 | * |
105 | * @param cls NULL | 104 | * @param cls NULL |
106 | * @param tc the task context | ||
107 | */ | 105 | */ |
108 | static void | 106 | static void |
109 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 107 | do_abort (void *cls) |
110 | { | 108 | { |
111 | LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); | 109 | LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); |
112 | abort_task = NULL; | 110 | abort_task = NULL; |
113 | if (NULL != shutdown_task) | 111 | if (NULL != shutdown_task) |
114 | GNUNET_SCHEDULER_cancel (shutdown_task); | 112 | GNUNET_SCHEDULER_cancel (shutdown_task); |
115 | do_shutdown (cls, tc); | 113 | do_shutdown (cls); |
116 | } | 114 | } |
117 | 115 | ||
118 | 116 | ||
diff --git a/src/testbed/test_testbed_api_testbed_run.c b/src/testbed/test_testbed_api_testbed_run.c index db3bb0d47..10beebc1f 100644 --- a/src/testbed/test_testbed_api_testbed_run.c +++ b/src/testbed/test_testbed_api_testbed_run.c | |||
@@ -68,10 +68,9 @@ static int wait_forever; | |||
68 | * Shutdown nicely | 68 | * Shutdown nicely |
69 | * | 69 | * |
70 | * @param cls NULL | 70 | * @param cls NULL |
71 | * @param tc the task context | ||
72 | */ | 71 | */ |
73 | static void | 72 | static void |
74 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 73 | do_shutdown (void *cls) |
75 | { | 74 | { |
76 | if (NULL != abort_task) | 75 | if (NULL != abort_task) |
77 | GNUNET_SCHEDULER_cancel (abort_task); | 76 | GNUNET_SCHEDULER_cancel (abort_task); |
@@ -83,10 +82,9 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
83 | * abort task to run on test timed out | 82 | * abort task to run on test timed out |
84 | * | 83 | * |
85 | * @param cls NULL | 84 | * @param cls NULL |
86 | * @param tc the task context | ||
87 | */ | 85 | */ |
88 | static void | 86 | static void |
89 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 87 | do_abort (void *cls) |
90 | { | 88 | { |
91 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); | 89 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); |
92 | abort_task = NULL; | 90 | abort_task = NULL; |
diff --git a/src/testbed/test_testbed_api_topology.c b/src/testbed/test_testbed_api_topology.c index c6064af65..49b46b0df 100644 --- a/src/testbed/test_testbed_api_topology.c +++ b/src/testbed/test_testbed_api_topology.c | |||
@@ -63,10 +63,9 @@ static unsigned int overlay_connects; | |||
63 | * Shutdown nicely | 63 | * Shutdown nicely |
64 | * | 64 | * |
65 | * @param cls NULL | 65 | * @param cls NULL |
66 | * @param tc the task context | ||
67 | */ | 66 | */ |
68 | static void | 67 | static void |
69 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 68 | do_shutdown (void *cls) |
70 | { | 69 | { |
71 | shutdown_task = NULL; | 70 | shutdown_task = NULL; |
72 | if (NULL != op) | 71 | if (NULL != op) |
diff --git a/src/testbed/test_testbed_api_topology_clique.c b/src/testbed/test_testbed_api_topology_clique.c index d1ccdc2c0..4ca6dbdda 100644 --- a/src/testbed/test_testbed_api_topology_clique.c +++ b/src/testbed/test_testbed_api_topology_clique.c | |||
@@ -63,10 +63,9 @@ static unsigned int overlay_connects; | |||
63 | * Shutdown nicely | 63 | * Shutdown nicely |
64 | * | 64 | * |
65 | * @param cls NULL | 65 | * @param cls NULL |
66 | * @param tc the task context | ||
67 | */ | 66 | */ |
68 | static void | 67 | static void |
69 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 68 | do_shutdown (void *cls) |
70 | { | 69 | { |
71 | shutdown_task = NULL; | 70 | shutdown_task = NULL; |
72 | if (NULL != op) | 71 | if (NULL != op) |
diff --git a/src/testbed/test_testbed_logger_api.c b/src/testbed/test_testbed_logger_api.c index 2cc33ea5b..bedb9d4da 100644 --- a/src/testbed/test_testbed_logger_api.c +++ b/src/testbed/test_testbed_logger_api.c | |||
@@ -97,7 +97,7 @@ shutdown_now () | |||
97 | 97 | ||
98 | 98 | ||
99 | static void | 99 | static void |
100 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 100 | do_abort (void *cls) |
101 | { | 101 | { |
102 | LOG (GNUNET_ERROR_TYPE_WARNING, "Aborting\n"); | 102 | LOG (GNUNET_ERROR_TYPE_WARNING, "Aborting\n"); |
103 | abort_task = NULL; | 103 | abort_task = NULL; |
@@ -173,7 +173,7 @@ flush_comp (void *cls, size_t size) | |||
173 | 173 | ||
174 | 174 | ||
175 | static void | 175 | static void |
176 | do_write (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 176 | do_write (void *cls) |
177 | { | 177 | { |
178 | static int i; | 178 | static int i; |
179 | char buf[BSIZE]; | 179 | char buf[BSIZE]; |
diff --git a/src/testbed/test_testbed_underlay.c b/src/testbed/test_testbed_underlay.c index caea41881..098a2b3db 100644 --- a/src/testbed/test_testbed_underlay.c +++ b/src/testbed/test_testbed_underlay.c | |||
@@ -49,7 +49,7 @@ static struct GNUNET_TESTBED_Operation *op; | |||
49 | * @param tc scheduler task context | 49 | * @param tc scheduler task context |
50 | */ | 50 | */ |
51 | static void | 51 | static void |
52 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 52 | do_shutdown (void *cls) |
53 | { | 53 | { |
54 | if (NULL != op) | 54 | if (NULL != op) |
55 | GNUNET_TESTBED_operation_done (op); | 55 | GNUNET_TESTBED_operation_done (op); |
diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c index 7c8580319..d371108ec 100644 --- a/src/testbed/testbed_api_hosts.c +++ b/src/testbed/testbed_api_hosts.c | |||
@@ -1259,10 +1259,9 @@ struct GNUNET_TESTBED_HostHabitableCheckHandle | |||
1259 | * Task for checking whether a host is habitable or not | 1259 | * Task for checking whether a host is habitable or not |
1260 | * | 1260 | * |
1261 | * @param cls GNUNET_TESTBED_HostHabitableCheckHandle | 1261 | * @param cls GNUNET_TESTBED_HostHabitableCheckHandle |
1262 | * @param tc the scheduler task context | ||
1263 | */ | 1262 | */ |
1264 | static void | 1263 | static void |
1265 | habitability_check (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 1264 | habitability_check (void *cls) |
1266 | { | 1265 | { |
1267 | struct GNUNET_TESTBED_HostHabitableCheckHandle *h = cls; | 1266 | struct GNUNET_TESTBED_HostHabitableCheckHandle *h = cls; |
1268 | void *cb_cls; | 1267 | void *cb_cls; |
diff --git a/src/testbed/testbed_api_operations.c b/src/testbed/testbed_api_operations.c index e4da01fb7..7f5aaa873 100644 --- a/src/testbed/testbed_api_operations.c +++ b/src/testbed/testbed_api_operations.c | |||
@@ -549,10 +549,9 @@ rq_remove (struct GNUNET_TESTBED_Operation *op) | |||
549 | * the ready queue. | 549 | * the ready queue. |
550 | * | 550 | * |
551 | * @param cls NULL | 551 | * @param cls NULL |
552 | * @param tc scheduler task context. Not used. | ||
553 | */ | 552 | */ |
554 | static void | 553 | static void |
555 | process_rq_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 554 | process_rq_task (void *cls) |
556 | { | 555 | { |
557 | struct GNUNET_TESTBED_Operation *op; | 556 | struct GNUNET_TESTBED_Operation *op; |
558 | struct OperationQueue *queue; | 557 | struct OperationQueue *queue; |
diff --git a/src/testbed/testbed_api_statistics.c b/src/testbed/testbed_api_statistics.c index 0f24446fe..a4778f84d 100644 --- a/src/testbed/testbed_api_statistics.c +++ b/src/testbed/testbed_api_statistics.c | |||
@@ -150,10 +150,9 @@ static struct OperationQueue *no_wait_queue; | |||
150 | * get_statistics operation. | 150 | * get_statistics operation. |
151 | * | 151 | * |
152 | * @param cls the GetStatsContext | 152 | * @param cls the GetStatsContext |
153 | * @param tc the scheduler task context | ||
154 | */ | 153 | */ |
155 | static void | 154 | static void |
156 | call_completion_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 155 | call_completion_task (void *cls) |
157 | { | 156 | { |
158 | struct GetStatsContext *sc = cls; | 157 | struct GetStatsContext *sc = cls; |
159 | 158 | ||
@@ -169,10 +168,9 @@ call_completion_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
169 | * as we cannot destroy the statistics handle in iteration_completion_cb() | 168 | * as we cannot destroy the statistics handle in iteration_completion_cb() |
170 | * | 169 | * |
171 | * @param cls the PeerGetStatsContext | 170 | * @param cls the PeerGetStatsContext |
172 | * @param tc the scheduler task context | ||
173 | */ | 171 | */ |
174 | static void | 172 | static void |
175 | op_done_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 173 | op_done_task (void *cls) |
176 | { | 174 | { |
177 | struct PeerGetStatsContext *peer_sc = cls; | 175 | struct PeerGetStatsContext *peer_sc = cls; |
178 | struct GetStatsContext *sc; | 176 | struct GetStatsContext *sc; |
diff --git a/src/testbed/testbed_api_testbed.c b/src/testbed/testbed_api_testbed.c index 76403e427..de99fb5a3 100644 --- a/src/testbed/testbed_api_testbed.c +++ b/src/testbed/testbed_api_testbed.c | |||
@@ -611,10 +611,9 @@ wait_op_completion (void *cls) | |||
611 | * Task run upon interrupts (SIGINT, SIGTERM) and upon scheduler shutdown. | 611 | * Task run upon interrupts (SIGINT, SIGTERM) and upon scheduler shutdown. |
612 | * | 612 | * |
613 | * @param cls the RunContext which has to be acted upon | 613 | * @param cls the RunContext which has to be acted upon |
614 | * @param tc the scheduler task context | ||
615 | */ | 614 | */ |
616 | static void | 615 | static void |
617 | interrupt (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 616 | interrupt (void *cls) |
618 | { | 617 | { |
619 | struct GNUNET_TESTBED_RunHandle *rc = cls; | 618 | struct GNUNET_TESTBED_RunHandle *rc = cls; |
620 | struct GNUNET_TESTBED_Controller *c = rc->c; | 619 | struct GNUNET_TESTBED_Controller *c = rc->c; |
@@ -661,10 +660,9 @@ prof_time (struct GNUNET_TESTBED_RunHandle *rc) | |||
661 | * Task for starting peers | 660 | * Task for starting peers |
662 | * | 661 | * |
663 | * @param cls the RunHandle | 662 | * @param cls the RunHandle |
664 | * @param tc the task context from scheduler | ||
665 | */ | 663 | */ |
666 | static void | 664 | static void |
667 | start_peers_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 665 | start_peers_task (void *cls) |
668 | { | 666 | { |
669 | struct GNUNET_TESTBED_RunHandle *rc = cls; | 667 | struct GNUNET_TESTBED_RunHandle *rc = cls; |
670 | struct RunContextOperation *rcop; | 668 | struct RunContextOperation *rcop; |
@@ -966,10 +964,9 @@ call_cc: | |||
966 | * Task to register all hosts available in the global host list | 964 | * Task to register all hosts available in the global host list |
967 | * | 965 | * |
968 | * @param cls the RunContext | 966 | * @param cls the RunContext |
969 | * @param tc the scheduler task context | ||
970 | */ | 967 | */ |
971 | static void | 968 | static void |
972 | register_hosts (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); | 969 | register_hosts (void *cls); |
973 | 970 | ||
974 | 971 | ||
975 | /** | 972 | /** |
@@ -999,10 +996,9 @@ host_registration_completion (void *cls, const char *emsg) | |||
999 | * Task to register all hosts available in the global host list | 996 | * Task to register all hosts available in the global host list |
1000 | * | 997 | * |
1001 | * @param cls RunContext | 998 | * @param cls RunContext |
1002 | * @param tc the scheduler task context | ||
1003 | */ | 999 | */ |
1004 | static void | 1000 | static void |
1005 | register_hosts (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 1001 | register_hosts (void *cls) |
1006 | { | 1002 | { |
1007 | struct GNUNET_TESTBED_RunHandle *rc = cls; | 1003 | struct GNUNET_TESTBED_RunHandle *rc = cls; |
1008 | struct RunContextOperation *rcop; | 1004 | struct RunContextOperation *rcop; |
@@ -1194,15 +1190,15 @@ host_habitable_cb (void *cls, const struct GNUNET_TESTBED_Host *host, | |||
1194 | * Task run upon timeout while setting up the testbed | 1190 | * Task run upon timeout while setting up the testbed |
1195 | * | 1191 | * |
1196 | * @param cls the RunContext | 1192 | * @param cls the RunContext |
1197 | * @param tc the task context | ||
1198 | */ | 1193 | */ |
1199 | static void | 1194 | static void |
1200 | timeout_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 1195 | timeout_task (void *cls) |
1201 | { | 1196 | { |
1202 | struct GNUNET_TESTBED_RunHandle *rc = cls; | 1197 | struct GNUNET_TESTBED_RunHandle *rc = cls; |
1203 | 1198 | ||
1204 | rc->timeout_task = NULL; | 1199 | rc->timeout_task = NULL; |
1205 | LOG (GNUNET_ERROR_TYPE_ERROR, _("Shutting down testbed due to timeout while setup.\n")); | 1200 | LOG (GNUNET_ERROR_TYPE_ERROR, |
1201 | _("Shutting down testbed due to timeout while setup.\n")); | ||
1206 | GNUNET_SCHEDULER_shutdown (); | 1202 | GNUNET_SCHEDULER_shutdown (); |
1207 | if (NULL != rc->test_master) | 1203 | if (NULL != rc->test_master) |
1208 | rc->test_master (rc->test_master_cls, rc, 0, NULL, 0, 0); | 1204 | rc->test_master (rc->test_master_cls, rc, 0, NULL, 0, 0); |
diff --git a/src/testbed/testbed_logger_api.c b/src/testbed/testbed_logger_api.c index ca6bc354e..aa182e21c 100644 --- a/src/testbed/testbed_logger_api.c +++ b/src/testbed/testbed_logger_api.c | |||
@@ -170,10 +170,9 @@ cancel_timeout_flush (struct GNUNET_TESTBED_LOGGER_Handle *h) | |||
170 | * Task to call the flush completion notification | 170 | * Task to call the flush completion notification |
171 | * | 171 | * |
172 | * @param cls the logger handle | 172 | * @param cls the logger handle |
173 | * @param tc the scheduler task context | ||
174 | */ | 173 | */ |
175 | static void | 174 | static void |
176 | call_flush_completion (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 175 | call_flush_completion (void *cls) |
177 | { | 176 | { |
178 | struct GNUNET_TESTBED_LOGGER_Handle *h = cls; | 177 | struct GNUNET_TESTBED_LOGGER_Handle *h = cls; |
179 | GNUNET_TESTBED_LOGGER_FlushCompletion cb; | 178 | GNUNET_TESTBED_LOGGER_FlushCompletion cb; |
@@ -416,10 +415,9 @@ GNUNET_TESTBED_LOGGER_write (struct GNUNET_TESTBED_LOGGER_Handle *h, | |||
416 | * be called with 0 as the amount of data sent. | 415 | * be called with 0 as the amount of data sent. |
417 | * | 416 | * |
418 | * @param cls the logger handle | 417 | * @param cls the logger handle |
419 | * @param tc scheduler task context | ||
420 | */ | 418 | */ |
421 | static void | 419 | static void |
422 | timeout_flush (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 420 | timeout_flush (void *cls) |
423 | { | 421 | { |
424 | struct GNUNET_TESTBED_LOGGER_Handle *h = cls; | 422 | struct GNUNET_TESTBED_LOGGER_Handle *h = cls; |
425 | GNUNET_TESTBED_LOGGER_FlushCompletion cb; | 423 | GNUNET_TESTBED_LOGGER_FlushCompletion cb; |