X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FModuleManager.cc;h=d5a64f771e5e840afff886315d3350a9c24894a1;hb=82e8df5de8b11448423388632e8602ad97bc7885;hp=a356eeec452efc802aec9415dfae66299faaee39;hpb=a1a6c76a214ad1935032826713cabaf9ac57bf07;p=senf.git

diff --git a/PPI/ModuleManager.cc b/PPI/ModuleManager.cc
index a356eee..d5a64f7 100644
--- a/PPI/ModuleManager.cc
+++ b/PPI/ModuleManager.cc
@@ -28,6 +28,7 @@
 
 // Custom includes
 #include "../Scheduler/Scheduler.hh"
+#include "../Utils/membind.hh"
 #include "Module.hh"
 
 //#include "ModuleManager.mpp"
@@ -39,10 +40,11 @@
 
 prefix_ void senf::ppi::ModuleManager::init()
 {
-    ModuleRegistry::const_iterator i (moduleRegistry_.begin());
-    ModuleRegistry::const_iterator const i_end (moduleRegistry_.end());
-    for (; i != i_end; ++i)
-        (*i)->init();
+    while (! initQueue_.empty()) {
+        initQueue_.front()->v_init();
+        initQueue_.pop_front();
+    }
+    initRunner_.disable();
 }
 
 #ifndef DOXYGEN
@@ -60,14 +62,16 @@ prefix_ void senf::ppi::ModuleManager::run()
 {
     init();
     RunGuard guard (*this);
-    Scheduler::instance().process();
+    scheduler::process();
 }
 
 ////////////////////////////////////////
 // private members
 
 prefix_ senf::ppi::ModuleManager::ModuleManager()
-    : running_(false), terminate_(false)
+    : running_(false), terminate_(false), 
+      initRunner_ ("senf::ppi::init", membind(&ModuleManager::init, this), false, 
+                   scheduler::EventHook::PRE)
 {}
 
 ///////////////////////////////cc.e////////////////////////////////////////