From 029bad6698df6ac9556fe308342e616f4a7a8cc7 Mon Sep 17 00:00:00 2001
From: leak <leak@bitmx.net>
Date: Tue, 1 Jul 2014 00:54:09 +0200
Subject: Replaced all remaining ACE based Singletons

Replaced ACE base AutoPtr class with shared_ptr
Note: worldserver currently broken due to MapUpdater threading failure (ACE ofc, what else could it be)
---
 src/server/worldserver/Master.cpp                  | 55 ++++++++--------------
 src/server/worldserver/Master.h                    |  8 +++-
 .../worldserver/WorldThread/WorldRunnable.cpp      |  4 +-
 src/server/worldserver/WorldThread/WorldRunnable.h |  4 +-
 4 files changed, 33 insertions(+), 38 deletions(-)

(limited to 'src/server/worldserver')

diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp
index 2a8fcdd431a..41060e37b38 100644
--- a/src/server/worldserver/Master.cpp
+++ b/src/server/worldserver/Master.cpp
@@ -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();
diff --git a/src/server/worldserver/Master.h b/src/server/worldserver/Master.h
index 9ee94a44acb..d2a51b85f4b 100644
--- a/src/server/worldserver/Master.h
+++ b/src/server/worldserver/Master.h
@@ -29,6 +29,12 @@
 class Master
 {
     public:
+        static Master* instance()
+        {
+            static Master* instance = new Master();
+            return instance;
+        }
+
         int Run();
 
     private:
@@ -38,7 +44,7 @@ class Master
         void ClearOnlineAccounts();
 };
 
-#define sMaster ACE_Singleton<Master, ACE_Null_Mutex>::instance()
+#define sMaster Master::instance()
 
 #endif
 
diff --git a/src/server/worldserver/WorldThread/WorldRunnable.cpp b/src/server/worldserver/WorldThread/WorldRunnable.cpp
index 7722492b5a8..85c3e7a74b9 100644
--- a/src/server/worldserver/WorldThread/WorldRunnable.cpp
+++ b/src/server/worldserver/WorldThread/WorldRunnable.cpp
@@ -42,7 +42,7 @@ extern int m_ServiceStatus;
 #endif
 
 /// Heartbeat for the World
-void WorldThread()
+void WorldThread(boost::asio::io_service& ioService)
 {
     uint32 realCurrTime = 0;
     uint32 realPrevTime = getMSTime();
@@ -84,6 +84,8 @@ void WorldThread()
         #endif
     }
 
+    ioService.stop();
+
     sScriptMgr->OnShutdown();
 
     sWorld->KickAll();                                       // save and kick all players
diff --git a/src/server/worldserver/WorldThread/WorldRunnable.h b/src/server/worldserver/WorldThread/WorldRunnable.h
index 915bd5b580a..3e2c07b8842 100644
--- a/src/server/worldserver/WorldThread/WorldRunnable.h
+++ b/src/server/worldserver/WorldThread/WorldRunnable.h
@@ -23,7 +23,9 @@
 #ifndef __WORLDRUNNABLE_H
 #define __WORLDRUNNABLE_H
 
-void WorldThread();
+#include <boost/asio.hpp>
+
+void WorldThread(boost::asio::io_service& ioService);
 
 #endif
 
-- 
cgit v1.2.3