X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FScheduler%2FTimerEventProxy.ct;h=a1c744a6344804af01ae2ad2e613241a829cc30d;hb=78a6e233083efa63a9cd0684a92abc64202a9ee7;hp=0c1899d39afb6e7c8611cd20ec943c620ee8626f;hpb=4adca0eda1b26c8ca84421fd936f8450713ca6fd;p=senf.git

diff --git a/senf/Scheduler/TimerEventProxy.ct b/senf/Scheduler/TimerEventProxy.ct
index 0c1899d..a1c744a 100644
--- a/senf/Scheduler/TimerEventProxy.ct
+++ b/senf/Scheduler/TimerEventProxy.ct
@@ -30,33 +30,24 @@
 ///////////////////////////////ct.p////////////////////////////////////////
 
 template<typename IdType>
-prefix_ senf::scheduler::TimerEventProxy<IdType>::TimerEventProxy() 
+prefix_ senf::scheduler::TimerEventProxy<IdType>::TimerEventProxy(std::string const & description)
     : entrySetById( entrySet.template get<Id>()),
       entrySetByTimeout( entrySet.template get<Timeout> ()),
-      timer( "TimerEventProxy", membind(&TimerEventProxy<IdType>::timerEvent, this), 0, false)
+      timer( "TimerEventProxy " + description,
+              membind(&TimerEventProxy<IdType>::timerEvent, this), 0, false)
 { }
 
 template<typename IdType>
-prefix_ senf::scheduler::TimerEventProxy<IdType>::TimerEventProxy(std::string const & name, console::DirectoryNode & node) 
-    : entrySetById( entrySet.template get<Id>()),
-      entrySetByTimeout( entrySet.template get<Timeout> ()),
-      timer( "TimerEventProxy", membind(&TimerEventProxy<IdType>::timerEvent, this), 0, false)
-{
-    node.add(name, console::factory::Command(
-            &TimerEventProxy<IdType>::list, this) .doc("List active Timers"));
-}
-
-template<typename IdType>
 prefix_ void senf::scheduler::TimerEventProxy<IdType>::timerEvent()
 {
-    ClockService::clock_type actual = ClockService::now();
+    ClockService::clock_type now = senf::scheduler::now();
     typename EntrySetByTimeout_t::iterator it = entrySetByTimeout.begin();
-    while (it != entrySetByTimeout.end() && it->timeout <= actual) {
+    while (it != entrySetByTimeout.end() && it->timeout <= now) {
         Entry item (*it);
         // remove due entry from set
         entrySetByTimeout.erase(it);
         // call callback
-        item.cb(actual, item.id);
+        item.cb(now, item.id);
         it = entrySetByTimeout.begin();
     }
     if (entrySet.size() > 0)
@@ -76,7 +67,12 @@ prefix_ void senf::scheduler::TimerEventProxy<IdType>::add(
 template<typename IdType>
 prefix_ bool senf::scheduler::TimerEventProxy<IdType>::remove(IdType const & id)
 {
-    return entrySetById.erase( id) > 0;
+    bool removed (entrySetById.erase( id) > 0);
+    if (entrySet.size() > 0)
+        timer.timeout(entrySetByTimeout.begin()->timeout);
+    else
+        timer.disable();
+    return removed;
 }
 
 template<typename IdType>