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/conversation/test_conversation_api_twocalls.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/conversation/test_conversation_api_twocalls.c')
-rw-r--r-- | src/conversation/test_conversation_api_twocalls.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/conversation/test_conversation_api_twocalls.c b/src/conversation/test_conversation_api_twocalls.c index 500f0858c..7226ffba1 100644 --- a/src/conversation/test_conversation_api_twocalls.c +++ b/src/conversation/test_conversation_api_twocalls.c | |||
@@ -73,7 +73,7 @@ static GNUNET_MICROPHONE_RecordedDataCallback phone_rdc; | |||
73 | 73 | ||
74 | static void *phone_rdc_cls; | 74 | static void *phone_rdc_cls; |
75 | 75 | ||
76 | static GNUNET_SCHEDULER_TaskIdentifier phone_task; | 76 | static struct GNUNET_SCHEDULER_Task * phone_task; |
77 | 77 | ||
78 | /** | 78 | /** |
79 | * Variable for recognizing caller1 | 79 | * Variable for recognizing caller1 |
@@ -114,7 +114,7 @@ struct MicContext | |||
114 | 114 | ||
115 | void *rdc_cls; | 115 | void *rdc_cls; |
116 | 116 | ||
117 | GNUNET_SCHEDULER_TaskIdentifier call_task; | 117 | struct GNUNET_SCHEDULER_Task * call_task; |
118 | 118 | ||
119 | }; | 119 | }; |
120 | 120 | ||
@@ -268,14 +268,14 @@ enable_mic (void *cls, | |||
268 | { | 268 | { |
269 | phone_rdc = rdc; | 269 | phone_rdc = rdc; |
270 | phone_rdc_cls = rdc_cls; | 270 | phone_rdc_cls = rdc_cls; |
271 | GNUNET_break (GNUNET_SCHEDULER_NO_TASK == phone_task); | 271 | GNUNET_break (NULL == phone_task); |
272 | phone_task = GNUNET_SCHEDULER_add_now (&phone_send, NULL); | 272 | phone_task = GNUNET_SCHEDULER_add_now (&phone_send, NULL); |
273 | return GNUNET_OK; | 273 | return GNUNET_OK; |
274 | } | 274 | } |
275 | mc = (CALLER1 == cls) ? &call1_mic_ctx : &call2_mic_ctx; | 275 | mc = (CALLER1 == cls) ? &call1_mic_ctx : &call2_mic_ctx; |
276 | mc->rdc = rdc; | 276 | mc->rdc = rdc; |
277 | mc->rdc_cls = rdc_cls; | 277 | mc->rdc_cls = rdc_cls; |
278 | GNUNET_break (GNUNET_SCHEDULER_NO_TASK == mc->call_task); | 278 | GNUNET_break (NULL == mc->call_task); |
279 | mc->call_task = GNUNET_SCHEDULER_add_now (&call_send, mc); | 279 | mc->call_task = GNUNET_SCHEDULER_add_now (&call_send, mc); |
280 | return GNUNET_OK; | 280 | return GNUNET_OK; |
281 | } | 281 | } |
@@ -294,14 +294,14 @@ disable_mic (void *cls) | |||
294 | phone_rdc = NULL; | 294 | phone_rdc = NULL; |
295 | phone_rdc_cls = NULL; | 295 | phone_rdc_cls = NULL; |
296 | GNUNET_SCHEDULER_cancel (phone_task); | 296 | GNUNET_SCHEDULER_cancel (phone_task); |
297 | phone_task = GNUNET_SCHEDULER_NO_TASK; | 297 | phone_task = NULL; |
298 | return; | 298 | return; |
299 | } | 299 | } |
300 | mc = (CALLER1 == cls) ? &call1_mic_ctx : &call2_mic_ctx; | 300 | mc = (CALLER1 == cls) ? &call1_mic_ctx : &call2_mic_ctx; |
301 | mc->rdc = NULL; | 301 | mc->rdc = NULL; |
302 | mc->rdc_cls = NULL; | 302 | mc->rdc_cls = NULL; |
303 | GNUNET_SCHEDULER_cancel (mc->call_task); | 303 | GNUNET_SCHEDULER_cancel (mc->call_task); |
304 | mc->call_task = GNUNET_SCHEDULER_NO_TASK; | 304 | mc->call_task = NULL; |
305 | } | 305 | } |
306 | 306 | ||
307 | 307 | ||