Changeset 10543 for code/branches/core7

Timestamp:

Jun 7, 2015, 2:50:04 PM (9 years ago)

Author:

landauf

Message:

create and destroy root-context in a controlled manner

Location:

code/branches/core7/src/libraries/core

Files:

• Core.cc (modified) (3 diffs)
• object/Context.cc (modified) (2 diffs)

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

@@ -123 +123 @@
         this->dynLibManager_ = new DynLibManager();
 
-        // TODO: initialize Root-Context
+        // create handler for static initialization
         new StaticInitializationManager(); // create singleton
         this->staticInitHandler_ = new CoreStaticInitializationHandler();
         StaticInitializationManager::getInstance().addHandler(this->staticInitHandler_);
 
+        // load root module (all libraries which are linked to the executable, including core, network, and orxonox)
         this->rootModule_ = ModuleInstance::getCurrentModuleInstance();
         StaticInitializationManager::getInstance().loadModule(this->rootModule_);
@@ -170 +171 @@
         orxout(internal_info) << "Loading language:" << endl;
         this->languageInstance_ = new Language();
+
+        // initialize root context
+        Context::setRootContext(new Context(NULL));
 
         // Do this soon after the ConfigFileManager has been created to open up the
@@ -251 +255 @@
         if (this->staticInitHandler_)
             StaticInitializationManager::getInstance().removeHandler(this->staticInitHandler_);
+        delete Context::getRootContext();
         Context::setRootContext(NULL);
         safeObjectDelete(&rootModule_);

code/branches/core7/src/libraries/core/object/Context.cc

@@ -76 +76 @@
     /*static*/ void Context::setRootContext(Context* context)
     {
-        if (Context::rootContext_s)
-            delete Context::rootContext_s;
         Context::rootContext_s = context;
     }
@@ -83 +81 @@
     /*static*/ Context* Context::getRootContext()
     {
-        if (!Context::rootContext_s)
-            Context::rootContext_s = new Context(NULL);
+        OrxVerify(Context::rootContext_s != NULL, "Root Context is undefined");
         return Context::rootContext_s;
     }