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

5 files changed, 47 insertions, 47 deletions

diff --git a/src/nat/nat.c b/src/nat/nat.c
index 85d069e07..0225508a6 100644
--- a/src/nat/nat.c
+++ b/src/nat/nat.c
@@ -230,27 +230,27 @@ struct GNUNET_NAT_Handle
   /**
    * ID of select gnunet-helper-nat-server stdout read task
    */
-  GNUNET_SCHEDULER_TaskIdentifier server_read_task;
+  struct GNUNET_SCHEDULER_Task * server_read_task;
 
   /**
    * ID of interface IP-scan task
    */
-  GNUNET_SCHEDULER_TaskIdentifier ifc_task;
+  struct GNUNET_SCHEDULER_Task * ifc_task;
 
   /**
    * ID of hostname DNS lookup task
    */
-  GNUNET_SCHEDULER_TaskIdentifier hostname_task;
+  struct GNUNET_SCHEDULER_Task * hostname_task;
 
   /**
    * ID of DynDNS lookup task
    */
-  GNUNET_SCHEDULER_TaskIdentifier dns_task;
+  struct GNUNET_SCHEDULER_Task * dns_task;
 
   /**
    * ID of task to add addresses from bind.
    */
-  GNUNET_SCHEDULER_TaskIdentifier bind_task;
+  struct GNUNET_SCHEDULER_Task * bind_task;
 
   /**
    * How often do we scan for changes in our IP address from our local
@@ -758,7 +758,7 @@ process_interfaces (void *cls, const char *name, int isDefault,
     return GNUNET_OK;
   }
   if ((h->internal_address == NULL) && (h->server_proc == NULL) &&
-      (h->server_read_task == GNUNET_SCHEDULER_NO_TASK) &&
+      (h->server_read_task == NULL) &&
       (GNUNET_YES == isDefault) && ((addr->sa_family == AF_INET) ||
                                     (addr->sa_family == AF_INET6)))
   {
@@ -784,7 +784,7 @@ restart_nat_server (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct GNUNET_NAT_Handle *h = cls;
 
-  h->server_read_task = GNUNET_SCHEDULER_NO_TASK;
+  h->server_read_task = NULL;
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
     return;
   start_gnunet_nat_server (h);
@@ -811,7 +811,7 @@ nat_server_read (void *cls,
   const char *port_start;
   struct sockaddr_in sin_addr;
 
-  h->server_read_task = GNUNET_SCHEDULER_NO_TASK;
+  h->server_read_task = NULL;
   if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
     return;
   memset (mybuf, 0, sizeof (mybuf));
@@ -946,7 +946,7 @@ list_interfaces (void *cls,
 {
   struct GNUNET_NAT_Handle *h = cls;
 
-  h->ifc_task = GNUNET_SCHEDULER_NO_TASK;
+  h->ifc_task = NULL;
   remove_from_address_list_by_source (h, LAL_INTERFACE_ADDRESS);
   GNUNET_OS_network_interfaces_list (&process_interfaces, h);
   h->ifc_task =
@@ -967,7 +967,7 @@ resolve_hostname (void *cls,
 {
   struct GNUNET_NAT_Handle *h = cls;
 
-  h->hostname_task = GNUNET_SCHEDULER_NO_TASK;
+  h->hostname_task = NULL;
   remove_from_address_list_by_source (h, LAL_HOSTNAME_DNS);
   h->hostname_dns =
       GNUNET_RESOLVER_hostname_resolve (AF_UNSPEC, HOSTNAME_RESOLVE_TIMEOUT,
@@ -989,7 +989,7 @@ resolve_dns (void *cls,
   struct GNUNET_NAT_Handle *h = cls;
   struct LocalAddressList *pos;
 
-  h->dns_task = GNUNET_SCHEDULER_NO_TASK;
+  h->dns_task = NULL;
   for (pos = h->lal_head; NULL != pos; pos = pos->next)
     if (pos->source == LAL_EXTERNAL_IP)
       pos->source = LAL_EXTERNAL_IP_OLD;
@@ -1124,7 +1124,7 @@ add_from_bind (void *cls,
   struct sockaddr *sa;
   const struct sockaddr_in *v4;
 
-  h->bind_task = GNUNET_SCHEDULER_NO_TASK;
+  h->bind_task = NULL;
   for (i = 0; i < h->num_local_addrs; i++)
   {
     sa = h->local_addrs[i];
@@ -1384,30 +1384,30 @@ GNUNET_NAT_unregister (struct GNUNET_NAT_Handle *h)
     GNUNET_RESOLVER_request_cancel (h->hostname_dns);
     h->hostname_dns = NULL;
   }
-  if (GNUNET_SCHEDULER_NO_TASK != h->server_read_task)
+  if (NULL != h->server_read_task)
   {
     GNUNET_SCHEDULER_cancel (h->server_read_task);
-    h->server_read_task = GNUNET_SCHEDULER_NO_TASK;
+    h->server_read_task = NULL;
   }
-  if (GNUNET_SCHEDULER_NO_TASK != h->bind_task)
+  if (NULL != h->bind_task)
   {
     GNUNET_SCHEDULER_cancel (h->bind_task);
-    h->bind_task = GNUNET_SCHEDULER_NO_TASK;
+    h->bind_task = NULL;
   }
-  if (GNUNET_SCHEDULER_NO_TASK != h->ifc_task)
+  if (NULL != h->ifc_task)
   {
     GNUNET_SCHEDULER_cancel (h->ifc_task);
-    h->ifc_task = GNUNET_SCHEDULER_NO_TASK;
+    h->ifc_task = NULL;
   }
-  if (GNUNET_SCHEDULER_NO_TASK != h->hostname_task)
+  if (NULL != h->hostname_task)
   {
     GNUNET_SCHEDULER_cancel (h->hostname_task);
-    h->hostname_task = GNUNET_SCHEDULER_NO_TASK;
+    h->hostname_task = NULL;
   }
-  if (GNUNET_SCHEDULER_NO_TASK != h->dns_task)
+  if (NULL != h->dns_task)
   {
     GNUNET_SCHEDULER_cancel (h->dns_task);
-    h->dns_task = GNUNET_SCHEDULER_NO_TASK;
+    h->dns_task = NULL;
   }
   if (NULL != h->server_proc)
   {
diff --git a/src/nat/nat_auto.c b/src/nat/nat_auto.c
index 8fc85d7a7..33ce8c1f1 100644
--- a/src/nat/nat_auto.c
+++ b/src/nat/nat_auto.c
@@ -129,7 +129,7 @@ struct GNUNET_NAT_AutoHandle
   /**
    * Task identifier for the timeout.
    */
-  GNUNET_SCHEDULER_TaskIdentifier task;
+  struct GNUNET_SCHEDULER_Task * task;
 
   /**
    * Where are we in the test?
@@ -196,7 +196,7 @@ reversal_test (void *cls,
 {
   struct GNUNET_NAT_AutoHandle *ah = cls;
 
-  ah->task = GNUNET_SCHEDULER_NO_TASK;
+  ah->task = NULL;
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               _("Testing connection reversal with ICMP server.\n"));
   GNUNET_RESOLVER_connect (ah->cfg);
@@ -603,10 +603,10 @@ GNUNET_NAT_autoconfig_cancel (struct GNUNET_NAT_AutoHandle *ah)
     GNUNET_NAT_mini_get_external_ipv4_cancel (ah->eh);
     ah->eh = NULL;
   }
-  if (GNUNET_SCHEDULER_NO_TASK != ah->task)
+  if (NULL != ah->task)
   {
     GNUNET_SCHEDULER_cancel (ah->task);
-    ah->task = GNUNET_SCHEDULER_NO_TASK;
+    ah->task = NULL;
   }
   GNUNET_CONFIGURATION_destroy (ah->cfg);
   GNUNET_CONFIGURATION_destroy (ah->initial_cfg);
diff --git a/src/nat/nat_mini.c b/src/nat/nat_mini.c
index 1e8ab7ecc..47ba27de8 100644
--- a/src/nat/nat_mini.c
+++ b/src/nat/nat_mini.c
@@ -66,7 +66,7 @@ struct GNUNET_NAT_ExternalHandle
   /**
    * Read task.
    */
-  GNUNET_SCHEDULER_TaskIdentifier task;
+  struct GNUNET_SCHEDULER_Task * task;
 
   /**
    * Handle to 'external-ip' process.
@@ -120,7 +120,7 @@ read_external_ipv4 (void *cls,
   ssize_t ret;
   struct in_addr addr;
 
-  eh->task = GNUNET_SCHEDULER_NO_TASK;
+  eh->task = NULL;
   if (GNUNET_YES == GNUNET_NETWORK_fdset_handle_isset (tc->read_ready, eh->r))
     ret =
         GNUNET_DISK_file_read (eh->r, &eh->buf[eh->off],
@@ -170,7 +170,7 @@ signal_external_ip_error (void *cls,
 {
   struct GNUNET_NAT_ExternalHandle *eh = cls;
 
-  eh->task = GNUNET_SCHEDULER_NO_TASK;
+  eh->task = NULL;
   eh->cb (eh->cb_cls,
           NULL,
           eh->ret);
@@ -254,7 +254,7 @@ GNUNET_NAT_mini_get_external_ipv4_cancel (struct GNUNET_NAT_ExternalHandle *eh)
   }
   if (NULL != eh->opipe)
     GNUNET_DISK_pipe_close (eh->opipe);
-  if (GNUNET_SCHEDULER_NO_TASK != eh->task)
+  if (NULL != eh->task)
     GNUNET_SCHEDULER_cancel (eh->task);
   GNUNET_free (eh);
 }
@@ -300,7 +300,7 @@ struct GNUNET_NAT_MiniHandle
    * We check the mapping periodically to see if it
    * still works.  This task triggers the check.
    */
-  GNUNET_SCHEDULER_TaskIdentifier refresh_task;
+  struct GNUNET_SCHEDULER_Task * refresh_task;
 
   /**
    * Are we mapping TCP or UDP?
@@ -543,7 +543,7 @@ process_map_output (void *cls,
                 GNUNET_SYSERR,
                 NULL, 0,
                 GNUNET_NAT_ERROR_UPNPC_PORTMAP_FAILED);
-    if (GNUNET_SCHEDULER_NO_TASK == mini->refresh_task)
+    if (NULL == mini->refresh_task)
       mini->refresh_task =
         GNUNET_SCHEDULER_add_delayed (MAP_REFRESH_FREQ, &do_refresh, mini);
     return;
@@ -664,10 +664,10 @@ GNUNET_NAT_mini_map_stop (struct GNUNET_NAT_MiniHandle *mini)
 {
   char pstr[6];
 
-  if (GNUNET_SCHEDULER_NO_TASK != mini->refresh_task)
+  if (NULL != mini->refresh_task)
   {
     GNUNET_SCHEDULER_cancel (mini->refresh_task);
-    mini->refresh_task = GNUNET_SCHEDULER_NO_TASK;
+    mini->refresh_task = NULL;
   }
   if (NULL != mini->refresh_cmd)
   {
diff --git a/src/nat/nat_test.c b/src/nat/nat_test.c
index b96ee60ed..33fbb1070 100644
--- a/src/nat/nat_test.c
+++ b/src/nat/nat_test.c
@@ -60,7 +60,7 @@ struct NatActivity
   /**
    * Task reading from the incoming connection.
    */
-  GNUNET_SCHEDULER_TaskIdentifier rtask;
+  struct GNUNET_SCHEDULER_Task * rtask;
 };
 
 
@@ -141,12 +141,12 @@ struct GNUNET_NAT_Test
   /**
    * Identity of task for the listen socket (if any)
    */
-  GNUNET_SCHEDULER_TaskIdentifier ltask;
+  struct GNUNET_SCHEDULER_Task * ltask;
 
   /**
    * Task identifier for the timeout (if any)
    */
-  GNUNET_SCHEDULER_TaskIdentifier ttask;
+  struct GNUNET_SCHEDULER_Task * ttask;
 
   /**
    * GNUNET_YES if we're testing TCP
@@ -250,7 +250,7 @@ do_read (void *cls,
   struct GNUNET_NAT_Test *tst;
   uint16_t data;
 
-  na->rtask = GNUNET_SCHEDULER_NO_TASK;
+  na->rtask = NULL;
   tst = na->h;
   GNUNET_CONTAINER_DLL_remove (tst->na_head, tst->na_tail, na);
   if ((NULL != tc->write_ready) &&
@@ -287,7 +287,7 @@ do_accept (void *cls,
   struct GNUNET_NETWORK_Handle *s;
   struct NatActivity *wl;
 
-  tst->ltask = GNUNET_SCHEDULER_NO_TASK;
+  tst->ltask = NULL;
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
     return;
   tst->ltask =
@@ -386,7 +386,7 @@ do_timeout (void *cls,
 {
   struct GNUNET_NAT_Test *nh = cls;
 
-  nh->ttask = GNUNET_SCHEDULER_NO_TASK;
+  nh->ttask = NULL;
   nh->report (nh->report_cls,
               (GNUNET_NAT_ERROR_SUCCESS == nh->status)
               ? GNUNET_NAT_ERROR_TIMEOUT
@@ -495,10 +495,10 @@ GNUNET_NAT_test_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
     {
       LOG (GNUNET_ERROR_TYPE_ERROR,
           _("NAT test failed to start NAT library\n"));
-      if (GNUNET_SCHEDULER_NO_TASK != nh->ltask)
+      if (NULL != nh->ltask)
       {
         GNUNET_SCHEDULER_cancel (nh->ltask);
-        nh->ltask = GNUNET_SCHEDULER_NO_TASK;
+        nh->ltask = NULL;
       }
       if (NULL != nh->lsock)
       {
@@ -541,9 +541,9 @@ GNUNET_NAT_test_stop (struct GNUNET_NAT_Test *tst)
     GNUNET_NETWORK_socket_close (pos->sock);
     GNUNET_free (pos);
   }
-  if (GNUNET_SCHEDULER_NO_TASK != tst->ttask)
+  if (NULL != tst->ttask)
     GNUNET_SCHEDULER_cancel (tst->ttask);
-  if (GNUNET_SCHEDULER_NO_TASK != tst->ltask)
+  if (NULL != tst->ltask)
     GNUNET_SCHEDULER_cancel (tst->ltask);
   if (NULL != tst->lsock)
     GNUNET_NETWORK_socket_close (tst->lsock);
diff --git a/src/nat/test_nat_test.c b/src/nat/test_nat_test.c
index d32015b56..a5e6ba209 100644
--- a/src/nat/test_nat_test.c
+++ b/src/nat/test_nat_test.c
@@ -36,7 +36,7 @@ static int ret = 1;
 
 static struct GNUNET_NAT_Test *tst;
 
-static GNUNET_SCHEDULER_TaskIdentifier tsk;
+static struct GNUNET_SCHEDULER_Task * tsk;
 
 
 static void
@@ -54,7 +54,7 @@ report_result (void *cls,
   GNUNET_NAT_test_stop (tst);
   tst = NULL;
   GNUNET_SCHEDULER_cancel (tsk);
-  tsk = GNUNET_SCHEDULER_NO_TASK;
+  tsk = NULL;
 }
 
 
@@ -62,7 +62,7 @@ static void
 failed_timeout (void *cls,
                 const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  tsk = GNUNET_SCHEDULER_NO_TASK;
+  tsk = NULL;
   fprintf (stderr,
            "NAT test failed to terminate on timeout\n");
   ret = 2;