From: lurchi <lurchi@strangeplace.net>
Date: Tue, 8 Aug 2017 16:42:02 +0000 (+0200)
Subject: Merge branch 'refactoring-scheduler' of ssh://gnunet.org/gnunet
X-Git-Tag: gnunet-0.11.0rc0~48^2^2~31
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=99603b4ebf07ea30130514f9b8770d22f2bee3fd;p=oweals%2Fgnunet.git

Merge branch 'refactoring-scheduler' of ssh://gnunet.org/gnunet
---

99603b4ebf07ea30130514f9b8770d22f2bee3fd
diff --cc src/util/scheduler.c
index 7cd42dcea,e90763fb4..68143d051
--- a/src/util/scheduler.c
+++ b/src/util/scheduler.c
@@@ -808,8 -1080,9 +808,9 @@@ GNUNET_SCHEDULER_cancel (struct GNUNET_
            pending_timeout_last = NULL;
          else
            scheduler_driver->set_wakeup (scheduler_driver->cls,
 -                                        pending_timeout_head->timeout);
 +                                        get_timeout ());
        }
+       //TODO check if this is redundant
        if (task == pending_timeout_last)
          pending_timeout_last = NULL;
      }
@@@ -1663,8 -1923,12 +1664,11 @@@ GNUNET_SCHEDULER_run_from_driver (struc
      GNUNET_CONTAINER_DLL_remove (pending_timeout_head,
                                   pending_timeout_tail,
                                   pos);
 -
      if (pending_timeout_last == pos)
        pending_timeout_last = NULL;
+     else
+       scheduler_driver->set_wakeup(scheduler_driver->cls,pending_timeout_head->timeout);
+ 
      queue_ready_task (pos);
    }