external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 20:01:56 +00:00
Code Issues Releases Wiki Activity

Update server stat for fast-id search

Browse source
This commit is contained in:
winlin 2021-02-07 20:54:06 +08:00
parent 5ae47725e6
commit 44f5ca6a35
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
trunk/src/app/srs_app_conn.cpp
View file

@ -36,6 +36,11 @@ using namespace std;
#include <srs_app_config.hpp> #include <srs_app_config.hpp>
#include <srs_core_autofree.hpp> #include <srs_core_autofree.hpp>
#include <srs_protocol_kbps.hpp>
SrsPps* _srs_pps_fids = new SrsPps(_srs_clock);
SrsPps* _srs_pps_fids_level0 = new SrsPps(_srs_clock);
ISrsDisposingHandler::ISrsDisposingHandler() 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_]; SrsResourceFastIdItem* item = &conns_level0_cache_[(id | id>>32) % nn_level0_cache_];
if (item->available && item->fast_id == id) { if (item->available && item->fast_id == id) {
++_srs_pps_fids_level0->sugar;
return item->impl; return item->impl;
} }
++_srs_pps_fids->sugar;
map<uint64_t, ISrsResource*>::iterator it = conns_fast_id_.find(id); map<uint64_t, ISrsResource*>::iterator it = conns_fast_id_.find(id);
return (it != conns_fast_id_.end())? it->second : NULL; return (it != conns_fast_id_.end())? it->second : NULL;
} }

9
trunk/src/app/srs_app_rtc_server.cpp
View file

@ -49,6 +49,9 @@ extern SrsPps* _srs_pps_pkts;
extern SrsPps* _srs_pps_addrs; extern SrsPps* _srs_pps_addrs;
extern SrsPps* _srs_pps_fast_addrs; extern SrsPps* _srs_pps_fast_addrs;
extern SrsPps* _srs_pps_fids;
extern SrsPps* _srs_pps_fids_level0;
SrsRtcBlackhole::SrsRtcBlackhole() SrsRtcBlackhole::SrsRtcBlackhole()
{ {
blackhole = false; 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. // Update the pps stat for UDP socket and adddresses.
_srs_pps_pkts->update(); _srs_pps_addrs->update(); _srs_pps_fast_addrs->update(); _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. // 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, 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; return err;