Changeset 63

Timestamp:

09/07/2008 10:03:45 PM (4 years ago)

Author:

art

Message:

• small changes in the Kernel and Engine, now Engine do stop the kernel when releasing and let kernel run one tick, so that all tasks can stop before removed

Location:

trunk

Files:

• Make/Makedefs (modified) (1 diff)
• include/nrEngine/Engine.h (modified) (1 diff)
• src/nrEngine/Engine.cpp (modified) (18 diffs)
• src/nrEngine/Kernel.cpp (modified) (2 diffs)

trunk/Make/Makedefs

@@ -50 +50 @@
 #-----------------------------------------------
 CC = g++
-CFLAGS = -m32 -pthread -g -O2 -Wall -Werror $(INCPATH)
+CFLAGS = -m32 -pthread -g -O2 $(INCPATH)
 LIBS = 
 LDFLAGS = -shared $(LIBPATH) $(LIBS)

trunk/include/nrEngine/Engine.h

@@ -171 +171 @@
                          * Check whenever the engine'S singleton was created before
                          **/
-                        static bool valid(void* p = sSingleton.get(), char* name = "Engine", bool showWarn = true);
+                        static bool valid(void* p = sSingleton.get(), char* name = (char*)"Engine", bool showWarn = true);
                          
                         /**

trunk/src/nrEngine/Engine.cpp

@@ -74 +74 @@
          Log* Engine::sLog()
         {
-                valid(_logger, "Log");
+                valid(_logger, (char*)"Log");
                 return _logger;
         }
@@ -81 +81 @@
          Kernel* Engine::sKernel()
         {
-                valid(_kernel, "Kernel");
+                valid(_kernel, (char*)"Kernel");
                 return _kernel;
         }
@@ -88 +88 @@
          Clock* Engine::sClock()
         {
-                valid(_clock, "Clock");
+                valid(_clock, (char*)"Clock");
                 return _clock;
         }
@@ -95 +95 @@
          Profiler* Engine::sProfiler()
         {
-                valid(_profiler, "Profiler");
+                valid(_profiler, (char*)"Profiler");
                 return _profiler;
         }
@@ -102 +102 @@
          ResourceManager* Engine::sResourceManager()
         {
-                valid(_resmgr, "ResourceManager");
+                valid(_resmgr, (char*)"ResourceManager");
                 return _resmgr;
         }
@@ -109 +109 @@
          EventManager* Engine::sEventManager()
         {
-                valid(_event, "EventManager");
+                valid(_event, (char*)"EventManager");
                 return _event;
         }
@@ -116 +116 @@
          ScriptEngine* Engine::sScriptEngine()
         {
-                valid(_script, "ScriptEngine");
+                valid(_script, (char*)"ScriptEngine");
                 return _script;
         }
@@ -123 +123 @@
         PropertyManager* Engine::sPropertyManager()
         {
-                valid(_propmgr, "PropertyManager");
+                valid(_propmgr, (char*)"PropertyManager");
                 return _propmgr;
         }
@@ -136 +136 @@
                         NR_EXCEPT(OUT_OF_MEMORY, "Log system could not be created. Probably memory is full", "Engine::Engine()");
                 }
-                
+
                 // create property manager
                 _propmgr = (new PropertyManager());
@@ -169 +169 @@
         Engine::~Engine()
         {
+        stopEngine();
+
                 // remove default scripting methods
                 DefaultScriptingFunctions::delMethods();
@@ -186 +188 @@
                 // delete the event system
                 delete _event;
-                
+
                 // remove property manager
                 delete _propmgr;
-                
+
                 // remove profiler
                 delete _profiler;
@@ -208 +210 @@
         {
                 // give log information
-                _logger->log(Log::LOG_ENGINE, "nrEngine stopped");
+                _logger->log(Log::LOG_ENGINE, (char*)"nrEngine stopped");
 
                 // stop kernel tasks
                 _kernel->StopExecution();
-
+        _kernel->OneTick();
         }
         //------------------------------------------------------------------------
@@ -218 +220 @@
         {
                 // give some info about the underlying engine
-                NR_Log(Log::LOG_ENGINE | Log::LOG_CONSOLE | Log::LOG_KERNEL, "nrEngine v%s - %s", convertVersionToString(nrEngineVersion).c_str(), NR_VERSION_NAME);
-                
+                NR_Log(Log::LOG_ENGINE | Log::LOG_CONSOLE | Log::LOG_KERNEL, (char*)"nrEngine v%s - %s", convertVersionToString(nrEngineVersion).c_str(), NR_VERSION_NAME);
+
                 // initialize the clock
                 SharedPtr<TimeSource> timeSource(new TimeSource());
@@ -226 +228 @@
                 _profiler = (new Profiler(timeSource));
                 if (_profiler == NULL)
-                        NR_Log(Log::LOG_ENGINE, Log::LL_ERROR, "Profiler singleton could not be created. Probably memory is full");
+                        NR_Log(Log::LOG_ENGINE, Log::LL_ERROR, (char*)"Profiler singleton could not be created. Probably memory is full");
 
                 // now add the clock into kernel
@@ -236 +238 @@
                 _event = (new EventManager());
                 if (_event == NULL)
-                        NR_Log(Log::LOG_ENGINE, Log::LL_ERROR, "Event manager singleton could not be created. Probably memory is full");
+                        NR_Log(Log::LOG_ENGINE, Log::LL_ERROR, (char*)"Event manager singleton could not be created. Probably memory is full");
 
                 _event->createChannel(NR_DEFAULT_EVENT_CHANNEL);
@@ -244 +246 @@
                 // initialise default scripting methods
                 DefaultScriptingFunctions::addMethods();
-                
+
                 // initialize resource manager singleton
                 _resmgr = (new ResourceManager());
                 if (_resmgr == NULL)
-                        NR_Log(Log::LOG_ENGINE, Log::LL_ERROR, "Resource manager singleton could not be created. Probably memory is full");
+                        NR_Log(Log::LOG_ENGINE, Log::LL_ERROR, (char*)"Resource manager singleton could not be created. Probably memory is full");
 
                 // Add the file reading functionality
                 ResourceLoader fileLoader (new FileStreamLoader());
-                _resmgr->registerLoader("FileStreamLoader", fileLoader);
+                _resmgr->registerLoader((char*)"FileStreamLoader", fileLoader);
 
                 // create an instance of plugin loader and add it to the resource manager
                 ResourceLoader loader ( new PluginLoader() );
-                _resmgr->registerLoader("PluginLoader", loader);
+                _resmgr->registerLoader((char*)"PluginLoader", loader);
 
                 // create simple scripting language instancies
                 ResourceLoader scriptLoader( new ScriptLoader() );
-                _resmgr->registerLoader("ScriptLoader", scriptLoader);
+                _resmgr->registerLoader((char*)"ScriptLoader", scriptLoader);
 
                 return true;
@@ -270 +272 @@
 
                 // log info
-                _logger->log(Log::LOG_ENGINE, "nrEngine started");
+                _logger->log(Log::LOG_ENGINE, (char*)"nrEngine started");
 
                 // start the kernel
@@ -291 +293 @@
                 if (_resmgr == NULL)
                 {
-                        NR_Log(Log::LOG_ENGINE, Log::LL_ERROR, "Engine was not initialized properly");
+                        NR_Log(Log::LOG_ENGINE, Log::LL_ERROR, (char*)"Engine was not initialized properly");
                         return false;
                 }
 
                 // try to load the resource and check for the error code
-                IResourcePtr plg = _resmgr->loadResource(name, "Plugins", path + file, "Plugin");
+                IResourcePtr plg = _resmgr->loadResource(name, (char*)"Plugins", path + file, (char*)"Plugin");
 
                 return true;
         }
 
-        
+
         //------------------------------------------------------------------------
         //Plugin getPlugin(const std::string& name){
 
         //}
-        
+
 }; // end namespace
 

trunk/src/nrEngine/Kernel.cpp

@@ -35 +35 @@
 
         //-------------------------------------------------------------------------
-        Kernel::~Kernel(){
+        Kernel::~Kernel()
+    {
                 StopExecution();
 
@@ -134 +135 @@
                 }
 
-                // Now we yield the running thread, so that our system could still 
+                // Now we yield the running thread, so that our system could still
                 // response
                 IThread::yield();