From 5b8eea8cc52d56381d27f8e8675b06f872e499d9 Mon Sep 17 00:00:00 2001 From: winlin Date: Fri, 19 Feb 2021 19:08:16 +0800 Subject: [PATCH 1/2] Stat: Fix build fail for stat of timer and dispose --- trunk/src/app/srs_app_conn.cpp | 3 +++ trunk/src/protocol/srs_service_log.cpp | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/trunk/src/app/srs_app_conn.cpp b/trunk/src/app/srs_app_conn.cpp index fffa224f2..17301c4c4 100644 --- a/trunk/src/app/srs_app_conn.cpp +++ b/trunk/src/app/srs_app_conn.cpp @@ -41,6 +41,7 @@ using namespace std; SrsPps* _srs_pps_ids = new SrsPps(_srs_clock); SrsPps* _srs_pps_fids = new SrsPps(_srs_clock); SrsPps* _srs_pps_fids_level0 = new SrsPps(_srs_clock); +SrsPps* _srs_pps_dispose = new SrsPps(_srs_clock); ISrsDisposingHandler::ISrsDisposingHandler() { @@ -343,6 +344,8 @@ void SrsResourceManager::do_clear() i, conn->desc().c_str(), conn, (int)conns_.size(), (int)copy.size(), (int)zombies_.size()); } + ++_srs_pps_dispose->sugar; + dispose(conn); } diff --git a/trunk/src/protocol/srs_service_log.cpp b/trunk/src/protocol/srs_service_log.cpp index 5dafb4c05..fbd1e4b9e 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() @@ -51,11 +56,15 @@ SrsContextId SrsThreadContext::generate_id() const SrsContextId& SrsThreadContext::get_id() { + ++_srs_pps_cids_get->sugar; + return cache[srs_thread_self()]; } const SrsContextId& SrsThreadContext::set_id(const SrsContextId& v) { + ++_srs_pps_cids_set->sugar; + srs_thread_t self = srs_thread_self(); if (cache.find(self) == cache.end()) { From 3a83a74dfc7ce5c6c946748acca2adc81caa586e Mon Sep 17 00:00:00 2001 From: winlin Date: Fri, 19 Feb 2021 19:12:40 +0800 Subject: [PATCH 2/2] Stat: Refine stat bug for timer --- trunk/src/app/srs_app_rtc_conn.cpp | 6 ++++++ trunk/src/app/srs_app_rtc_server.cpp | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 8e14af8ce..981a59c33 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -1434,11 +1434,15 @@ srs_error_t SrsRtcPublishStream::notify(int type, srs_utime_t interval, srs_utim { srs_error_t err = srs_success; + ++_srs_pps_pub->sugar; + if (!is_started) { return err; } if (type == SRS_TICKID_RTCP) { + ++_srs_pps_rr->sugar; + if ((err = send_rtcp_rr()) != srs_success) { srs_warn("RR err %s", srs_error_desc(err).c_str()); srs_freep(err); @@ -1451,6 +1455,8 @@ srs_error_t SrsRtcPublishStream::notify(int type, srs_utime_t interval, srs_utim } if (twcc_enabled_ && type == SRS_TICKID_TWCC) { + ++_srs_pps_twcc->sugar; + // We should not depends on the received packet, // instead we should send feedback every Nms. if ((err = send_periodic_twcc()) != srs_success) { diff --git a/trunk/src/app/srs_app_rtc_server.cpp b/trunk/src/app/srs_app_rtc_server.cpp index 1573c73ff..f5f4dfe73 100644 --- a/trunk/src/app/srs_app_rtc_server.cpp +++ b/trunk/src/app/srs_app_rtc_server.cpp @@ -57,10 +57,6 @@ extern SrsPps* _srs_pps_pli; extern SrsPps* _srs_pps_twcc; extern SrsPps* _srs_pps_rr; -extern SrsPps* _srs_pps_timer; -extern SrsPps* _srs_pps_pub; -extern SrsPps* _srs_pps_conn; - extern SrsPps* _srs_pps_snack; extern SrsPps* _srs_pps_snack2; extern SrsPps* _srs_pps_sanack; @@ -666,7 +662,6 @@ srs_error_t SrsRtcServer::notify(int type, srs_utime_t interval, srs_utime_t tic _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_pli->update(); _srs_pps_twcc->update(); _srs_pps_rr->update(); - _srs_pps_timer->update(); _srs_pps_pub->update(); _srs_pps_conn->update(); _srs_pps_snack->update(); _srs_pps_snack2->update(); _srs_pps_sanack->update(); _srs_pps_svnack->update(); _srs_pps_rnack->update(); _srs_pps_rnack2->update();