X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FScheduler.cci;h=873b64f0ff8d17ca87a35d6348edc72edccead28;hb=bd9f9d3fd6fbcff0112a7bf48ab9284da9576b11;hp=6f8786171129e882a52b9c7e9fa4e0f9ec9013db;hpb=c48abca75a9bb62c31d0f2651a00ddf4ce79c7f2;p=senf.git

diff --git a/Scheduler/Scheduler.cci b/Scheduler/Scheduler.cci
index 6f87861..873b64f 100644
--- a/Scheduler/Scheduler.cci
+++ b/Scheduler/Scheduler.cci
@@ -39,36 +39,64 @@ prefix_ senf::ClockService::clock_type senf::scheduler::eventTime()
     return scheduler::detail::FdManager::instance().eventTime();
 }
 
-prefix_ void senf::scheduler::taskTimeout(unsigned ms)
+prefix_ void senf::scheduler::watchdogTimeout(unsigned ms)
 {
     scheduler::detail::FIFORunner::instance().taskTimeout(ms);
 }
 
-prefix_ unsigned senf::scheduler::taskTimeout()
+prefix_ unsigned senf::scheduler::watchdogTimeout()
 {
     return scheduler::detail::FIFORunner::instance().taskTimeout();
 }
 
-prefix_ unsigned senf::scheduler::hangCount()
+prefix_ unsigned senf::scheduler::watchdogEvents()
 {
     return scheduler::detail::FIFORunner::instance().hangCount();
 }
 
-prefix_ void senf::scheduler::hiresTimers()
+prefix_ void senf::scheduler::watchdogAbort(bool flag)
 {
-    detail::TimerDispatcher::instance().setTimerSource(
-        std::auto_ptr<TimerSource>(new POSIXTimerSource()));
+    scheduler::detail::FIFORunner::instance().abortOnTimeout(flag);
+}
+
+prefix_ bool senf::scheduler::watchdogAbort()
+{
+    return scheduler::detail::FIFORunner::instance().abortOnTimeout();
 }
 
 prefix_ void senf::scheduler::loresTimers()
 {
-    detail::TimerDispatcher::instance().setTimerSource(
-        std::auto_ptr<TimerSource>(new PollTimerSource()));
+    detail::TimerDispatcher::instance().timerSource(
+        std::auto_ptr<detail::TimerSource>(new detail::PollTimerSource()));
 }
 
 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///////////////////////////////////////