From 4795244716c1e1279c8b6fc663576d14d37d3369 Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 27 Sep 2020 14:57:18 +0800 Subject: [PATCH] Fix stat get time bug --- trunk/src/app/srs_app_utility.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/trunk/src/app/srs_app_utility.cpp b/trunk/src/app/srs_app_utility.cpp index f3857b178..bde16dc83 100644 --- a/trunk/src/app/srs_app_utility.cpp +++ b/trunk/src/app/srs_app_utility.cpp @@ -235,7 +235,7 @@ void srs_update_system_rusage() return; } - _srs_system_rusage.sample_time = srsu2ms(srs_get_system_time()); + _srs_system_rusage.sample_time = srsu2ms(srs_update_system_time()); _srs_system_rusage.ok = true; } @@ -420,7 +420,7 @@ void srs_update_proc_stat() return; } - r.sample_time = srsu2ms(srs_get_system_time()); + r.sample_time = srsu2ms(srs_update_system_time()); // calc usage in percent SrsProcSystemStat& o = _srs_system_cpu_system_stat; @@ -446,7 +446,7 @@ void srs_update_proc_stat() return; } - r.sample_time = srsu2ms(srs_get_system_time()); + r.sample_time = srsu2ms(srs_update_system_time()); // calc usage in percent SrsProcSelfStat& o = _srs_system_cpu_self_stat; @@ -498,7 +498,7 @@ bool srs_get_disk_vmstat_stat(SrsDiskStat& r) return false; } - r.sample_time = srsu2ms(srs_get_system_time()); + r.sample_time = srsu2ms(srs_update_system_time()); static char buf[1024]; while (fgets(buf, sizeof(buf), f)) { @@ -521,7 +521,7 @@ bool srs_get_disk_vmstat_stat(SrsDiskStat& r) bool srs_get_disk_diskstats_stat(SrsDiskStat& r) { r.ok = true; - r.sample_time = srsu2ms(srs_get_system_time()); + r.sample_time = srsu2ms(srs_update_system_time()); #ifndef SRS_OSX // if disabled, ignore all devices. @@ -715,7 +715,7 @@ void srs_update_meminfo() fclose(f); #endif - r.sample_time = srsu2ms(srs_get_system_time()); + r.sample_time = srsu2ms(srs_update_system_time()); r.MemActive = r.MemTotal - r.MemFree; r.RealInUse = r.MemActive - r.Buffers - r.Cached; r.NotInUse = r.MemTotal - r.RealInUse; @@ -924,7 +924,7 @@ void srs_update_network_devices() _nb_srs_system_network_devices = i + 1; srs_info("scan network device ifname=%s, total=%d", r.name, _nb_srs_system_network_devices); - r.sample_time = srsu2ms(srs_get_system_time()); + r.sample_time = srsu2ms(srs_update_system_time()); r.ok = true; } @@ -1070,7 +1070,7 @@ void srs_update_rtmp_server(int nb_conn, SrsKbps* kbps) r.ok = true; r.nb_conn_srs = nb_conn; - r.sample_time = srsu2ms(srs_get_system_time()); + r.sample_time = srsu2ms(srs_update_system_time()); r.rbytes = kbps->get_recv_bytes(); r.rkbps = kbps->get_recv_kbps(); @@ -1190,7 +1190,7 @@ void srs_api_dump_summaries(SrsJsonObject* obj) self_mem_percent = (float)(r->r.ru_maxrss / (double)m->MemTotal); } - int64_t now = srsu2ms(srs_get_system_time()); + int64_t now = srsu2ms(srs_update_system_time()); double srs_uptime = (now - p->srs_startup_time) / 100 / 10.0; int64_t n_sample_time = 0;