X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FScheduler.cc;h=c758ea9ca30658542562c5aa6509c3460ccaad4c;hb=53a3d02e7fde841badf42555eba87ccef4566073;hp=65b3f0998501478ca207859fd6dd94a6011c9df9;hpb=31d85cd6b8e03c5ecc924ca8892906be1bab702f;p=senf.git

diff --git a/Scheduler/Scheduler.cc b/Scheduler/Scheduler.cc
index 65b3f09..c758ea9 100644
--- a/Scheduler/Scheduler.cc
+++ b/Scheduler/Scheduler.cc
@@ -79,26 +79,15 @@
 #include <errno.h>
 #include <sys/epoll.h>
 #include "Utils/Exception.hh"
-#include "Utils/MicroTime.hh"
 
 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(unsigned long timeout, TimerCallback const & cb)
-{
-    timerQueue_.push(TimerSpec(now()+1000*timeout,cb));
-}
-
 prefix_ senf::Scheduler::Scheduler()
-    : epollFd_(epoll_create(EPollInitialSize))
+    : timerIdCounter_(0), epollFd_ (epoll_create(EPollInitialSize)), terminate_(false),
+      eventTime_(0)
 {
     if (epollFd_<0)
         throw SystemException(errno);
@@ -165,30 +154,62 @@ prefix_ int senf::Scheduler::EventSpec::epollMask()
 prefix_ void senf::Scheduler::process()
 {
     terminate_ = false;
+    eventTime_ = ClockService::now();
     while (! terminate_) {
 
-        MicroTime timeNow = now();
-        while ( ! timerQueue_.empty() && timerQueue_.top().timeout <= timeNow ) {
-            timerQueue_.top().cb();
+        // Since a callback may have disabled further timers, we need to check for canceled timeouts
+        // again.
+
+        while (! timerQueue_.empty()) {
+            TimerMap::iterator i (timerQueue_.top());
+            if (! i->second.canceled)
+                break;
+            timerMap_.erase(i);
             timerQueue_.pop();
         }
-        if (terminate_)
-            return;
-        int timeout = timerQueue_.empty() ? -1 : int((timerQueue_.top().timeout - timeNow)/1000);
 
+        int timeout (-1);
+        if (timerQueue_.empty()) {
+            if (fdTable_.empty())
+                break;
+        }
+        else {
+            ClockService::clock_type delta (
+                (timerQueue_.top()->second.timeout - eventTime_)/1000000UL);
+            timeout = delta < 0 ? 0 : delta;
+        }
+
+        ///\todo Handle more than one epoll_event per call
         struct epoll_event ev;
         int events = epoll_wait(epollFd_, &ev, 1, timeout);
         if (events<0)
-            // Hmm ... man epoll says, it will NOT return with EINTR. I hope, this is true :-)
-            throw SystemException(errno);
-        if (events==0)
-            // Timeout .. the handler will be run when going back to the loop top
+            if (errno != EINTR)
+                throw SystemException(errno);
+
+        eventTime_ = ClockService::now();
+
+        // We always run event handlers. This is important, even if a file-descriptor is signaled
+        // since some descriptors (e.g. real files) will *always* be ready and we still may want to
+        // handle timers.
+        // Time handlers are run before file events to not delay them unnecessarily.
+
+        while (! timerQueue_.empty()) {
+            TimerMap::iterator i (timerQueue_.top());
+            if (i->second.canceled)
+                ;
+            else if (i->second.timeout <= eventTime_)
+                i->second.cb();
+            else
+                break;
+            timerMap_.erase(i);
+            timerQueue_.pop();
+        }
+
+        if (events <= 0)
             continue;
 
         FdTable::iterator i = fdTable_.find(ev.data.fd);
         BOOST_ASSERT (i != fdTable_.end() );
-        // \todo Make this more efficient. Instead of copying the event-spec it should be
-        // revalidated by monitoring add/remove calls
         EventSpec spec (i->second);
 
         unsigned extraFlags (0);
@@ -233,4 +254,5 @@ prefix_ void senf::Scheduler::process()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End: