X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FScheduler.cci;h=873b64f0ff8d17ca87a35d6348edc72edccead28;hb=5443435c4c2b6e4386c5334b5b8358273f2bae93;hp=f436274e54bb4f3d72a188958b5da3c1c9e10916;hpb=56cc32ae48cac37909d4a3019c2e7b1729fc3ccd;p=senf.git

diff --git a/Scheduler/Scheduler.cci b/Scheduler/Scheduler.cci
index f436274..873b64f 100644
--- a/Scheduler/Scheduler.cci
+++ b/Scheduler/Scheduler.cci
@@ -27,76 +27,76 @@
 //#include "Scheduler.ih"
 
 // Custom includes
+#include <boost/format.hpp>
 
 #define prefix_ inline
 ///////////////////////////////cci.p///////////////////////////////////////
 
-prefix_ senf::Scheduler::Scheduler & senf::Scheduler::instance()
+// public members
+
+prefix_ senf::ClockService::clock_type senf::scheduler::eventTime()
 {
-    static Scheduler instance;
-    return instance;
+    return scheduler::detail::FdManager::instance().eventTime();
 }
 
-prefix_ unsigned senf::Scheduler::timeout(ClockService::clock_type timeout,
-                                          SimpleCallback const & cb)
+prefix_ void senf::scheduler::watchdogTimeout(unsigned ms)
 {
-    ++ timerIdCounter_;
-    TimerMap::iterator i (
-        timerMap_.insert(std::make_pair(timerIdCounter_, 
-                                        TimerSpec(timeout,cb,timerIdCounter_))).first);
-    timerQueue_.push(i);
-    return timerIdCounter_;
+    scheduler::detail::FIFORunner::instance().taskTimeout(ms);
 }
 
-prefix_ void senf::Scheduler::cancelTimeout(unsigned id)
+prefix_ unsigned senf::scheduler::watchdogTimeout()
 {
-    TimerMap::iterator i (timerMap_.find(id));
-    if (i != timerMap_.end())
-        i->second.canceled = true;
+    return scheduler::detail::FIFORunner::instance().taskTimeout();
 }
 
-prefix_ senf::ClockService::clock_type senf::Scheduler::timeoutEarly()
-    const
+prefix_ unsigned senf::scheduler::watchdogEvents()
 {
-    return eventEarly_;
+    return scheduler::detail::FIFORunner::instance().hangCount();
 }
 
-prefix_ void senf::Scheduler::timeoutEarly(ClockService::clock_type v)
+prefix_ void senf::scheduler::watchdogAbort(bool flag)
 {
-    eventEarly_ = v;
+    scheduler::detail::FIFORunner::instance().abortOnTimeout(flag);
 }
 
-prefix_ senf::ClockService::clock_type senf::Scheduler::timeoutAdjust()
-    const
+prefix_ bool senf::scheduler::watchdogAbort()
 {
-    return eventAdjust_;
+    return scheduler::detail::FIFORunner::instance().abortOnTimeout();
 }
 
-prefix_ void senf::Scheduler::timeoutAdjust(ClockService::clock_type v)
+prefix_ void senf::scheduler::loresTimers()
 {
-    eventAdjust_ = v;
+    detail::TimerDispatcher::instance().timerSource(
+        std::auto_ptr<detail::TimerSource>(new detail::PollTimerSource()));
 }
 
-prefix_ void senf::Scheduler::terminate()
+prefix_ bool senf::scheduler::haveScalableHiresTimers()
 {
-    terminate_ = true;
+#ifndef HAVE_TIMERFD
+    return false;
+#else
+    return detail::TimerFDTimerSource::haveTimerFD();
+#endif
 }
 
-prefix_ senf::ClockService::clock_type senf::Scheduler::eventTime()
-    const
+prefix_ bool senf::scheduler::usingHiresTimers()
 {
-    return eventTime_;
+    return dynamic_cast<detail::PollTimerSource*>(
+        detail::TimerDispatcher::instance().timerSource()) == 0;
 }
 
-prefix_ int senf::retrieve_filehandle(int fd)
+///////////////////////////////////////////////////////////////////////////
+// senf::scheduler::BlockSignals
+
+prefix_ senf::scheduler::BlockSignals::~BlockSignals()
 {
-    return fd;
+    unblock();
 }
 
-prefix_ senf::Scheduler::TimerSpecCompare::result_type
-senf::Scheduler::TimerSpecCompare::operator()(first_argument_type a, second_argument_type b)
+prefix_ bool senf::scheduler::BlockSignals::blocked()
+    const
 {
-    return a->second < b->second;
+    return blocked_;
 }
 
 ///////////////////////////////cci.e///////////////////////////////////////