X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FTimerSource.cc;h=df05438a7ff1e83a3ade6486c22903cf17771c28;hb=44d9219e6dbfc94f8a6d40a352b2d01eff6fca7c;hp=fe6b7d1a380932e13fbb5764dd2870a65a14a3c0;hpb=bec6af3105a72bd23d560e1934ec3a64bd9979d5;p=senf.git diff --git a/Scheduler/TimerSource.cc b/Scheduler/TimerSource.cc index fe6b7d1..df05438 100644 --- 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 #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