Changeset 10536 for code/branches/core7/src

Timestamp:

Jun 7, 2015, 12:12:20 AM (9 years ago)

Author:

landauf

Message:

unload in reversed order

Location:

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

Files:

• ModuleInstance.cc (modified) (1 diff)
• StaticInitializationManager.cc (modified) (2 diffs)

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

@@ -65 +65 @@
     void ModuleInstance::unloadAllStaticallyInitializedInstances(StaticInitialization::Type type)
     {
+        // unload in reversed order
         const std::set<StaticallyInitializedInstance*>& instances = this->staticallyInitializedInstancesByType_[type];
-        for (std::set<StaticallyInitializedInstance*>::iterator it = instances.begin(); it != instances.end(); ++it)
+        for (std::set<StaticallyInitializedInstance*>::reverse_iterator it = instances.rbegin(); it != instances.rend(); ++it)
             (*it)->unload();
     }

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

@@ -51 +51 @@
     void StaticInitializationManager::loadModule(ModuleInstance* module)
     {
+        // attention: loading a module may add new handlers to the list
         for (std::list<StaticInitializationHandler*>::iterator it = this->handlers_.begin(); it != this->handlers_.end(); ++it)
             (*it)->loadModule(module);
@@ -57 +58 @@
     void StaticInitializationManager::unloadModule(ModuleInstance* module)
     {
-        for (std::list<StaticInitializationHandler*>::iterator it = this->handlers_.begin(); it != this->handlers_.end(); ++it)
-            (*it)->unloadModule(module);
+        // unload in reversed order
+        // attention: unloading a module may remove handlers from the list
+        for (std::list<StaticInitializationHandler*>::reverse_iterator it = this->handlers_.rbegin(); it != this->handlers_.rend(); )
+            (*(it++))->unloadModule(module);
     }
 }