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

Timestamp:

Jun 6, 2015, 2:45:20 PM (9 years ago)

Author:

landauf

Message:

statically initialized instances may contain a type. currently not used.

Location:

code/branches/core7/src/libraries

Files:

• core/Core.cc (modified) (4 diffs)
• core/CoreIncludes.h (modified) (1 diff)
• core/command/ConsoleCommandIncludes.h (modified) (1 diff)
• core/commandline/CommandLineIncludes.h (modified) (1 diff)
• core/module/ModuleInstance.cc (modified) (1 diff)
• core/module/ModuleInstance.h (modified) (3 diffs)
• core/module/StaticallyInitializedInstance.cc (modified) (1 diff)
• core/module/StaticallyInitializedInstance.h (modified) (2 diffs)
• core/singleton/ScopedSingletonIncludes.h (modified) (1 diff)
• network/NetworkFunctionIncludes.h (modified) (1 diff)

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

@@ -130 +130 @@
         // TODO: initialize NetworkFunctionManager here
         this->rootModule_ = ModuleInstance::getCurrentModuleInstance();
-        this->rootModule_->loadAllStaticallyInitializedInstances();
+        this->rootModule_->loadAllStaticallyInitializedInstances(0);
 
         // Parse command line arguments AFTER the modules have been loaded (static code!)
@@ -246 +246 @@
         if (this->rootModule_)
         {
-            this->rootModule_->unloadAllStaticallyInitializedInstances();
+            this->rootModule_->unloadAllStaticallyInitializedInstances(0);
             this->rootModule_->deleteAllStaticallyInitializedInstances();
         }
@@ -287 +287 @@
         DynLib* dynLib = this->dynLibManager_->load(module->getName());
         module->setDynLib(dynLib);
-        module->loadAllStaticallyInitializedInstances();
+        module->loadAllStaticallyInitializedInstances(0);
         IdentifierManager::getInstance().createClassHierarchy();
         ScopeManager::getInstance().updateListeners();
@@ -307 +307 @@
         orxout(internal_info) << "Unloading module " << module->getName() << "..." << endl;
 
-        module->unloadAllStaticallyInitializedInstances();
+        module->unloadAllStaticallyInitializedInstances(0);
         module->deleteAllStaticallyInitializedInstances();
         this->dynLibManager_->unload(module->getDynLib());

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

@@ -225 +225 @@
 
         public:
-            StaticallyInitializedIdentifier(Identifier* identifier) : identifier_(identifier) {}
+            StaticallyInitializedIdentifier(Identifier* identifier)
+                : StaticallyInitializedInstance(0)
+                , identifier_(identifier)
+            {}
             ~StaticallyInitializedIdentifier() { delete identifier_; }
 

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

@@ -310 +310 @@
     {
         public:
-            StaticallyInitializedConsoleCommand(ConsoleCommand* command) : command_(command) {}
+            StaticallyInitializedConsoleCommand(ConsoleCommand* command)
+                : StaticallyInitializedInstance(0)
+                , command_(command)
+            {}
             ~StaticallyInitializedConsoleCommand() { delete command_; }
 

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

@@ -58 +58 @@
     {
         public:
-            StaticallyInitializedCommandLineArgument(CommandLineArgument* argument) : argument_(argument) {}
+            StaticallyInitializedCommandLineArgument(CommandLineArgument* argument)
+                : StaticallyInitializedInstance(0)
+                , argument_(argument)
+            {}
             ~StaticallyInitializedCommandLineArgument() { delete argument_; }
 

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

@@ -48 +48 @@
     void ModuleInstance::addStaticallyInitializedInstance(StaticallyInitializedInstance* instance)
     {
-        this->staticallyInitializedInstances_.insert(instance);
-    }
-
-    void ModuleInstance::loadAllStaticallyInitializedInstances()
-    {
-        for (std::set<StaticallyInitializedInstance*>::iterator it = this->staticallyInitializedInstances_.begin(); it != this->staticallyInitializedInstances_.end(); ++it)
-            (*it)->load();
-    }
-
-    void ModuleInstance::unloadAllStaticallyInitializedInstances()
-    {
-        for (std::set<StaticallyInitializedInstance*>::iterator it = this->staticallyInitializedInstances_.begin(); it != this->staticallyInitializedInstances_.end(); ++it)
-            (*it)->unload();
+        this->staticallyInitializedInstancesByType_[instance->getType()].insert(instance);
     }
 
     void ModuleInstance::removeStaticallyInitializedInstance(StaticallyInitializedInstance* instance)
     {
-        this->staticallyInitializedInstances_.erase(instance);
+        this->staticallyInitializedInstancesByType_[instance->getType()].erase(instance);
+    }
+
+    void ModuleInstance::loadAllStaticallyInitializedInstances(StaticallyInitializedInstance::Type type)
+    {
+        const std::set<StaticallyInitializedInstance*>& instances = this->staticallyInitializedInstancesByType_[type];
+        for (std::set<StaticallyInitializedInstance*>::iterator it = instances.begin(); it != instances.end(); ++it)
+            (*it)->load();
+    }
+
+    void ModuleInstance::unloadAllStaticallyInitializedInstances(StaticallyInitializedInstance::Type type)
+    {
+        const std::set<StaticallyInitializedInstance*>& instances = this->staticallyInitializedInstancesByType_[type];
+        for (std::set<StaticallyInitializedInstance*>::iterator it = instances.begin(); it != instances.end(); ++it)
+            (*it)->unload();
     }
 
     void ModuleInstance::deleteAllStaticallyInitializedInstances()
     {
-        std::set<StaticallyInitializedInstance*> copy(this->staticallyInitializedInstances_);
-        this->staticallyInitializedInstances_.clear();
-        for (std::set<StaticallyInitializedInstance*>::iterator it = copy.begin(); it != copy.end(); ++it)
-            delete (*it);
+        std::map<StaticallyInitializedInstance::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::set<StaticallyInitializedInstance*>::iterator it2 = it1->second.begin(); it2 != it1->second.end(); ++it2)
+                delete (*it2);
     }
 

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

@@ -33 +33 @@
 
 #include <set>
+#include <map>
 #include <string>
+
+#include "StaticallyInitializedInstance.h"
 
 namespace orxonox
@@ -44 +47 @@
 
             void addStaticallyInitializedInstance(StaticallyInitializedInstance* instance);
-            void loadAllStaticallyInitializedInstances();
-            void unloadAllStaticallyInitializedInstances();
             void removeStaticallyInitializedInstance(StaticallyInitializedInstance* instance);
+
+            void loadAllStaticallyInitializedInstances(StaticallyInitializedInstance::Type type);
+            void unloadAllStaticallyInitializedInstances(StaticallyInitializedInstance::Type type);
+
             void deleteAllStaticallyInitializedInstances();
 
@@ -61 +66 @@
 
         private:
-            std::set<StaticallyInitializedInstance*> staticallyInitializedInstances_;
+            std::map<StaticallyInitializedInstance::Type, std::set<StaticallyInitializedInstance*> > staticallyInitializedInstancesByType_;
             std::string name_;
             DynLib* dynLib_;

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

@@ -33 +33 @@
 namespace orxonox
 {
-    StaticallyInitializedInstance::StaticallyInitializedInstance()
+    StaticallyInitializedInstance::StaticallyInitializedInstance(Type type)
     {
+        this->type_ = type;
         this->module_ = ModuleInstance::getCurrentModuleInstance();
         this->module_->addStaticallyInitializedInstance(this);

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

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

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

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

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

@@ -51 +51 @@
     {
         public:
-            StaticallyInitializedNetworkFunction(NetworkFunctionBase* function) : function_(function) {}
+            StaticallyInitializedNetworkFunction(NetworkFunctionBase* function)
+                : StaticallyInitializedInstance(0)
+                , function_(function)
+            {}
             ~StaticallyInitializedNetworkFunction() { delete function_; }