diff --git a/Scheduler/Scheduler.cci b/Scheduler/Scheduler.cci index 1e69ee1e2d5935bebd1fbaeb8631439904d8e75e..6f8786171129e882a52b9c7e9fa4e0f9ec9013db 100644 --- a/Scheduler/Scheduler.cci +++ b/Scheduler/Scheduler.cci @@ -54,6 +54,23 @@ prefix_ unsigned senf::scheduler::hangCount() return scheduler::detail::FIFORunner::instance().hangCount(); } +prefix_ void senf::scheduler::hiresTimers() +{ + detail::TimerDispatcher::instance().setTimerSource( + std::auto_ptr<TimerSource>(new POSIXTimerSource())); +} + +prefix_ void senf::scheduler::loresTimers() +{ + detail::TimerDispatcher::instance().setTimerSource( + std::auto_ptr<TimerSource>(new PollTimerSource())); +} + +prefix_ bool senf::scheduler::haveScalableHiresTimers() +{ + return false; +} + ///////////////////////////////cci.e/////////////////////////////////////// #undef prefix_ diff --git a/Scheduler/Scheduler.hh b/Scheduler/Scheduler.hh index a8cfe59f3629b6e50190aef537a218d4e3e00a25..fdd5f59360c8c6f8439a9b346b30e14eec496117 100644 --- a/Scheduler/Scheduler.hh +++ b/Scheduler/Scheduler.hh @@ -232,6 +232,32 @@ namespace scheduler { /** \brief Number of watchdog events */ unsigned hangCount(); + /** \brief Switch to using hi resolution timers + + By default, timers are implemented directly using epoll. This however restricts the timer + resolution to that of the kernel HZ value. + + High resolution timers are implemented either using POSIX timers or, when available, using + the Linux special \c timerfd() syscall. + + POSIX timers are delivered using signals. A high timer load this increases the signal load + considerably. \c timerfd()'s are delivered on a file descriptor and thus don't have such a + scalability issue. + + \warning The timer source must not be switched from a scheduler callback + */ + void hiresTimers(); + + /** \brief Switch back to using epoll for timing + \see hiresTimers() + */ + void loresTimers(); + + /** \brief return \c true, if \c timerfd() timing is available, \c false otherwise + \see hiresTimers() + */ + bool haveScalableHiresTimers(); + /** \brief Restart scheduler This call will restart all scheduler dispatchers (timers, signals, file descriptors). This diff --git a/Scheduler/TimerEvent.cc b/Scheduler/TimerEvent.cc index 38ad03abe7fb250a96cde292978c494a61f71ab8..437aae34ddcf0587604ec239c79e7f8eeac69174 100644 --- a/Scheduler/TimerEvent.cc +++ b/Scheduler/TimerEvent.cc @@ -34,7 +34,7 @@ ///////////////////////////////cc.p//////////////////////////////////////// prefix_ senf::scheduler::detail::TimerDispatcher::TimerDispatcher() - : source_ (new POSIXTimerSource()) + : source_ (new PollTimerSource()) {} prefix_ senf::scheduler::detail::TimerDispatcher::~TimerDispatcher() diff --git a/Scheduler/TimerEvent.cci b/Scheduler/TimerEvent.cci index 5fcf5ef5023c5e20c271e65d0058f86f08cbaf20..e2bf3fbd61bb76d93fb58f10cbd227f33d9652f1 100644 --- a/Scheduler/TimerEvent.cci +++ b/Scheduler/TimerEvent.cci @@ -98,6 +98,12 @@ prefix_ bool senf::scheduler::detail::TimerDispatcher::empty() return timers_.empty(); } +prefix_ void senf::scheduler::detail::TimerDispatcher:: +setTimerSource(std::auto_ptr<TimerSource> timerSource) +{ + source_.reset(timerSource.release()); +} + ///////////////////////////////cci.e/////////////////////////////////////// #undef prefix_ diff --git a/Scheduler/TimerEvent.ih b/Scheduler/TimerEvent.ih index af9c104756b2fc4d2b8b0bdcea8587947c5e9e08..a6ecf9b7470f3af5fccae7b979ed5e1c1acf1725 100644 --- a/Scheduler/TimerEvent.ih +++ b/Scheduler/TimerEvent.ih @@ -65,6 +65,8 @@ namespace detail { bool empty() const; + void setTimerSource(std::auto_ptr<TimerSource> timerSource); + protected: private: