修改服务管理池

nodes/battle/service/srvBattleMgr.lua

@@ -16,22 +16,22 @@ local pool
 local CMD = {}
 
 function CMD.getBattleAgent()
-    return pool:allocation()
+    return pool:alloc_agent_srv()
 end
 
 -- from agent
 function CMD.battleEnter(id, battleAgent)
-    pool:bindAgent(id, battleAgent)
+    pool:bind_agent(id, battleAgent)
 end
 
 -- from agent
 function CMD.battleLeave(id, battleAgent)
-    pool:unbindAgent(id, battleAgent)
+    pool:unbind_agent(id, battleAgent)
 end
 
 -- 玩家是否在战斗中
 function CMD.is_user_in_battle(uid, battleId, battleAgent)
-    if battleAgent == nil or not pool:getObj(battleAgent) then
+    if battleAgent == nil or not pool:get_agent_info_by_addr(battleAgent) then
         return false
     end
     local ok = skynet.call(battleAgent, "lua", "is_user_in_battle", uid, battleId)

nodes/game/service/srvAgentMgr.lua

@@ -23,12 +23,12 @@ function root.user_get_game_agent(uid)
 	if mapUid2Agent[uid] then
 		log.error("uid:%s上一次的agent地址没有释放", uid)
 	end
-	return pool:allocation(uid)
+	return pool:alloc_agent_srv(uid)
 end
 
 -- 玩家登陆游戏服
 function root.login(uid, session)
-	pool:bindAgent(uid, session.gameAgent)
+	pool:bind_agent(uid, session.gameAgent)
 
 	mapUid2Agent[uid] = session.gameAgent
 	-- log.error("uid:%s登陆成功绑定agent地址:%s", uid, gSession.gameAgent)
@@ -36,7 +36,7 @@ end
 
 -- 玩家退出游戏服
 function root.logout(uid, session)
-	pool:unbindAgent(uid, session.gameAgent)
+	pool:unbind_agent(uid, session.gameAgent)
 	mapUid2Agent[uid] = nil
 	-- log.error("uid:%s下线成功, 解绑agent地址:%s", uid, gSession.gameAgent)
 end
@@ -58,7 +58,7 @@ function root.onStop()
 end
 
 function root.exit(agent)
-	pool:remove(agent)
+	pool:remove_agent_service(agent)
 	-- agent全部退出 唤醒退出协程
 	local addrList = pool:get_agent_srv_addr_list()
 	if #addrList <= 0 then

nodes/gate/service/wsProtobufWatchdog.lua

@@ -40,7 +40,7 @@ local function l_close_connect(fd)
 		local gateAgent = session.gateAgent
 		skynet.call(gateAgent, "lua", "logout", uid, fd)
 
-		pool:unbindAgent(uid, gateAgent)
+		pool:unbind_agent(uid, gateAgent)
 	end
 end
 
@@ -106,7 +106,7 @@ local function l_build_connection(uid, fd, msgSession)
 	mapUid2Session[uid] = session
 
 	-- 分配agent
-	local gateAgent = pool:allocation(uid)
+	local gateAgent = pool:alloc_agent_srv(uid)
 	if gateAgent == nil then
 		session.status = LOGIN_DONE
 		l_response_auth(fd, code.UNKNOWN, msgSession)
@@ -127,7 +127,7 @@ local function l_build_connection(uid, fd, msgSession)
 	end
 
 	-- 绑定agent
-	pool:bindAgent(uid, gateAgent)
+	pool:bind_agent(uid, gateAgent)
 	return l_response_auth(fd, code.OK, msgSession)
 end
 

nodes/gate/service/wsSprotoWatchdog.lua

@@ -40,7 +40,7 @@ local function l_close_connect(fd)
 		local gateAgent = session.gateAgent
 		skynet.call(gateAgent, "lua", "logout", uid, fd)
 
-		pool:unbindAgent(uid, gateAgent)
+		pool:unbind_agent(uid, gateAgent)
 	end
 end
 
@@ -106,7 +106,7 @@ local function l_build_connection(uid, fd, response)
 	mapUid2Session[uid] = session
 
 	-- 分配agent
-	local gateAgent = pool:allocation(uid)
+	local gateAgent = pool:alloc_agent_srv(uid)
 	if gateAgent == nil then
 		session.status = LOGIN_DONE
 		l_response_auth(fd, response, code.UNKNOWN)
@@ -127,7 +127,7 @@ local function l_build_connection(uid, fd, response)
 	end
 
 	-- 绑定agent
-	pool:bindAgent(uid, gateAgent)
+	pool:bind_agent(uid, gateAgent)
 	return l_response_auth(fd, response, code.OK)
 end