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

diff --git a/Scheduler/Scheduler.cc b/Scheduler/Scheduler.cc
index 1bfd963..74761da 100644
--- a/Scheduler/Scheduler.cc
+++ b/Scheduler/Scheduler.cc
@@ -35,58 +35,79 @@
 //#include "Scheduler.ih"
 
 // Custom includes
-#include "SignalEvent.hh"
 
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
-prefix_ void senf::Scheduler::process()
+namespace {
+    bool terminate_ (false);
+}
+
+prefix_ void senf::scheduler::terminate()
+{
+    terminate_ = true;
+}
+
+prefix_ void senf::scheduler::process()
 {
     terminate_ = false;
-    while(! terminate_ && ! (fdDispatcher_.empty() &&
-                             timerDispatcher_.empty() &&
-                             fileDispatcher_.empty())) {
-        scheduler::detail::SignalDispatcher::instance().unblockSignals();
-        timerDispatcher_.unblockSignals();
-        scheduler::FdManager::instance().processOnce();
-        timerDispatcher_.blockSignals();
-        scheduler::detail::SignalDispatcher::instance().blockSignals();
-        fileDispatcher_.prepareRun();
-        scheduler::FIFORunner::instance().run();
+    while(! terminate_ && ! (detail::FdDispatcher::instance().empty() &&
+                             detail::TimerDispatcher::instance().empty() &&
+                             detail::FileDispatcher::instance().empty())) {
+        detail::SignalDispatcher::instance().unblockSignals();
+        detail::TimerDispatcher::instance().unblockSignals();
+        detail::FdManager::instance().processOnce();
+        detail::TimerDispatcher::instance().blockSignals();
+        detail::SignalDispatcher::instance().blockSignals();
+        detail::FileDispatcher::instance().prepareRun();
+        detail::EventEventDispatcher::instance().prepareRun();
+        detail::FIFORunner::instance().run();
     }
 }
 
-prefix_ void senf::Scheduler::restart()
+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::SignalDispatcher* sd (&scheduler::detail::SignalDispatcher::instance());
-    scheduler::FileDispatcher* fld (&fileDispatcher_);
-    
+    detail::FdManager*            fdm (&detail::FdManager::instance());
+    detail::FIFORunner*           ffr (&detail::FIFORunner::instance());
+    detail::FdDispatcher*         fdd (&detail::FdDispatcher::instance());
+    detail::TimerDispatcher*      tdd (&detail::TimerDispatcher::instance());
+    detail::SignalDispatcher*     sdd (&detail::SignalDispatcher::instance());
+    detail::FileDispatcher*       fld (&detail::FileDispatcher::instance());
+    detail::EventEventDispatcher* eed (&detail::EventEventDispatcher::instance());
+
+    eed->~EventEventDispatcher();
     fld->~FileDispatcher();
-    sd->~SignalDispatcher();
-    td->~TimerDispatcher();
+    sdd->~SignalDispatcher();
+    tdd->~TimerDispatcher();
     fdd->~FdDispatcher();
     ffr->~FIFORunner();
     fdm->~FdManager();
     
-    new (fdm) scheduler::FdManager();
-    new (ffr) scheduler::FIFORunner();
-    new (fdd) scheduler::FdDispatcher(*fdm, *ffr);
-    new (td) scheduler::TimerDispatcher(*fdm, *ffr);
-    new (sd) scheduler::detail::SignalDispatcher();
-    new (fld) scheduler::FileDispatcher(*fdm, *ffr);
+    new (fdm) detail::FdManager();
+    new (ffr) detail::FIFORunner();
+    new (fdd) detail::FdDispatcher();
+    new (tdd) detail::TimerDispatcher();
+    new (sdd) detail::SignalDispatcher();
+    new (fld) detail::FileDispatcher();
+    new (eed) detail::EventEventDispatcher();
+}
+
+prefix_ bool senf::scheduler::empty()
+{
+    return detail::FdDispatcher::instance().empty() 
+        && detail::TimerDispatcher::instance().empty()
+        && detail::FileDispatcher::instance().empty()
+        && detail::SignalDispatcher::instance().empty()
+        && detail::EventEventDispatcher::instance().empty();
 }
 
 ///////////////////////////////////////////////////////////////////////////
-// senf::SchedulerLogTimeSource
+// senf::schedulerLogTimeSource
 
-prefix_ senf::log::time_type senf::SchedulerLogTimeSource::operator()()
+prefix_ senf::log::time_type senf::scheduler::LogTimeSource::operator()()
     const
 {
-    return Scheduler::instance().eventTime();
+    return eventTime();
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////