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

Refine srs_update_system_time in time unit

Browse source
This commit is contained in:
winlin 2019-04-10 09:07:03 +08:00
parent 9b7c0802a9
commit 6c12aa0eca
26 changed files with 123 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

20
trunk/src/app/srs_app_utility.cpp
View file

@ -236,7 +236,7 @@ void srs_update_system_rusage()
return;
}
_srs_system_rusage.sample_time = srs_get_system_time_ms();
_srs_system_rusage.sample_time = srsu2ms(srs_get_system_time());
_srs_system_rusage.ok = true;
}
@ -427,7 +427,7 @@ void srs_update_proc_stat()
return;
}
r.sample_time = srs_get_system_time_ms();
r.sample_time = srsu2ms(srs_get_system_time());
// calc usage in percent
SrsProcSystemStat& o = _srs_system_cpu_system_stat;
@ -453,7 +453,7 @@ void srs_update_proc_stat()
return;
}
r.sample_time = srs_get_system_time_ms();
r.sample_time = srsu2ms(srs_get_system_time());
// calc usage in percent
SrsProcSelfStat& o = _srs_system_cpu_self_stat;
@ -505,7 +505,7 @@ bool srs_get_disk_vmstat_stat(SrsDiskStat& r)
return false;
}
r.sample_time = srs_get_system_time_ms();
r.sample_time = srsu2ms(srs_get_system_time());
static char buf[1024];
while (fgets(buf, sizeof(buf), f)) {
@ -531,7 +531,7 @@ bool srs_get_disk_vmstat_stat(SrsDiskStat& r)
bool srs_get_disk_diskstats_stat(SrsDiskStat& r)
{
r.ok = true;
r.sample_time = srs_get_system_time_ms();
r.sample_time = srsu2ms(srs_get_system_time());
// if disabled, ignore all devices.
SrsConfDirective* conf = _srs_config->get_stats_disk_device();
@ -731,7 +731,7 @@ void srs_update_meminfo()
// Fuck all of you who use osx for a long time and never patch the osx features for srs.
#endif
r.sample_time = srs_get_system_time_ms();
r.sample_time = srsu2ms(srs_get_system_time());
r.MemActive = r.MemTotal - r.MemFree;
r.RealInUse = r.MemActive - r.Buffers - r.Cached;
r.NotInUse = r.MemTotal - r.RealInUse;
@ -795,7 +795,7 @@ void srs_update_platform_info()
{
SrsPlatformInfo& r = _srs_system_platform_info;
r.srs_startup_time = srs_get_system_startup_time_ms();
r.srs_startup_time = srsu2ms(srs_get_system_startup_time());
#ifndef SRS_OSX
if (true) {
@ -940,7 +940,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 = srs_get_system_time_ms();
r.sample_time = srsu2ms(srs_get_system_time());
r.ok = true;
}
@ -1090,7 +1090,7 @@ void srs_update_rtmp_server(int nb_conn, SrsKbps* kbps)
r.ok = true;
r.nb_conn_srs = nb_conn;
r.sample_time = srs_get_system_time_ms();
r.sample_time = srsu2ms(srs_get_system_time());
r.rbytes = kbps->get_recv_bytes();
r.rkbps = kbps->get_recv_kbps();
@ -1199,7 +1199,7 @@ void srs_api_dump_summaries(SrsJsonObject* obj)
self_mem_percent = (float)(r->r.ru_maxrss / (double)m->MemTotal);
}
int64_t now = srs_get_system_time_ms();
int64_t now = srsu2ms(srs_get_system_time());
double srs_uptime = (now - p->srs_startup_time) / 100 / 10.0;
int64_t n_sample_time = 0;