[GNUnet-SVN] [gnunet] 13/45: Merge branch 'refactoring-scheduler' of ssh://gnunet.org/gnunet

[gnunet]

This is an automated email from the git hooks/post-receive script.

lurchi pushed a commit to branch master
in repository gnunet.

commit 99603b4ebf07ea30130514f9b8770d22f2bee3fd
Merge: 6a1cd49f7 b1e413857
Author: lurchi <address@hidden>
AuthorDate: Tue Aug 8 18:42:02 2017 +0200

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

 src/util/scheduler.c | 4 ++++
 1 file changed, 4 insertions(+)

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);
    }
  

-- 
To stop receiving notification emails like this one, please contact
address@hidden