From d259d03d2ab8b3d611549828b6b52051014e30f0 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Sat, 12 Jan 2019 18:45:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4python=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/dbproxy/CMakeLists.txt | 3 +-- server/dbproxy/GSListener.cc | 24 +++++++++++----------- server/dbproxy/GSListener.h | 6 +++--- server/dbproxy/app.cc | 8 ++++---- server/dbproxy/app.h | 2 +- server/dbproxy/dbpool.cc | 4 ++-- server/dbproxy/dbpool.h | 4 ++-- server/dbproxy/handlermgr.h | 2 +- server/dbproxy/precompile.h | 1 + server/tools/scripts/construct/build_pb.py | 18 ++++++++-------- third_party/a8engine | 2 +- third_party/framework | 2 +- 12 files changed, 38 insertions(+), 38 deletions(-) diff --git a/server/dbproxy/CMakeLists.txt b/server/dbproxy/CMakeLists.txt index a1118e6..c948cc0 100644 --- a/server/dbproxy/CMakeLists.txt +++ b/server/dbproxy/CMakeLists.txt @@ -10,9 +10,9 @@ include_directories( ../../third_party/a8engine /usr/include/mysql /usr/include/jsoncpp - /usr/include/python3.4m /usr/include/hiredis ../../third_party + . ) link_directories( @@ -60,7 +60,6 @@ target_link_libraries( rt crypto ssl - python3.4m jsoncpp curl hiredis diff --git a/server/dbproxy/GSListener.cc b/server/dbproxy/GSListener.cc index d775dc1..42b1275 100644 --- a/server/dbproxy/GSListener.cc +++ b/server/dbproxy/GSListener.cc @@ -21,10 +21,10 @@ public: //packagelen + msgid + magiccode + msgbody //2 + 2 + 4+ xx + \0 + xx bool warning = false; - while (buflen - offset >= sizeof(PackHead)) { - PackHead* p = (PackHead*)&buf[offset]; - if (p->magic_code == MAGIC_CODE) { - if (buflen - offset < sizeof(PackHead) + p->packlen) { + while (buflen - offset >= sizeof(f8::PackHead)) { + f8::PackHead* p = (f8::PackHead*)&buf[offset]; + if (p->magic_code == f8::MAGIC_CODE) { + if (buflen - offset < sizeof(f8::PackHead) + p->packlen) { break; } App::Instance()->AddSocketMsg(SF_GameServer, @@ -32,9 +32,9 @@ public: saddr, p->msgid, p->seqid, - &buf[offset + sizeof(PackHead)], + &buf[offset + sizeof(f8::PackHead)], p->packlen); - offset += sizeof(PackHead) + p->packlen; + offset += sizeof(f8::PackHead) + p->packlen; } else { warning = true; offset++; @@ -94,20 +94,20 @@ void GSListener::UnInit() tcp_listener_ = nullptr; } -void GSListener::ForwardTargetConnMsg(MsgHdr& hdr) +void GSListener::ForwardTargetConnMsg(f8::MsgHdr& hdr) { - char* buff = (char*)malloc(sizeof(PackHead) + hdr.buflen); - PackHead* head = (PackHead*)buff; + char* buff = (char*)malloc(sizeof(f8::PackHead) + hdr.buflen); + f8::PackHead* head = (f8::PackHead*)buff; head->packlen = hdr.buflen; head->msgid = hdr.msgid; head->seqid = hdr.seqid; - head->magic_code = MAGIC_CODE; + head->magic_code = f8::MAGIC_CODE; head->rpc_error_code = 0; if (hdr.buflen > 0) { - memmove(buff + sizeof(PackHead), hdr.buf, hdr.buflen); + memmove(buff + sizeof(f8::PackHead), hdr.buf, hdr.buflen); } - tcp_listener_->SendClientMsg(hdr.socket_handle, buff, sizeof(PackHead) + head->packlen); + tcp_listener_->SendClientMsg(hdr.socket_handle, buff, sizeof(f8::PackHead) + head->packlen); free(buff); } diff --git a/server/dbproxy/GSListener.h b/server/dbproxy/GSListener.h index 0b8a26e..182d291 100644 --- a/server/dbproxy/GSListener.h +++ b/server/dbproxy/GSListener.h @@ -22,11 +22,11 @@ class GSListener : public a8::Singleton template void SendMsg(unsigned short socket_handle, T& msg) { - static int msgid = ::Net_GetMessageId(msg); - Net_SendMsg(tcp_listener_, socket_handle, 0, msgid, msg); + static int msgid = ::f8::Net_GetMessageId(msg); + f8::Net_SendMsg(tcp_listener_, socket_handle, 0, msgid, msg); } - void ForwardTargetConnMsg(MsgHdr& hdr); + void ForwardTargetConnMsg(f8::MsgHdr& hdr); void SendText(unsigned short sockhandle, const std::string& text); void ForceCloseClient(unsigned short sockhandle); diff --git a/server/dbproxy/app.cc b/server/dbproxy/app.cc index 09fcb98..f4f25cc 100644 --- a/server/dbproxy/app.cc +++ b/server/dbproxy/app.cc @@ -271,7 +271,7 @@ void App::DispatchMsg() msg_mutex_->unlock(); } - MsgHdr hdr; + f8::MsgHdr hdr; while (work_node_) { MsgNode *pdelnode = work_node_; work_node_ = pdelnode->next; @@ -304,10 +304,10 @@ void App::DispatchMsg() } } -void App::ProcessGSMsg(MsgHdr& hdr) +void App::ProcessGSMsg(f8::MsgHdr& hdr) { - NetMsgHandler* handler = GetNetMsgHandler(&HandlerMgr::Instance()->gsmsghandler, - hdr.msgid); + f8::NetMsgHandler* handler = GetNetMsgHandler(&HandlerMgr::Instance()->gsmsghandler, + hdr.msgid); if (handler) { switch (handler->handlerid) { case HID_DBPool: diff --git a/server/dbproxy/app.h b/server/dbproxy/app.h index 99ed30c..d806a98 100644 --- a/server/dbproxy/app.h +++ b/server/dbproxy/app.h @@ -41,7 +41,7 @@ private: void DispatchMsg(); void ProcessIMMsg(); - void ProcessGSMsg(MsgHdr& hdr); + void ProcessGSMsg(f8::MsgHdr& hdr); void InitLog(); void UnInitLog(); diff --git a/server/dbproxy/dbpool.cc b/server/dbproxy/dbpool.cc index 591ce72..cf543bd 100644 --- a/server/dbproxy/dbpool.cc +++ b/server/dbproxy/dbpool.cc @@ -229,13 +229,13 @@ void DBPool::Update() { } -void DBPool::_SS_Ping(MsgHdr& hdr, const ss::SS_Ping& msg) +void DBPool::_SS_Ping(f8::MsgHdr& hdr, const ss::SS_Ping& msg) { ss::SS_Pong respmsg; GSListener::Instance()->SendMsg(hdr.socket_handle, respmsg); } -void DBPool::_SS_GSM_ExecAsyncSql(MsgHdr& hdr, const ss::SS_GSM_ExecAsyncSql& msg) +void DBPool::_SS_GSM_ExecAsyncSql(f8::MsgHdr& hdr, const ss::SS_GSM_ExecAsyncSql& msg) { DBThread *db_thread = db_single_thread_; switch (msg.exec_type()) { diff --git a/server/dbproxy/dbpool.h b/server/dbproxy/dbpool.h index b971e9e..d0d82b8 100644 --- a/server/dbproxy/dbpool.h +++ b/server/dbproxy/dbpool.h @@ -21,9 +21,9 @@ class DBPool : public a8::Singleton void UnInit(); void Update(); - void _SS_Ping(MsgHdr& hdr, const ss::SS_Ping& msg); + void _SS_Ping(f8::MsgHdr& hdr, const ss::SS_Ping& msg); - void _SS_GSM_ExecAsyncSql(MsgHdr& hdr, const ss::SS_GSM_ExecAsyncSql& msg); + void _SS_GSM_ExecAsyncSql(f8::MsgHdr& hdr, const ss::SS_GSM_ExecAsyncSql& msg); private: diff --git a/server/dbproxy/handlermgr.h b/server/dbproxy/handlermgr.h index c615723..79a1f21 100644 --- a/server/dbproxy/handlermgr.h +++ b/server/dbproxy/handlermgr.h @@ -21,7 +21,7 @@ class HandlerMgr : public a8::Singleton void Init(); void UnInit(); - NetMsgHandlerObject gsmsghandler; + f8::NetMsgHandlerObject gsmsghandler; void ProcGMMsg(int sockhandle, const std::string& url, const std::string& quyerstr); diff --git a/server/dbproxy/precompile.h b/server/dbproxy/precompile.h index da4d743..f50bb88 100644 --- a/server/dbproxy/precompile.h +++ b/server/dbproxy/precompile.h @@ -15,4 +15,5 @@ namespace google } } +#include "framework/cpp/types.h" #include "framework/cpp/protoutils.h" diff --git a/server/tools/scripts/construct/build_pb.py b/server/tools/scripts/construct/build_pb.py index 956010d..7a7493a 100644 --- a/server/tools/scripts/construct/build_pb.py +++ b/server/tools/scripts/construct/build_pb.py @@ -16,18 +16,18 @@ def printp_stdout(p): while not is_terminated(): line = p.stdout.readline() if len(line) > 0: - print line, - except Exception, e: - print 'build_pb stdout error:' + e + print(line, end = '') + except Exception as e: + print('build_pb stdout error:' + e) def printp_stderr(p): try: while is_terminated(): line = p.stderr.readline() if len(line) > 0: - print line, - except Exception, e: - print 'build_pb stderr error:' + e + print(line, end = '') + except Exception as e: + print('build_pb stderr error:' + e) def need_rebuild(): for proto_name in ('ss_proto', 'ss_msgid'): @@ -58,8 +58,8 @@ def rebuild(): t1.join() t2.join() sys.exit(p.returncode) - except Exception, e: - print 'build_protocol rebuild error:' + str(e) + except Exception as e: + print('build_protocol rebuild error:' + str(e)) def repair_githooks(): os.system('/bin/bash ../tools/scripts/githooks/install.sh') @@ -68,4 +68,4 @@ repair_githooks() if need_rebuild(): rebuild() else: - print 'pb files already is the latest' + print('pb files already is the latest') diff --git a/third_party/a8engine b/third_party/a8engine index 5255275..3d34fc3 160000 --- a/third_party/a8engine +++ b/third_party/a8engine @@ -1 +1 @@ -Subproject commit 52552756404c7047c4438cf11425299c88cb74a7 +Subproject commit 3d34fc3fbe5e0491010b1224ca655909845f9d7d diff --git a/third_party/framework b/third_party/framework index ffe6975..1813384 160000 --- a/third_party/framework +++ b/third_party/framework @@ -1 +1 @@ -Subproject commit ffe697539112bca297d7af73f8a02f9c83a38d58 +Subproject commit 18133846b6672634219c080064b7a24720d17588