external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +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:57:22 +08:00
parent af499094f8
commit cbfec753f0
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -38,6 +38,7 @@ using namespace std;
#include <srs_protocol_kbps.hpp> #include <srs_protocol_kbps.hpp>
SrsPps* _srs_pps_ids = new SrsPps(_srs_clock);
SrsPps* _srs_pps_fids = new SrsPps(_srs_clock); SrsPps* _srs_pps_fids = new SrsPps(_srs_clock);
SrsPps* _srs_pps_fids_level0 = new SrsPps(_srs_clock); SrsPps* _srs_pps_fids_level0 = new SrsPps(_srs_clock);
@ -187,6 +188,7 @@ ISrsResource* SrsResourceManager::at(int index)
ISrsResource* SrsResourceManager::find_by_id(std::string id) ISrsResource* SrsResourceManager::find_by_id(std::string id)
{ {
++_srs_pps_ids->sugar;
map<string, ISrsResource*>::iterator it = conns_id_.find(id); map<string, ISrsResource*>::iterator it = conns_id_.find(id);
return (it != conns_id_.end())? it->second : NULL; return (it != conns_id_.end())? it->second : NULL;
} }
@ -206,6 +208,7 @@ ISrsResource* SrsResourceManager::find_by_fast_id(uint64_t id)
ISrsResource* SrsResourceManager::find_by_name(std::string name) ISrsResource* SrsResourceManager::find_by_name(std::string name)
{ {
++_srs_pps_ids->sugar;
map<string, ISrsResource*>::iterator it = conns_name_.find(name); map<string, ISrsResource*>::iterator it = conns_name_.find(name);
return (it != conns_name_.end())? it->second : NULL; return (it != conns_name_.end())? it->second : NULL;
} }

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

@ -49,6 +49,7 @@ 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_ids;
extern SrsPps* _srs_pps_fids; extern SrsPps* _srs_pps_fids;
extern SrsPps* _srs_pps_fids_level0; extern SrsPps* _srs_pps_fids_level0;
@ -647,13 +648,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(); _srs_pps_ids->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, fid=%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() _srs_pps_ids->r10s(), _srs_pps_fids->r10s(), _srs_pps_fids_level0->r10s()
); );
return err; return err;