server/game2004
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2020-05-22 22:34:39 +08:00
parent 61946d50bf
commit d58a670d5e
6 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/gameserver/android.cc
View File

@ -45,6 +45,9 @@ void Android::Update(int delta_time)
if (room->frame_no % 2 == 0) { if (room->frame_no % 2 == 0) {
SendUpdateMsg(); SendUpdateMsg();
} }
if (!real_dead) {
room->IncRealAliveCount();
}
++updated_times_; ++updated_times_;
} }

4
server/gameserver/app.cc
View File

@ -56,7 +56,7 @@ static void SavePerfLog()
{ {
a8::UdpLog::Instance()->Info a8::UdpLog::Instance()->Info
("mainloop_rundelay:%d room_num:%d player_num:%d online_num:%d alive_count:%d " ("mainloop_rundelay:%d room_num:%d player_num:%d online_num:%d alive_count:%d "
"sys_request_delay:%d user_request_delay:%d http_pending_num:%d active_count:%d", "sys_request_delay:%d user_request_delay:%d http_pending_num:%d real_alive_count:%d",
{ {
App::Instance()->perf.max_run_delay_time, App::Instance()->perf.max_run_delay_time,
RoomMgr::Instance()->RoomNum(), RoomMgr::Instance()->RoomNum(),
@ -66,7 +66,7 @@ static void SavePerfLog()
f8::HttpClientPool::Instance()->max_sys_request_delay, f8::HttpClientPool::Instance()->max_sys_request_delay,
f8::HttpClientPool::Instance()->max_user_request_delay, f8::HttpClientPool::Instance()->max_user_request_delay,
f8::HttpClientPool::Instance()->GetPendingNum(), f8::HttpClientPool::Instance()->GetPendingNum(),
App::Instance()->perf.active_count App::Instance()->perf.real_alive_count
}); });
App::Instance()->perf.max_run_delay_time = 0; App::Instance()->perf.max_run_delay_time = 0;
App::Instance()->perf.max_dispatchmsg_time = 0; App::Instance()->perf.max_dispatchmsg_time = 0;

3
server/gameserver/player.cc
View File

@ -48,6 +48,9 @@ void Player::Update(int delta_time)
if (room->frame_no % 2 == 0) { if (room->frame_no % 2 == 0) {
SendUpdateMsg(); SendUpdateMsg();
} }
if (!real_dead) {
room->IncRealAliveCount();
}
++updated_times_; ++updated_times_;
} }

8
server/gameserver/room.cc
View File

@ -120,7 +120,8 @@ Player* Room::GetPlayerByAccountId(const std::string& accountid)
Player* Room::GetPlayerByUniId(int uniid) Player* Room::GetPlayerByUniId(int uniid)
{ {
Entity* entity = GetEntityByUniId(uniid); Entity* entity = GetEntityByUniId(uniid);
return entity && entity->entity_type == ET_Player && entity->entity_subtype == EST_Player ? (Player*)entity : nullptr; return entity && entity->entity_type == ET_Player && entity->entity_subtype == EST_Player ?
(Player*)entity : nullptr;
} }
Entity* Room::GetEntityByUniId(int uniid) Entity* Room::GetEntityByUniId(int uniid)
@ -134,11 +135,6 @@ int Room::AliveCount()
return alive_count_; return alive_count_;
} }
int Room::RealAliveCount()
{
return real_alive_count_;
}
int Room::ActiveCount() int Room::ActiveCount()
{ {
return active_count_; return active_count_;

3
server/gameserver/room.h
View File

@ -73,7 +73,8 @@ public:
void Update(int delta_time); void Update(int delta_time);
int GetPlayerNum(); int GetPlayerNum();
int AliveCount(); int AliveCount();
inline int RealAliveCount(); inline int RealAliveCount() { return real_alive_count_; }
inline void IncRealAliveCount() { ++real_alive_count_; }
int ActiveCount(); int ActiveCount();
Player* GetPlayerByAccountId(const std::string& accountid); Player* GetPlayerByAccountId(const std::string& accountid);
Player* GetPlayerByUniId(int uniid); Player* GetPlayerByUniId(int uniid);

6
server/gameserver/roommgr.cc
View File

@ -62,9 +62,13 @@ void RoomMgr::UnInit()
void RoomMgr::Update(int delta_time) void RoomMgr::Update(int delta_time)
{ {
long long real_alive_count = 0;
for (auto& pair : room_hash_) { for (auto& pair : room_hash_) {
pair.second->Update(delta_time); Room* room = pair.second;
room->Update(delta_time);
real_alive_count += room->RealAliveCount();
} }
App::Instance()->perf.real_alive_count = real_alive_count;
} }
void RoomMgr::_CMJoin(f8::MsgHdr& hdr, const cs::CMJoin& msg) void RoomMgr::_CMJoin(f8::MsgHdr& hdr, const cs::CMJoin& msg)