Move generic thread logic into shared Thread class

Author: twostars

Server/AIServer/SendThreadMain.cpp

@@ -6,104 +6,91 @@
 #include <spdlog/spdlog.h>
 
 SendThreadMain::SendThreadMain(CIOCPort* iocPort)
-	: _iocPort(iocPort), _running(false)
+	: _iocPort(iocPort), _aiSocketCount(0)
 {
 }
 
-void SendThreadMain::start()
+bool SendThreadMain::shutdown()
 {
-	if (_running)
-		return;
+	if (!Thread::shutdown())
+		return false;
 
-	_running = true;
-	_workerThread = std::thread(&SendThreadMain::run, this);
-}
-
-void SendThreadMain::shutdown()
-{
-	if (!_running)
-		return;
-
-	{
-		std::lock_guard<std::mutex> lock(_queueMutex);
-		_running = false;
-		_cv.notify_one();
-	}
-
-	_workerThread.join();
+	clear();
+	return true;
 }
 
 void SendThreadMain::queue(_SEND_DATA* sendData)
 {
-	std::lock_guard<std::mutex> lock(_queueMutex);
+	std::lock_guard<std::mutex> lock(_mutex);
 	_sendDataQueue.push(sendData);
 	_cv.notify_one();
 }
 
-SendThreadMain::~SendThreadMain()
-{
-	shutdown();
-	clear();
-}
-
-void SendThreadMain::run()
+void SendThreadMain::thread_loop()
 {
 	while (_running)
 	{
-		std::unique_lock<std::mutex> lock(_queueMutex);
+		std::unique_lock<std::mutex> lock(_mutex);
 		_cv.wait(lock);
 
 		if (!_running)
 			break;
 
-		int nRet = 0;
-		CGameSocket* pSocket = nullptr;
-		int size = 0, index = 0;
+		tick();
+	}
+}
 
-		while (!_sendDataQueue.empty())
+void SendThreadMain::tick()
+{
+	while (!_sendDataQueue.empty())
+	{
+		_SEND_DATA* pSendData = _sendDataQueue.front();
+
+		int count = -1;
+		for (int i = 0; i < MAX_SOCKET; i++)
 		{
-			_SEND_DATA* pSendData = _sendDataQueue.front();
+			CGameSocket* pSocket = (CGameSocket*) _iocPort->m_SockArray[i];
+			if (pSocket == nullptr)
+				continue;
 
-			int count = -1;
-			for (int i = 0; i < MAX_SOCKET; i++)
+			count++;
+
+			if (_aiSocketCount == count)
 			{
-				CGameSocket* pSocket = (CGameSocket*) _iocPort->m_SockArray[i];
-				if (pSocket == nullptr)
+				int size = pSocket->Send(pSendData->pBuf, pSendData->sLength);
+				if (size <= 0)
+				{
+					spdlog::error("SendThreadMain::tick: send failed: size={} socket_num={}",
+						size, count);
+					count--;
 					continue;
+				}
 
-				count++;
+				if (++_aiSocketCount >= MAX_AI_SOCKET)
+					_aiSocketCount = 0;
 
-				if (_aiSocketCount == count)
-				{
-					size = pSocket->Send(pSendData->pBuf, pSendData->sLength);
-					if (size <= 0)
-					{
-						spdlog::error("SendThreadMain::run: send failed: size={} socket_num={}",
-							size, count);
-						count--;
-						continue;
-					}
-
-					if (++_aiSocketCount >= MAX_AI_SOCKET)
-						_aiSocketCount = 0;
-
-					//TRACE(_T("SendThreadMain - Send : size=%d, socket_num=%d\n"), size, count);
-					break;
-				}
+				//TRACE(_T("SendThreadMain - Send : size=%d, socket_num=%d\n"), size, count);
+				break;
 			}
-
-			delete pSendData;
-			_sendDataQueue.pop();
 		}
+
+		delete pSendData;
+		_sendDataQueue.pop();
 	}
 }
 
 void SendThreadMain::clear()
 {
-	std::lock_guard<std::mutex> lock(_queueMutex);
+	std::lock_guard<std::mutex> lock(_mutex);
 	while (!_sendDataQueue.empty());
 	{
 		delete _sendDataQueue.front();
 		_sendDataQueue.pop();
 	}
 }
+
+SendThreadMain::~SendThreadMain()
+{
+	shutdown();
+	clear();
+}

Server/AIServer/SendThreadMain.h

@@ -1,31 +1,26 @@
 #pragma once
 
-#include <condition_variable>
-#include <mutex>
+#include <shared/Thread.h>
+
 #include <queue>
-#include <thread>
 
 class CIOCPort;
 struct _SEND_DATA;
-class SendThreadMain
+class SendThreadMain : public Thread
 {
 public:
 	SendThreadMain(CIOCPort* iocPort);
-	void start();
-	void shutdown();
+	bool shutdown() override;
 	void queue(_SEND_DATA* sendData);
-	~SendThreadMain();
+	~SendThreadMain() override;
 
 protected:
-	void run();
+	void thread_loop() override;
+	void tick() override;
 	void clear();
 
 protected:
 	CIOCPort* _iocPort;
 	std::queue<_SEND_DATA*>	_sendDataQueue;
-	std::mutex _queueMutex;
-	std::condition_variable _cv;
-	std::thread _workerThread;
-	bool _running;
 	int _aiSocketCount;
 };

Server/shared/Thread.cpp

@@ -0,0 +1,38 @@
+#include "stdafx.h"
+#include "Thread.h"
+
+Thread::Thread()
+{
+	_running = false;
+}
+
+void Thread::start()
+{
+	if (_running)
+		return;
+
+	_running = true;
+	_thread = std::thread(&Thread::thread_loop, this);
+}
+
+bool Thread::shutdown()
+{
+	if (!_running)
+		return false;
+
+	{
+		std::lock_guard<std::mutex> lock(_mutex);
+		_running = false;
+		_cv.notify_one();
+	}
+
+	if (_thread.joinable())
+		_thread.join();
+
+	return true;
+}
+
+Thread::~Thread()
+{
+	shutdown();
+}

Server/shared/Thread.h

@@ -0,0 +1,29 @@
+#pragma once
+
+#include <condition_variable>
+#include <mutex>
+#include <thread>
+
+class Thread
+{
+public:
+	bool IsRunning() const
+	{
+		return _running;
+	}
+
+	Thread();
+	virtual void start();
+	virtual bool shutdown();
+	virtual ~Thread();
+
+protected:
+	virtual void thread_loop() = 0;
+	virtual void tick() = 0;
+
+protected:
+	std::mutex				_mutex;
+	std::condition_variable	_cv;
+	std::thread				_thread;
+	bool					_running;
+};

Server/shared/shared.vcxproj

@@ -153,6 +153,7 @@
     </ClCompile>
     <ClCompile Include="StringConversion.cpp" />
     <ClCompile Include="StringUtils.cpp" />
+    <ClCompile Include="Thread.cpp" />
     <ClCompile Include="TimeThread.cpp" />
     <ClCompile Include="logger.cpp" />
   </ItemGroup>
@@ -172,6 +173,7 @@
     <ClInclude Include="STLMap.h" />
     <ClInclude Include="StringConversion.h" />
     <ClInclude Include="StringUtils.h" />
+    <ClInclude Include="Thread.h" />
     <ClInclude Include="TimeThread.h" />
     <ClInclude Include="types.h" />
     <ClInclude Include="version.h" />

Server/shared/shared.vcxproj.filters

@@ -51,6 +51,9 @@
     <ClCompile Include="logger.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="Thread.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="ByteBuffer.h">
@@ -110,5 +113,8 @@
     <ClInclude Include="server_config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Thread.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>