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

Core: Refine ST stat for io events

Browse source
This commit is contained in:
winlin 2021-02-11 12:07:38 +08:00
parent cde456710d
commit e726aba8f9
2 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
trunk/3rdparty/st-srs/sched.c vendored
View file

@ -497,21 +497,21 @@ void _st_vp_check_clock(void)
_ST_LAST_CLOCK = now; _ST_LAST_CLOCK = now;
#ifdef DEBUG #ifdef DEBUG
if (elapsed < 1000) { if (elapsed <= 1000) {
++_st_stat_sched_us; ++_st_stat_sched_us;
} else if (elapsed < 10000) { } else if (elapsed <= 10000) {
++_st_stat_sched_10ms; ++_st_stat_sched_10ms;
} else if (elapsed < 20000) { } else if (elapsed <= 21000) {
++_st_stat_sched_20ms; ++_st_stat_sched_20ms;
} else if (elapsed < 40000) { } else if (elapsed <= 40000) {
++_st_stat_sched_40ms; ++_st_stat_sched_40ms;
} else if (elapsed < 80000) { } else if (elapsed <= 80000) {
++_st_stat_sched_80ms; ++_st_stat_sched_80ms;
} else if (elapsed < 160000) { } else if (elapsed <= 160000) {
++_st_stat_sched_160ms; ++_st_stat_sched_160ms;
} else if (elapsed < 320000) { } else if (elapsed <= 320000) {
++_st_stat_sched_320ms; ++_st_stat_sched_320ms;
} else if (elapsed < 1000000) { } else if (elapsed <= 1000000) {
++_st_stat_sched_1000ms; ++_st_stat_sched_1000ms;
} else { } else {
++_st_stat_sched_s; ++_st_stat_sched_s;

40
trunk/src/app/srs_app_hybrid.cpp
View file

@ -102,14 +102,14 @@ SrsPps* _srs_pps_sched_320ms = new SrsPps(_srs_clock);
SrsPps* _srs_pps_sched_1000ms = new SrsPps(_srs_clock); SrsPps* _srs_pps_sched_1000ms = new SrsPps(_srs_clock);
SrsPps* _srs_pps_sched_s = new SrsPps(_srs_clock); SrsPps* _srs_pps_sched_s = new SrsPps(_srs_clock);
SrsPps* _srs_pps_clock_s = new SrsPps(_srs_clock); SrsPps* _srs_pps_clock_15ms = new SrsPps(_srs_clock);
SrsPps* _srs_pps_clock_10ms = new SrsPps(_srs_clock);
SrsPps* _srs_pps_clock_20ms = new SrsPps(_srs_clock); SrsPps* _srs_pps_clock_20ms = new SrsPps(_srs_clock);
SrsPps* _srs_pps_clock_25ms = new SrsPps(_srs_clock);
SrsPps* _srs_pps_clock_30ms = new SrsPps(_srs_clock); SrsPps* _srs_pps_clock_30ms = new SrsPps(_srs_clock);
SrsPps* _srs_pps_clock_35ms = new SrsPps(_srs_clock);
SrsPps* _srs_pps_clock_40ms = new SrsPps(_srs_clock); SrsPps* _srs_pps_clock_40ms = new SrsPps(_srs_clock);
SrsPps* _srs_pps_clock_80ms = new SrsPps(_srs_clock); SrsPps* _srs_pps_clock_80ms = new SrsPps(_srs_clock);
SrsPps* _srs_pps_clock_160ms = new SrsPps(_srs_clock); SrsPps* _srs_pps_clock_160ms = new SrsPps(_srs_clock);
SrsPps* _srs_pps_clock_500ms = new SrsPps(_srs_clock);
SrsPps* _srs_pps_timer_s = new SrsPps(_srs_clock); SrsPps* _srs_pps_timer_s = new SrsPps(_srs_clock);
ISrsHybridServer::ISrsHybridServer() ISrsHybridServer::ISrsHybridServer()
@ -311,22 +311,22 @@ srs_error_t SrsHybridServer::notify(int event, srs_utime_t interval, srs_utime_t
srs_utime_t elapsed = now - clock; srs_utime_t elapsed = now - clock;
clock = now; clock = now;
if (elapsed < 1 * SRS_UTIME_MILLISECONDS) { if (elapsed <= 15 * SRS_UTIME_MILLISECONDS) {
++_srs_pps_clock_s->sugar; ++_srs_pps_clock_15ms->sugar;
} else if (elapsed < 10 * SRS_UTIME_MILLISECONDS) { } else if (elapsed <= 21 * SRS_UTIME_MILLISECONDS) {
++_srs_pps_clock_10ms->sugar;
} else if (elapsed < 20 * SRS_UTIME_MILLISECONDS) {
++_srs_pps_clock_20ms->sugar; ++_srs_pps_clock_20ms->sugar;
} else if (elapsed < 30 * SRS_UTIME_MILLISECONDS) { } else if (elapsed <= 25 * SRS_UTIME_MILLISECONDS) {
++_srs_pps_clock_25ms->sugar;
} else if (elapsed <= 30 * SRS_UTIME_MILLISECONDS) {
++_srs_pps_clock_30ms->sugar; ++_srs_pps_clock_30ms->sugar;
} else if (elapsed < 40 * SRS_UTIME_MILLISECONDS) { } else if (elapsed <= 35 * SRS_UTIME_MILLISECONDS) {
++_srs_pps_clock_35ms->sugar;
} else if (elapsed <= 40 * SRS_UTIME_MILLISECONDS) {
++_srs_pps_clock_40ms->sugar; ++_srs_pps_clock_40ms->sugar;
} else if (elapsed < 80 * SRS_UTIME_MILLISECONDS) { } else if (elapsed <= 80 * SRS_UTIME_MILLISECONDS) {
++_srs_pps_clock_80ms->sugar; ++_srs_pps_clock_80ms->sugar;
} else if (elapsed < 160 * SRS_UTIME_MILLISECONDS) { } else if (elapsed <= 160 * SRS_UTIME_MILLISECONDS) {
++_srs_pps_clock_160ms->sugar; ++_srs_pps_clock_160ms->sugar;
} else if (elapsed < 500 * SRS_UTIME_MILLISECONDS) {
++_srs_pps_clock_500ms->sugar;
} else { } else {
++_srs_pps_timer_s->sugar; ++_srs_pps_timer_s->sugar;
} }
@ -407,13 +407,13 @@ srs_error_t SrsHybridServer::notify(int event, srs_utime_t interval, srs_utime_t
} }
string clock_desc; string clock_desc;
_srs_pps_clock_s->update(); _srs_pps_clock_10ms->update(); _srs_pps_clock_15ms->update(); _srs_pps_clock_20ms->update();
_srs_pps_clock_20ms->update(); _srs_pps_clock_30ms->update(); _srs_pps_clock_25ms->update(); _srs_pps_clock_30ms->update();
_srs_pps_clock_40ms->update(); _srs_pps_clock_80ms->update(); _srs_pps_clock_35ms->update(); _srs_pps_clock_40ms->update();
_srs_pps_clock_160ms->update(); _srs_pps_clock_500ms->update(); _srs_pps_clock_80ms->update(); _srs_pps_clock_160ms->update();
_srs_pps_timer_s->update(); _srs_pps_timer_s->update();
if (_srs_pps_clock_s->r10s() || _srs_pps_timer_s->r10s() || _srs_pps_clock_10ms->r10s() || _srs_pps_clock_20ms->r10s() || _srs_pps_clock_30ms->r10s() || _srs_pps_clock_40ms->r10s() || _srs_pps_clock_80ms->r10s() || _srs_pps_clock_160ms->r10s() || _srs_pps_clock_500ms->r10s()) { if (_srs_pps_clock_15ms->r10s() || _srs_pps_timer_s->r10s() || _srs_pps_clock_20ms->r10s() || _srs_pps_clock_25ms->r10s() || _srs_pps_clock_30ms->r10s() || _srs_pps_clock_35ms->r10s() || _srs_pps_clock_40ms->r10s() || _srs_pps_clock_80ms->r10s() || _srs_pps_clock_160ms->r10s()) {
snprintf(buf, sizeof(buf), ", clock=%d,%d,%d,%d,%d,%d,%d,%d,%d", _srs_pps_clock_s->r10s(), _srs_pps_clock_10ms->r10s(), _srs_pps_clock_20ms->r10s(), _srs_pps_clock_30ms->r10s(), _srs_pps_clock_40ms->r10s(), _srs_pps_clock_80ms->r10s(), _srs_pps_clock_160ms->r10s(), _srs_pps_clock_500ms->r10s(), _srs_pps_timer_s->r10s()); snprintf(buf, sizeof(buf), ", clock=%d,%d,%d,%d,%d,%d,%d,%d,%d", _srs_pps_clock_15ms->r10s(), _srs_pps_clock_20ms->r10s(), _srs_pps_clock_25ms->r10s(), _srs_pps_clock_30ms->r10s(), _srs_pps_clock_35ms->r10s(), _srs_pps_clock_40ms->r10s(), _srs_pps_clock_80ms->r10s(), _srs_pps_clock_160ms->r10s(), _srs_pps_timer_s->r10s());
clock_desc = buf; clock_desc = buf;
} }