From 44f5ca6a358d2330ce1ae9a96d15b845a64aa678 Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 7 Feb 2021 20:54:06 +0800 Subject: [PATCH] Update server stat for fast-id search --- trunk/src/app/srs_app_conn.cpp | 7 +++++++ trunk/src/app/srs_app_rtc_server.cpp | 9 +++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/trunk/src/app/srs_app_conn.cpp b/trunk/src/app/srs_app_conn.cpp index b9b88f87c..f6c07cc50 100644 --- a/trunk/src/app/srs_app_conn.cpp +++ b/trunk/src/app/srs_app_conn.cpp @@ -36,6 +36,11 @@ using namespace std; #include #include +#include + +SrsPps* _srs_pps_fids = new SrsPps(_srs_clock); +SrsPps* _srs_pps_fids_level0 = new SrsPps(_srs_clock); + ISrsDisposingHandler::ISrsDisposingHandler() { } @@ -190,9 +195,11 @@ ISrsResource* SrsResourceManager::find_by_fast_id(uint64_t id) { SrsResourceFastIdItem* item = &conns_level0_cache_[(id | id>>32) % nn_level0_cache_]; if (item->available && item->fast_id == id) { + ++_srs_pps_fids_level0->sugar; return item->impl; } + ++_srs_pps_fids->sugar; map::iterator it = conns_fast_id_.find(id); return (it != conns_fast_id_.end())? it->second : NULL; } diff --git a/trunk/src/app/srs_app_rtc_server.cpp b/trunk/src/app/srs_app_rtc_server.cpp index 5b4a7faf6..6297bf155 100644 --- a/trunk/src/app/srs_app_rtc_server.cpp +++ b/trunk/src/app/srs_app_rtc_server.cpp @@ -49,6 +49,9 @@ extern SrsPps* _srs_pps_pkts; extern SrsPps* _srs_pps_addrs; extern SrsPps* _srs_pps_fast_addrs; +extern SrsPps* _srs_pps_fids; +extern SrsPps* _srs_pps_fids_level0; + SrsRtcBlackhole::SrsRtcBlackhole() { blackhole = false; @@ -644,11 +647,13 @@ srs_error_t SrsRtcServer::notify(int type, srs_utime_t interval, srs_utime_t tic // Update the pps stat for UDP socket and adddresses. _srs_pps_pkts->update(); _srs_pps_addrs->update(); _srs_pps_fast_addrs->update(); + _srs_pps_fids->update(); _srs_pps_fids_level0->update(); // TODO: FIXME: Show more data for RTC server. - srs_trace("RTC: Server conns=%u, cpu=%.2f%%, rss=%dMB, pkts=%d, addrs=%d,%d", + srs_trace("RTC: Server conns=%u, cpu=%.2f%%, rss=%dMB, pkts=%d, addrs=%d,%d, fid=%d,%d", nn_rtc_conns, u->percent * 100, memory, - _srs_pps_pkts->r10s(), _srs_pps_addrs->r10s(), _srs_pps_fast_addrs->r10s() + _srs_pps_pkts->r10s(), _srs_pps_addrs->r10s(), _srs_pps_fast_addrs->r10s(), + _srs_pps_fids->r10s(), _srs_pps_fids_level0->r10s() ); return err;