From a43f339aa6ed14208f467842d42e2993fefb6c0a Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 7 Feb 2021 21:25:51 +0800 Subject: [PATCH] Update server stat for cid --- trunk/src/app/srs_app_rtc_server.cpp | 9 +++++++-- trunk/src/protocol/srs_service_log.cpp | 9 +++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/trunk/src/app/srs_app_rtc_server.cpp b/trunk/src/app/srs_app_rtc_server.cpp index 644c8768e..e2d86ee23 100644 --- a/trunk/src/app/srs_app_rtc_server.cpp +++ b/trunk/src/app/srs_app_rtc_server.cpp @@ -53,6 +53,9 @@ extern SrsPps* _srs_pps_ids; extern SrsPps* _srs_pps_fids; extern SrsPps* _srs_pps_fids_level0; +extern SrsPps* _srs_pps_cids_get; +extern SrsPps* _srs_pps_cids_set; + SrsRtcBlackhole::SrsRtcBlackhole() { blackhole = false; @@ -649,12 +652,14 @@ 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_ids->update(); _srs_pps_fids->update(); _srs_pps_fids_level0->update(); + _srs_pps_cids_get->update(); _srs_pps_cids_set->update(); // TODO: FIXME: Show more data for RTC server. - srs_trace("RTC: Server conns=%u, cpu=%.2f%%, rss=%dMB, pkts=%d, addrs=%d,%d, fid=%d,%d,%d", + srs_trace("RTC: Server conns=%u, cpu=%.2f%%, rss=%dMB, pkts=%d, addrs=%d,%d, fid=%d,%d,%d, cid=%d,%d", nn_rtc_conns, u->percent * 100, memory, _srs_pps_pkts->r10s(), _srs_pps_addrs->r10s(), _srs_pps_fast_addrs->r10s(), - _srs_pps_ids->r10s(), _srs_pps_fids->r10s(), _srs_pps_fids_level0->r10s() + _srs_pps_ids->r10s(), _srs_pps_fids->r10s(), _srs_pps_fids_level0->r10s(), + _srs_pps_cids_get->r10s(), _srs_pps_cids_set->r10s() ); return err; diff --git a/trunk/src/protocol/srs_service_log.cpp b/trunk/src/protocol/srs_service_log.cpp index 2b4af2f27..b30b35e6b 100644 --- a/trunk/src/protocol/srs_service_log.cpp +++ b/trunk/src/protocol/srs_service_log.cpp @@ -33,6 +33,11 @@ using namespace std; #include #include +#include + +SrsPps* _srs_pps_cids_get = new SrsPps(_srs_clock); +SrsPps* _srs_pps_cids_set = new SrsPps(_srs_clock); + #define SRS_BASIC_LOG_SIZE 8192 SrsThreadContext::SrsThreadContext() @@ -59,6 +64,8 @@ void _srs_context_destructor(void* arg) const SrsContextId& SrsThreadContext::get_id() { + ++_srs_pps_cids_get->sugar; + if (!srs_thread_self()) { return _srs_context_default; } @@ -73,6 +80,8 @@ const SrsContextId& SrsThreadContext::get_id() const SrsContextId& SrsThreadContext::set_id(const SrsContextId& v) { + ++_srs_pps_cids_set->sugar; + if (!srs_thread_self()) { _srs_context_default = v; return v;