Changeset 10535 for code/branches/core7/src/libraries

Timestamp:

Jun 6, 2015, 11:52:25 PM (10 years ago)

Author:

landauf

Message:

statically initialized instances are now registered with a type. CoreStaticInitializationHandler initializes all instances in core, NetworkStaticInitializationHandler initializes all instances in network.

Location:

code/branches/core7/src/libraries

Files:

• core/Core.cc (modified) (4 diffs)
• core/CoreIncludes.h (modified) (1 diff)
• core/CorePrereqs.h (modified) (1 diff)
• core/CoreStaticInitializationHandler.cc (modified) (2 diffs)
• core/CoreStaticInitializationHandler.h (modified) (2 diffs)
• core/command/ConsoleCommandIncludes.h (modified) (1 diff)
• core/commandline/CommandLineIncludes.h (modified) (1 diff)
• core/module/ModuleInstance.cc (modified) (3 diffs)
• core/module/ModuleInstance.h (modified) (2 diffs)
• core/module/StaticInitializationHandlerIncludes.h (modified) (1 diff)
• core/module/StaticInitializationManager.h (modified) (1 diff)
• core/module/StaticallyInitializedInstance.cc (modified) (1 diff)
• core/module/StaticallyInitializedInstance.h (modified) (2 diffs)
• core/singleton/ScopedSingletonIncludes.h (modified) (1 diff)
• network/CMakeLists.txt (modified) (1 diff)
• network/NetworkFunctionIncludes.cc (modified) (1 diff)
• network/NetworkFunctionIncludes.h (modified) (1 diff)
• network/NetworkPrereqs.h (modified) (1 diff)
• network/NetworkStaticInitializationHandler.cc (added)
• network/NetworkStaticInitializationHandler.h (added)

code/branches/core7/src/libraries/core/Core.cc

@@ -126 +126 @@
         this->dynLibManager_ = new DynLibManager();
 
-        // TODO: initialize StaticInitializationManager
-        this->staticInitHandler_ = new CoreStaticInitializationHandler();
-        StaticInitializationManager::getInstance().addHandler(this->staticInitHandler_);
-
         // TODO: initialize Root-Context
         // TODO: initialize IdentifierManager here
@@ -136 +132 @@
         // TODO: initialize ConsoleCommandManager here
         // TODO: initialize NetworkFunctionManager here
+        // TODO: initialize StaticInitializationManager
+        this->staticInitHandler_ = new CoreStaticInitializationHandler();
+        StaticInitializationManager::getInstance().addHandler(this->staticInitHandler_);
+
         this->rootModule_ = ModuleInstance::getCurrentModuleInstance();
-        this->rootModule_->loadAllStaticallyInitializedInstances(0);
+        StaticInitializationManager::getInstance().loadModule(this->rootModule_);
 
         // Parse command line arguments AFTER the modules have been loaded (static code!)
@@ -198 +198 @@
         // creates the class hierarchy for all classes with factories
         orxout(internal_info) << "creating class hierarchy" << endl;
-        IdentifierManager::getInstance().createClassHierarchy();
+        this->staticInitHandler_->initInstances(this->rootModule_);
+        this->staticInitHandler_->setInitInstances(true);
 
         // Loader
@@ -253 +254 @@
         if (this->rootModule_)
         {
-            this->rootModule_->unloadAllStaticallyInitializedInstances(0);
+            StaticInitializationManager::getInstance().unloadModule(this->rootModule_);
             this->rootModule_->deleteAllStaticallyInitializedInstances();
         }

code/branches/core7/src/libraries/core/CoreIncludes.h

@@ -226 +226 @@
         public:
             StaticallyInitializedIdentifier(Identifier* identifier)
-                : StaticallyInitializedInstance(0)
+                : StaticallyInitializedInstance(StaticInitialization::IDENTIFIER)
                 , identifier_(identifier)
             {}

code/branches/core7/src/libraries/core/CorePrereqs.h

@@ -84 +84 @@
         static const Value ROOT = 1;
         static const Value GRAPHICS = 2;
+    }
+
+    namespace StaticInitialization
+    {
+        typedef int Type;
+
+        static const Type STATIC_INITIALIZATION_HANDLER = 1;
+        static const Type IDENTIFIER = 2;
+        static const Type SCOPED_SINGLETON_WRAPPER = 3;
+        static const Type COMMAND_LINE_ARGUMENT = 4;
+        static const Type CONSOLE_COMMAND = 5;
     }
 

code/branches/core7/src/libraries/core/CoreStaticInitializationHandler.cc

@@ -47 +47 @@
     void CoreStaticInitializationHandler::loadModule(ModuleInstance* module)
     {
-        module->loadAllStaticallyInitializedInstances(0);
+        this->loadInstances(module);
+        if (this->bInitInstances_)
+            this->initInstances(module);
+    }
+
+    void CoreStaticInitializationHandler::loadInstances(ModuleInstance* module)
+    {
+        // the order of initialization is important
+        module->loadAllStaticallyInitializedInstances(StaticInitialization::STATIC_INITIALIZATION_HANDLER);
+        module->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
+        module->loadAllStaticallyInitializedInstances(StaticInitialization::SCOPED_SINGLETON_WRAPPER);
+        module->loadAllStaticallyInitializedInstances(StaticInitialization::COMMAND_LINE_ARGUMENT);
+        module->loadAllStaticallyInitializedInstances(StaticInitialization::CONSOLE_COMMAND);
+    }
+
+    void CoreStaticInitializationHandler::initInstances(ModuleInstance* module)
+    {
         IdentifierManager::getInstance().createClassHierarchy();
         ScopeManager::getInstance().updateListeners();
@@ -54 +70 @@
     void CoreStaticInitializationHandler::unloadModule(ModuleInstance* module)
     {
-        module->unloadAllStaticallyInitializedInstances(0);
+        // inverted order of initialization
+        module->unloadAllStaticallyInitializedInstances(StaticInitialization::CONSOLE_COMMAND);
+        module->unloadAllStaticallyInitializedInstances(StaticInitialization::COMMAND_LINE_ARGUMENT);
+        module->unloadAllStaticallyInitializedInstances(StaticInitialization::SCOPED_SINGLETON_WRAPPER);
+        module->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
+        module->unloadAllStaticallyInitializedInstances(StaticInitialization::STATIC_INITIALIZATION_HANDLER);
     }
 }

code/branches/core7/src/libraries/core/CoreStaticInitializationHandler.h

@@ -38 +38 @@
     class _CoreExport CoreStaticInitializationHandler : public StaticInitializationHandler
     {
+        friend class Core;
+
         public:
+            CoreStaticInitializationHandler() : bInitInstances_(false) {}
+
             virtual void setupHandler();
             virtual void shutdownHandler();
@@ -44 +48 @@
             virtual void loadModule(ModuleInstance* module);
             virtual void unloadModule(ModuleInstance* module);
+
+            inline void setInitInstances(bool bInitInstances)
+                { this->bInitInstances_ = bInitInstances; }
+
+        private:
+            void loadInstances(ModuleInstance* module);
+            void initInstances(ModuleInstance* module);
+
+            bool bInitInstances_;
     };
 }

code/branches/core7/src/libraries/core/command/ConsoleCommandIncludes.h

@@ -311 +311 @@
         public:
             StaticallyInitializedConsoleCommand(ConsoleCommand* command)
-                : StaticallyInitializedInstance(0)
+                : StaticallyInitializedInstance(StaticInitialization::CONSOLE_COMMAND)
                 , command_(command)
             {}

code/branches/core7/src/libraries/core/commandline/CommandLineIncludes.h

@@ -59 +59 @@
         public:
             StaticallyInitializedCommandLineArgument(CommandLineArgument* argument)
-                : StaticallyInitializedInstance(0)
+                : StaticallyInitializedInstance(StaticInitialization::COMMAND_LINE_ARGUMENT)
                 , argument_(argument)
             {}

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

@@ -56 +56 @@
     }
 
-    void ModuleInstance::loadAllStaticallyInitializedInstances(StaticallyInitializedInstance::Type type)
+    void ModuleInstance::loadAllStaticallyInitializedInstances(StaticInitialization::Type type)
     {
         const std::set<StaticallyInitializedInstance*>& instances = this->staticallyInitializedInstancesByType_[type];
@@ -63 +63 @@
     }
 
-    void ModuleInstance::unloadAllStaticallyInitializedInstances(StaticallyInitializedInstance::Type type)
+    void ModuleInstance::unloadAllStaticallyInitializedInstances(StaticInitialization::Type type)
     {
         const std::set<StaticallyInitializedInstance*>& instances = this->staticallyInitializedInstancesByType_[type];
@@ -72 +72 @@
     void ModuleInstance::deleteAllStaticallyInitializedInstances()
     {
-        std::map<StaticallyInitializedInstance::Type, std::set<StaticallyInitializedInstance*> > copy(this->staticallyInitializedInstancesByType_);
+        std::map<StaticInitialization::Type, std::set<StaticallyInitializedInstance*> > copy(this->staticallyInitializedInstancesByType_);
         this->staticallyInitializedInstancesByType_.clear();
-        for (std::map<StaticallyInitializedInstance::Type, std::set<StaticallyInitializedInstance*> >::iterator it1 = copy.begin(); it1 != copy.end(); ++it1)
+        for (std::map<StaticInitialization::Type, std::set<StaticallyInitializedInstance*> >::iterator it1 = copy.begin(); it1 != copy.end(); ++it1)
             for (std::set<StaticallyInitializedInstance*>::iterator it2 = it1->second.begin(); it2 != it1->second.end(); ++it2)
                 delete (*it2);

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

@@ -49 +49 @@
             void removeStaticallyInitializedInstance(StaticallyInitializedInstance* instance);
 
-            void loadAllStaticallyInitializedInstances(StaticallyInitializedInstance::Type type);
-            void unloadAllStaticallyInitializedInstances(StaticallyInitializedInstance::Type type);
+            void loadAllStaticallyInitializedInstances(StaticInitialization::Type type);
+            void unloadAllStaticallyInitializedInstances(StaticInitialization::Type type);
 
             void deleteAllStaticallyInitializedInstances();
@@ -66 +66 @@
 
         private:
-            std::map<StaticallyInitializedInstance::Type, std::set<StaticallyInitializedInstance*> > staticallyInitializedInstancesByType_;
+            std::map<StaticInitialization::Type, std::set<StaticallyInitializedInstance*> > staticallyInitializedInstancesByType_;
             std::string name_;
             DynLib* dynLib_;

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

@@ -48 +48 @@
         public:
             StaticallyInitializedStaticInitializationHandler(StaticInitializationHandler* handler)
-                : StaticallyInitializedInstance(0)
+                : StaticallyInitializedInstance(StaticInitialization::STATIC_INITIALIZATION_HANDLER)
                 , handler_(handler)
             {}

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

@@ -38 +38 @@
     class _CoreExport StaticInitializationManager
     {
-        friend class Core;
-
         public:
             static StaticInitializationManager& getInstance();

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

@@ -33 +33 @@
 namespace orxonox
 {
-    StaticallyInitializedInstance::StaticallyInitializedInstance(Type type)
+    StaticallyInitializedInstance::StaticallyInitializedInstance(StaticInitialization::Type type)
     {
         this->type_ = type;

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

@@ -37 +37 @@
     {
         public:
-            typedef int Type;
 
-            StaticallyInitializedInstance(Type type);
+            StaticallyInitializedInstance(StaticInitialization::Type type);
             virtual ~StaticallyInitializedInstance();
 
@@ -45 +44 @@
             virtual void unload() = 0;
 
-            inline Type getType() const
+            inline StaticInitialization::Type getType() const
                 { return this->type_; }
 
         private:
             ModuleInstance* module_;
-            Type type_;
+            StaticInitialization::Type type_;
     };
 }

code/branches/core7/src/libraries/core/singleton/ScopedSingletonIncludes.h

@@ -81 +81 @@
         public:
             StaticallyInitializedScopedSingletonWrapper(ScopedSingletonWrapper* wrapper, ScopeID::Value scope)
-                : StaticallyInitializedInstance(0)
+                : StaticallyInitializedInstance(StaticInitialization::SCOPED_SINGLETON_WRAPPER)
                 , wrapper_(wrapper)
                 , scope_(scope)

code/branches/core7/src/libraries/network/CMakeLists.txt

@@ -36 +36 @@
   NetworkFunctionIncludes.cc
   NetworkFunctionManager.cc
+  NetworkStaticInitializationHandler.cc
   Host.cc
   Server.cc

code/branches/core7/src/libraries/network/NetworkFunctionIncludes.cc

@@ -30 +30 @@
 #include "NetworkFunctionManager.h"
 
+#include "core/module/StaticInitializationHandlerIncludes.h"
+#include "NetworkStaticInitializationHandler.h"
+
 namespace orxonox
 {
+    RegisterStaticInitializationHandler(NetworkStaticInitializationHandler);
+
     void StaticallyInitializedNetworkFunction::load()
     {

code/branches/core7/src/libraries/network/NetworkFunctionIncludes.h

@@ -52 +52 @@
         public:
             StaticallyInitializedNetworkFunction(NetworkFunctionBase* function)
-                : StaticallyInitializedInstance(0)
+                : StaticallyInitializedInstance(StaticInitialization::NETWORK_FUNCTION)
                 , function_(function)
             {}

code/branches/core7/src/libraries/network/NetworkPrereqs.h

@@ -97 +97 @@
     }
   }
+
+  namespace StaticInitialization
+  {
+    typedef int Type;
+    static const Type NETWORK_FUNCTION = 6;
+  }
 }