X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FScheduler.cci;h=7fe4f5315cf42c69f4332a163878e1e3b13169a1;hb=03516e8371a90f908ce54dedb3c874eec7dd08ff;hp=f8a565eb0c82b7b65757f40ab3775075067aaca5;hpb=40fa3e3f1e0f639c68bd15bf469e35045f94abee;p=senf.git

diff --git a/Scheduler/Scheduler.cci b/Scheduler/Scheduler.cci
index f8a565e..7fe4f53 100644
--- a/Scheduler/Scheduler.cci
+++ b/Scheduler/Scheduler.cci
@@ -32,28 +32,6 @@
 #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()
@@ -62,90 +40,36 @@ prefix_ senf::Scheduler::Scheduler & senf::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)
-{
-    return timerDispatcher_.add("<anon timer>", timeout, cb);
-}
-
-prefix_ senf::Scheduler::timer_id senf::Scheduler::timeout(std::string const & name,
-                                                           ClockService::clock_type timeout,
-                                                           SimpleCallback const & cb)
-{
-    return timerDispatcher_.add(name, timeout, cb);
-}
-
-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)
+prefix_ void senf::Scheduler::terminate()
 {
-    SENF_LOG( (senf::log::IMPORTANT) 
-              ("timeoutEarly() is deprecated and a no-op. It will be removed") );
+    terminate_ = true;
 }
 
-prefix_ senf::ClockService::clock_type senf::Scheduler::timeoutAdjust()
+prefix_ senf::ClockService::clock_type senf::Scheduler::eventTime()
     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::registerSignal(unsigned signal, SignalCallback const & cb)
-{
-    signalDispatcher_.add(signal, cb);
-}
-
-prefix_ void senf::Scheduler::unregisterSignal(unsigned signal)
-{
-    signalDispatcher_.remove(signal);
+    return scheduler::FdManager::instance().eventTime();
 }
 
-prefix_ void senf::Scheduler::terminate()
+prefix_ void senf::Scheduler::taskTimeout(unsigned ms)
 {
-    terminate_ = true;
+    scheduler::FIFORunner::instance().taskTimeout(ms);
 }
 
-prefix_ senf::ClockService::clock_type senf::Scheduler::eventTime()
+prefix_ unsigned senf::Scheduler::taskTimeout()
     const
 {
-    return manager_.eventTime();
+    return scheduler::FIFORunner::instance().taskTimeout();
 }
 
 prefix_ unsigned senf::Scheduler::hangCount()
     const
 {
-    return runner_.hangCount();
+    return scheduler::FIFORunner::instance().hangCount();
 }
 
 prefix_ senf::Scheduler::Scheduler()
-    : terminate_ (false), 
-      fdDispatcher_ (manager_, runner_),
-      timerDispatcher_ (manager_, runner_),
-      signalDispatcher_ (manager_, runner_),
-      fileDispatcher_ (manager_, runner_)
+    : terminate_ (false)
 {}
 
 ///////////////////////////////cci.e///////////////////////////////////////