aboutsummaryrefslogtreecommitdiff
path: root/src/trinitycore
diff options
context:
space:
mode:
Diffstat (limited to 'src/trinitycore')
-rw-r--r--src/trinitycore/Makefile.am3
-rw-r--r--src/trinitycore/Master.cpp181
-rw-r--r--src/trinitycore/TrinityCore.rc8
-rw-r--r--src/trinitycore/WorldRunnable.cpp3
4 files changed, 115 insertions, 80 deletions
diff --git a/src/trinitycore/Makefile.am b/src/trinitycore/Makefile.am
index 624bfb93c37..6f74bd1c658 100644
--- a/src/trinitycore/Makefile.am
+++ b/src/trinitycore/Makefile.am
@@ -24,6 +24,8 @@ trinity_core_CPPFLAGS = \
$(MYSQL_INCLUDES) \
$(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 \
-I$(top_srcdir)/src/game \
@@ -49,6 +51,7 @@ $(top_builddir)/src/shared/vmap/libvmaps.a \
$(top_builddir)/src/framework/libmangosframework.a \
$(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
if USE_TSCRIPTS
diff --git a/src/trinitycore/Master.cpp b/src/trinitycore/Master.cpp
index cf094bbd048..de4b2c3e14f 100644
--- a/src/trinitycore/Master.cpp
+++ b/src/trinitycore/Master.cpp
@@ -20,16 +20,16 @@
\ingroup mangosd
*/
+#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"
#include "Config/ConfigEnv.h"
@@ -43,6 +43,8 @@
#include "sockets/Utility.h"
#include "sockets/Parse.h"
#include "sockets/Socket.h"
+#include "sockets/SocketHandler.h"
+#include "sockets/ListenSocket.h"
#ifdef WIN32
#include "ServiceWin32.h"
@@ -79,18 +81,20 @@ public:
uint32 curtime = getMSTime();
//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
if(w_loops != World::m_worldLoopCounter)
@@ -109,6 +113,77 @@ public:
}
};
+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()
{
}
@@ -154,21 +229,6 @@ int Master::Run()
///- Initialize the World
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();
@@ -188,25 +248,8 @@ int Master::Run()
///- Launch CliRunnable thread
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
#ifdef WIN32
@@ -271,34 +314,19 @@ int Master::Run()
t.setPriority(ZThread::High);
}
- ///- 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);
+ ///- Launch the world listener socket
+ port_t wsport = sWorld.getConfig (CONFIG_PORT_WORLD);
+ std::string bind_ip = sConfig.GetStringDefault ("BindIP", "0.0.0.0");
- // 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");
- }
+ 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);
@@ -308,7 +336,8 @@ int Master::Run()
// when the main thread closes the singletons get unloaded
// since worldrunnable uses them, it will crash if unloaded after master
t.wait();
-
+ td2.wait ();
+
///- Clean database before leaving
clearOnlineAccounts();
diff --git a/src/trinitycore/TrinityCore.rc b/src/trinitycore/TrinityCore.rc
index 7e00bb16d8b..4b121534c49 100644
--- a/src/trinitycore/TrinityCore.rc
+++ b/src/trinitycore/TrinityCore.rc
@@ -52,8 +52,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_SYS_DEFAULT
//
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
FILEFLAGS 0x1L
@@ -69,12 +69,12 @@ BEGIN
BLOCK "080004b0"
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
BLOCK "VarFileInfo"
diff --git a/src/trinitycore/WorldRunnable.cpp b/src/trinitycore/WorldRunnable.cpp
index 6dae1575ac2..35d643727c6 100644
--- a/src/trinitycore/WorldRunnable.cpp
+++ b/src/trinitycore/WorldRunnable.cpp
@@ -20,6 +20,7 @@
\ingroup mangosd
*/
+#include "WorldSocketMgr.h"
#include "Common.h"
#include "World.h"
#include "WorldRunnable.h"
@@ -74,6 +75,8 @@ void WorldRunnable::run()
sWorld.KickAllQueued(); // kick all queued players (and prevent its login at kick in game players)
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)