支持生成protobuf

Src/CMakeLists.txt

@@ -1,12 +1,28 @@
-project(Cpp)
-cmake_minimum_required(VERSION 2.6)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
-enable_testing()
+SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/Cmake)
+SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
 
-include_directories(Egametang)
-include_directories(ThirdParty)
+PROJECT(Cpp)
+
+OPTION(BUILD_TESTS "Decide if the test suite shall be built or not" ON)
+
+IF(BUILD_TESTS)
+	ENABLE_TESTING()
+ENDIF()
+
+INCLUDE_DIRECTORIES(Egametang)
+INCLUDE_DIRECTORIES(ThirdParty)
+
+FIND_PACKAGE(Protobuf REQUIRED)
+INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIRS})
+LINK_DIRECTORIES(${PROTOBUF_LIBRARIES})
+
+FIND_PACKAGE(PythonLibs REQUIRED)
+INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIRS})
+LINK_DIRECTORIES(${PYTHON_LIBRARIES})
+
+ADD_SUBDIRECTORY(Egametang)
+ADD_SUBDIRECTORY(ThirdParty)
 
-link_directories(/usr/local/lib)
 
-add_subdirectory(Egametang)
-add_subdirectory(ThirdParty)

Src/Egametang/Python/CMakeLists.txt

@@ -1,28 +1,26 @@
-set(PythonSrc 
+SET(PythonSrc 
 	PythonInit.cc 
 	PythonEntry.cc
 )
-add_library(PythonEntry ${PythonSrc})
+ADD_LIBRARY(PythonEntry ${PythonSrc})
 
-include_directories(/usr/include/python2.6)
+ADD_EXECUTABLE(PythonInitTest PythonInitTest.cc)
+ADD_EXECUTABLE(PythonEntryTest PythonEntryTest.cc)
 
-add_executable(PythonInitTest PythonInitTest.cc)
-add_executable(PythonEntryTest PythonEntryTest.cc)
-
-set(Excutes 
+SET(Excutes 
 	PythonInitTest 
 	PythonEntryTest
 )
 
-foreach(Excute ${Excutes})
-	target_link_libraries(${Excute}
+FOREACH(Excute ${Excutes})
+	TARGET_LINK_LIBRARIES(${Excute}
 		PythonEntry
 		boost_python
-		python2.6
-		glog
-		gflags
-		gtest
-		gmock
+		${PYTHON_LIBRARIES}
+		Glog
+		Gflags
+		Gtest
+		Gmock
 	)
-	add_test(${Excute} ${Excute})
-endforeach()
+	ADD_TEST(${Excute} ${Excute})
+ENDFOREACH()

Src/Egametang/Rpc/CMakeLists.txt

@@ -1,5 +1,8 @@
+protobuf_generate_cpp(proto_srcs proto_hdrs RpcProtobufData.proto)
+
 set(RpcSrc 
 	RPCCommunicator.cc
+	${proto_srcs}
 	)
 
 add_library(Rpc ${RpcSrc})
@@ -14,13 +17,13 @@ foreach(Excute ${Excutes})
 	target_link_libraries(${Excute}
 		Rpc
 		Thread
+		${protobuf_library}
 		boost_thread
 		boost_system
-		protobuf
-		glog
-		gflags
-		gtest
-		gmock
+		Glog
+		Gflags
+		Gtest
+		Gmock
 	)
 	add_test(${Excute} ${Excute})
 endforeach()

Src/Egametang/Rpc/RPCCommunicatorTest.cc

@@ -146,13 +146,12 @@ public:
 TEST_F(RPCCommunicatorTest, ClientSendString)
 {
 	ThreadPool thread_pool(2);
-	thread_pool.Start();
 	thread_pool.PushTask(boost::bind(&RPCServerTest::Start, &rpc_server_));
 	thread_pool.PushTask(boost::bind(&RPCClientTest::Start, &rpc_client_));
 	barrier_.Wait();
 	ASSERT_EQ(std::string("send test rpc communicator string"), rpc_server_.recv_string_);
 	ASSERT_EQ(std::string("response test rpc communicator string"), rpc_client_.recv_string_);
-	thread_pool.Stop();
+	thread_pool.Wait();
 	rpc_server_.Stop();
 	rpc_client_.Stop();
 }

Src/Egametang/Rpc/RpcProtobufData.proto

@@ -1,4 +1,4 @@
-package Hainan;
+package Egametang;
 
 enum ResponseType
 {

Src/Egametang/Rpc/RpcServer.cc

@@ -19,8 +19,8 @@ RpcServer::RpcServer(boost::asio::io_service& io_service, int port, ThreadPool&
 	acceptor_.set_option(boost::asio::ip::tcp::acceptor::reuse_address(true));
 	acceptor_.bind(endpoint);
 	acceptor_.listen();
-	RpcSessionPtr new_session(new RpcSession(sessions_));
-	acceptor_.async_accept(new_session->socket(),
+	RpcSessionPtr new_session(new RpcSession(*this));
+	acceptor_.async_accept(new_session->Socket(),
 			boost::bind(&RpcServer::OnAsyncAccept, this,
 					new_session, boost::asio::placeholders::error));
 }
@@ -35,7 +35,7 @@ void RpcServer::OnAsyncAccept(RpcSessionPtr session, const boost::system::error_
 	session->Start();
 	sessions_.insert(session);
 	RpcSessionPtr new_session(new RpcSession(*this));
-	acceptor_.async_accept(new_session->socket(),
+	acceptor_.async_accept(new_session->Socket(),
 			boost::bind(&RpcServer::OnAsyncAccept, this,
 					boost::asio::placeholders::error));
 }
@@ -43,7 +43,7 @@ void RpcServer::OnAsyncAccept(RpcSessionPtr session, const boost::system::error_
 void RpcServer::Callback(RpcSessionPtr session,
 		boost::function<void (RpcSessionPtr, RpcResponsePtr)> handler)
 {
-	session->socket.get_io_service().post(handler);
+	session->Socket().get_io_service().post(handler);
 }
 
 void RpcServer::Stop()
@@ -71,11 +71,6 @@ void RpcServer::RegisterService(ProtobufServicePtr service)
 
 }
 
-void RpcServer::Start()
-{
-	io_service_.run();
-}
-
 void RpcServer::RemoveSession(RpcSessionPtr& session)
 {
 	sessions_.erase(session);

Src/Egametang/Rpc/RpcServer.h

@@ -24,14 +24,12 @@ private:
 public:
 	RpcServer(boost::asio::io_service& io_service, int port, ThreadPool& thread_pool);
 	~RpcServer();
-	void Start();
-	void Stop();
 
-	boost::asio::io_service& IOService();
 	void RunService(RpcSessionPtr session, RpcRequestPtr request,
 			boost::function<void (RpcSessionPtr, RpcResponsePtr)> handler);
 	void RegisterService(ProtobufServicePtr service);
 	void RemoveSession(RpcSessionPtr& session);
+	void Stop();
 };
 
 } // namespace Egametang

Src/Egametang/Thread/CMakeLists.txt

@@ -16,10 +16,10 @@ foreach(Excute ${Excutes})
 	target_link_libraries(${Excute}
 		Thread
 		boost_thread
-		glog
-		gflags
-		gtest
-		gmock
+		Glog
+		Gflags
+		Gtest
+		Gmock
 	)
 	add_test(${Excute} ${Excute})
 endforeach()

Src/Egametang/Thread/CountBarrierTest.cc

@@ -44,7 +44,6 @@ TEST_F(CountBarrierTest, WaitAndSignal)
 {
 	CountBarrier barrier(10);
 	ThreadPool pool(10);
-	pool.Start();
 	for (int i = 0; i < 10; ++i)
 	{
 		pool.PushTask(
@@ -54,7 +53,7 @@ TEST_F(CountBarrierTest, WaitAndSignal)
 	ASSERT_EQ(0, this->count_);
 	barrier.Wait();
 	ASSERT_EQ(10, this->count_);
-	pool.Stop();
+	pool.Wait();
 }
 
 } // namespace Egametang

Src/Egametang/Thread/ThreadPool.cc

@@ -4,21 +4,12 @@
 namespace Egametang {
 
 ThreadPool::ThreadPool(int num) :
-	thread_num_(num), running_(false), work_num_(0)
+	thread_num_(num), running_(true), work_num_(0)
 {
 	if (num == 0)
 	{
 		thread_num_ = boost::thread::hardware_concurrency();
 	}
-}
-
-ThreadPool::~ThreadPool()
-{
-}
-
-void ThreadPool::Start()
-{
-	running_ = true;
 	for (int i = 0; i < thread_num_; ++i)
 	{
 		ThreadPtr t(new boost::thread(
@@ -29,46 +20,39 @@ void ThreadPool::Start()
 	}
 }
 
-void ThreadPool::Stop()
+ThreadPool::~ThreadPool()
+{
+}
+
+void ThreadPool::Wait()
 {
-	VLOG(3)<< "Stop";
 	boost::mutex::scoped_lock lock(mutex_);
 	running_ = false;
 	cond_.notify_all();
 	while (work_num_ > 0)
 	{
-		VLOG(3) << "done tasks size = " << tasks_.size();
 		done_.wait(lock);
 	}
 }
 
 void ThreadPool::Runner()
 {
-	VLOG(3) << "thread start";
 	bool continued = true;
 	while (continued)
 	{
 		boost::function<void (void)> task;
 		{
-			VLOG(3) << "loop lock";
 			boost::mutex::scoped_lock lock(mutex_);
-			VLOG(3) << "loop lock ok";
 			while (running_ && tasks_.empty())
 			{
 				cond_.wait(lock);
-				VLOG(3) << "cond";
 			}
 			if (!tasks_.empty())
 			{
-				VLOG(3) << "fetch task";
 				task = tasks_.front();
 				tasks_.pop_front();
 			}
 			continued = running_ || !tasks_.empty();
-			VLOG(3) << "continued = " << continued
-					<< " running = " << running_
-					<< " tasks size = " << tasks_.size();
-			VLOG(3) << "loop unlock";
 		}
 
 		if (task)
@@ -78,14 +62,12 @@ void ThreadPool::Runner()
 	}
 	if (--work_num_ == 0)
 	{
-		VLOG(3) << "work_num = " << work_num_;
 		done_.notify_one();
 	}
 }
 
 bool ThreadPool::PushTask(boost::function<void (void)> task)
 {
-	VLOG(3) << "push task";
 	{
 		boost::mutex::scoped_lock lock(mutex_);
 		if (!running_)
@@ -94,7 +76,6 @@ bool ThreadPool::PushTask(boost::function<void (void)> task)
 		}
 		tasks_.push_back(task);
 	}
-	VLOG(3) << "push task unlock";
 	cond_.notify_one();
 	return true;
 }

Src/Egametang/Thread/ThreadPool.h

@@ -1,11 +1,12 @@
-#ifndef THREAD_THREAD_POOL_H
-#define THREAD_THREAD_POOL_H
+#ifndef THREAD_THREADPOOL_H
+#define THREAD_THREADPOOL_H
 
 #include <list>
 #include <boost/thread.hpp>
 #include <boost/function.hpp>
 #include <boost/detail/atomic_count.hpp>
 #include "Thread/ThreadTypedef.h"
+#include "Base/Marcos.h"
 
 namespace Egametang {
 
@@ -26,10 +27,9 @@ public:
 	ThreadPool(int num = 0);
 	~ThreadPool();
 
-	virtual void Start();
-	virtual void Stop();
+	virtual void Wait();
 	virtual bool PushTask(boost::function<void (void)> task);
 };
 
 } // namespace Egametang
-#endif // THREAD_THREAD_POOL_H
+#endif // THREAD_THREADPOOL_H

Src/Egametang/Thread/ThreadPoolTest.cc

@@ -23,7 +23,6 @@ public:
 
 TEST_F(ThreadPoolTest, Test1)
 {
-	pool_.Start();
 	std::vector<int> x(100, 8);
 	std::vector<int> y(100, 9);
 	std::vector<int> z(100, 0);
@@ -33,7 +32,7 @@ TEST_F(ThreadPoolTest, Test1)
 				boost::bind(&ThreadPoolTest::Max,
 						this, x[i], y[i], &z[i]));
 	}
-	pool_.Stop();
+	pool_.Wait();
 	for (int i = 0; i < 100; ++i)
 	{
 		ASSERT_EQ(9, z[i]) << "i = " << i;

Src/ThirdParty/gflags/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(GFlags 
+set(Gflags 
 	src/gflags_completions.cc
 	src/gflags_nc.cc
 	src/gflags_reporting.cc
@@ -7,4 +7,4 @@ set(GFlags
 
 include_directories(./src)
 
-add_library(gflags ${GFlags})
+add_library(Gflags ${Gflags})

Src/ThirdParty/glog/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(GLog
+set(Glog
 	src/demangle.cc
 	src/logging.cc
 	src/raw_logging.cc
@@ -10,4 +10,4 @@ set(GLog
 
 include_directories(./src)
 
-add_library(glog ${GLog})
+add_library(Glog ${Glog})

Src/ThirdParty/gmock/CMakeLists.txt

@@ -1,5 +1,5 @@
-set(GMock src/gmock-all.cc)
+set(Gmock src/gmock-all.cc)
 
 include_directories(.)
 
-add_library(gmock ${GMock})
+add_library(Gmock ${Gmock})

Src/ThirdParty/gtest/CMakeLists.txt

@@ -1,5 +1,5 @@
-set(GTest src/gtest-all.cc)
+set(Gtest src/gtest-all.cc)
 
 include_directories(.)
 
-add_library(gtest ${GTest})
+add_library(Gtest ${Gtest})