Changeset 279 for trunk/src/trinitycore

Timestamp:

11/22/08 00:36:22 (17 years ago)

Author:

yumileroy

Message:

Merged commit 269 (5f0e38da128a).

Original author: gvcoman
Date: 2008-11-21 14:34:05-05:00

Location:

trunk/src/trinitycore

Files:

• CliRunnable.cpp (modified) (3 diffs)
• Master.cpp (modified) (7 diffs)
• WorldRunnable.cpp (modified) (1 diff)

trunk/src/trinitycore/CliRunnable.cpp

@@ -170 +170 @@
 {
     SendSysMessage(LANG_COMMAND_EXIT);
-    World::m_stopEvent = true;
+    World::StopNow(SHUTDOWN_EXIT_CODE);
     return true;
 }
@@ -311 +311 @@
 
     ///- As long as the World is running (no World::m_stopEvent), get the command line and handle it
-    while (!World::m_stopEvent)
+    while (!World::IsStopped())
     {
         fflush(stdout);
         #ifdef linux
-        while (!kb_hit_return() && !World::m_stopEvent)
+        while (!kb_hit_return() && !World::IsStopped())
             // With this, we limit CLI to 10commands/second
             usleep(100);
-        if (World::m_stopEvent)
+        if (World::IsStopped())
             break;
         #endif
@@ -349 +349 @@
         else if (feof(stdin))
         {
-            World::m_stopEvent = true;
+            World::StopNow(SHUTDOWN_EXIT_CODE);
         }
     }

trunk/src/trinitycore/Master.cpp

@@ -78 +78 @@
         m_lastchange = 0;
         w_lastchange = 0;
-        while(!World::m_stopEvent)
+        while(!World::IsStopped())
         {
             ZThread::Thread::sleep(1000);
@@ -173 +173 @@
     // if use ra spend time waiting for io, if not use ra ,just sleep
     if (usera)
-      while (!World::m_stopEvent)
+      while (!World::IsStopped())
         {
           h.Select (0, socketSelecttime);
@@ -179 +179 @@
         }
     else
-      while (!World::m_stopEvent)
+      while (!World::IsStopped())
         {
           ZThread::Thread::sleep (static_cast<unsigned long> (socketSelecttime / 1000));
@@ -324 +324 @@
     {
       sLog.outError ("Failed to start network");
-      World::m_stopEvent = true;
+      World::StopNow(ERROR_EXIT_CODE);
       // go down and shutdown the server
     }
@@ -395 +395 @@
     UnloadScriptingModule();
 
-    return sWorld.GetShutdownMask() & SHUTDOWN_MASK_RESTART ? 2 : 0;
+    // Exit the process with specified return value
+    return World::GetExitCode();
 }
 
@@ -478 +479 @@
 
 /// Handle termination signals
-/** Put the World::m_stopEvent to 'true' if a termination signal is caught **/
 void Master::_OnSignal(int s)
 {
@@ -484 +484 @@
     {
         case SIGINT:
+            World::StopNow(RESTART_EXIT_CODE);
+            break;
         case SIGTERM:
         #ifdef _WIN32
         case SIGBREAK:
         #endif
-            World::m_stopEvent = true;
+            World::StopNow(SHUTDOWN_EXIT_CODE);
             break;
     }

trunk/src/trinitycore/WorldRunnable.cpp

@@ -52 +52 @@
 
     ///- While we have not World::m_stopEvent, update the world
-    while (!World::m_stopEvent)
+    while (!World::IsStopped())
     {
         ++World::m_worldLoopCounter;