This commit is contained in:
aozhiwei 2019-05-31 15:15:33 +08:00
parent 7bbdcd419b
commit 9759a9f009
2 changed files with 8 additions and 1 deletions

View File

@ -16,9 +16,10 @@ else()
endif() endif()
set(CMAKE_BUILD_TYPE "Debug") set(CMAKE_BUILD_TYPE "Debug")
set(CMAKE_BUILD_TYPE "Release") #set(CMAKE_BUILD_TYPE "Release")
set(CMAKE_CXX_FLAGS_RELEASE "-Wall -g -std=gnu++11 -DGAME_ID=${GAME_ID} -DMASTER_MODE=${MASTER_MODE} -DA8_TCP_SESSION2=1") set(CMAKE_CXX_FLAGS_RELEASE "-Wall -g -std=gnu++11 -DGAME_ID=${GAME_ID} -DMASTER_MODE=${MASTER_MODE} -DA8_TCP_SESSION2=1")
set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++11 -DGAME_ID=${GAME_ID} -DMASTER_MODE=${MASTER_MODE} -DA8_TCP_SESSION2=1") set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++11 -DGAME_ID=${GAME_ID} -DMASTER_MODE=${MASTER_MODE} -DA8_TCP_SESSION2=1")
set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++11 -DGAME_ID=${GAME_ID} -DA8_TCP_SESSION2=1")
include_directories( include_directories(
AFTER AFTER

View File

@ -120,7 +120,9 @@ bool App::Init(int argc, char* argv[])
uuid.SetMachineId(instance_id); uuid.SetMachineId(instance_id);
#endif #endif
GameClientMgr::Instance()->Init(); GameClientMgr::Instance()->Init();
#if MASTER_MODE
MasterSvrMgr::Instance()->Init(); MasterSvrMgr::Instance()->Init();
#endif
TargetConnMgr::Instance()->Init(); TargetConnMgr::Instance()->Init();
GCListener::Instance()->Init(); GCListener::Instance()->Init();
@ -155,7 +157,9 @@ void App::UnInit()
{ {
a8::XPrintf("wsproxy terminating instance_id:%d pid:%d\n", {instance_id, getpid()}); a8::XPrintf("wsproxy terminating instance_id:%d pid:%d\n", {instance_id, getpid()});
GCListener::Instance()->UnInit(); GCListener::Instance()->UnInit();
#ifdef MASTER_MODE
MasterSvrMgr::Instance()->UnInit(); MasterSvrMgr::Instance()->UnInit();
#endif
TargetConnMgr::Instance()->UnInit(); TargetConnMgr::Instance()->UnInit();
GameClientMgr::Instance()->UnInit(); GameClientMgr::Instance()->UnInit();
JsonDataMgr::Instance()->UnInit(); JsonDataMgr::Instance()->UnInit();
@ -455,7 +459,9 @@ void App::ProcessIMMsg()
case IM_ClientSocketDisconnect: case IM_ClientSocketDisconnect:
{ {
GameClientMgr::Instance()->OnClientDisconnect(pdelnode->params); GameClientMgr::Instance()->OnClientDisconnect(pdelnode->params);
#ifdef MASTER_MODE
MasterSvrMgr::Instance()->RemoveRequest(pdelnode->params.param1, pdelnode->params.sender); MasterSvrMgr::Instance()->RemoveRequest(pdelnode->params.param1, pdelnode->params.sender);
#endif
} }
break; break;
case IM_TargetConnConnect: case IM_TargetConnConnect: