server_common/masterserver
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2020-08-19 09:52:58 +08:00
parent ebda67e3cc
commit 5f0e4c444c
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/masterserver/gsmgr.cc
View File

@ -98,7 +98,6 @@ void GSMgr::___GSReport(f8::JsonHttpRequest* request)
RearrangeNode(); RearrangeNode();
} }
itr->second.alive_count = alive_count; itr->second.alive_count = alive_count;
itr->second.channel = channel;
itr->second.last_active_tick = a8::XGetTickCount(); itr->second.last_active_tick = a8::XGetTickCount();
} else { } else {
GSNode gs; GSNode gs;
@ -252,7 +251,7 @@ void GSMgr::ClearTimeOutNode()
} }
} }
for (GSNode* node : time_out_nodes) { for (GSNode* node : time_out_nodes) {
RemoveNodeRomSortedNodes(node); RemoveNodeFromSortedNodes(node);
{ {
std::vector<std::string> deleted_teams; std::vector<std::string> deleted_teams;
for (auto& pair : team_hash_) { for (auto& pair : team_hash_) {
@ -279,7 +278,7 @@ void GSMgr::AddNodeToSortedNodes(GSNode* node)
} }
} }
void GSMgr::RemoveNodeRomSortedNodes(GSNode* node) void GSMgr::RemoveNodeFromSortedNodes(GSNode* node)
{ {
for (auto& pair : sorted_node_hash_) { for (auto& pair : sorted_node_hash_) {
std::vector<GSNode*>& node_list = pair.second; std::vector<GSNode*>& node_list = pair.second;
@ -304,6 +303,6 @@ std::vector<GSNode*>* GSMgr::GetSortedNodesByChannel(int channel)
void GSMgr::OnChannelChange(GSNode* node) void GSMgr::OnChannelChange(GSNode* node)
{ {
RemoveNodeRomSortedNodes(node); RemoveNodeFromSortedNodes(node);
AddNodeToSortedNodes(node); AddNodeToSortedNodes(node);
} }

2
server/masterserver/gsmgr.h
View File

@ -45,7 +45,7 @@ class GSMgr : public a8::Singleton<GSMgr>
void RearrangeNode(); void RearrangeNode();
void ClearTimeOutNode(); void ClearTimeOutNode();
void AddNodeToSortedNodes(GSNode* node); void AddNodeToSortedNodes(GSNode* node);
void RemoveNodeRomSortedNodes(GSNode* node); void RemoveNodeFromSortedNodes(GSNode* node);
std::vector<GSNode*>* GetSortedNodesByChannel(int channel); std::vector<GSNode*>* GetSortedNodesByChannel(int channel);
void OnChannelChange(GSNode* node); void OnChannelChange(GSNode* node);