diff options
Diffstat (limited to 'src/game/WorldSocketMgr.cpp')
| -rw-r--r-- | src/game/WorldSocketMgr.cpp | 80 |
1 files changed, 0 insertions, 80 deletions
diff --git a/src/game/WorldSocketMgr.cpp b/src/game/WorldSocketMgr.cpp index cc08962efa5..9b7f50bfc57 100644 --- a/src/game/WorldSocketMgr.cpp +++ b/src/game/WorldSocketMgr.cpp @@ -17,14 +17,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - /** \file WorldSocketMgr.cpp * \ingroup u2w * \author Derex <derex101@gmail.com> */ - #include "WorldSocketMgr.h" - #include <ace/ACE.h> #include <ace/Log_Msg.h> #include <ace/Reactor.h> @@ -37,15 +34,12 @@ #include <ace/os_include/netinet/os_tcp.h> #include <ace/os_include/sys/os_types.h> #include <ace/os_include/sys/os_socket.h> - #include <set> - #include "Log.h" #include "Common.h" #include "Config/ConfigEnv.h" #include "Database/DatabaseEnv.h" #include "WorldSocket.h" - /** * This is a helper class to WorldSocketMgr ,that manages * network threads, and assigning connections from acceptor thread @@ -54,90 +48,66 @@ class ReactorRunnable : protected ACE_Task_Base { public: - ReactorRunnable () : m_ThreadId (-1), m_Connections (0), m_Reactor (0) { ACE_Reactor_Impl* imp = 0; - #if defined (ACE_HAS_EVENT_POLL) || defined (ACE_HAS_DEV_POLL) - imp = new ACE_Dev_Poll_Reactor (); - imp->max_notify_iterations (128); imp->restart (1); - #else - imp = new ACE_TP_Reactor (); imp->max_notify_iterations (128); - #endif - m_Reactor = new ACE_Reactor (imp, 1); } - virtual ~ReactorRunnable () { Stop (); Wait (); - if (m_Reactor) delete m_Reactor; } - void Stop () { m_Reactor->end_reactor_event_loop (); } - int Start () { if (m_ThreadId != -1) return -1; - return (m_ThreadId = activate ()); } - void Wait () { ACE_Task_Base::wait (); } - long Connections () { return static_cast<long> (m_Connections.value ()); } - int AddSocket (WorldSocket* sock) { ACE_GUARD_RETURN (ACE_Thread_Mutex, Guard, m_NewSockets_Lock, -1); - ++m_Connections; sock->AddReference(); sock->reactor (m_Reactor); m_NewSockets.insert (sock); - return 0; } - ACE_Reactor* GetReactor () { return m_Reactor; } - protected: - void AddNewSockets () { ACE_GUARD (ACE_Thread_Mutex, Guard, m_NewSockets_Lock); - if (m_NewSockets.empty ()) return; - for (SocketSet::const_iterator i = m_NewSockets.begin (); i != m_NewSockets.end (); ++i) { WorldSocket* sock = (*i); - if (sock->IsClosed ()) { sock->RemoveReference (); @@ -146,31 +116,22 @@ class ReactorRunnable : protected ACE_Task_Base else m_Sockets.insert (sock); } - m_NewSockets.clear (); } - virtual int svc () { DEBUG_LOG ("Network Thread Starting"); - WorldDatabase.ThreadStart (); - ACE_ASSERT (m_Reactor); - SocketSet::iterator i, t; - while (!m_Reactor->reactor_event_loop_done ()) { // dont be too smart to move this outside the loop // the run_reactor_event_loop will modify interval ACE_Time_Value interval (0, 10000); - if (m_Reactor->run_reactor_event_loop (interval) == -1) break; - AddNewSockets (); - for (i = m_Sockets.begin (); i != m_Sockets.end ();) { if ((*i)->Update () == -1) @@ -186,28 +147,20 @@ class ReactorRunnable : protected ACE_Task_Base ++i; } } - WorldDatabase.ThreadEnd (); - DEBUG_LOG ("Network Thread Exitting"); - return 0; } - private: typedef ACE_Atomic_Op<ACE_SYNCH_MUTEX, long> AtomicInt; typedef std::set<WorldSocket*> SocketSet; - ACE_Reactor* m_Reactor; AtomicInt m_Connections; int m_ThreadId; - SocketSet m_Sockets; - SocketSet m_NewSockets; ACE_Thread_Mutex m_NewSockets_Lock; }; - WorldSocketMgr::WorldSocketMgr () : m_NetThreadsCount (0), m_NetThreads (0), @@ -217,95 +170,71 @@ WorldSocketMgr::WorldSocketMgr () : m_Acceptor (0) { } - WorldSocketMgr::~WorldSocketMgr () { if (m_NetThreads) delete [] m_NetThreads; - if(m_Acceptor) delete m_Acceptor; } - int WorldSocketMgr::StartReactiveIO (ACE_UINT16 port, const char* address) { m_UseNoDelay = sConfig.GetBoolDefault ("Network.TcpNodelay", true); - int num_threads = sConfig.GetIntDefault ("Network.Threads", 1); - if (num_threads <= 0) { sLog.outError ("Network.Threads is wrong in your config file"); return -1; } - m_NetThreadsCount = static_cast<size_t> (num_threads + 1); - m_NetThreads = new ReactorRunnable[m_NetThreadsCount]; - sLog.outBasic ("Max allowed socket connections %d",ACE::max_handles ()); - // -1 means use default m_SockOutKBuff = sConfig.GetIntDefault ("Network.OutKBuff", -1); - m_SockOutUBuff = sConfig.GetIntDefault ("Network.OutUBuff", 65536); - if ( m_SockOutUBuff <= 0 ) { sLog.outError ("Network.OutUBuff is wrong in your config file"); return -1; } - WorldSocket::Acceptor *acc = new WorldSocket::Acceptor; m_Acceptor = acc; - ACE_INET_Addr listen_addr (port, address); - if (acc->open (listen_addr, m_NetThreads[0].GetReactor (), ACE_NONBLOCK) == -1) { sLog.outError ("Failed to open acceptor ,check if the port is free"); return -1; } - for (size_t i = 0; i < m_NetThreadsCount; ++i) m_NetThreads[i].Start (); - return 0; } - int WorldSocketMgr::StartNetwork (ACE_UINT16 port, const char* address) { if (!sLog.IsOutDebug ()) ACE_Log_Msg::instance ()->priority_mask (LM_ERROR, ACE_Log_Msg::PROCESS); - if (StartReactiveIO (port, address) == -1) return -1; - return 0; } - void WorldSocketMgr::StopNetwork () { if (m_Acceptor) { WorldSocket::Acceptor* acc = dynamic_cast<WorldSocket::Acceptor*> (m_Acceptor); - if (acc) acc->close (); } - if (m_NetThreadsCount != 0) { for (size_t i = 0; i < m_NetThreadsCount; ++i) m_NetThreads[i].Stop (); } - Wait (); } - void WorldSocketMgr::Wait () { @@ -315,7 +244,6 @@ WorldSocketMgr::Wait () m_NetThreads[i].Wait (); } } - int WorldSocketMgr::OnSocketOpen (WorldSocket* sock) { @@ -331,9 +259,7 @@ WorldSocketMgr::OnSocketOpen (WorldSocket* sock) return -1; } } - static const int ndoption = 1; - // Set TCP_NODELAY. if (m_UseNoDelay) { @@ -346,21 +272,15 @@ WorldSocketMgr::OnSocketOpen (WorldSocket* sock) return -1; } } - sock->m_OutBufferSize = static_cast<size_t> (m_SockOutUBuff); - // we skip the Acceptor Thread size_t min = 1; - ACE_ASSERT (m_NetThreadsCount >= 1); - for (size_t i = 1; i < m_NetThreadsCount; ++i) if (m_NetThreads[i].Connections () < m_NetThreads[min].Connections ()) min = i; - return m_NetThreads[min].AddSocket (sock); } - WorldSocketMgr* WorldSocketMgr::Instance () { |