diff options
Diffstat (limited to 'src/ats-tests/perf_ats_logging.c')
-rw-r--r-- | src/ats-tests/perf_ats_logging.c | 14 |
1 files changed, 7 insertions, 7 deletions
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 | |||