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/nse/nse_api.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/nse/nse_api.c')
-rw-r--r-- | src/nse/nse_api.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/nse/nse_api.c b/src/nse/nse_api.c index bc927f481..edd05b71a 100644 --- a/src/nse/nse_api.c +++ b/src/nse/nse_api.c | |||
@@ -57,7 +57,7 @@ struct GNUNET_NSE_Handle | |||
57 | /** | 57 | /** |
58 | * Task doing exponential back-off trying to reconnect. | 58 | * Task doing exponential back-off trying to reconnect. |
59 | */ | 59 | */ |
60 | GNUNET_SCHEDULER_TaskIdentifier reconnect_task; | 60 | struct GNUNET_SCHEDULER_Task * reconnect_task; |
61 | 61 | ||
62 | /** | 62 | /** |
63 | * Time for next connect retry. | 63 | * Time for next connect retry. |
@@ -133,7 +133,7 @@ message_handler (void *cls, const struct GNUNET_MessageHeader *msg) | |||
133 | static void | 133 | static void |
134 | reschedule_connect (struct GNUNET_NSE_Handle *h) | 134 | reschedule_connect (struct GNUNET_NSE_Handle *h) |
135 | { | 135 | { |
136 | GNUNET_assert (h->reconnect_task == GNUNET_SCHEDULER_NO_TASK); | 136 | GNUNET_assert (h->reconnect_task == NULL); |
137 | 137 | ||
138 | if (NULL != h->th) | 138 | if (NULL != h->th) |
139 | { | 139 | { |
@@ -206,7 +206,7 @@ reconnect (void *cls, | |||
206 | { | 206 | { |
207 | struct GNUNET_NSE_Handle *h = cls; | 207 | struct GNUNET_NSE_Handle *h = cls; |
208 | 208 | ||
209 | h->reconnect_task = GNUNET_SCHEDULER_NO_TASK; | 209 | h->reconnect_task = NULL; |
210 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 210 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
211 | "Connecting to network size estimation service.\n"); | 211 | "Connecting to network size estimation service.\n"); |
212 | GNUNET_assert (NULL == h->client); | 212 | GNUNET_assert (NULL == h->client); |
@@ -256,10 +256,10 @@ void | |||
256 | GNUNET_NSE_disconnect (struct GNUNET_NSE_Handle *h) | 256 | GNUNET_NSE_disconnect (struct GNUNET_NSE_Handle *h) |
257 | { | 257 | { |
258 | GNUNET_assert (NULL != h); | 258 | GNUNET_assert (NULL != h); |
259 | if (h->reconnect_task != GNUNET_SCHEDULER_NO_TASK) | 259 | if (h->reconnect_task != NULL) |
260 | { | 260 | { |
261 | GNUNET_SCHEDULER_cancel (h->reconnect_task); | 261 | GNUNET_SCHEDULER_cancel (h->reconnect_task); |
262 | h->reconnect_task = GNUNET_SCHEDULER_NO_TASK; | 262 | h->reconnect_task = NULL; |
263 | } | 263 | } |
264 | if (NULL != h->th) | 264 | if (NULL != h->th) |
265 | { | 265 | { |