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/ats-tests | |
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/ats-tests')
-rw-r--r-- | src/ats-tests/ats-testing-experiment.c | 9 | ||||
-rw-r--r-- | src/ats-tests/ats-testing-log.c | 14 | ||||
-rw-r--r-- | src/ats-tests/ats-testing-preferences.c | 3 | ||||
-rw-r--r-- | src/ats-tests/ats-testing-traffic.c | 4 | ||||
-rw-r--r-- | src/ats-tests/ats-testing.c | 10 | ||||
-rw-r--r-- | src/ats-tests/gnunet-solver-eval.c | 8 | ||||
-rw-r--r-- | src/ats-tests/perf_ats.c | 6 | ||||
-rw-r--r-- | src/ats-tests/perf_ats_logging.c | 14 |
8 files changed, 36 insertions, 32 deletions
diff --git a/src/ats-tests/ats-testing-experiment.c b/src/ats-tests/ats-testing-experiment.c index a4a925847..b8da23df9 100644 --- a/src/ats-tests/ats-testing-experiment.c +++ b/src/ats-tests/ats-testing-experiment.c | |||
@@ -415,8 +415,9 @@ load_episodes (struct Experiment *e, struct GNUNET_CONFIGURATION_Handle *cfg) | |||
415 | return e_counter; | 415 | return e_counter; |
416 | } | 416 | } |
417 | 417 | ||
418 | |||
418 | static void | 419 | static void |
419 | timeout_experiment (void *cls, const struct GNUNET_SCHEDULER_TaskContext* tc) | 420 | timeout_experiment (void *cls) |
420 | { | 421 | { |
421 | struct Experiment *e = cls; | 422 | struct Experiment *e = cls; |
422 | e->experiment_timeout_task = NULL; | 423 | e->experiment_timeout_task = NULL; |
@@ -432,6 +433,7 @@ timeout_experiment (void *cls, const struct GNUNET_SCHEDULER_TaskContext* tc) | |||
432 | GNUNET_SYSERR); | 433 | GNUNET_SYSERR); |
433 | } | 434 | } |
434 | 435 | ||
436 | |||
435 | static void | 437 | static void |
436 | enforce_start_send (struct GNUNET_ATS_TEST_Operation *op) | 438 | enforce_start_send (struct GNUNET_ATS_TEST_Operation *op) |
437 | { | 439 | { |
@@ -573,10 +575,12 @@ static void enforce_episode (struct Episode *ep) | |||
573 | } | 575 | } |
574 | } | 576 | } |
575 | 577 | ||
578 | |||
576 | static void | 579 | static void |
577 | timeout_episode (void *cls, const struct GNUNET_SCHEDULER_TaskContext* tc) | 580 | timeout_episode (void *cls) |
578 | { | 581 | { |
579 | struct Experiment *e = cls; | 582 | struct Experiment *e = cls; |
583 | |||
580 | e->episode_timeout_task = NULL; | 584 | e->episode_timeout_task = NULL; |
581 | if (NULL != e->ep_done_cb) | 585 | if (NULL != e->ep_done_cb) |
582 | e->ep_done_cb (e->cur); | 586 | e->ep_done_cb (e->cur); |
@@ -741,4 +745,3 @@ GNUNET_ATS_TEST_experimentation_stop (struct Experiment *e) | |||
741 | } | 745 | } |
742 | 746 | ||
743 | /* end of file ats-testing-experiment.c*/ | 747 | /* end of file ats-testing-experiment.c*/ |
744 | |||
diff --git a/src/ats-tests/ats-testing-log.c b/src/ats-tests/ats-testing-log.c index fff70052d..650be29f3 100644 --- a/src/ats-tests/ats-testing-log.c +++ b/src/ats-tests/ats-testing-log.c | |||
@@ -799,21 +799,24 @@ GNUNET_ATS_TEST_logging_now (struct LoggingHandle *l) | |||
799 | } | 799 | } |
800 | } | 800 | } |
801 | 801 | ||
802 | |||
802 | static void | 803 | static void |
803 | collect_log_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 804 | collect_log_task (void *cls) |
804 | { | 805 | { |
805 | struct LoggingHandle *l = cls; | 806 | struct LoggingHandle *l = cls; |
806 | l->log_task = NULL; | 807 | const struct GNUNET_SCHEDULER_TaskContext *tc; |
807 | 808 | ||
809 | l->log_task = NULL; | ||
808 | GNUNET_ATS_TEST_logging_now (l); | 810 | GNUNET_ATS_TEST_logging_now (l); |
809 | 811 | tc = GNUNET_SCHEDULER_get_task_context (); | |
810 | if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN) | 812 | if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN) |
811 | return; | 813 | return; |
812 | |||
813 | l->log_task = GNUNET_SCHEDULER_add_delayed (l->frequency, | 814 | l->log_task = GNUNET_SCHEDULER_add_delayed (l->frequency, |
814 | &collect_log_task, l); | 815 | &collect_log_task, |
816 | l); | ||
815 | } | 817 | } |
816 | 818 | ||
819 | |||
817 | /** | 820 | /** |
818 | * Stop logging | 821 | * Stop logging |
819 | * | 822 | * |
@@ -905,4 +908,3 @@ GNUNET_ATS_TEST_logging_start(struct GNUNET_TIME_Relative log_frequency, | |||
905 | return l; | 908 | return l; |
906 | } | 909 | } |
907 | /* end of file ats-testing-log.c */ | 910 | /* end of file ats-testing-log.c */ |
908 | |||
diff --git a/src/ats-tests/ats-testing-preferences.c b/src/ats-tests/ats-testing-preferences.c index b8cf205ec..856c8de4b 100644 --- a/src/ats-tests/ats-testing-preferences.c +++ b/src/ats-tests/ats-testing-preferences.c | |||
@@ -91,8 +91,7 @@ get_preference (struct PreferenceGenerator *pg) | |||
91 | 91 | ||
92 | 92 | ||
93 | static void | 93 | static void |
94 | set_pref_task (void *cls, | 94 | set_pref_task (void *cls) |
95 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
96 | { | 95 | { |
97 | struct BenchmarkPartner *p = cls; | 96 | struct BenchmarkPartner *p = cls; |
98 | double pref_value; | 97 | double pref_value; |
diff --git a/src/ats-tests/ats-testing-traffic.c b/src/ats-tests/ats-testing-traffic.c index 4446be171..5eb01bd55 100644 --- a/src/ats-tests/ats-testing-traffic.c +++ b/src/ats-tests/ats-testing-traffic.c | |||
@@ -166,8 +166,7 @@ send_ping_ready_cb (void *cls, size_t size, void *buf) | |||
166 | 166 | ||
167 | 167 | ||
168 | static void | 168 | static void |
169 | comm_schedule_send (void *cls, | 169 | comm_schedule_send (void *cls) |
170 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
171 | { | 170 | { |
172 | struct BenchmarkPartner *p = cls; | 171 | struct BenchmarkPartner *p = cls; |
173 | 172 | ||
@@ -431,4 +430,3 @@ GNUNET_ATS_TEST_generate_traffic_stop_all () | |||
431 | } | 430 | } |
432 | 431 | ||
433 | /* end of file ats-testing-traffic.c */ | 432 | /* end of file ats-testing-traffic.c */ |
434 | |||
diff --git a/src/ats-tests/ats-testing.c b/src/ats-tests/ats-testing.c index a3a6b9623..49aa5a052 100644 --- a/src/ats-tests/ats-testing.c +++ b/src/ats-tests/ats-testing.c | |||
@@ -52,14 +52,14 @@ struct GNUNET_CONFIGURATION_Handle *cfg; | |||
52 | 52 | ||
53 | struct GNUNET_ATS_TEST_Topology *top; | 53 | struct GNUNET_ATS_TEST_Topology *top; |
54 | 54 | ||
55 | |||
55 | /** | 56 | /** |
56 | * Shutdown nicely | 57 | * Shutdown nicely |
57 | * | 58 | * |
58 | * @param cls NULL | 59 | * @param cls NULL |
59 | * @param tc the task context | ||
60 | */ | 60 | */ |
61 | static void | 61 | static void |
62 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 62 | do_shutdown (void *cls) |
63 | { | 63 | { |
64 | int c_m; | 64 | int c_m; |
65 | int c_s; | 65 | int c_s; |
@@ -437,7 +437,7 @@ connect_completion_callback (void *cls, struct GNUNET_TESTBED_Operation *op, | |||
437 | } | 437 | } |
438 | 438 | ||
439 | static void | 439 | static void |
440 | do_connect_peers (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 440 | do_connect_peers (void *cls) |
441 | { | 441 | { |
442 | int c_m; | 442 | int c_m; |
443 | int c_s; | 443 | int c_s; |
@@ -506,7 +506,7 @@ comm_connect_completion_cb (void *cls, struct GNUNET_TESTBED_Operation *op, | |||
506 | } | 506 | } |
507 | 507 | ||
508 | static void | 508 | static void |
509 | do_comm_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 509 | do_comm_connect (void *cls) |
510 | { | 510 | { |
511 | int c_s; | 511 | int c_s; |
512 | int c_m; | 512 | int c_m; |
@@ -649,7 +649,7 @@ ats_connect_completion_cb (void *cls, struct GNUNET_TESTBED_Operation *op, | |||
649 | 649 | ||
650 | 650 | ||
651 | static void | 651 | static void |
652 | do_connect_ats (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 652 | do_connect_ats (void *cls) |
653 | { | 653 | { |
654 | int c_m; | 654 | int c_m; |
655 | int c_s; | 655 | int c_s; |
diff --git a/src/ats-tests/gnunet-solver-eval.c b/src/ats-tests/gnunet-solver-eval.c index e0d85094c..0d2460b7f 100644 --- a/src/ats-tests/gnunet-solver-eval.c +++ b/src/ats-tests/gnunet-solver-eval.c | |||
@@ -418,8 +418,9 @@ load_episodes (struct Experiment *e, struct GNUNET_CONFIGURATION_Handle *cfg) | |||
418 | return e_counter; | 418 | return e_counter; |
419 | } | 419 | } |
420 | 420 | ||
421 | |||
421 | static void | 422 | static void |
422 | timeout_experiment (void *cls, const struct GNUNET_SCHEDULER_TaskContext* tc) | 423 | timeout_experiment (void *cls) |
423 | { | 424 | { |
424 | struct Experiment *e = cls; | 425 | struct Experiment *e = cls; |
425 | e->experiment_timeout_task = NULL; | 426 | e->experiment_timeout_task = NULL; |
@@ -435,6 +436,7 @@ timeout_experiment (void *cls, const struct GNUNET_SCHEDULER_TaskContext* tc) | |||
435 | GNUNET_SYSERR); | 436 | GNUNET_SYSERR); |
436 | } | 437 | } |
437 | 438 | ||
439 | |||
438 | static void | 440 | static void |
439 | enforce_start_send (struct GNUNET_ATS_TEST_Operation *op) | 441 | enforce_start_send (struct GNUNET_ATS_TEST_Operation *op) |
440 | { | 442 | { |
@@ -584,8 +586,9 @@ static void enforce_episode (struct Episode *ep) | |||
584 | } | 586 | } |
585 | } | 587 | } |
586 | 588 | ||
589 | |||
587 | static void | 590 | static void |
588 | timeout_episode (void *cls, const struct GNUNET_SCHEDULER_TaskContext* tc) | 591 | timeout_episode (void *cls) |
589 | { | 592 | { |
590 | struct Experiment *e = cls; | 593 | struct Experiment *e = cls; |
591 | e->episode_timeout_task = NULL; | 594 | e->episode_timeout_task = NULL; |
@@ -931,4 +934,3 @@ main (int argc, char *argv[]) | |||
931 | return 0; | 934 | return 0; |
932 | } | 935 | } |
933 | /* end of file ats-testing-experiment.c*/ | 936 | /* end of file ats-testing-experiment.c*/ |
934 | |||
diff --git a/src/ats-tests/perf_ats.c b/src/ats-tests/perf_ats.c index c49d5f03d..4c22043e5 100644 --- a/src/ats-tests/perf_ats.c +++ b/src/ats-tests/perf_ats.c | |||
@@ -185,10 +185,9 @@ evaluate () | |||
185 | * Shutdown nicely | 185 | * Shutdown nicely |
186 | * | 186 | * |
187 | * @param cls NULL | 187 | * @param cls NULL |
188 | * @param tc the task context | ||
189 | */ | 188 | */ |
190 | static void | 189 | static void |
191 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 190 | do_shutdown (void *cls) |
192 | { | 191 | { |
193 | 192 | ||
194 | if (GNUNET_YES == logging) | 193 | if (GNUNET_YES == logging) |
@@ -223,8 +222,9 @@ print_progress () | |||
223 | &print_progress, NULL ); | 222 | &print_progress, NULL ); |
224 | } | 223 | } |
225 | 224 | ||
225 | |||
226 | static void | 226 | static void |
227 | ats_pref_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 227 | ats_pref_task (void *cls) |
228 | { | 228 | { |
229 | struct BenchmarkPeer *me = cls; | 229 | struct BenchmarkPeer *me = cls; |
230 | 230 | ||
diff --git a/src/ats-tests/perf_ats_logging.c b/src/ats-tests/perf_ats_logging.c index d3c6ed9c5..1e4b15432 100644 --- a/src/ats-tests/perf_ats_logging.c +++ b/src/ats-tests/perf_ats_logging.c | |||
@@ -637,17 +637,19 @@ collect_log_now (void) | |||
637 | } | 637 | } |
638 | 638 | ||
639 | static void | 639 | static void |
640 | collect_log_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 640 | collect_log_task (void *cls) |
641 | { | 641 | { |
642 | const struct GNUNET_SCHEDULER_TaskContext *tc; | ||
643 | |||
642 | log_task = NULL; | 644 | log_task = NULL; |
643 | 645 | ||
644 | collect_log_now(); | 646 | collect_log_now(); |
645 | 647 | tc = GNUNET_SCHEDULER_get_task_context (); | |
646 | if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN) | 648 | if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN) |
647 | return; | 649 | return; |
648 | 650 | ||
649 | log_task = GNUNET_SCHEDULER_add_delayed (frequency, | 651 | log_task = GNUNET_SCHEDULER_add_delayed (frequency, |
650 | &collect_log_task, NULL); | 652 | &collect_log_task, NULL); |
651 | } | 653 | } |
652 | 654 | ||
653 | 655 | ||
@@ -655,7 +657,6 @@ void | |||
655 | perf_logging_stop () | 657 | perf_logging_stop () |
656 | { | 658 | { |
657 | int c_m; | 659 | int c_m; |
658 | struct GNUNET_SCHEDULER_TaskContext tc; | ||
659 | struct PeerLoggingTimestep *cur; | 660 | struct PeerLoggingTimestep *cur; |
660 | 661 | ||
661 | if (GNUNET_YES!= running) | 662 | if (GNUNET_YES!= running) |
@@ -664,8 +665,7 @@ perf_logging_stop () | |||
664 | if (NULL != log_task) | 665 | if (NULL != log_task) |
665 | GNUNET_SCHEDULER_cancel (log_task); | 666 | GNUNET_SCHEDULER_cancel (log_task); |
666 | log_task = NULL; | 667 | log_task = NULL; |
667 | tc.reason = GNUNET_SCHEDULER_REASON_SHUTDOWN; | 668 | collect_log_task (NULL); |
668 | collect_log_task (NULL, &tc); | ||
669 | 669 | ||
670 | GNUNET_log(GNUNET_ERROR_TYPE_INFO, | 670 | GNUNET_log(GNUNET_ERROR_TYPE_INFO, |
671 | _("Stop logging\n")); | 671 | _("Stop logging\n")); |
@@ -685,6 +685,7 @@ perf_logging_stop () | |||
685 | GNUNET_free (lp); | 685 | GNUNET_free (lp); |
686 | } | 686 | } |
687 | 687 | ||
688 | |||
688 | void | 689 | void |
689 | perf_logging_start (struct GNUNET_TIME_Relative log_frequency, | 690 | perf_logging_start (struct GNUNET_TIME_Relative log_frequency, |
690 | char * testname, struct BenchmarkPeer *masters, int num_masters) | 691 | char * testname, struct BenchmarkPeer *masters, int num_masters) |
@@ -710,4 +711,3 @@ perf_logging_start (struct GNUNET_TIME_Relative log_frequency, | |||
710 | running = GNUNET_YES; | 711 | running = GNUNET_YES; |
711 | } | 712 | } |
712 | /* end of file perf_ats_logging.c */ | 713 | /* end of file perf_ats_logging.c */ |
713 | |||