X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FModuleManager.cc;h=f72cab1812e5fb4426acc9ca8c5bb4867ccdd9d0;hb=a1fdb7bb122f0b05be809a922d4b7ef5e125fa67;hp=490bb010e6e0eeb69169621c08bc1967f1f0db01;hpb=ac90835cbb00ca83a51ab9efb23fdcb75518e808;p=senf.git

diff --git a/PPI/ModuleManager.cc b/PPI/ModuleManager.cc
index 490bb01..f72cab1 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
@@ -67,7 +69,9 @@ prefix_ void senf::ppi::ModuleManager::run()
 // private members
 
 prefix_ senf::ppi::ModuleManager::ModuleManager()
-    : running_(false), terminate_(false)
+    : running_(false), terminate_(false), 
+      initRunner_ ("senf::ppi::init", membind(&ModuleManager::init, this),
+                   scheduler::EventHook::PRE, false)
 {}
 
 ///////////////////////////////cc.e////////////////////////////////////////