diff options
Diffstat (limited to 'src/ats-tests/perf_ats.c')
-rw-r--r-- | src/ats-tests/perf_ats.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/ats-tests/perf_ats.c b/src/ats-tests/perf_ats.c index 7b5a903be..f57ac19f0 100644 --- a/src/ats-tests/perf_ats.c +++ b/src/ats-tests/perf_ats.c | |||
@@ -46,12 +46,12 @@ | |||
46 | /** | 46 | /** |
47 | * Shutdown task | 47 | * Shutdown task |
48 | */ | 48 | */ |
49 | static GNUNET_SCHEDULER_TaskIdentifier shutdown_task; | 49 | static struct GNUNET_SCHEDULER_Task * shutdown_task; |
50 | 50 | ||
51 | /** | 51 | /** |
52 | * Progress task | 52 | * Progress task |
53 | */ | 53 | */ |
54 | static GNUNET_SCHEDULER_TaskIdentifier progress_task; | 54 | static struct GNUNET_SCHEDULER_Task * progress_task; |
55 | 55 | ||
56 | /** | 56 | /** |
57 | * Test result | 57 | * Test result |
@@ -194,13 +194,13 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
194 | if (GNUNET_YES == logging) | 194 | if (GNUNET_YES == logging) |
195 | GNUNET_ATS_TEST_logging_clean_up(l); | 195 | GNUNET_ATS_TEST_logging_clean_up(l); |
196 | 196 | ||
197 | shutdown_task = GNUNET_SCHEDULER_NO_TASK; | 197 | shutdown_task = NULL; |
198 | if (GNUNET_SCHEDULER_NO_TASK != progress_task) | 198 | if (NULL != progress_task) |
199 | { | 199 | { |
200 | fprintf (stderr, "0\n"); | 200 | fprintf (stderr, "0\n"); |
201 | GNUNET_SCHEDULER_cancel (progress_task); | 201 | GNUNET_SCHEDULER_cancel (progress_task); |
202 | } | 202 | } |
203 | progress_task = GNUNET_SCHEDULER_NO_TASK; | 203 | progress_task = NULL; |
204 | 204 | ||
205 | evaluate (); | 205 | evaluate (); |
206 | GNUNET_log(GNUNET_ERROR_TYPE_INFO, _("Benchmarking done\n")); | 206 | GNUNET_log(GNUNET_ERROR_TYPE_INFO, _("Benchmarking done\n")); |
@@ -213,7 +213,7 @@ static void | |||
213 | print_progress () | 213 | print_progress () |
214 | { | 214 | { |
215 | static int calls; | 215 | static int calls; |
216 | progress_task = GNUNET_SCHEDULER_NO_TASK; | 216 | progress_task = NULL; |
217 | 217 | ||
218 | fprintf (stderr, "%llu..", | 218 | fprintf (stderr, "%llu..", |
219 | (long long unsigned) perf_duration.rel_value_us / (1000 * 1000) - calls); | 219 | (long long unsigned) perf_duration.rel_value_us / (1000 * 1000) - calls); |
@@ -228,7 +228,7 @@ ats_pref_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
228 | { | 228 | { |
229 | struct BenchmarkPeer *me = cls; | 229 | struct BenchmarkPeer *me = cls; |
230 | 230 | ||
231 | me->ats_task = GNUNET_SCHEDULER_NO_TASK; | 231 | me->ats_task = NULL; |
232 | 232 | ||
233 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, " Master [%u] set preference for slave [%u] to %f\n", | 233 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, " Master [%u] set preference for slave [%u] to %f\n", |
234 | me->no, me->pref_partner->no, me->pref_value); | 234 | me->no, me->pref_partner->no, me->pref_value); |
@@ -248,7 +248,7 @@ start_benchmark() | |||
248 | 248 | ||
249 | GNUNET_log(GNUNET_ERROR_TYPE_INFO, _("Benchmarking start\n")); | 249 | GNUNET_log(GNUNET_ERROR_TYPE_INFO, _("Benchmarking start\n")); |
250 | 250 | ||
251 | if (GNUNET_SCHEDULER_NO_TASK != shutdown_task) | 251 | if (NULL != shutdown_task) |
252 | GNUNET_SCHEDULER_cancel(shutdown_task); | 252 | GNUNET_SCHEDULER_cancel(shutdown_task); |
253 | shutdown_task = GNUNET_SCHEDULER_add_delayed(perf_duration, &do_shutdown, | 253 | shutdown_task = GNUNET_SCHEDULER_add_delayed(perf_duration, &do_shutdown, |
254 | NULL ); | 254 | NULL ); |