now senf could also be located in ../senf

[senf.git] / Scheduler / TimerSource.cc

diff --git a/Scheduler/TimerSource.cc b/Scheduler/TimerSource.cc
index fe6b7d1..df05438 100644 (file)
--- a/Scheduler/TimerSource.cc
+++ b/Scheduler/TimerSource.cc
@@ -27,7 +27,7 @@
 //#include "TimerSource.ih"
 
 // Custom includes
-#include "FdEvent.hh"
+#include "IdleEvent.hh"
 #ifdef HAVE_TIMERFD
 #include <sys/timerfd.h>
 #endif
@@ -157,12 +157,12 @@ prefix_ void senf::scheduler::detail::PollTimerSource::timeout(ClockService::clo
 {
     ClockService::clock_type now (ClockService::now());
     int delay (ClockService::in_milliseconds(timeout-now)+1);
-    FileDispatcher::instance().timeout(delay<0?0:delay);
+    IdleEventDispatcher::instance().timeout(delay<0?0:delay);
 }
 
 prefix_ void senf::scheduler::detail::PollTimerSource::notimeout()
 {
-    FileDispatcher::instance().timeout(-1);
+    IdleEventDispatcher::instance().timeout(-1);
 }
 
 prefix_ void senf::scheduler::detail::PollTimerSource::enable()
@@ -261,7 +261,7 @@ prefix_ void senf::scheduler::detail::TimerFDTimerSource::reschedule()
         timer.it_value.tv_nsec = ClockService::in_nanoseconds(
             timeout_ - ClockService::seconds(timer.it_value.tv_sec));
     }
-    if (timerfd_settime(timerfd_, TIMER_ABSTIME, &timer, 0)<0)
+    if (timerfd_settime(timerfd_, TFD_TIMER_ABSTIME, &timer, 0)<0)
         SENF_THROW_SYSTEM_EXCEPTION("timerfd_settime()");
 }
 #endif