X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FScheduler%2FScheduler.cc;h=b90ef66f91a799445ae330f9f15e513f15c7397e;hb=78a6e233083efa63a9cd0684a92abc64202a9ee7;hp=1f946436454a664a4c7f400d981a672380143fcb;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git diff --git a/senf/Scheduler/Scheduler.cc b/senf/Scheduler/Scheduler.cc index 1f94643..b90ef66 100644 --- a/senf/Scheduler/Scheduler.cc +++ b/senf/Scheduler/Scheduler.cc @@ -65,12 +65,12 @@ prefix_ senf::ClockService::clock_type senf::scheduler::now() } namespace { - + // We don't want try { } catch(...) { ... throw; } since that will make debugging more // difficult: the stack backtrace for an unexpected exception would always end here. struct SchedulerScopedInit { - SchedulerScopedInit() + SchedulerScopedInit() { senf::scheduler::detail::FIFORunner::instance().startWatchdog(); senf::scheduler::detail::SignalDispatcher::instance().unblockSignals(); @@ -126,7 +126,7 @@ prefix_ void senf::scheduler::restart() fdd->~FdDispatcher(); ffr->~FIFORunner(); fdm->~FdManager(); - + new (fdm) detail::FdManager(); new (ffr) detail::FIFORunner(); new (fdd) detail::FdDispatcher(); @@ -139,7 +139,7 @@ prefix_ void senf::scheduler::restart() prefix_ bool senf::scheduler::empty() { - return detail::FdDispatcher::instance().empty() + return detail::FdDispatcher::instance().empty() && detail::TimerDispatcher::instance().empty() && detail::FileDispatcher::instance().empty() && detail::SignalDispatcher::instance().empty() @@ -149,7 +149,7 @@ prefix_ bool senf::scheduler::empty() prefix_ void senf::scheduler::hiresTimers() { -#ifdef HAVE_TIMERFD +#ifdef HAVE_TIMERFD_CREATE if (haveScalableHiresTimers()) detail::TimerDispatcher::instance().timerSource( std::auto_ptr(new detail::TimerFDTimerSource()));