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/transport/test_transport_api_disconnect.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/transport/test_transport_api_disconnect.c')
-rw-r--r-- | src/transport/test_transport_api_disconnect.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/transport/test_transport_api_disconnect.c b/src/transport/test_transport_api_disconnect.c index 3f8246142..607b3480b 100644 --- a/src/transport/test_transport_api_disconnect.c +++ b/src/transport/test_transport_api_disconnect.c | |||
@@ -47,9 +47,9 @@ static char *test_name; | |||
47 | 47 | ||
48 | static int ok; | 48 | static int ok; |
49 | 49 | ||
50 | static GNUNET_SCHEDULER_TaskIdentifier die_task; | 50 | static struct GNUNET_SCHEDULER_Task * die_task; |
51 | 51 | ||
52 | static GNUNET_SCHEDULER_TaskIdentifier send_task; | 52 | static struct GNUNET_SCHEDULER_Task * send_task; |
53 | 53 | ||
54 | struct PeerContext *p1; | 54 | struct PeerContext *p1; |
55 | 55 | ||
@@ -79,16 +79,16 @@ end () | |||
79 | { | 79 | { |
80 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n"); | 80 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n"); |
81 | 81 | ||
82 | if (send_task != GNUNET_SCHEDULER_NO_TASK) | 82 | if (send_task != NULL) |
83 | { | 83 | { |
84 | GNUNET_SCHEDULER_cancel (send_task); | 84 | GNUNET_SCHEDULER_cancel (send_task); |
85 | send_task = GNUNET_SCHEDULER_NO_TASK; | 85 | send_task = NULL; |
86 | } | 86 | } |
87 | 87 | ||
88 | if (die_task != GNUNET_SCHEDULER_NO_TASK) | 88 | if (die_task != NULL) |
89 | { | 89 | { |
90 | GNUNET_SCHEDULER_cancel (die_task); | 90 | GNUNET_SCHEDULER_cancel (die_task); |
91 | die_task = GNUNET_SCHEDULER_NO_TASK; | 91 | die_task = NULL; |
92 | } | 92 | } |
93 | 93 | ||
94 | if (th != NULL) | 94 | if (th != NULL) |
@@ -110,7 +110,7 @@ end () | |||
110 | static void | 110 | static void |
111 | end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 111 | end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
112 | { | 112 | { |
113 | die_task = GNUNET_SCHEDULER_NO_TASK; | 113 | die_task = NULL; |
114 | 114 | ||
115 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n"); | 115 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n"); |
116 | 116 | ||
@@ -120,10 +120,10 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
120 | cc = NULL; | 120 | cc = NULL; |
121 | } | 121 | } |
122 | 122 | ||
123 | if (send_task != GNUNET_SCHEDULER_NO_TASK) | 123 | if (send_task != NULL) |
124 | { | 124 | { |
125 | GNUNET_SCHEDULER_cancel (send_task); | 125 | GNUNET_SCHEDULER_cancel (send_task); |
126 | send_task = GNUNET_SCHEDULER_NO_TASK; | 126 | send_task = NULL; |
127 | } | 127 | } |
128 | 128 | ||
129 | if (th != NULL) | 129 | if (th != NULL) |
@@ -221,7 +221,7 @@ notify_ready (void *cls, size_t size, void *buf) | |||
221 | { | 221 | { |
222 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 222 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
223 | "Timeout occurred while waiting for transmit_ready\n"); | 223 | "Timeout occurred while waiting for transmit_ready\n"); |
224 | if (GNUNET_SCHEDULER_NO_TASK != die_task) | 224 | if (NULL != die_task) |
225 | GNUNET_SCHEDULER_cancel (die_task); | 225 | GNUNET_SCHEDULER_cancel (die_task); |
226 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); | 226 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); |
227 | ok = 42; | 227 | ok = 42; |
@@ -250,7 +250,7 @@ notify_ready (void *cls, size_t size, void *buf) | |||
250 | static void | 250 | static void |
251 | sendtask (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 251 | sendtask (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
252 | { | 252 | { |
253 | send_task = GNUNET_SCHEDULER_NO_TASK; | 253 | send_task = NULL; |
254 | 254 | ||
255 | if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0) | 255 | if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0) |
256 | return; | 256 | return; |
@@ -347,7 +347,7 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
347 | if ((p1 == NULL) || (p2 == NULL)) | 347 | if ((p1 == NULL) || (p2 == NULL)) |
348 | { | 348 | { |
349 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not start peers!\n"); | 349 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not start peers!\n"); |
350 | if (die_task != GNUNET_SCHEDULER_NO_TASK) | 350 | if (die_task != NULL) |
351 | GNUNET_SCHEDULER_cancel (die_task); | 351 | GNUNET_SCHEDULER_cancel (die_task); |
352 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); | 352 | die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); |
353 | return; | 353 | return; |
@@ -367,7 +367,7 @@ check () | |||
367 | GNUNET_GETOPT_OPTION_END | 367 | GNUNET_GETOPT_OPTION_END |
368 | }; | 368 | }; |
369 | 369 | ||
370 | send_task = GNUNET_SCHEDULER_NO_TASK; | 370 | send_task = NULL; |
371 | 371 | ||
372 | ok = 1; | 372 | ok = 1; |
373 | GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, test_name, | 373 | GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, test_name, |