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

diff --git a/Scheduler/Scheduler.cci b/Scheduler/Scheduler.cci
index b20de6e..873b64f 100644
--- a/Scheduler/Scheduler.cci
+++ b/Scheduler/Scheduler.cci
@@ -39,25 +39,29 @@ 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().timerSource(
-        std::auto_ptr<detail::TimerSource>(new detail::POSIXTimerSource()));
+    scheduler::detail::FIFORunner::instance().abortOnTimeout(flag);
+}
+
+prefix_ bool senf::scheduler::watchdogAbort()
+{
+    return scheduler::detail::FIFORunner::instance().abortOnTimeout();
 }
 
 prefix_ void senf::scheduler::loresTimers()
@@ -68,7 +72,11 @@ prefix_ void senf::scheduler::loresTimers()
 
 prefix_ bool senf::scheduler::haveScalableHiresTimers()
 {
+#ifndef HAVE_TIMERFD
     return false;
+#else
+    return detail::TimerFDTimerSource::haveTimerFD();
+#endif
 }
 
 prefix_ bool senf::scheduler::usingHiresTimers()