Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 10:56:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replaced all remaining ACE based Singletons

Browse Source 
Replaced ACE base AutoPtr class with shared_ptr
Note: worldserver currently broken due to MapUpdater threading failure (ACE ofc, what else could it be)
This commit is contained in:
leak
2014-07-01 00:54:09 +02:00
parent d39a013b6b
commit 029bad6698
61 changed files with 347 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/server/worldserver/Master.cpp
View File

@@ -22,8 +22,6 @@
#include <thread>
#include <ace/Sig_Handler.h>
#include "Common.h"
#include "SystemConfig.h"
#include "SignalHandler.h"
@@ -46,6 +44,7 @@
#include "BigNumber.h"
#include "OpenSSLCrypto.h"
#include <boost/asio.hpp>
#ifdef _WIN32
#include "ServiceWin32.h"
@@ -58,27 +57,22 @@ extern int m_ServiceStatus;
#define PROCESS_HIGH_PRIORITY -15 // [-20, 19], default is 0
#endif
/// Handle worldservers's termination signals
class WorldServerSignalHandler : public Trinity::SignalHandler
boost::asio::io_service _ioService;
void SignalHandler(const boost::system::error_code& error, int signalNumber)
{
public:
virtual void HandleSignal(int sigNum)
if (!error)
{
switch (signalNumber)
{
switch (sigNum)
{
case SIGINT:
World::StopNow(RESTART_EXIT_CODE);
break;
case SIGTERM:
#ifdef _WIN32
case SIGBREAK:
if (m_ServiceStatus != 1)
#endif
World::StopNow(SHUTDOWN_EXIT_CODE);
break;
}
case SIGINT:
case SIGTERM:
_ioService.stop();
break;
}
};
}
}
void FreezeDetectorThread(uint32 delayTime)
{
@@ -153,23 +147,12 @@ int Master::Run()
///- Initialize the World
sWorld->SetInitialWorldSettings();
///- Initialize the signal handlers
WorldServerSignalHandler signalINT, signalTERM;
#ifdef _WIN32
WorldServerSignalHandler signalBREAK;
#endif /* _WIN32 */
///- Register worldserver's signal handlers
ACE_Sig_Handler handle;
handle.register_handler(SIGINT, &signalINT);
handle.register_handler(SIGTERM, &signalTERM);
#ifdef _WIN32
handle.register_handler(SIGBREAK, &signalBREAK);
#endif
// Set signal handlers
boost::asio::signal_set signals(_ioService, SIGINT, SIGTERM);
signals.async_wait(SignalHandler);
///- Launch WorldRunnable thread
std::thread worldThread(WorldThread);
std::thread worldThread(WorldThread, std::ref(_ioService));
std::thread* cliThread = nullptr;
@@ -286,6 +269,8 @@ int Master::Run()
TC_LOG_INFO("server.worldserver", "%s (worldserver-daemon) ready...", _FULLVERSION);
_ioService.run();
// when the main thread closes the singletons get unloaded
// since worldrunnable uses them, it will crash if unloaded after master
worldThread.join();