From: Matthias Wachs Date: Fri, 1 Apr 2011 09:31:20 +0000 (+0000) Subject: (no commit message) X-Git-Tag: initial-import-from-subversion-38251~18836 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2c803aa73957a91e8d523b072134dff7b6c5ca73;p=oweals%2Fgnunet.git --- diff --git a/src/transport/test_transport_ats.c b/src/transport/test_transport_ats.c index 1fa140c6d..d4189d063 100644 --- a/src/transport/test_transport_ats.c +++ b/src/transport/test_transport_ats.c @@ -25,7 +25,7 @@ #include "gnunet_testing_lib.h" #include "gnunet_scheduler_lib.h" -#define VERBOSE GNUNET_NO +#define VERBOSE GNUNET_YES #define NUM_PEERS 11 #define MEASUREMENTS 5 @@ -85,6 +85,9 @@ shutdown_callback (void *cls, const char *emsg) #if VERBOSE GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All peers successfully shut down!\n"); + if (stats != NULL) + GNUNET_STATISTICS_destroy(stats, GNUNET_NO); + stats = NULL; #endif } } @@ -92,9 +95,15 @@ shutdown_callback (void *cls, const char *emsg) static void shutdown_peers() { if (shutdown_task != GNUNET_SCHEDULER_NO_TASK) + { GNUNET_SCHEDULER_cancel(shutdown_task); + shutdown_task = GNUNET_SCHEDULER_NO_TASK; + } if (stats_task != GNUNET_SCHEDULER_NO_TASK) + { GNUNET_SCHEDULER_cancel(stats_task); + stats_task = GNUNET_SCHEDULER_NO_TASK; + } GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL); } @@ -206,7 +215,6 @@ delay (void *cls, #if VERBOSE GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Delay over\n"); #endif - GNUNET_STATISTICS_destroy(stats, GNUNET_NO); shutdown_peers (); }