服务器端代码重构

prudens · Nov 7, 2017 · 6f9446e · 6f9446e
1 parent fe75ce9
commit 6f9446e
Show file tree

Hide file tree

Showing 28 changed files with 1,083 additions and 929 deletions.
diff --git a/base/async_task.h b/base/async_task.h
@@ -120,6 +120,11 @@ namespace audio_engine
 		STask( ThreadPool* thread )
 			:_thread(thread->GetTaskThread())
 		{
+		}
+		STask( TaskThread&thread )
+			:_thread(thread)
+		{
+
 		}
 		template<class F, class... Args>
 		auto AddTask( F&& f, Args&&... args )
@@ -145,12 +150,16 @@ namespace audio_engine
 			_thread.AddTask(std::move(t));
 			return res;
 		}
+		TaskThread& GetTaskThread()
+		{
+			return _thread;
+		}
 		void Stop()
 		{
 			_stop = true;
 		}
 	private:
-	    TaskThread& _thread;
+		TaskThread& _thread;
 		bool _stop = false;
 		std::mutex _mutex;
 	};
@@ -162,6 +171,10 @@ namespace audio_engine
 		{
 			_stask = std::make_shared<STask>(pool);
 		}
+		AsyncTask( TaskThread& thread )
+		{
+			_stask = std::make_shared<STask>(thread);
+		}
 		~AsyncTask()
 		{
 			_stask->Stop();
@@ -173,6 +186,10 @@ namespace audio_engine
 		{
 			return _stask->AddTask(std::forward<F>(f),std::forward<Args>(args)...);
 		}
+		TaskThread& TaskThread()
+		{
+			return _stask->GetTaskThread();
+		}
 	private:
 		std::shared_ptr<STask> _stask;
 	};

diff --git a/base/tcp_socket.cpp b/base/tcp_socket.cpp
@@ -37,8 +37,7 @@ namespace audio_engine
 		virtual std::error_code DisConnect()
 		{
 			std::error_code ec;
-			_socket.shutdown( asio::ip::tcp::socket::shutdown_both, ec );
-			_socket.close( ec );
+			_socket.shutdown( asio::ip::tcp::socket::shutdown_receive, ec );
 			return ec;
 		}
 		virtual void AsyncConnect( std::string ip, int16_t port, ConnectHandle handle )override

diff --git a/outsource/real_audio_server/account_verify.cpp b/outsource/real_audio_server/account_verify.cpp
diff --git a/outsource/real_audio_server/account_verify.h b/outsource/real_audio_server/account_verify.h
diff --git a/outsource/real_audio_server/client_conn_mgr.cpp b/outsource/real_audio_server/client_conn_mgr.cpp
@@ -0,0 +1,93 @@
+#include "client_conn_mgr.h"
+#include "error_code.h"
+#include "server_config.h"
+#include "server_module.h"
+#include "master_control.h"
+#define MIN_SUPPORTED_VERSION "20171105"
+
+namespace audio_engine{
+	ClientConnMgr::ClientConnMgr(MasterControl *ctrl)
+		:_task(ServerModule::GetInstance()->GetThreadPool())
+	{
+		_master_ctrl = ctrl;
+	}
+
+	ClientConnMgr::~ClientConnMgr()
+	{
+
+	}
+
+	void ClientConnMgr::StartListen()
+	{
+		std::string ip;
+		int16_t port;
+		if(ServerModule::GetInstance()->GetServerCnfig()->GetServer( 1, ip, port ))
+		{
+			TcpFactory *f = ServerModule::GetInstance()->GetSocketManager();
+			_acceptor = f->CreateTcpAcceptr( ip, port );
+			//ASSERT( _acceptor );
+			_acceptor->AsyncAccept( std::bind( &ClientConnMgr::HandleAccept, this, std::placeholders::_1, std::placeholders::_2 ) );
+		}
+	}
+
+	void ClientConnMgr::StopListen()
+	{
+		_acceptor->DisAccept();
+		_acceptor.reset();
+	}
+
+	bool ClientConnMgr::HandleAccept( std::error_code ec, TcpSocketPtr tcp )
+	{
+		if(ec)
+		{
+			printf( "accept error:%s\n", ec.message().c_str() );
+		}
+		if(!ec)
+		{
+			std::string ip;
+			int16_t port;
+			if(!tcp->QuerySocketInfo( ip, port ))
+			{
+				printf( "收到客户端新连接：%s:%u\n", ip.c_str(), (uint16_t)port );
+			}
+
+			auto user_conn = std::make_shared<UserConnection>( tcp, _task.TaskThread() );//保证跟上面同一线程
+			user_conn->SetVerifyAccountCB( std::bind( &ClientConnMgr::VerifyAccount, this, std::placeholders::_1,std::placeholders::_2) );
+			user_conn->Start();
+		}
+		if(_stop)
+		{
+			return false;
+		}
+		_acceptor->AsyncAccept( std::bind( &ClientConnMgr::HandleAccept, this, std::placeholders::_1, std::placeholders::_2 ) );
+		return true;
+	}
+
+	int ClientConnMgr::VerifyAccount( RAUserMessagePtr pb, UserConnPtr conn )
+	{
+		if( pb->has_request_login() )
+		{
+			auto reqLogin = pb->request_login();
+
+			if(reqLogin.version() < MIN_SUPPORTED_VERSION)
+			{
+				return ERR_NOT_VERSION_SUPPORTED;
+			}
+			if(reqLogin.userid().empty())
+			{
+				return ERR_INVALID_USER_ID;
+			}
+			if(reqLogin.roomkey().empty())
+			{
+				return ERR_INVALID_ROOM_KEY;
+			}
+
+			_master_ctrl->JoinRoom( pb, conn);
+		}
+		else
+		{
+			return ERR_INVALID_ARGUMENT;
+		}
+		return ERR_OK;
+	}
+}
diff --git a/outsource/real_audio_server/client_conn_mgr.h b/outsource/real_audio_server/client_conn_mgr.h
@@ -0,0 +1,24 @@
+#pragma once
+#include <string>
+#include "user_connection.h"
+#include "base/tcp_socket.h"
+#include "base/async_task.h"
+
+namespace audio_engine{
+	class MasterControl;
+	class ClientConnMgr
+	{
+	public:
+		ClientConnMgr(MasterControl* host);
+		~ClientConnMgr();
+		void StartListen();
+		void StopListen();
+		int VerifyAccount( RAUserMessagePtr pb, UserConnPtr conn );
+		bool HandleAccept( std::error_code ec, TcpSocketPtr tcp );
+	private:
+		TcpAcceptorPtr _acceptor;
+		AsyncTask _task;
+		bool _stop = false;
+		MasterControl *_master_ctrl;
+	};
+}
diff --git a/outsource/real_audio_server/main.cpp b/outsource/real_audio_server/main.cpp
@@ -1,16 +1,29 @@
-#include "server_module.h"
-#include "user_manager.h"
-#include <thread>
-#include <chrono>
+#include "service.h"
+
 using namespace audio_engine;
 int main( int argc, char** argv )
 {
-    ServerModule::CreateInstance();
-    auto usermgr = std::make_shared<UserManager>();
-    usermgr->Start();
-    system( "pause" );
-    usermgr->Stop();
-    usermgr.reset();
-    ServerModule::DestroyInstance();
+	bool running = true;
+	while(running)
+	{
+		Service service;
+		service.Run();
+		std::string cmd;
+		while(true)
+		{
+			std::cin >> cmd;
+			if(cmd == "q")
+			{
+				running = false;
+				break;
+			}
+			else if( cmd == "restart" )
+			{
+				break;
+			}
+		}
+	}
+
+
     return 0;
 }
diff --git a/outsource/real_audio_server/master_control.cpp b/outsource/real_audio_server/master_control.cpp
@@ -0,0 +1,37 @@
+#include "master_control.h"
+#include "error_code.h"
+namespace audio_engine{
+	MasterControl::MasterControl()
+		:_conn_mgr(this)
+	{
+
+    }
+	MasterControl::~MasterControl()
+	{
+
+	}
+
+	void MasterControl::Start()
+	{
+		_conn_mgr.StartListen();
+	}
+
+	int MasterControl::JoinRoom( RAUserMessagePtr pb, UserConnPtr conn )
+	{
+		auto reqLogin = pb->request_login();
+		auto roomkey = reqLogin.roomkey();
+		auto it = _rooms.find(roomkey);
+		if(it != _rooms.end())
+		{
+			if(it->second.FindMember(reqLogin.userid()))
+			{
+				// 已经有一个同名用户在里面。
+			}
+			else
+			{
+				it->second.HandleConnection(conn);
+			}
+		}
+		return ERR_OK;
+	}
+}