diff options
Diffstat (limited to 'src/core/test_core_quota_compliance.c')
-rw-r--r-- | src/core/test_core_quota_compliance.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/core/test_core_quota_compliance.c b/src/core/test_core_quota_compliance.c index ed895df42..e28f57fa6 100644 --- a/src/core/test_core_quota_compliance.c +++ b/src/core/test_core_quota_compliance.c | |||
@@ -163,13 +163,9 @@ terminate_task (void *cls) | |||
163 | static void | 163 | static void |
164 | terminate_task_error (void *cls) | 164 | terminate_task_error (void *cls) |
165 | { | 165 | { |
166 | const struct GNUNET_SCHEDULER_TaskContext *tc; | ||
167 | |||
168 | err_task = NULL; | 166 | err_task = NULL; |
169 | tc = GNUNET_SCHEDULER_get_task_context (); | 167 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
170 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) | 168 | "Testcase failed!\n"); |
171 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
172 | "Testcase failed!\n"); | ||
173 | terminate_peer (&p1); | 169 | terminate_peer (&p1); |
174 | terminate_peer (&p2); | 170 | terminate_peer (&p2); |
175 | //GNUNET_break (0); | 171 | //GNUNET_break (0); |
@@ -301,7 +297,6 @@ measurement_stop (void *cls) | |||
301 | */ | 297 | */ |
302 | GNUNET_SCHEDULER_cancel (err_task); | 298 | GNUNET_SCHEDULER_cancel (err_task); |
303 | err_task = GNUNET_SCHEDULER_add_now (&terminate_task, NULL); | 299 | err_task = GNUNET_SCHEDULER_add_now (&terminate_task, NULL); |
304 | |||
305 | } | 300 | } |
306 | 301 | ||
307 | 302 | ||
@@ -357,7 +352,6 @@ transmit_ready (void *cls, size_t size, void *buf) | |||
357 | } | 352 | } |
358 | 353 | ||
359 | 354 | ||
360 | |||
361 | static void | 355 | static void |
362 | connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer) | 356 | connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer) |
363 | { | 357 | { |
@@ -375,8 +369,7 @@ connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer) | |||
375 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 369 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
376 | "Asking core (1) for transmission to peer `%4s'\n", | 370 | "Asking core (1) for transmission to peer `%4s'\n", |
377 | GNUNET_i2s (&p2.id)); | 371 | GNUNET_i2s (&p2.id)); |
378 | if (err_task != NULL) | 372 | GNUNET_SCHEDULER_cancel (err_task); |
379 | GNUNET_SCHEDULER_cancel (err_task); | ||
380 | err_task = | 373 | err_task = |
381 | GNUNET_SCHEDULER_add_delayed (TIMEOUT, &terminate_task_error, NULL); | 374 | GNUNET_SCHEDULER_add_delayed (TIMEOUT, &terminate_task_error, NULL); |
382 | start_time = GNUNET_TIME_absolute_get (); | 375 | start_time = GNUNET_TIME_absolute_get (); |