diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-09-01 15:06:23 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-09-01 15:06:23 +0000 |
commit | 2f2addcbb2e6f9bb65865a3e6791f18ad0dd3cda (patch) | |
tree | 63e560bc37367dacd1a0a419b1e0af8fff0c5847 /src/dht/test_dht_api.c | |
parent | 7e520854fcacaa4991d279919d179f6aff4887cb (diff) | |
download | gnunet-2f2addcbb2e6f9bb65865a3e6791f18ad0dd3cda.tar.gz gnunet-2f2addcbb2e6f9bb65865a3e6791f18ad0dd3cda.zip |
fixing double-adding of the 'die-task'
Diffstat (limited to 'src/dht/test_dht_api.c')
-rw-r--r-- | src/dht/test_dht_api.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/dht/test_dht_api.c b/src/dht/test_dht_api.c index f5bb05d8b..7605d8499 100644 --- a/src/dht/test_dht_api.c +++ b/src/dht/test_dht_api.c | |||
@@ -96,7 +96,7 @@ struct RetryContext retry_context; | |||
96 | 96 | ||
97 | static int ok; | 97 | static int ok; |
98 | 98 | ||
99 | GNUNET_SCHEDULER_TaskIdentifier die_task; | 99 | static GNUNET_SCHEDULER_TaskIdentifier die_task; |
100 | 100 | ||
101 | #if VERBOSE | 101 | #if VERBOSE |
102 | #define OKPP do { ok++; fprintf (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0) | 102 | #define OKPP do { ok++; fprintf (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0) |
@@ -173,7 +173,7 @@ test_find_peer_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
173 | { | 173 | { |
174 | GNUNET_break (0); | 174 | GNUNET_break (0); |
175 | GNUNET_SCHEDULER_cancel (die_task); | 175 | GNUNET_SCHEDULER_cancel (die_task); |
176 | GNUNET_SCHEDULER_add_now (&end_badly, NULL); | 176 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); |
177 | return; | 177 | return; |
178 | } | 178 | } |
179 | 179 | ||
@@ -279,7 +279,7 @@ retry_find_peer (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
279 | { | 279 | { |
280 | GNUNET_break (0); | 280 | GNUNET_break (0); |
281 | GNUNET_SCHEDULER_cancel (die_task); | 281 | GNUNET_SCHEDULER_cancel (die_task); |
282 | GNUNET_SCHEDULER_add_now (&end_badly, &p1); | 282 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, &p1); |
283 | return; | 283 | return; |
284 | } | 284 | } |
285 | retry_ctx->retry_task = | 285 | retry_ctx->retry_task = |
@@ -339,7 +339,7 @@ test_find_peer (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
339 | { | 339 | { |
340 | GNUNET_break (0); | 340 | GNUNET_break (0); |
341 | GNUNET_SCHEDULER_cancel (die_task); | 341 | GNUNET_SCHEDULER_cancel (die_task); |
342 | GNUNET_SCHEDULER_add_now (&end_badly, &p1); | 342 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, &p1); |
343 | return; | 343 | return; |
344 | } | 344 | } |
345 | retry_context.retry_task = | 345 | retry_context.retry_task = |
@@ -363,7 +363,7 @@ test_get_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
363 | { | 363 | { |
364 | GNUNET_break (0); | 364 | GNUNET_break (0); |
365 | GNUNET_SCHEDULER_cancel (die_task); | 365 | GNUNET_SCHEDULER_cancel (die_task); |
366 | GNUNET_SCHEDULER_add_now (&end_badly, NULL); | 366 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); |
367 | return; | 367 | return; |
368 | } | 368 | } |
369 | GNUNET_assert (peer->dht_handle != NULL); | 369 | GNUNET_assert (peer->dht_handle != NULL); |
@@ -416,7 +416,7 @@ test_get (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
416 | { | 416 | { |
417 | GNUNET_break (0); | 417 | GNUNET_break (0); |
418 | GNUNET_SCHEDULER_cancel (die_task); | 418 | GNUNET_SCHEDULER_cancel (die_task); |
419 | GNUNET_SCHEDULER_add_now (&end_badly, &p1); | 419 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, &p1); |
420 | return; | 420 | return; |
421 | } | 421 | } |
422 | 422 | ||