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

diff --git a/Scheduler/Scheduler.cci b/Scheduler/Scheduler.cci
index 5379b6f..27f463e 100644
--- a/Scheduler/Scheduler.cci
+++ b/Scheduler/Scheduler.cci
@@ -67,62 +67,6 @@ 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)
-{
-    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::registerSignal(unsigned signal, SignalCallback const & cb)
-{
-    signalDispatcher_.add(signal, cb);
-}
-
-prefix_ void senf::Scheduler::unregisterSignal(unsigned signal)
-{
-    signalDispatcher_.remove(signal);
-}
-
 prefix_ void senf::Scheduler::terminate()
 {
     terminate_ = true;
@@ -131,32 +75,30 @@ prefix_ void senf::Scheduler::terminate()
 prefix_ senf::ClockService::clock_type senf::Scheduler::eventTime()
     const
 {
-    return manager_.eventTime();
+    return scheduler::FdManager::instance().eventTime();
 }
 
 prefix_ void senf::Scheduler::taskTimeout(unsigned ms)
 {
-    runner_.taskTimeout(ms);
+    scheduler::FIFORunner::instance().taskTimeout(ms);
 }
 
 prefix_ unsigned senf::Scheduler::taskTimeout()
     const
 {
-    return runner_.taskTimeout();
+    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_)
+      fdDispatcher_ (scheduler::FdManager::instance(), scheduler::FIFORunner::instance()),
+      fileDispatcher_ (scheduler::FdManager::instance(), scheduler::FIFORunner::instance())
 {}
 
 ///////////////////////////////cci.e///////////////////////////////////////