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

diff --git a/Scheduler/Scheduler.cci b/Scheduler/Scheduler.cci
index 7fe4f53..873b64f 100644
--- a/Scheduler/Scheduler.cci
+++ b/Scheduler/Scheduler.cci
@@ -34,43 +34,70 @@
 
 // public members
 
-prefix_ senf::Scheduler::Scheduler & senf::Scheduler::instance()
+prefix_ senf::ClockService::clock_type senf::scheduler::eventTime()
 {
-    static Scheduler instance;
-    return instance;
+    return scheduler::detail::FdManager::instance().eventTime();
 }
 
-prefix_ void senf::Scheduler::terminate()
+prefix_ void senf::scheduler::watchdogTimeout(unsigned ms)
 {
-    terminate_ = true;
+    scheduler::detail::FIFORunner::instance().taskTimeout(ms);
 }
 
-prefix_ senf::ClockService::clock_type senf::Scheduler::eventTime()
-    const
+prefix_ unsigned senf::scheduler::watchdogTimeout()
 {
-    return scheduler::FdManager::instance().eventTime();
+    return scheduler::detail::FIFORunner::instance().taskTimeout();
 }
 
-prefix_ void senf::Scheduler::taskTimeout(unsigned ms)
+prefix_ unsigned senf::scheduler::watchdogEvents()
 {
-    scheduler::FIFORunner::instance().taskTimeout(ms);
+    return scheduler::detail::FIFORunner::instance().hangCount();
 }
 
-prefix_ unsigned senf::Scheduler::taskTimeout()
-    const
+prefix_ void senf::scheduler::watchdogAbort(bool flag)
 {
-    return scheduler::FIFORunner::instance().taskTimeout();
+    scheduler::detail::FIFORunner::instance().abortOnTimeout(flag);
 }
 
-prefix_ unsigned senf::Scheduler::hangCount()
-    const
+prefix_ bool senf::scheduler::watchdogAbort()
+{
+    return scheduler::detail::FIFORunner::instance().abortOnTimeout();
+}
+
+prefix_ void senf::scheduler::loresTimers()
 {
-    return scheduler::FIFORunner::instance().hangCount();
+    detail::TimerDispatcher::instance().timerSource(
+        std::auto_ptr<detail::TimerSource>(new detail::PollTimerSource()));
 }
 
-prefix_ senf::Scheduler::Scheduler()
-    : terminate_ (false)
-{}
+prefix_ bool senf::scheduler::haveScalableHiresTimers()
+{
+#ifndef HAVE_TIMERFD
+    return false;
+#else
+    return detail::TimerFDTimerSource::haveTimerFD();
+#endif
+}
+
+prefix_ bool senf::scheduler::usingHiresTimers()
+{
+    return dynamic_cast<detail::PollTimerSource*>(
+        detail::TimerDispatcher::instance().timerSource()) == 0;
+}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::scheduler::BlockSignals
+
+prefix_ senf::scheduler::BlockSignals::~BlockSignals()
+{
+    unblock();
+}
+
+prefix_ bool senf::scheduler::BlockSignals::blocked()
+    const
+{
+    return blocked_;
+}
 
 ///////////////////////////////cci.e///////////////////////////////////////
 #undef prefix_