Utils/Console: Fix singleton instantiation order (ServerManager / Scheduler)

[senf.git] / Scheduler / TimerDispatcher.cci

diff --git a/Scheduler/TimerDispatcher.cci b/Scheduler/TimerDispatcher.cci
index d0a3308..6e8e9e6 100644 (file)
--- a/Scheduler/TimerDispatcher.cci
+++ b/Scheduler/TimerDispatcher.cci
@@ -33,14 +33,17 @@
 
 prefix_ senf::scheduler::TimerDispatcher::TimerEvent::TimerEvent(timer_id id_,
                                                                  Callback const & cb_,
-                                                                 TimerDispatcher & dispatcher_)
+                                                                 TimerDispatcher & dispatcher_,
+                                                                 std::string const & n)
     : id (id_), cb (cb_), dispatcher (dispatcher_)
-{}
+{
+    name = n;    
+}
 
-prefix_ void senf::scheduler::TimerDispatcher::TimerEvent::run()
+prefix_ bool senf::scheduler::TimerDispatcher::empty()
+    const
 {
-    cb();
-    dispatcher.remove(id);
+    return timers_.empty();
 }
 
 ///////////////////////////////cci.e///////////////////////////////////////