PPI: Clean up time interface

[senf.git] / Scheduler / Scheduler.cc

diff --git a/Scheduler/Scheduler.cc b/Scheduler/Scheduler.cc
index 799c4a5..5285fa7 100644 (file)
--- a/Scheduler/Scheduler.cc
+++ b/Scheduler/Scheduler.cc
@@ -85,20 +85,9 @@ static const int EPollInitialSize = 16;
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
-prefix_ senf::Scheduler::Scheduler & senf::Scheduler::instance()
-{
-    static Scheduler instance;
-    return instance;
-}
-
-prefix_ void senf::Scheduler::timeout(sched_time timeout, TimerCallback const & cb)
-{
-    timerQueue_.push(TimerSpec(now()+timeout,cb));
-}
-
 prefix_ senf::Scheduler::Scheduler()
-    : epollFd_ (epoll_create(EPollInitialSize)), 
-      epoch_ (boost::posix_time::microsec_clock::universal_time())
+    : timerIdCounter_(0), epollFd_ (epoll_create(EPollInitialSize)), terminate_(false),
+      eventTime_(0)
 {
     if (epollFd_<0)
         throw SystemException(errno);
@@ -165,11 +154,13 @@ prefix_ int senf::Scheduler::EventSpec::epollMask()
 prefix_ void senf::Scheduler::process()
 {
     terminate_ = false;
+    eventTime_ = ClockService::now();
     while (! terminate_) {
-        sched_time timeNow = now();
-
-        while ( ! timerQueue_.empty() && timerQueue_.top().timeout <= timeNow ) {
-            timerQueue_.top().cb();
+        while ( ! timerQueue_.empty() && timerQueue_.top()->second.timeout <= eventTime_ ) {
+            TimerMap::iterator i (timerQueue_.top());
+            if (! i->second.canceled)
+                i->second.cb();
+            timerMap_.erase(i);
             timerQueue_.pop();
         }
 
@@ -178,7 +169,8 @@ prefix_ void senf::Scheduler::process()
 
         int timeout (MinTimeout);
         if (! timerQueue_.empty()) {
-            sched_time delta ((timerQueue_.top().timeout - timeNow)/1000000UL);
+            ClockService::clock_type delta (
+                (timerQueue_.top()->second.timeout - eventTime_)/1000000UL);
             if (delta<MinTimeout)
                 timeout = int(delta);
         }
@@ -188,6 +180,12 @@ prefix_ void senf::Scheduler::process()
         if (events<0)
             // 'man epoll' says, epoll will not return with EINTR.
             throw SystemException(errno);
+
+        /// \fixme Fix unneeded timer delays
+        // Hmm ... I remember, I purposely moved the timeout-handlers to the loop top ... but why?
+        // This delays possible time-critical handlers even further ...
+
+        eventTime_ = ClockService::now();
         if (events==0)
             // Timeout .. the handler will be run when going back to the loop top
             continue;