X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FScheduler.cc;h=9ea0e481ea8f57df5f98fe04ae167e537c557761;hb=f2f5d59e83863f3b513950173baee1b6da2aee3c;hp=f40bf69803814562e0ff9b42786609c789859e7a;hpb=b5d7667a0ee87f023a74df607b582b976241dcf7;p=senf.git

diff --git a/Scheduler/Scheduler.cc b/Scheduler/Scheduler.cc
index f40bf69..9ea0e48 100644
--- a/Scheduler/Scheduler.cc
+++ b/Scheduler/Scheduler.cc
@@ -41,6 +41,7 @@
 
 namespace {
     bool terminate_ (false);
+    bool running_ (false);
 }
 
 prefix_ void senf::scheduler::terminate()
@@ -48,6 +49,16 @@ prefix_ void senf::scheduler::terminate()
     terminate_ = true;
 }
 
+prefix_ bool senf::scheduler::running()
+{
+    return running_;
+}
+
+prefix_ senf::ClockService::clock_type senf::scheduler::now()
+{
+    return running() ? eventTime() : ClockService::now();
+}
+
 namespace {
     
     // We don't want try { } catch(...) { ... throw; } since that will make debugging more
@@ -59,6 +70,7 @@ namespace {
                 senf::scheduler::detail::FIFORunner::instance().startWatchdog();
                 senf::scheduler::detail::SignalDispatcher::instance().unblockSignals();
                 senf::scheduler::detail::TimerDispatcher::instance().enable();
+                running_ = true;
             }
 
         ~SchedulerScopedInit()
@@ -66,6 +78,7 @@ namespace {
                 senf::scheduler::detail::TimerDispatcher::instance().disable();
                 senf::scheduler::detail::SignalDispatcher::instance().blockSignals();
                 senf::scheduler::detail::FIFORunner::instance().stopWatchdog();
+                running_ = false;
             }
     };
 }
@@ -74,6 +87,7 @@ prefix_ void senf::scheduler::process()
 {
     SchedulerScopedInit initScheduler;
     terminate_ = false;
+    running_ = true;
     detail::TimerDispatcher::instance().reschedule();
     while(! terminate_ && ! (detail::FdDispatcher::instance().empty() &&
                              detail::TimerDispatcher::instance().empty() &&
@@ -123,6 +137,18 @@ prefix_ bool senf::scheduler::empty()
         && detail::EventHookDispatcher::instance().empty();
 }
 
+prefix_ void senf::scheduler::hiresTimers()
+{
+#ifdef HAVE_TIMERFD
+    if (haveScalableHiresTimers())
+        detail::TimerDispatcher::instance().timerSource(
+            std::auto_ptr<detail::TimerSource>(new detail::TimerFDTimerSource()));
+    else
+#endif
+        detail::TimerDispatcher::instance().timerSource(
+            std::auto_ptr<detail::TimerSource>(new detail::POSIXTimerSource()));
+}
+
 ///////////////////////////////////////////////////////////////////////////
 // senf::schedulerLogTimeSource