Changeset 10532 for code/branches/core7/src/libraries/core/module

Timestamp:

Jun 6, 2015, 4:38:45 PM (10 years ago)

Author:

landauf

Message:

use CoreStaticInitializationHandler to initialize core instances

Location:

code/branches/core7/src/libraries/core/module

Files:

• CMakeLists.txt (modified) (1 diff)
• StaticInitializationHandler.cc (deleted)
• StaticInitializationHandler.h (modified) (1 diff)
• StaticInitializationManager.cc (modified) (2 diffs)
• StaticInitializationManager.h (modified) (1 diff)

code/branches/core7/src/libraries/core/module/CMakeLists.txt

@@ -2 +2 @@
   ModuleInstance.cc
   StaticallyInitializedInstance.cc
-  StaticInitializationHandler.cc
   StaticInitializationHandlerIncludes.cc
   StaticInitializationManager.cc

code/branches/core7/src/libraries/core/module/StaticInitializationHandler.h

@@ -39 +39 @@
             StaticInitializationHandler() {}
             virtual ~StaticInitializationHandler() {}
+
+            virtual void setupHandler() = 0;
+            virtual void shutdownHandler() = 0;
+
+            virtual void loadModule(ModuleInstance* module) = 0;
+            virtual void unloadModule(ModuleInstance* module) = 0;
     };
 }

code/branches/core7/src/libraries/core/module/StaticInitializationManager.cc

@@ -29 +29 @@
 #include "StaticInitializationManager.h"
 
+#include "StaticInitializationHandler.h"
+
 namespace orxonox
 {
@@ -47 +49 @@
     }
 
-    void StaticInitializationManager::addCoreHandler()
+    void StaticInitializationManager::loadModule(ModuleInstance* module)
     {
-        // TODO
+        for (std::list<StaticInitializationHandler*>::iterator it = this->handlers_.begin(); it != this->handlers_.end(); ++it)
+            (*it)->loadModule(module);
+    }
+
+    void StaticInitializationManager::unloadModule(ModuleInstance* module)
+    {
+        for (std::list<StaticInitializationHandler*>::iterator it = this->handlers_.begin(); it != this->handlers_.end(); ++it)
+            (*it)->unloadModule(module);
     }
 }

code/branches/core7/src/libraries/core/module/StaticInitializationManager.h

@@ -49 +49 @@
             void removeHandler(StaticInitializationHandler* handler);
 
+            void loadModule(ModuleInstance* module);
+            void unloadModule(ModuleInstance* module);
+
         private:
-            void addCoreHandler();
-
             std::list<StaticInitializationHandler*> handlers_;
     };