Scheduler: Remove obsolete 'Scheduler' class

[senf.git] / Scheduler / Scheduler.cci

diff --git a/Scheduler/Scheduler.cci b/Scheduler/Scheduler.cci
index 94cd693..1e69ee1 100644 (file)
--- a/Scheduler/Scheduler.cci
+++ b/Scheduler/Scheduler.cci
@@ -32,122 +32,28 @@
 #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::taskTimeout(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::taskTimeout()
 {
-    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::hangCount()
 {
-    return timerDispatcher_.add(name, timeout, cb);
+    return scheduler::detail::FIFORunner::instance().hangCount();
 }
 
-prefix_ void senf::Scheduler::cancelTimeout(timer_id id)
-{
-    timerDispatcher_.remove(id);
-}
-
-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
-{
-    SENF_LOG( (senf::log::IMPORTANT) 
-              ("timeoutAdjust() is deprecated and a no-op. It will be removed") );
-    return 0;
-}
-
-prefix_ void senf::Scheduler::timeoutAdjust(ClockService::clock_type v)
-{
-    SENF_LOG( (senf::log::IMPORTANT) 
-              ("timeoutAdjust() is deprecated and a no-op. It will be removed") );
-}
-
-prefix_ void senf::Scheduler::terminate()
-{
-    terminate_ = true;
-}
-
-prefix_ senf::ClockService::clock_type senf::Scheduler::eventTime()
-    const
-{
-    return scheduler::FdManager::instance().eventTime();
-}
-
-prefix_ void senf::Scheduler::taskTimeout(unsigned ms)
-{
-    scheduler::FIFORunner::instance().taskTimeout(ms);
-}
-
-prefix_ unsigned senf::Scheduler::taskTimeout()
-    const
-{
-    return scheduler::FIFORunner::instance().taskTimeout();
-}
-
-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_