Changeset 10344

Timestamp:

Apr 5, 2015, 5:29:21 PM (10 years ago)

Author:

landauf

Message:

remove and destroy StaticallyInitializedInstances

Location:

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

Files:

• ModuleInstance.cc (modified) (2 diffs)
• ModuleInstance.h (modified) (3 diffs)
• StaticallyInitializedInstance.cc (modified) (1 diff)
• StaticallyInitializedInstance.h (modified) (1 diff)

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

@@ -35 +35 @@
     ModuleInstance* ModuleInstance::currentModuleInstance_s = NULL;
 
+    ModuleInstance::~ModuleInstance()
+    {
+        std::list<StaticallyInitializedInstance*> copy(this->staticallyInitializedInstances_);
+        for (std::list<StaticallyInitializedInstance*>::iterator it = this->staticallyInitializedInstances_.begin(); it != this->staticallyInitializedInstances_.end(); ++it)
+            delete (*it);
+    }
+
     void ModuleInstance::addStaticallyInitializedInstance(StaticallyInitializedInstance* instance)
     {
@@ -42 +49 @@
     void ModuleInstance::loadAllStaticallyInitializedInstances()
     {
-        for (size_t i = 0; i < this->staticallyInitializedInstances_.size(); ++i)
-            this->staticallyInitializedInstances_[i]->load();
+        for (std::list<StaticallyInitializedInstance*>::iterator it = this->staticallyInitializedInstances_.begin(); it != this->staticallyInitializedInstances_.end(); ++it)
+            (*it)->load();
+    }
+
+    void ModuleInstance::removeStaticallyInitializedInstance(StaticallyInitializedInstance* instance)
+    {
+        this->staticallyInitializedInstances_.remove(instance);
     }
 

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

@@ -32 +32 @@
 #include "core/CorePrereqs.h"
 
-#include <vector>
+#include <list>
 
 namespace orxonox
@@ -39 +39 @@
     {
         public:
+            ~ModuleInstance();
+
             void addStaticallyInitializedInstance(StaticallyInitializedInstance* instance);
             void loadAllStaticallyInitializedInstances();
+            void removeStaticallyInitializedInstance(StaticallyInitializedInstance* instance);
 
             static void setCurrentModuleInstance(ModuleInstance* instance);
@@ -46 +49 @@
 
         private:
-            std::vector<StaticallyInitializedInstance*> staticallyInitializedInstances_;
+            std::list<StaticallyInitializedInstance*> staticallyInitializedInstances_;
 
             static ModuleInstance* currentModuleInstance_s;

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

@@ -37 +37 @@
         ModuleInstance::getCurrentModuleInstance()->addStaticallyInitializedInstance(this);
     }
+
+    StaticallyInitializedInstance::~StaticallyInitializedInstance()
+    {
+        ModuleInstance::getCurrentModuleInstance()->removeStaticallyInitializedInstance(this);
+    }
 }

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

@@ -38 +38 @@
         public:
             StaticallyInitializedInstance();
-            virtual ~StaticallyInitializedInstance() {}
+            virtual ~StaticallyInitializedInstance();
 
             virtual void load() = 0;