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

diff --git a/Scheduler/Scheduler.cci b/Scheduler/Scheduler.cci
index 7fe4f53..1e69ee1 100644
--- a/Scheduler/Scheduler.cci
+++ b/Scheduler/Scheduler.cci
@@ -34,44 +34,26 @@
 
 // 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_ void senf::Scheduler::terminate()
+prefix_ void senf::scheduler::taskTimeout(unsigned ms)
 {
-    terminate_ = true;
+    scheduler::detail::FIFORunner::instance().taskTimeout(ms);
 }
 
-prefix_ senf::ClockService::clock_type senf::Scheduler::eventTime()
-    const
+prefix_ unsigned senf::scheduler::taskTimeout()
 {
-    return scheduler::FdManager::instance().eventTime();
+    return scheduler::detail::FIFORunner::instance().taskTimeout();
 }
 
-prefix_ void senf::Scheduler::taskTimeout(unsigned ms)
+prefix_ unsigned senf::scheduler::hangCount()
 {
-    scheduler::FIFORunner::instance().taskTimeout(ms);
+    return scheduler::detail::FIFORunner::instance().hangCount();
 }
 
-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)
-{}
-
 ///////////////////////////////cci.e///////////////////////////////////////
 #undef prefix_