diff options
Diffstat (limited to 'src/testbed/testbed_api_testbed.c')
-rw-r--r-- | src/testbed/testbed_api_testbed.c | 18 |
1 files changed, 7 insertions, 11 deletions
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); |