From 7f456a2fea3b00e1bf5369161a573ec844dacd00 Mon Sep 17 00:00:00 2001 From: azw Date: Mon, 13 Nov 2023 06:50:48 +0000 Subject: [PATCH] 1 --- server/wsproxy/app.cc | 39 +++++++++++++++++++-------------------- server/wsproxy/app.h | 3 --- third_party/f8 | 2 +- 3 files changed, 20 insertions(+), 24 deletions(-) diff --git a/server/wsproxy/app.cc b/server/wsproxy/app.cc index 8c82bfb..f4e3df3 100644 --- a/server/wsproxy/app.cc +++ b/server/wsproxy/app.cc @@ -49,24 +49,25 @@ struct UdpMsgNode static void SavePerfLog() { - f8::UdpLog::Instance()->Info("max_run_delay_time:%d max_timer_idle:%d " - "in_data_size:%d out_data_size:%d msgnode_size:%d udp_msgnode_size:%d " - "read_count:%d max_login_time:%d " - "max_join_time:%d tcp_count:%d udp_count:%d down_stream_count:%d", - { - App::Instance()->GetPerf().max_run_delay_time, - App::Instance()->GetPerf().max_timer_idle, - App::Instance()->GetPerf().in_data_size, - App::Instance()->GetPerf().out_data_size, - App::Instance()->GetMsgNodeSize(), - App::Instance()->GetUdpMsgNodeSize(), - App::Instance()->GetPerf().read_count, - App::Instance()->GetPerf().max_login_time, - App::Instance()->GetPerf().max_join_time, - GCListener::Instance()->GetSocketCount(), - LongSessionMgr::Instance()->GetLongSessionCount(), - DownStreamMgr::Instance()->GetDownStreamCount() - }); + f8::UdpLog::Instance()->Info + ("max_run_delay_time:%d max_timer_idle:%d " + "in_data_size:%d out_data_size:%d msgnode_size:%d udp_msgnode_size:%d " + "read_count:%d max_login_time:%d " + "max_join_time:%d tcp_count:%d udp_count:%d down_stream_count:%d", + { + App::Instance()->GetPerf().max_run_delay_time, + App::Instance()->GetPerf().max_timer_idle, + App::Instance()->GetPerf().in_data_size, + App::Instance()->GetPerf().out_data_size, + f8::App::Instance()->GetMsgNodeSize(), + App::Instance()->GetUdpMsgNodeSize(), + App::Instance()->GetPerf().read_count, + App::Instance()->GetPerf().max_login_time, + App::Instance()->GetPerf().max_join_time, + GCListener::Instance()->GetSocketCount(), + LongSessionMgr::Instance()->GetLongSessionCount(), + DownStreamMgr::Instance()->GetDownStreamCount() + }); if (f8::App::Instance()->HasFlag(2)) { a8::XPrintf("mainloop_time:%d netmsg_time:%d send_node_num:%d sent_bytes_num:%d\n", { @@ -162,8 +163,6 @@ void App::Update() void App::QuickExecute() { - f8::Timer::Instance()->Update(); - f8::MsgQueue::Instance()->Update(); DispatchUdpMsg(); LongSessionMgr::Instance()->Update(); } diff --git a/server/wsproxy/app.h b/server/wsproxy/app.h index 7b9d23f..2358fbe 100644 --- a/server/wsproxy/app.h +++ b/server/wsproxy/app.h @@ -29,7 +29,6 @@ public: void AddUdpMsg(a8::UdpPacket* pkt); PerfMonitor& GetPerf() { return perf_; } - int GetMsgNodeSize() { return msgnode_size_;} int GetUdpMsgNodeSize() { return udp_msgnode_size_;} int GetGameId() const; @@ -54,9 +53,7 @@ private: UdpMsgNode* udp_bot_node_ = nullptr; UdpMsgNode* udp_work_node_ = nullptr; - int msgnode_size_ = 0 ; int udp_msgnode_size_ = 0 ; - int working_msgnode_size_ = 0; int udp_working_msgnode_size_ = 0; }; diff --git a/third_party/f8 b/third_party/f8 index e6570ff..39cf53e 160000 --- a/third_party/f8 +++ b/third_party/f8 @@ -1 +1 @@ -Subproject commit e6570ff2d38b71d20328d875d02237a3a908512d +Subproject commit 39cf53ed693b0c6e6d9119c38b894013ac9716e6