X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FScheduler.cci;h=27f463e39f27c57e99761180e41b12548a5a1d53;hb=09010bdcf81888480d4d481a523f9714a89f2625;hp=f436274e54bb4f3d72a188958b5da3c1c9e10916;hpb=56cc32ae48cac37909d4a3019c2e7b1729fc3ccd;p=senf.git

diff --git a/Scheduler/Scheduler.cci b/Scheduler/Scheduler.cci
index f436274..27f463e 100644
--- a/Scheduler/Scheduler.cci
+++ b/Scheduler/Scheduler.cci
@@ -27,54 +27,44 @@
 //#include "Scheduler.ih"
 
 // Custom includes
+#include <boost/format.hpp>
 
 #define prefix_ inline
 ///////////////////////////////cci.p///////////////////////////////////////
 
-prefix_ senf::Scheduler::Scheduler & senf::Scheduler::instance()
-{
-    static Scheduler instance;
-    return instance;
-}
+// private members
 
-prefix_ unsigned senf::Scheduler::timeout(ClockService::clock_type timeout,
-                                          SimpleCallback const & cb)
+prefix_ void senf::Scheduler::do_add(int fd, FdCallback const & cb, int eventMask)
 {
-    ++ timerIdCounter_;
-    TimerMap::iterator i (
-        timerMap_.insert(std::make_pair(timerIdCounter_, 
-                                        TimerSpec(timeout,cb,timerIdCounter_))).first);
-    timerQueue_.push(i);
-    return timerIdCounter_;
+    do_add((boost::format("<anon fd %d>") % fd).str(), fd, cb, eventMask);
 }
 
-prefix_ void senf::Scheduler::cancelTimeout(unsigned id)
+prefix_ void senf::Scheduler::do_add(std::string const & name, int fd, FdCallback const & cb,
+                                     int eventMask)
 {
-    TimerMap::iterator i (timerMap_.find(id));
-    if (i != timerMap_.end())
-        i->second.canceled = true;
+    if (! fdDispatcher_.add(name, fd, cb, eventMask))
+        fileDispatcher_.add(name, fd, cb, eventMask);
 }
 
-prefix_ senf::ClockService::clock_type senf::Scheduler::timeoutEarly()
-    const
+prefix_ void senf::Scheduler::do_remove(int fd, int eventMask)
 {
-    return eventEarly_;
+    // We don't know, where the descriptor is registered. However, this is no problem since removing
+    // a non-registered fd is a no-opp
+    fdDispatcher_.remove(fd, eventMask);
+    fileDispatcher_.remove(fd, eventMask);
 }
 
-prefix_ void senf::Scheduler::timeoutEarly(ClockService::clock_type v)
-{
-    eventEarly_ = v;
-}
+// public members
 
-prefix_ senf::ClockService::clock_type senf::Scheduler::timeoutAdjust()
-    const
+prefix_ senf::Scheduler::Scheduler & senf::Scheduler::instance()
 {
-    return eventAdjust_;
+    static Scheduler instance;
+    return instance;
 }
 
-prefix_ void senf::Scheduler::timeoutAdjust(ClockService::clock_type v)
+prefix_ int senf::retrieve_filehandle(int fd)
 {
-    eventAdjust_ = v;
+    return fd;
 }
 
 prefix_ void senf::Scheduler::terminate()
@@ -85,20 +75,32 @@ prefix_ void senf::Scheduler::terminate()
 prefix_ senf::ClockService::clock_type senf::Scheduler::eventTime()
     const
 {
-    return eventTime_;
+    return scheduler::FdManager::instance().eventTime();
 }
 
-prefix_ int senf::retrieve_filehandle(int fd)
+prefix_ void senf::Scheduler::taskTimeout(unsigned ms)
 {
-    return fd;
+    scheduler::FIFORunner::instance().taskTimeout(ms);
 }
 
-prefix_ senf::Scheduler::TimerSpecCompare::result_type
-senf::Scheduler::TimerSpecCompare::operator()(first_argument_type a, second_argument_type b)
+prefix_ unsigned senf::Scheduler::taskTimeout()
+    const
 {
-    return a->second < b->second;
+    return scheduler::FIFORunner::instance().taskTimeout();
 }
 
+prefix_ unsigned senf::Scheduler::hangCount()
+    const
+{
+    return scheduler::FIFORunner::instance().hangCount();
+}
+
+prefix_ senf::Scheduler::Scheduler()
+    : terminate_ (false), 
+      fdDispatcher_ (scheduler::FdManager::instance(), scheduler::FIFORunner::instance()),
+      fileDispatcher_ (scheduler::FdManager::instance(), scheduler::FIFORunner::instance())
+{}
+
 ///////////////////////////////cci.e///////////////////////////////////////
 #undef prefix_