making GNUNET_SCHEDULER_cancel() perform in O(1) instead of O(n) to help or even fully address #3247

4 files changed, 17 insertions, 17 deletions

diff --git a/src/conversation/gnunet-conversation-test.c b/src/conversation/gnunet-conversation-test.c
index cc831a3ab..108ca7b5a 100644
--- a/src/conversation/gnunet-conversation-test.c
+++ b/src/conversation/gnunet-conversation-test.c
@@ -74,12 +74,12 @@ static struct GNUNET_SPEAKER_Handle *speaker;
 /**
  * Task scheduled to switch from recording to playback.
  */
-static GNUNET_SCHEDULER_TaskIdentifier switch_task;
+static struct GNUNET_SCHEDULER_Task * switch_task;
 
 /**
  * The shutdown task.
  */
-static GNUNET_SCHEDULER_TaskIdentifier st;
+static struct GNUNET_SCHEDULER_Task * st;
 
 /**
  * Head of DLL with recorded frames.
@@ -104,7 +104,7 @@ do_shutdown (void *cls,
 {
   struct Recording *rec;
 
-  if (GNUNET_SCHEDULER_NO_TASK != switch_task)
+  if (NULL != switch_task)
     GNUNET_SCHEDULER_cancel (switch_task);
   if (NULL != microphone)
     GNUNET_MICROPHONE_destroy (microphone);
@@ -134,7 +134,7 @@ switch_to_speaker (void *cls,
 {
   struct Recording *rec;
 
-  switch_task = GNUNET_SCHEDULER_NO_TASK;
+  switch_task = NULL;
   microphone->disable_microphone (microphone->cls);
   if (GNUNET_OK !=
       speaker->enable_speaker (speaker->cls))
diff --git a/src/conversation/gnunet-conversation.c b/src/conversation/gnunet-conversation.c
index 4b4c5f5da..7d5cb990a 100644
--- a/src/conversation/gnunet-conversation.c
+++ b/src/conversation/gnunet-conversation.c
@@ -173,7 +173,7 @@ static unsigned int line;
 /**
  * Task which handles the commands
  */
-static GNUNET_SCHEDULER_TaskIdentifier handle_cmd_task;
+static struct GNUNET_SCHEDULER_Task * handle_cmd_task;
 
 /**
  * Our speaker.
@@ -1036,10 +1036,10 @@ do_stop_task (void *cls,
     GNUNET_CONVERSATION_phone_destroy (phone);
     phone = NULL;
   }
-  if (GNUNET_SCHEDULER_NO_TASK != handle_cmd_task)
+  if (NULL != handle_cmd_task)
   {
     GNUNET_SCHEDULER_cancel (handle_cmd_task);
-    handle_cmd_task = GNUNET_SCHEDULER_NO_TASK;
+    handle_cmd_task = NULL;
   }
   if (NULL != id)
   {
diff --git a/src/conversation/test_conversation_api.c b/src/conversation/test_conversation_api.c
index 7a5537144..91ece5c11 100644
--- a/src/conversation/test_conversation_api.c
+++ b/src/conversation/test_conversation_api.c
@@ -67,9 +67,9 @@ static GNUNET_MICROPHONE_RecordedDataCallback call_rdc;
 
 static void *call_rdc_cls;
 
-static GNUNET_SCHEDULER_TaskIdentifier phone_task;
+static struct GNUNET_SCHEDULER_Task * phone_task;
 
-static GNUNET_SCHEDULER_TaskIdentifier call_task;
+static struct GNUNET_SCHEDULER_Task * call_task;
 
 
 static void
@@ -229,14 +229,14 @@ disable_mic (void *cls)
     phone_rdc = NULL;
     phone_rdc_cls = NULL;
     GNUNET_SCHEDULER_cancel (phone_task);
-    phone_task = GNUNET_SCHEDULER_NO_TASK;
+    phone_task = NULL;
   }
   else
   {
     call_rdc = NULL;
     call_rdc_cls = NULL;
     GNUNET_SCHEDULER_cancel (call_task);
-    call_task = GNUNET_SCHEDULER_NO_TASK;
+    call_task = NULL;
   }
 }
 
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;
 
 static void *phone_rdc_cls;
 
-static GNUNET_SCHEDULER_TaskIdentifier phone_task;
+static struct GNUNET_SCHEDULER_Task * phone_task;
 
 /**
  * Variable for recognizing caller1
@@ -114,7 +114,7 @@ struct MicContext
 
   void *rdc_cls;
 
-  GNUNET_SCHEDULER_TaskIdentifier call_task;
+  struct GNUNET_SCHEDULER_Task * call_task;
 
 };
 
@@ -268,14 +268,14 @@ enable_mic (void *cls,
   {
     phone_rdc = rdc;
     phone_rdc_cls = rdc_cls;
-    GNUNET_break (GNUNET_SCHEDULER_NO_TASK == phone_task);
+    GNUNET_break (NULL == phone_task);
     phone_task = GNUNET_SCHEDULER_add_now (&phone_send, NULL);
     return GNUNET_OK;
   }
   mc = (CALLER1 == cls) ? &call1_mic_ctx : &call2_mic_ctx;
   mc->rdc = rdc;
   mc->rdc_cls = rdc_cls;
-  GNUNET_break (GNUNET_SCHEDULER_NO_TASK == mc->call_task);
+  GNUNET_break (NULL == mc->call_task);
   mc->call_task = GNUNET_SCHEDULER_add_now (&call_send, mc);
   return GNUNET_OK;
 }
@@ -294,14 +294,14 @@ disable_mic (void *cls)
     phone_rdc = NULL;
     phone_rdc_cls = NULL;
     GNUNET_SCHEDULER_cancel (phone_task);
-    phone_task = GNUNET_SCHEDULER_NO_TASK;
+    phone_task = NULL;
     return;
   }
   mc = (CALLER1 == cls) ? &call1_mic_ctx : &call2_mic_ctx;
   mc->rdc = NULL;
   mc->rdc_cls = NULL;
   GNUNET_SCHEDULER_cancel (mc->call_task);
-  mc->call_task = GNUNET_SCHEDULER_NO_TASK;
+  mc->call_task = NULL;
 }