X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FScheduler.cci;h=873b64f0ff8d17ca87a35d6348edc72edccead28;hb=5443435c4c2b6e4386c5334b5b8358273f2bae93;hp=94cd69334b1979fc2eb38487d304191af53bd2f0;hpb=925317c7f45c32b01ab9292023db3f372b74bf0f;p=senf.git

diff --git a/Scheduler/Scheduler.cci b/Scheduler/Scheduler.cci
index 94cd693..873b64f 100644
--- a/Scheduler/Scheduler.cci
+++ b/Scheduler/Scheduler.cci
@@ -32,122 +32,73 @@
 #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()
+prefix_ senf::ClockService::clock_type senf::scheduler::eventTime()
 {
-    static Scheduler instance;
-    return instance;
+    return scheduler::detail::FdManager::instance().eventTime();
 }
 
-prefix_ int senf::retrieve_filehandle(int fd)
+prefix_ void senf::scheduler::watchdogTimeout(unsigned ms)
 {
-    return fd;
+    scheduler::detail::FIFORunner::instance().taskTimeout(ms);
 }
 
-prefix_ senf::Scheduler::timer_id senf::Scheduler::timeout(ClockService::clock_type timeout,
-                                                           SimpleCallback const & cb)
+prefix_ unsigned senf::scheduler::watchdogTimeout()
 {
-    return timerDispatcher_.add("<anon timer>", timeout, cb);
+    return scheduler::detail::FIFORunner::instance().taskTimeout();
 }
 
-prefix_ senf::Scheduler::timer_id senf::Scheduler::timeout(std::string const & name,
-                                                           ClockService::clock_type timeout,
-                                                           SimpleCallback const & cb)
+prefix_ unsigned senf::scheduler::watchdogEvents()
 {
-    return timerDispatcher_.add(name, timeout, cb);
+    return scheduler::detail::FIFORunner::instance().hangCount();
 }
 
-prefix_ void senf::Scheduler::cancelTimeout(timer_id id)
+prefix_ void senf::scheduler::watchdogAbort(bool flag)
 {
-    timerDispatcher_.remove(id);
+    scheduler::detail::FIFORunner::instance().abortOnTimeout(flag);
 }
 
-prefix_ senf::ClockService::clock_type senf::Scheduler::timeoutEarly()
-    const
+prefix_ bool senf::scheduler::watchdogAbort()
 {
-    SENF_LOG( (senf::log::IMPORTANT) 
-              ("timeoutEarly() is deprecated and a no-op. It will be removed") );
-    return 0;
+    return scheduler::detail::FIFORunner::instance().abortOnTimeout();
 }
 
-prefix_ void senf::Scheduler::timeoutEarly(ClockService::clock_type v)
+prefix_ void senf::scheduler::loresTimers()
 {
-    SENF_LOG( (senf::log::IMPORTANT) 
-              ("timeoutEarly() is deprecated and a no-op. It will be removed") );
+    detail::TimerDispatcher::instance().timerSource(
+        std::auto_ptr<detail::TimerSource>(new detail::PollTimerSource()));
 }
 
-prefix_ senf::ClockService::clock_type senf::Scheduler::timeoutAdjust()
-    const
+prefix_ bool senf::scheduler::haveScalableHiresTimers()
 {
-    SENF_LOG( (senf::log::IMPORTANT) 
-              ("timeoutAdjust() is deprecated and a no-op. It will be removed") );
-    return 0;
+#ifndef HAVE_TIMERFD
+    return false;
+#else
+    return detail::TimerFDTimerSource::haveTimerFD();
+#endif
 }
 
-prefix_ void senf::Scheduler::timeoutAdjust(ClockService::clock_type v)
+prefix_ bool senf::scheduler::usingHiresTimers()
 {
-    SENF_LOG( (senf::log::IMPORTANT) 
-              ("timeoutAdjust() is deprecated and a no-op. It will be removed") );
+    return dynamic_cast<detail::PollTimerSource*>(
+        detail::TimerDispatcher::instance().timerSource()) == 0;
 }
 
-prefix_ void senf::Scheduler::terminate()
-{
-    terminate_ = true;
-}
-
-prefix_ senf::ClockService::clock_type senf::Scheduler::eventTime()
-    const
-{
-    return scheduler::FdManager::instance().eventTime();
-}
+///////////////////////////////////////////////////////////////////////////
+// senf::scheduler::BlockSignals
 
-prefix_ void senf::Scheduler::taskTimeout(unsigned ms)
+prefix_ senf::scheduler::BlockSignals::~BlockSignals()
 {
-    scheduler::FIFORunner::instance().taskTimeout(ms);
+    unblock();
 }
 
-prefix_ unsigned senf::Scheduler::taskTimeout()
+prefix_ bool senf::scheduler::BlockSignals::blocked()
     const
 {
-    return scheduler::FIFORunner::instance().taskTimeout();
+    return blocked_;
 }
 
-prefix_ unsigned senf::Scheduler::hangCount()
-    const
-{
-    return scheduler::FIFORunner::instance().hangCount();
-}
-
-prefix_ senf::Scheduler::Scheduler()
-    : terminate_ (false), 
-      fdDispatcher_ (scheduler::FdManager::instance(), scheduler::FIFORunner::instance()),
-      timerDispatcher_ (scheduler::FdManager::instance(), scheduler::FIFORunner::instance()),
-      fileDispatcher_ (scheduler::FdManager::instance(), scheduler::FIFORunner::instance())
-{}
-
 ///////////////////////////////cci.e///////////////////////////////////////
 #undef prefix_