Changeset 6 for trunk/src/trinitycore

Timestamp:

11/19/08 13:22:12 (17 years ago)

Author:

yumileroy

Message:

[svn] * Added ACE for Linux and Windows (Thanks Derex for Linux part and partial Windows part)
* Updated to 6721 and 676
* Fixed TrinityScript? logo
* Version updated to 0.2.6721.676

Original author: Neo2003
Date: 2008-10-04 06:17:19-05:00

Location:

trunk/src/trinitycore

Files:

• Makefile.am (modified) (2 diffs)
• Master.cpp (modified) (8 diffs)
• TrinityCore.rc (modified) (2 diffs)
• WorldRunnable.cpp (modified) (2 diffs)

trunk/src/trinitycore/Makefile.am

@@ -25 +25 @@
 $(POSTGRE_INCLUDES) \
 -I$(top_srcdir)/dep/include \
+-I$(top_srcdir)/dep/ACE_wrappers \
+-I$(top_builddir)/dep/ACE_wrappers \
 -I$(top_srcdir)/src/shared \
 -I$(top_srcdir)/src/framework \
@@ -50 +52 @@
 $(top_builddir)/dep/src/sockets/libmangossockets.a \
 $(top_builddir)/dep/src/zthread/libZThread.la \
+$(top_builddir)/dep/ACE_wrappers/ace/libACE.la \
 $(top_builddir)/dep/src/g3dlite/libg3dlite.a
 

trunk/src/trinitycore/Master.cpp

@@ -21 +21 @@
 */
 
+#include <ace/OS_NS_signal.h>
+
+#include "WorldSocketMgr.h"
+#include "Common.h"
 #include "Master.h"
-#include "sockets/SocketHandler.h"
-#include "sockets/ListenSocket.h"
 #include "WorldSocket.h"
-#include "WorldSocketMgr.h"
 #include "WorldRunnable.h"
 #include "World.h"
 #include "Log.h"
 #include "Timer.h"
-#include <signal.h>
 #include "Policies/SingletonImp.h"
 #include "SystemConfig.h"
@@ -44 +44 @@
 #include "sockets/Parse.h"
 #include "sockets/Socket.h"
+#include "sockets/SocketHandler.h"
+#include "sockets/ListenSocket.h"
 
 #ifdef WIN32
@@ -80 +82 @@
             //DEBUG_LOG("anti-freeze: time=%u, counters=[%u; %u]",curtime,Master::m_masterLoopCounter,World::m_worldLoopCounter);
 
-            // normal work
-            if(m_loops != Master::m_masterLoopCounter)
-            {
-                m_lastchange = curtime;
-                m_loops = Master::m_masterLoopCounter;
-            }
-            // possible freeze 
-            else if(getMSTimeDiff(m_lastchange,curtime) > _delaytime)
-            {
-                sLog.outError("Main/Sockets Thread hangs, kicking out server!");
-                *((uint32 volatile*)NULL) = 0;                       // bang crash
-            }
+            // There is no Master anymore 
+            // TODO: clear the rest of the code 
+//            // normal work
+//            if(m_loops != Master::m_masterLoopCounter)
+//            {
+//                m_lastchange = curtime;
+//                m_loops = Master::m_masterLoopCounter;
+//            }
+//            // possible freeze 
+//            else if(getMSTimeDiff(m_lastchange,curtime) > _delaytime)
+//            {
+//                sLog.outError("Main/Sockets Thread hangs, kicking out server!");
+//                *((uint32 volatile*)NULL) = 0;                       // bang crash
+//            }
 
             // normal work
@@ -110 +114 @@
 };
 
+class RARunnable : public ZThread::Runnable
+{
+public:
+  uint32 numLoops, loopCounter;
+
+  RARunnable ()
+  {
+    uint32 socketSelecttime = sWorld.getConfig (CONFIG_SOCKET_SELECTTIME);
+    numLoops = (sConfig.GetIntDefault ("MaxPingTime", 30) * (MINUTE * 1000000 / socketSelecttime));
+    loopCounter = 0;
+  }
+
+  void
+  checkping ()
+  {
+    // ping if need
+    if ((++loopCounter) == numLoops)
+      {
+        loopCounter = 0;
+        sLog.outDetail ("Ping MySQL to keep connection alive");
+        delete WorldDatabase.Query ("SELECT 1 FROM command LIMIT 1");
+        delete loginDatabase.Query ("SELECT 1 FROM realmlist LIMIT 1");
+        delete CharacterDatabase.Query ("SELECT 1 FROM bugreport LIMIT 1");
+      }
+  }
+
+  void
+  run (void)
+  {
+    SocketHandler h;
+
+    // Launch the RA listener socket
+    ListenSocket<RASocket> RAListenSocket (h);
+    bool usera = sConfig.GetBoolDefault ("Ra.Enable", false);
+
+    if (usera)
+      {
+        port_t raport = sConfig.GetIntDefault ("Ra.Port", 3443);
+        std::string stringip = sConfig.GetStringDefault ("Ra.IP", "0.0.0.0");
+        ipaddr_t raip;
+        if (!Utility::u2ip (stringip, raip))
+          sLog.outError ("MaNGOS RA can not bind to ip %s", stringip.c_str ());
+        else if (RAListenSocket.Bind (raip, raport))
+          sLog.outError ("MaNGOS RA can not bind to port %d on %s", raport, stringip.c_str ());
+        else
+          {
+            h.Add (&RAListenSocket);
+
+            sLog.outString ("Starting Remote access listner on port %d on %s", raport, stringip.c_str ());
+          }
+      }
+
+    // Socket Selet time is in microseconds , not miliseconds!!
+    uint32 socketSelecttime = sWorld.getConfig (CONFIG_SOCKET_SELECTTIME);
+
+    // if use ra spend time waiting for io, if not use ra ,just sleep
+    if (usera)
+      while (!World::m_stopEvent)
+        {
+          h.Select (0, socketSelecttime);
+          checkping ();
+        }
+    else
+      while (!World::m_stopEvent)
+        {
+          ZThread::Thread::sleep (static_cast<unsigned long> (socketSelecttime / 1000));
+          checkping ();
+        }
+  }
+};
+
 Master::Master()
 {
@@ -155 +230 @@
     sWorld.SetInitialWorldSettings();
 
-    ///- Launch the world listener socket
-    port_t wsport = sWorld.getConfig(CONFIG_PORT_WORLD);
-    std::string bind_ip = sConfig.GetStringDefault("BindIP", "0.0.0.0");
-
-    SocketHandler h;
-    ListenSocket<WorldSocket> worldListenSocket(h);
-    if (worldListenSocket.Bind(bind_ip.c_str(),wsport))
-    {
-        clearOnlineAccounts();
-        sLog.outError("MaNGOS cannot bind to %s:%d",bind_ip.c_str(), wsport);
-        return 1;
-    }
-
-    h.Add(&worldListenSocket);
-
     ///- Catch termination signals
     _HookSignals();
@@ -189 +249 @@
         ZThread::Thread td1(new CliRunnable);
     }
-
-    ///- Launch the RA listener socket
-    ListenSocket<RASocket> RAListenSocket(h);
-    if (sConfig.GetBoolDefault("Ra.Enable", false))
-    {
-        port_t raport = sConfig.GetIntDefault( "Ra.Port", 3443 );
-        std::string stringip = sConfig.GetStringDefault( "Ra.IP", "0.0.0.0" );
-        ipaddr_t raip;
-        if(!Utility::u2ip(stringip, raip))
-            sLog.outError( "MaNGOS RA can not bind to ip %s", stringip.c_str());
-        else if (RAListenSocket.Bind(raip, raport))
-            sLog.outError( "MaNGOS RA can not bind to port %d on %s", raport, stringip.c_str());
-        else
-        {
-            h.Add(&RAListenSocket);
-
-            sLog.outString("Starting Remote access listner on port %d on %s", raport, stringip.c_str());
-        }
-    }
+    
+    ZThread::Thread td2(new RARunnable);
 
     ///- Handle affinity for multiple processors and process priority on Windows
@@ -272 +315 @@
     }
 
-    ///- Wait for termination signal
-    while (!World::m_stopEvent)
-    {
-        ++Master::m_masterLoopCounter;
-#ifdef WIN32
-        if (m_ServiceStatus == 0) World::m_stopEvent = true;
-        while (m_ServiceStatus == 2) Sleep(1000);
-#endif
-        if (realPrevTime > realCurrTime)
-            realPrevTime = 0;
-
-        realCurrTime = getMSTime();
-        sWorldSocketMgr.Update( getMSTimeDiff(realPrevTime,realCurrTime) );
-        realPrevTime = realCurrTime;
-
-        h.Select(0, socketSelecttime);
-
-        // ping if need
-        if( (++loopCounter) == numLoops )
-        {
-            loopCounter = 0;
-            sLog.outDetail("Ping MySQL to keep connection alive");
-            delete WorldDatabase.Query("SELECT 1 FROM command LIMIT 1");
-            delete loginDatabase.Query("SELECT 1 FROM realmlist LIMIT 1");
-            delete CharacterDatabase.Query("SELECT 1 FROM bugreport LIMIT 1");
-        }
-    }
-
+    ///- Launch the world listener socket
+  port_t wsport = sWorld.getConfig (CONFIG_PORT_WORLD);
+  std::string bind_ip = sConfig.GetStringDefault ("BindIP", "0.0.0.0");
+
+  if (sWorldSocketMgr->StartNetwork (wsport, bind_ip.c_str ()) == -1)
+    {
+      sLog.outError ("Failed to start network");
+      World::m_stopEvent = true;
+      // go down and shutdown the server
+    }
+
+    sWorldSocketMgr->Wait ();
+    
     // set server offline
     loginDatabase.PExecute("UPDATE realmlist SET color = 2 WHERE id = '%d'",realmID);
@@ -309 +337 @@
     // since worldrunnable uses them, it will crash if unloaded after master
     t.wait();
-
+    td2.wait ();
+    
     ///- Clean database before leaving
     clearOnlineAccounts();

trunk/src/trinitycore/TrinityCore.rc

@@ -53 +53 @@
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,1,6700,670
- PRODUCTVERSION 0,1,6700,670
+ FILEVERSION 0,2,6721,676
+ PRODUCTVERSION 0,2,6721,676
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
@@ -70 +70 @@
         BEGIN
             VALUE "FileDescription", "TrinityCore"
-            VALUE "FileVersion", "0, 1, 6700, 670"
+            VALUE "FileVersion", "0, 2, 6721, 676"
             VALUE "InternalName", "TrinityCore"
             VALUE "LegalCopyright", "Copyright (C) 2008"
             VALUE "OriginalFilename", "TrinityCore.exe"
             VALUE "ProductName", "TrinityCore"
-            VALUE "ProductVersion", "0, 1, 6700, 670"
+            VALUE "ProductVersion", "0, 2, 6721, 676"
         END
     END

trunk/src/trinitycore/WorldRunnable.cpp

@@ -21 +21 @@
 */
 
+#include "WorldSocketMgr.h"
 #include "Common.h"
 #include "World.h"
@@ -75 +76 @@
     sWorld.KickAll();                                       // save and kick all players
     sWorld.UpdateSessions( 1 );                             // real players unload required UpdateSessions call
+    
+    sWorldSocketMgr->StopNetwork();
 
     MapManager::Instance().UnloadAll();                     // unload all grids (including locked in memory)