Changeset 10527

Timestamp:

Jun 6, 2015, 10:43:12 AM (9 years ago)

Author:

landauf

Message:

unload modules, unload and destroy all statically initialized instances

Location:

code/branches/core7/src/libraries/core

Files:

• Core.cc (modified) (4 diffs)
• DynLib.cc (modified) (2 diffs)
• Game.cc (modified) (1 diff)

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

@@ -128 +128 @@
         // TODO: initialize CommandLineParser here
         // TODO: initialize ConsoleCommandManager here
+        // TODO: initialize NetworkFunctionManager here
         this->rootModule_ = ModuleInstance::getCurrentModuleInstance();
         this->rootModule_->loadAllStaticallyInitializedInstances();
@@ -241 +242 @@
         safeObjectDelete(&languageInstance_);
         safeObjectDelete(&configFileManager_);
+        safeObjectDelete(&signalHandler_);
+        Context::getRootContext()->unregisterObject(); // unregister context from object lists - otherwise the root context would be destroyed while unloading the root module
+        if (this->rootModule_)
+        {
+            this->rootModule_->unloadAllStaticallyInitializedInstances();
+            this->rootModule_->deleteAllStaticallyInitializedInstances();
+        }
         Context::setRootContext(NULL);
-        safeObjectDelete(&signalHandler_);
-//        if (this->rootModule_)
-//            this->rootModule_->unloadAllStaticallyInitializedInstances();
-//        safeObjectDelete(&rootModule_);
+        safeObjectDelete(&rootModule_);
         safeObjectDelete(&dynLibManager_);
         safeObjectDelete(&configurablePaths_);
@@ -277 +282 @@
     void Core::loadModule(ModuleInstance* module)
     {
+        orxout(internal_info) << "Loading module " << module->getName() << "..." << endl;
+
         ModuleInstance::setCurrentModuleInstance(module);
         DynLib* dynLib = this->dynLibManager_->load(module->getName());
@@ -298 +305 @@
     void Core::unloadModule(ModuleInstance* module)
     {
+        orxout(internal_info) << "Unloading module " << module->getName() << "..." << endl;
+
         module->unloadAllStaticallyInitializedInstances();
         module->deleteAllStaticallyInitializedInstances();

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

@@ -68 +68 @@
     {
         // Log library load
-        orxout(internal_info) << "Loading module " << mName << endl;
+        orxout(internal_info) << "load DynLib " << mName << endl;
 
         std::string name = mName;
@@ -101 +101 @@
     {
         // Log library unload
-        orxout(internal_info) << "Unloading module " << mName << endl;
+        orxout(internal_info) << "unload DynLib " << mName << endl;
 
         if (DYNLIB_UNLOAD( m_hInst ))

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

@@ -142 +142 @@
         GameStateFactory::getFactories().clear();
         safeObjectDelete(&config_);
-//        if (this->core_)
-//            this->core_->unloadModules();
+        if (this->core_)
+            this->core_->unloadModules();
         safeObjectDelete(&core_);
         safeObjectDelete(&gameClock_);