X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FScheduler.cc;h=1d0a10775a99d4920e70224ca1b1a21a77c29da7;hb=09010bdcf81888480d4d481a523f9714a89f2625;hp=1bfd9633aa073082d45ab2424e4c0a6334869484;hpb=925317c7f45c32b01ab9292023db3f372b74bf0f;p=senf.git

diff --git a/Scheduler/Scheduler.cc b/Scheduler/Scheduler.cc
index 1bfd963..1d0a107 100644
--- a/Scheduler/Scheduler.cc
+++ b/Scheduler/Scheduler.cc
@@ -44,12 +44,12 @@ prefix_ void senf::Scheduler::process()
 {
     terminate_ = false;
     while(! terminate_ && ! (fdDispatcher_.empty() &&
-                             timerDispatcher_.empty() &&
+                             scheduler::detail::TimerDispatcher::instance().empty() &&
                              fileDispatcher_.empty())) {
         scheduler::detail::SignalDispatcher::instance().unblockSignals();
-        timerDispatcher_.unblockSignals();
+        scheduler::detail::TimerDispatcher::instance().unblockSignals();
         scheduler::FdManager::instance().processOnce();
-        timerDispatcher_.blockSignals();
+        scheduler::detail::TimerDispatcher::instance().blockSignals();
         scheduler::detail::SignalDispatcher::instance().blockSignals();
         fileDispatcher_.prepareRun();
         scheduler::FIFORunner::instance().run();
@@ -61,7 +61,7 @@ prefix_ void senf::Scheduler::restart()
     scheduler::FdManager* fdm (&scheduler::FdManager::instance());
     scheduler::FIFORunner* ffr (&scheduler::FIFORunner::instance());
     scheduler::FdDispatcher* fdd (&fdDispatcher_);
-    scheduler::TimerDispatcher* td (&timerDispatcher_);
+    scheduler::detail::TimerDispatcher* td (&scheduler::detail::TimerDispatcher::instance());
     scheduler::detail::SignalDispatcher* sd (&scheduler::detail::SignalDispatcher::instance());
     scheduler::FileDispatcher* fld (&fileDispatcher_);
     
@@ -75,7 +75,7 @@ prefix_ void senf::Scheduler::restart()
     new (fdm) scheduler::FdManager();
     new (ffr) scheduler::FIFORunner();
     new (fdd) scheduler::FdDispatcher(*fdm, *ffr);
-    new (td) scheduler::TimerDispatcher(*fdm, *ffr);
+    new (td) scheduler::detail::TimerDispatcher();
     new (sd) scheduler::detail::SignalDispatcher();
     new (fld) scheduler::FileDispatcher(*fdm, *ffr);
 }