removed dependency on boost threads, mutex, and unordered containers,…

… now boost is optional and only used for preprocessor generators
ersintarhan · Sep 11, 2010 · e75b55b · e75b55b
1 parent affc14c
commit e75b55b
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 17 deletions.
diff --git a/Cpp/Source/ProtoBufRemote/RpcClient.h b/Cpp/Source/ProtoBufRemote/RpcClient.h
@@ -2,7 +2,7 @@
 #define PROTOBUFREMOTE_RPCCLIENT_H 1
 
 #include <string>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
 
 namespace ProtoBufRemote {
 
@@ -29,7 +29,7 @@ class RpcClient
 	RpcController* m_controller;
 	int m_nextId;
 
-	typedef boost::unordered_map<int, PendingCall*> PendingCallMap;
+	typedef std::unordered_map<int, PendingCall*> PendingCallMap;
 	PendingCallMap m_pendingCalls;
 };
 

diff --git a/Cpp/Source/ProtoBufRemote/RpcServer.h b/Cpp/Source/ProtoBufRemote/RpcServer.h
@@ -1,7 +1,7 @@
 #ifndef PROTOBUFREMOTE_RPCSERVER_H
 #define PROTOBUFREMOTE_RPCSERVER_H 1
 
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
 #include "ProtoBufRemote/RpcMessage.pb.h"
 
 namespace ProtoBufRemote {
@@ -26,7 +26,7 @@ class RpcServer
 	RpcController* m_controller;
 	RpcMessage m_resultMessage;
 
-	typedef boost::unordered_map<std::string, RpcService*> ServiceMap;
+	typedef std::unordered_map<std::string, RpcService*> ServiceMap;
 	ServiceMap m_services;
 };
 

diff --git a/Cpp/Source/ProtoBufRemote/SocketRpcChannel.cpp b/Cpp/Source/ProtoBufRemote/SocketRpcChannel.cpp
@@ -1,6 +1,10 @@
 
 #include "ProtoBufRemote/SocketRpcChannel.h"
 
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+#include <process.h>
+
 #include "ProtoBufRemote/RpcController.h"
 #include "ProtoBufRemote/RpcMessage.pb.h"
 
@@ -12,24 +16,27 @@ SocketRpcChannel::SocketRpcChannel(RpcController* controller, SOCKET socket)
 {
 	m_sendEvent = WSACreateEvent();
 	m_terminateEvent = WSACreateEvent();
+    InitializeCriticalSection(&m_sendMutex);
 }
 
 SocketRpcChannel::~SocketRpcChannel()
 {
 	CloseAndJoin();
 	WSACloseEvent(m_sendEvent);
 	WSACloseEvent(m_terminateEvent);
+    DeleteCriticalSection(&m_sendMutex);
 }
 
 void SocketRpcChannel::Start()
 {
-	m_thread = boost::thread(&SocketRpcChannel::Run, this);
+    m_thread = reinterpret_cast<HANDLE>(_beginthreadex(NULL, 0, &SocketRpcChannel::ThreadRun, this, 0, NULL));
 }
 
 void SocketRpcChannel::CloseAndJoin()
 {
 	WSASetEvent(m_terminateEvent);
-	m_thread.join();
+    WaitForSingleObject(m_thread, INFINITE);
+    CloseHandle(m_thread);
 }
 
 unsigned int SocketRpcChannel::GetAndClearBytesRead()
@@ -52,9 +59,17 @@ void SocketRpcChannel::Send(const RpcMessage& message)
 	bool isOk = message.SerializeToArray(data.m_data+sizeof(int), messageSize);
 	assert(isOk);
 
-	boost::lock_guard<boost::mutex> lock(m_sendMutex);
+    EnterCriticalSection(&m_sendMutex);
 	m_sendMessages.push(data);
 	WSASetEvent(m_sendEvent);
+    LeaveCriticalSection(&m_sendMutex);
+}
+
+unsigned int _stdcall SocketRpcChannel::ThreadRun(void* arg)
+{
+    SocketRpcChannel* socketRpcChannel = static_cast<SocketRpcChannel*>(arg);
+    socketRpcChannel->Run();
+    return 0;
 }
 
 void SocketRpcChannel::Run()
@@ -86,7 +101,7 @@ void SocketRpcChannel::Run()
 		if (waitResult == 2)
 		{
 			assert(!isSending);
-			boost::lock_guard<boost::mutex> lock(m_sendMutex);
+			EnterCriticalSection(&m_sendMutex);
 			if (!m_sendMessages.empty())
 			{
 				currentSendMessage = m_sendMessages.front();
@@ -95,6 +110,7 @@ void SocketRpcChannel::Run()
 				isSendReady = true; //send immediately
 				sendPos = 0;
 			}
+            LeaveCriticalSection(&m_sendMutex);
 		}
 		else
 		{
@@ -124,7 +140,7 @@ void SocketRpcChannel::Run()
 				{
 					delete[] currentSendMessage.m_data;
 
-					boost::lock_guard<boost::mutex> lock(m_sendMutex);
+					EnterCriticalSection(&m_sendMutex);
 					if (m_sendMessages.empty())
 					{
 						WSAResetEvent(m_sendEvent);
@@ -136,6 +152,7 @@ void SocketRpcChannel::Run()
 						m_sendMessages.pop();
 						sendPos = 0;
 					}
+                    LeaveCriticalSection(&m_sendMutex);
 				}
 			}
 		}

diff --git a/Cpp/Source/ProtoBufRemote/SocketRpcChannel.h b/Cpp/Source/ProtoBufRemote/SocketRpcChannel.h
@@ -3,7 +3,6 @@
 
 #include <winsock2.h>
 #include <queue>
-#include <boost/thread.hpp>
 #include "ProtoBufRemote/RpcChannel.h"
 
 namespace ProtoBufRemote {
@@ -25,14 +24,15 @@ class SocketRpcChannel : RpcChannel
 	unsigned int GetAndClearBytesWritten();
 
 private:
+    static unsigned int _stdcall ThreadRun(void* arg);
 	void Run();
 
 	SOCKET m_socket;
-	boost::thread m_thread;
+	HANDLE m_thread;
 	WSAEVENT m_sendEvent;
 	WSAEVENT m_terminateEvent;
 
-	boost::mutex m_sendMutex;
+	CRITICAL_SECTION m_sendMutex;
 
 	struct QueuedMessageData
 	{

diff --git a/Cpp/Source/ProtoBufRemoteTest/ProtoBufRemoteTest.vcxproj b/Cpp/Source/ProtoBufRemoteTest/ProtoBufRemoteTest.vcxproj
@@ -41,15 +41,15 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <IntDir>obj\$(Configuration)\</IntDir>
-    <LibraryPath>$(GmockDebugLibPath);$(ProtoBufDebugLibPath);$(BoostLibPath);$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(GmockDebugLibPath);$(ProtoBufDebugLibPath);$(LibraryPath)</LibraryPath>
     <IncludePath>$(GtestIncludePath);$(GmockIncludePath);$(ProtoBufIncludePath);$(BoostIncludePath);C:\Program Files\Microsoft DirectX SDK %28February 2010%29\Include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(ProjectDir)obj\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <IntDir>obj\$(Configuration)\</IntDir>
-    <LibraryPath>$(GmockReleaseLibPath);$(ProtoBufReleaseLibPath);$(BoostLibPath);$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(GmockReleaseLibPath);$(ProtoBufReleaseLibPath);$(LibraryPath)</LibraryPath>
     <IncludePath>$(GtestIncludePath);$(GmockIncludePath);$(ProtoBufIncludePath);$(BoostIncludePath);C:\Program Files\Microsoft DirectX SDK %28February 2010%29\Include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

diff --git a/Cpp/Source/ProtoBufRemoteTest/SocketRpcChannelTest.cpp b/Cpp/Source/ProtoBufRemoteTest/SocketRpcChannelTest.cpp
@@ -2,6 +2,7 @@
 #include <gtest/gtest.h>
 
 #include <ws2tcpip.h>
+#include <process.h>
 #include "ProtoBufRemote/RpcController.h"
 #include "ProtoBufRemote/RpcMessage.pb.h"
 #include "ProtoBufRemote/SocketRpcChannel.h"
@@ -15,7 +16,7 @@ namespace {
 	SocketRpcChannel* g_serverChannel;
 }
 
-void ServerThreadRun()
+unsigned int _stdcall ServerThreadRun(void * arg)
 {
 	ADDRINFO hints;
 	ADDRINFO* addrResult;
@@ -39,6 +40,8 @@ void ServerThreadRun()
 
 	freeaddrinfo(addrResult);
 	closesocket(listenSocket);
+
+    return 0;
 }
 
 class DummyRpcController : public RpcController
@@ -79,7 +82,7 @@ TEST(SocketRpcChannelTest, SendReceive)
 	WSADATA wsaData;
 	int result = WSAStartup(MAKEWORD(2,2), &wsaData);
 
-	boost::thread serverThread(ServerThreadRun);
+    HANDLE serverThread = reinterpret_cast<HANDLE>(_beginthreadex(NULL, 0, &ServerThreadRun, NULL, 0, NULL));
 
 	ADDRINFO hints;
 	ADDRINFO* addrResult;
@@ -92,7 +95,8 @@ TEST(SocketRpcChannelTest, SendReceive)
 	SOCKET connectSocket = socket(addrResult->ai_family, addrResult->ai_socktype, addrResult->ai_protocol);
 	result = connect(connectSocket, addrResult->ai_addr, (int)addrResult->ai_addrlen);
 
-	serverThread.join();
+    WaitForSingleObject(serverThread, INFINITE);
+    CloseHandle(serverThread);
 
 	DummyRpcController dummyController;
 	SocketRpcChannel clientChannel(&dummyController, connectSocket);