diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-12-24 01:10:47 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-12-24 01:10:47 +0000 |
commit | f1f603c7d0b3f03dca46a4f313472288eb080eb1 (patch) | |
tree | 3a29966b02dfb83e0a8a8d5c42b3116380209fb0 /src/namestore/test_namestore_api_zone_iteration_specific_zone.c | |
parent | 53cd5b8eda2fa8db86b0907a62a39598981d008a (diff) | |
download | gnunet-f1f603c7d0b3f03dca46a4f313472288eb080eb1.tar.gz gnunet-f1f603c7d0b3f03dca46a4f313472288eb080eb1.zip |
making GNUNET_SCHEDULER_cancel() perform in O(1) instead of O(n) to help or even fully address #3247
Diffstat (limited to 'src/namestore/test_namestore_api_zone_iteration_specific_zone.c')
-rw-r--r-- | src/namestore/test_namestore_api_zone_iteration_specific_zone.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c index ed393af8e..3f8d481d1 100644 --- a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c +++ b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c | |||
@@ -33,7 +33,7 @@ | |||
33 | 33 | ||
34 | static struct GNUNET_NAMESTORE_Handle * nsh; | 34 | static struct GNUNET_NAMESTORE_Handle * nsh; |
35 | 35 | ||
36 | static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; | 36 | static struct GNUNET_SCHEDULER_Task * endbadly_task; |
37 | 37 | ||
38 | static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey; | 38 | static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey; |
39 | 39 | ||
@@ -118,10 +118,10 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
118 | zi = NULL; | 118 | zi = NULL; |
119 | } | 119 | } |
120 | 120 | ||
121 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | 121 | if (endbadly_task != NULL) |
122 | { | 122 | { |
123 | GNUNET_SCHEDULER_cancel (endbadly_task); | 123 | GNUNET_SCHEDULER_cancel (endbadly_task); |
124 | endbadly_task = GNUNET_SCHEDULER_NO_TASK; | 124 | endbadly_task = NULL; |
125 | } | 125 | } |
126 | 126 | ||
127 | if (privkey != NULL) | 127 | if (privkey != NULL) |
@@ -275,7 +275,7 @@ put_cont (void *cls, int32_t success, const char *emsg) | |||
275 | "Failed to created records: `%s'\n", | 275 | "Failed to created records: `%s'\n", |
276 | emsg); | 276 | emsg); |
277 | GNUNET_break (0); | 277 | GNUNET_break (0); |
278 | if (GNUNET_SCHEDULER_NO_TASK != endbadly_task) | 278 | if (NULL != endbadly_task) |
279 | GNUNET_SCHEDULER_cancel (endbadly_task); | 279 | GNUNET_SCHEDULER_cancel (endbadly_task); |
280 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); | 280 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); |
281 | return; | 281 | return; |
@@ -296,7 +296,7 @@ put_cont (void *cls, int32_t success, const char *emsg) | |||
296 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 296 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
297 | "Failed to create zone iterator\n"); | 297 | "Failed to create zone iterator\n"); |
298 | GNUNET_break (0); | 298 | GNUNET_break (0); |
299 | if (GNUNET_SCHEDULER_NO_TASK != endbadly_task) | 299 | if (NULL != endbadly_task) |
300 | GNUNET_SCHEDULER_cancel (endbadly_task); | 300 | GNUNET_SCHEDULER_cancel (endbadly_task); |
301 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); | 301 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); |
302 | return; | 302 | return; |
@@ -345,7 +345,7 @@ empty_zone_proc (void *cls, | |||
345 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 345 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
346 | _("Expected empty zone but received zone private key\n")); | 346 | _("Expected empty zone but received zone private key\n")); |
347 | GNUNET_break (0); | 347 | GNUNET_break (0); |
348 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | 348 | if (endbadly_task != NULL) |
349 | GNUNET_SCHEDULER_cancel (endbadly_task); | 349 | GNUNET_SCHEDULER_cancel (endbadly_task); |
350 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); | 350 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); |
351 | return; | 351 | return; |
@@ -355,7 +355,7 @@ empty_zone_proc (void *cls, | |||
355 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 355 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
356 | _("Expected no zone content but received data\n")); | 356 | _("Expected no zone content but received data\n")); |
357 | GNUNET_break (0); | 357 | GNUNET_break (0); |
358 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | 358 | if (endbadly_task != NULL) |
359 | GNUNET_SCHEDULER_cancel (endbadly_task); | 359 | GNUNET_SCHEDULER_cancel (endbadly_task); |
360 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); | 360 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); |
361 | return; | 361 | return; |