X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FScheduler.cci;h=acce9dbc9019075dd497c1d72db56f7667639389;hb=556aea04a82b3e2e5cdfe28a0abd3b275c7decf9;hp=5379b6f93d96ede635c04ad8ab19925893ac4ef2;hpb=d785ab5820076da44b4a71b05cc231ef7e97c7bf;p=senf.git

diff --git a/Scheduler/Scheduler.cci b/Scheduler/Scheduler.cci
index 5379b6f..acce9db 100644
--- a/Scheduler/Scheduler.cci
+++ b/Scheduler/Scheduler.cci
@@ -32,133 +32,75 @@
 #define prefix_ inline
 ///////////////////////////////cci.p///////////////////////////////////////
 
-// private members
-
-prefix_ void senf::Scheduler::do_add(int fd, FdCallback const & cb, int eventMask)
-{
-    do_add((boost::format("<anon fd %d>") % fd).str(), fd, cb, eventMask);
-}
-
-prefix_ void senf::Scheduler::do_add(std::string const & name, int fd, FdCallback const & cb,
-                                     int eventMask)
-{
-    if (! fdDispatcher_.add(name, fd, cb, eventMask))
-        fileDispatcher_.add(name, fd, cb, eventMask);
-}
-
-prefix_ void senf::Scheduler::do_remove(int fd, int eventMask)
-{
-    // We don't know, where the descriptor is registered. However, this is no problem since removing
-    // a non-registered fd is a no-opp
-    fdDispatcher_.remove(fd, eventMask);
-    fileDispatcher_.remove(fd, eventMask);
-}
-
 // public members
 
-prefix_ senf::Scheduler::Scheduler & senf::Scheduler::instance()
-{
-    static Scheduler instance;
-    return instance;
-}
-
-prefix_ int senf::retrieve_filehandle(int fd)
-{
-    return fd;
-}
-
-prefix_ senf::Scheduler::timer_id senf::Scheduler::timeout(ClockService::clock_type timeout,
-                                                           SimpleCallback const & cb)
+prefix_ senf::ClockService::clock_type senf::scheduler::eventTime()
 {
-    return timerDispatcher_.add("<anon timer>", timeout, cb);
+    return scheduler::detail::FdManager::instance().eventTime();
 }
 
-prefix_ senf::Scheduler::timer_id senf::Scheduler::timeout(std::string const & name,
-                                                           ClockService::clock_type timeout,
-                                                           SimpleCallback const & cb)
+prefix_ void senf::scheduler::taskTimeout(unsigned ms)
 {
-    return timerDispatcher_.add(name, timeout, cb);
+    scheduler::detail::FIFORunner::instance().taskTimeout(ms);
 }
 
-prefix_ void senf::Scheduler::cancelTimeout(timer_id id)
+prefix_ unsigned senf::scheduler::taskTimeout()
 {
-    timerDispatcher_.remove(id);
+    return scheduler::detail::FIFORunner::instance().taskTimeout();
 }
 
-prefix_ senf::ClockService::clock_type senf::Scheduler::timeoutEarly()
-    const
-{
-    SENF_LOG( (senf::log::IMPORTANT) 
-              ("timeoutEarly() is deprecated and a no-op. It will be removed") );
-    return 0;
-}
-
-prefix_ void senf::Scheduler::timeoutEarly(ClockService::clock_type v)
-{
-    SENF_LOG( (senf::log::IMPORTANT) 
-              ("timeoutEarly() is deprecated and a no-op. It will be removed") );
-}
-
-prefix_ senf::ClockService::clock_type senf::Scheduler::timeoutAdjust()
-    const
+prefix_ unsigned senf::scheduler::hangCount()
 {
-    SENF_LOG( (senf::log::IMPORTANT) 
-              ("timeoutAdjust() is deprecated and a no-op. It will be removed") );
-    return 0;
+    return scheduler::detail::FIFORunner::instance().hangCount();
 }
 
-prefix_ void senf::Scheduler::timeoutAdjust(ClockService::clock_type v)
+prefix_ void senf::scheduler::hiresTimers()
 {
-    SENF_LOG( (senf::log::IMPORTANT) 
-              ("timeoutAdjust() is deprecated and a no-op. It will be removed") );
+#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()));
 }
 
-prefix_ void senf::Scheduler::registerSignal(unsigned signal, SignalCallback const & cb)
+prefix_ void senf::scheduler::loresTimers()
 {
-    signalDispatcher_.add(signal, cb);
+    detail::TimerDispatcher::instance().timerSource(
+        std::auto_ptr<detail::TimerSource>(new detail::PollTimerSource()));
 }
 
-prefix_ void senf::Scheduler::unregisterSignal(unsigned signal)
+prefix_ bool senf::scheduler::haveScalableHiresTimers()
 {
-    signalDispatcher_.remove(signal);
+#ifndef HAVE_TIMERFD
+    return false;
+#else
+    return true;
+#endif
 }
 
-prefix_ void senf::Scheduler::terminate()
+prefix_ bool senf::scheduler::usingHiresTimers()
 {
-    terminate_ = true;
+    return dynamic_cast<detail::PollTimerSource*>(
+        detail::TimerDispatcher::instance().timerSource()) == 0;
 }
 
-prefix_ senf::ClockService::clock_type senf::Scheduler::eventTime()
-    const
-{
-    return manager_.eventTime();
-}
-
-prefix_ void senf::Scheduler::taskTimeout(unsigned ms)
-{
-    runner_.taskTimeout(ms);
-}
+///////////////////////////////////////////////////////////////////////////
+// senf::scheduler::BlockSignals
 
-prefix_ unsigned senf::Scheduler::taskTimeout()
-    const
+prefix_ senf::scheduler::BlockSignals::~BlockSignals()
 {
-    return runner_.taskTimeout();
+    unblock();
 }
 
-prefix_ unsigned senf::Scheduler::hangCount()
+prefix_ bool senf::scheduler::BlockSignals::blocked()
     const
 {
-    return runner_.hangCount();
+    return blocked_;
 }
 
-prefix_ senf::Scheduler::Scheduler()
-    : terminate_ (false), 
-      fdDispatcher_ (manager_, runner_),
-      timerDispatcher_ (manager_, runner_),
-      signalDispatcher_ (manager_, runner_),
-      fileDispatcher_ (manager_, runner_)
-{}
-
 ///////////////////////////////cci.e///////////////////////////////////////
 #undef prefix_