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/gns/test_gns_proxy.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/gns/test_gns_proxy.c')
-rw-r--r-- | src/gns/test_gns_proxy.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/gns/test_gns_proxy.c b/src/gns/test_gns_proxy.c index 9e2c29fb4..1f7cc7d93 100644 --- a/src/gns/test_gns_proxy.c +++ b/src/gns/test_gns_proxy.c | |||
@@ -45,9 +45,9 @@ static struct GNUNET_NAMESTORE_Handle *namestore; | |||
45 | 45 | ||
46 | static struct MHD_Daemon *mhd; | 46 | static struct MHD_Daemon *mhd; |
47 | 47 | ||
48 | static GNUNET_SCHEDULER_TaskIdentifier mhd_task_id; | 48 | static struct GNUNET_SCHEDULER_Task * mhd_task_id; |
49 | 49 | ||
50 | static GNUNET_SCHEDULER_TaskIdentifier curl_task_id; | 50 | static struct GNUNET_SCHEDULER_Task * curl_task_id; |
51 | 51 | ||
52 | static CURL *curl; | 52 | static CURL *curl; |
53 | 53 | ||
@@ -117,15 +117,15 @@ mhd_ahc (void *cls, | |||
117 | static void | 117 | static void |
118 | do_shutdown () | 118 | do_shutdown () |
119 | { | 119 | { |
120 | if (mhd_task_id != GNUNET_SCHEDULER_NO_TASK) | 120 | if (mhd_task_id != NULL) |
121 | { | 121 | { |
122 | GNUNET_SCHEDULER_cancel (mhd_task_id); | 122 | GNUNET_SCHEDULER_cancel (mhd_task_id); |
123 | mhd_task_id = GNUNET_SCHEDULER_NO_TASK; | 123 | mhd_task_id = NULL; |
124 | } | 124 | } |
125 | if (curl_task_id != GNUNET_SCHEDULER_NO_TASK) | 125 | if (curl_task_id != NULL) |
126 | { | 126 | { |
127 | GNUNET_SCHEDULER_cancel (curl_task_id); | 127 | GNUNET_SCHEDULER_cancel (curl_task_id); |
128 | curl_task_id = GNUNET_SCHEDULER_NO_TASK; | 128 | curl_task_id = NULL; |
129 | } | 129 | } |
130 | if (NULL != mhd) | 130 | if (NULL != mhd) |
131 | { | 131 | { |
@@ -164,7 +164,7 @@ static void | |||
164 | curl_task (void *cls, | 164 | curl_task (void *cls, |
165 | const struct GNUNET_SCHEDULER_TaskContext *tc) | 165 | const struct GNUNET_SCHEDULER_TaskContext *tc) |
166 | { | 166 | { |
167 | curl_task_id = GNUNET_SCHEDULER_NO_TASK; | 167 | curl_task_id = NULL; |
168 | curl_main (); | 168 | curl_main (); |
169 | } | 169 | } |
170 | 170 | ||
@@ -314,7 +314,7 @@ static void | |||
314 | mhd_task (void *cls, | 314 | mhd_task (void *cls, |
315 | const struct GNUNET_SCHEDULER_TaskContext *tc) | 315 | const struct GNUNET_SCHEDULER_TaskContext *tc) |
316 | { | 316 | { |
317 | mhd_task_id = GNUNET_SCHEDULER_NO_TASK; | 317 | mhd_task_id = NULL; |
318 | MHD_run (mhd); | 318 | MHD_run (mhd); |
319 | mhd_main (); | 319 | mhd_main (); |
320 | } | 320 | } |
@@ -332,7 +332,7 @@ mhd_main () | |||
332 | unsigned MHD_LONG_LONG timeout; | 332 | unsigned MHD_LONG_LONG timeout; |
333 | struct GNUNET_TIME_Relative delay; | 333 | struct GNUNET_TIME_Relative delay; |
334 | 334 | ||
335 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == mhd_task_id); | 335 | GNUNET_assert (NULL == mhd_task_id); |
336 | FD_ZERO (&rs); | 336 | FD_ZERO (&rs); |
337 | FD_ZERO (&ws); | 337 | FD_ZERO (&ws); |
338 | FD_ZERO (&es); | 338 | FD_ZERO (&es); |