X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FModuleManager.hh;h=c8b411de759880734ad47efa99d73e2339cf894c;hb=b1f9349b1f3521d58cbef52ead0f2e5303a58c9e;hp=6c8d291dac1fb617997b617561f88fe820ba7382;hpb=a1a6c76a214ad1935032826713cabaf9ac57bf07;p=senf.git

diff --git a/PPI/ModuleManager.hh b/PPI/ModuleManager.hh
index 6c8d291..c8b411d 100644
--- a/PPI/ModuleManager.hh
+++ b/PPI/ModuleManager.hh
@@ -23,12 +23,15 @@
 /** \file
     \brief ModuleManager public header */
 
-#ifndef HH_ModuleManager_
-#define HH_ModuleManager_ 1
+#ifndef HH_SENF_PPI_ModuleManager_
+#define HH_SENF_PPI_ModuleManager_ 1
 
 // Custom includes
 #include <vector>
+#include <deque>
 #include "predecl.hh"
+#include "../Scheduler/Scheduler.hh"
+#include "../Utils/Console/ScopedDirectory.hh"
 
 //#include "ModuleManager.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
@@ -45,6 +48,21 @@ namespace ppi {
     {
     public:
         ///////////////////////////////////////////////////////////////////////////
+        // Types
+
+        struct Initializable
+        {
+            Initializable();
+            virtual ~Initializable();
+            ModuleManager & moduleManager() const;
+            void enqueueInitializable();
+            void dequeueInitializable();
+            bool initializationScheduled() const;
+
+            virtual void v_init() = 0;
+        };
+
+        ///////////////////////////////////////////////////////////////////////////
         ///\name Structors and default members
         ///@{
 
@@ -65,13 +83,22 @@ namespace ppi {
 
         bool running() const;           ///< \c true, if the network is running
 
+        senf::console::DirectoryNode & consoleDir() const;
+
     private:
         ModuleManager();
 
         void registerModule(module::Module & module);
         void unregisterModule(module::Module & module);
 
+        void registerInitializable(Initializable & i);
+        void unregisterInitializable(Initializable & i);
+        bool initializableRegistered(Initializable const & i) const;
+
+        void dumpModules(std::ostream & os);
+
         typedef std::vector<module::Module *> ModuleRegistry;
+        typedef std::deque<Initializable *> InitQueue;
 
 #ifndef DOXYGEN
         struct RunGuard;
@@ -82,7 +109,14 @@ namespace ppi {
         bool running_;
         bool terminate_;
 
+        InitQueue initQueue_;
+
+        scheduler::EventHook initRunner_;
+
+        senf::console::ScopedDirectory<> consoleDir_;
+
         friend class module::Module;
+        friend class Initializable;
     };