diff --git a/server/gameserver/app.cc b/server/gameserver/app.cc index 137c476..0e4eaf7 100755 --- a/server/gameserver/app.cc +++ b/server/gameserver/app.cc @@ -54,47 +54,19 @@ const char* const PROJ_LOG_FILENAME_FMT = "log_$pid_%Y%m%d.log"; static void SavePerfLog() { - a8::UdpLog::Instance()->Info("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", - { - App::Instance()->perf.max_run_delay_time, - RoomMgr::Instance()->RoomNum(), - App::Instance()->perf.entity_num[ET_Player], - PlayerMgr::Instance()->OnlineNum(), - App::Instance()->perf.alive_count, - f8::HttpClientPool::Instance()->max_sys_request_delay, - f8::HttpClientPool::Instance()->max_user_request_delay, - f8::HttpClientPool::Instance()->GetPendingNum() - }); - if (App::Instance()->HasFlag(4)) { - a8::XPrintf("mainloop_time:%d netmsg_time:%d room:%d over_room:%d online:%d bullet:%d grid_chg_times:%d test_times:%d send_node_num:%d sent_node_num:%d sent_bytes_num:%d max_user_request_delay:%d\n", - { - App::Instance()->perf.max_run_delay_time, - App::Instance()->perf.max_dispatchmsg_time, - RoomMgr::Instance()->RoomNum(), - RoomMgr::Instance()->OverRoomNum(), - PlayerMgr::Instance()->OnlineNum(), - App::Instance()->perf.entity_num[ET_Bullet], - App::Instance()->perf.grid_chg_times, - App::Instance()->perf.test_times, - GGListener::Instance()->GetSendNodeNum(), - GGListener::Instance()->GetSentNodeNum(), - GGListener::Instance()->GetSentBytesNum(), - f8::HttpClientPool::Instance()->max_user_request_delay - }); - #if 0 - a8::XPrintf("params[0]:%d params[1]:%d params[2]:%d params[3]:%d params[4]:%d params[5]:%d params[6]:%d\n", - { - App::Instance()->perf.params[0], - App::Instance()->perf.params[1], - App::Instance()->perf.params[2], - App::Instance()->perf.params[3], - App::Instance()->perf.params[4], - App::Instance()->perf.params[5], - App::Instance()->perf.params[6], - }); - #endif - } + a8::UdpLog::Instance()->Info + ("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", + { + App::Instance()->perf.max_run_delay_time, + RoomMgr::Instance()->RoomNum(), + App::Instance()->perf.entity_num[ET_Player], + PlayerMgr::Instance()->OnlineNum(), + App::Instance()->perf.alive_count, + f8::HttpClientPool::Instance()->max_sys_request_delay, + f8::HttpClientPool::Instance()->max_user_request_delay, + f8::HttpClientPool::Instance()->GetPendingNum() + }); App::Instance()->perf.max_run_delay_time = 0; App::Instance()->perf.max_dispatchmsg_time = 0; App::Instance()->perf.max_timer_idle = 0; @@ -306,21 +278,8 @@ void App::NotifyLoopCond() void App::Schedule() { - #if 1 - { - std::unique_lock lk(*loop_mutex_); - loop_cond_->wait_for(lk, std::chrono::milliseconds(1)); - } - #else std::unique_lock lk(*loop_mutex_); - if (!HasTask()) { - int sleep_time = a8::Timer::Instance()->GetIdleableMillSeconds(); - loop_cond_->wait_for(lk, std::chrono::milliseconds(sleep_time)); - if (sleep_time > perf.max_timer_idle) { - perf.max_timer_idle = sleep_time; - } - } - #endif + loop_cond_->wait_for(lk, std::chrono::milliseconds(1)); } bool App::HasTask()