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/testbed/test_testbed_api_statistics.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/testbed/test_testbed_api_statistics.c')
-rw-r--r-- | src/testbed/test_testbed_api_statistics.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/testbed/test_testbed_api_statistics.c b/src/testbed/test_testbed_api_statistics.c index 73c7f9734..158f21e07 100644 --- a/src/testbed/test_testbed_api_statistics.c +++ b/src/testbed/test_testbed_api_statistics.c | |||
@@ -51,7 +51,7 @@ static void *dummy_cls = (void *) 0xDEAD0001; | |||
51 | /** | 51 | /** |
52 | * Abort task identifier | 52 | * Abort task identifier |
53 | */ | 53 | */ |
54 | static GNUNET_SCHEDULER_TaskIdentifier abort_task; | 54 | static struct GNUNET_SCHEDULER_Task * abort_task; |
55 | 55 | ||
56 | /** | 56 | /** |
57 | * Global testing result | 57 | * Global testing result |
@@ -75,7 +75,7 @@ static unsigned int num_seen_peers; | |||
75 | #define FAIL_TEST(cond, ret) do { \ | 75 | #define FAIL_TEST(cond, ret) do { \ |
76 | if (!(cond)) { \ | 76 | if (!(cond)) { \ |
77 | GNUNET_break(0); \ | 77 | GNUNET_break(0); \ |
78 | if (GNUNET_SCHEDULER_NO_TASK != abort_task) \ | 78 | if (NULL != abort_task) \ |
79 | GNUNET_SCHEDULER_cancel (abort_task); \ | 79 | GNUNET_SCHEDULER_cancel (abort_task); \ |
80 | abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); \ | 80 | abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); \ |
81 | ret; \ | 81 | ret; \ |
@@ -93,7 +93,7 @@ static void | |||
93 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 93 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
94 | { | 94 | { |
95 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Test timed out -- Aborting\n"); | 95 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Test timed out -- Aborting\n"); |
96 | abort_task = GNUNET_SCHEDULER_NO_TASK; | 96 | abort_task = NULL; |
97 | if (NULL != op) | 97 | if (NULL != op) |
98 | { | 98 | { |
99 | GNUNET_TESTBED_operation_done (op); | 99 | GNUNET_TESTBED_operation_done (op); |