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

3 files changed, 17 insertions, 17 deletions

diff --git a/src/peerinfo/peerinfo_api.c b/src/peerinfo/peerinfo_api.c
index 20042f8e3..e2539bd55 100644
--- a/src/peerinfo/peerinfo_api.c
+++ b/src/peerinfo/peerinfo_api.c
@@ -110,7 +110,7 @@ struct GNUNET_PEERINFO_IteratorContext
   /**
    * Task responsible for timeout.
    */
-  GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+  struct GNUNET_SCHEDULER_Task * timeout_task;
 
   /**
    * Timeout for the operation.
@@ -179,7 +179,7 @@ struct GNUNET_PEERINFO_Handle
   /**
    * ID for a reconnect task.
    */
-  GNUNET_SCHEDULER_TaskIdentifier r_task;
+  struct GNUNET_SCHEDULER_Task * r_task;
 
   /**
    * Are we now receiving?
@@ -247,10 +247,10 @@ GNUNET_PEERINFO_disconnect (struct GNUNET_PEERINFO_Handle *h)
     GNUNET_CLIENT_disconnect (h->client);
     h->client = NULL;
   }
-  if (GNUNET_SCHEDULER_NO_TASK != h->r_task)
+  if (NULL != h->r_task)
   {
     GNUNET_SCHEDULER_cancel (h->r_task);
-    h->r_task = GNUNET_SCHEDULER_NO_TASK;
+    h->r_task = NULL;
   }
   GNUNET_free (h);
 }
@@ -287,7 +287,7 @@ reconnect_task (void *cls,
 {
   struct GNUNET_PEERINFO_Handle *h = cls;
 
-  h->r_task = GNUNET_SCHEDULER_NO_TASK;
+  h->r_task = NULL;
   reconnect (h);
 }
 
@@ -300,10 +300,10 @@ reconnect_task (void *cls,
 static void
 reconnect (struct GNUNET_PEERINFO_Handle *h)
 {
-  if (GNUNET_SCHEDULER_NO_TASK != h->r_task)
+  if (NULL != h->r_task)
   {
     GNUNET_SCHEDULER_cancel (h->r_task);
-    h->r_task = GNUNET_SCHEDULER_NO_TASK;
+    h->r_task = NULL;
   }
   if (NULL != h->th)
   {
@@ -709,7 +709,7 @@ signal_timeout (void *cls,
   GNUNET_PEERINFO_Processor cb;
   void *cb_cls;
 
-  ic->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+  ic->timeout_task = NULL;
   cb = ic->callback;
   cb_cls = ic->callback_cls;
   GNUNET_PEERINFO_iterate_cancel (ic);
@@ -811,10 +811,10 @@ GNUNET_PEERINFO_iterate_cancel (struct GNUNET_PEERINFO_IteratorContext *ic)
   struct GNUNET_PEERINFO_Handle *h;
 
   h = ic->h;
-  if (GNUNET_SCHEDULER_NO_TASK != ic->timeout_task)
+  if (NULL != ic->timeout_task)
   {
     GNUNET_SCHEDULER_cancel (ic->timeout_task);
-    ic->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+    ic->timeout_task = NULL;
   }
   ic->callback = NULL;
   if (GNUNET_YES == ic->request_transmitted)
diff --git a/src/peerinfo/peerinfo_api_notify.c b/src/peerinfo/peerinfo_api_notify.c
index af41b08f9..aaa62588e 100644
--- a/src/peerinfo/peerinfo_api_notify.c
+++ b/src/peerinfo/peerinfo_api_notify.c
@@ -66,7 +66,7 @@ struct GNUNET_PEERINFO_NotifyContext
   /**
    * Tasked used for delayed re-connection attempt.
    */
-  GNUNET_SCHEDULER_TaskIdentifier task;
+  struct GNUNET_SCHEDULER_Task * task;
 
   /**
    * Include friend only HELLOs in callbacks
@@ -107,7 +107,7 @@ reconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct GNUNET_PEERINFO_NotifyContext *nc = cls;
 
-  nc->task = GNUNET_SCHEDULER_NO_TASK;
+  nc->task = NULL;
   nc->client = GNUNET_CLIENT_connect ("peerinfo", nc->cfg);
   if (NULL == nc->client)
   {
@@ -295,7 +295,7 @@ GNUNET_PEERINFO_notify_cancel (struct GNUNET_PEERINFO_NotifyContext *nc)
   }
   if (NULL != nc->client)
     GNUNET_CLIENT_disconnect (nc->client);
-  if (GNUNET_SCHEDULER_NO_TASK != nc->task)
+  if (NULL != nc->task)
     GNUNET_SCHEDULER_cancel (nc->task);
   GNUNET_free (nc);
 }
diff --git a/src/peerinfo/test_peerinfo_api_notify_friend_only.c b/src/peerinfo/test_peerinfo_api_notify_friend_only.c
index c47fe6387..0b252621e 100644
--- a/src/peerinfo/test_peerinfo_api_notify_friend_only.c
+++ b/src/peerinfo/test_peerinfo_api_notify_friend_only.c
@@ -58,12 +58,12 @@ static int res_cb_wo_fo;
 
 struct GNUNET_PeerIdentity pid;
 
-GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+struct GNUNET_SCHEDULER_Task * timeout_task;
 
 static void
 end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  timeout_task = GNUNET_SCHEDULER_NO_TASK;
+  timeout_task = NULL;
   GNUNET_break(0);
   if (NULL != pnc_wo_fo)
   {
@@ -95,10 +95,10 @@ done (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   GNUNET_PEERINFO_disconnect (h);
   h = NULL;
 
-  if (GNUNET_SCHEDULER_NO_TASK != timeout_task)
+  if (NULL != timeout_task)
   {
     GNUNET_SCHEDULER_cancel (timeout_task);
-    timeout_task = GNUNET_SCHEDULER_NO_TASK;
+    timeout_task = NULL;
   }
 
   if ((GNUNET_YES == res_cb_w_fo) && (GNUNET_NO == res_cb_wo_fo))