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 08:32:46 +08:00
parent 9b1222a79c
commit 9b7c0802a9
17 changed files with 64 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

10
trunk/src/kernel/srs_kernel_utility.cpp
View file

@ -107,7 +107,7 @@ int64_t _srs_system_time_startup_time = 0;
int64_t srs_get_system_time_ms()
{
if (_srs_system_time_us_cache <= 0) {
srs_update_system_time_ms();
srs_update_system_time();
}
return _srs_system_time_us_cache / 1000;
@ -116,13 +116,13 @@ int64_t srs_get_system_time_ms()
int64_t srs_get_system_startup_time_ms()
{
if (_srs_system_time_startup_time <= 0) {
srs_update_system_time_ms();
srs_update_system_time();
}
return _srs_system_time_startup_time / 1000;
}
int64_t srs_update_system_time_ms()
srs_utime_t srs_update_system_time()
{
timeval now;
@ -143,7 +143,7 @@ int64_t srs_update_system_time_ms()
// so we use relative time.
if (_srs_system_time_us_cache <= 0) {
_srs_system_time_startup_time = _srs_system_time_us_cache = now_us;
return _srs_system_time_us_cache / 1000;
return _srs_system_time_us_cache;
}
// use relative time.
@ -158,7 +158,7 @@ int64_t srs_update_system_time_ms()
_srs_system_time_us_cache = now_us;
srs_info("clock updated, startup=%" PRId64 "us, now=%" PRId64 "us", _srs_system_time_startup_time, _srs_system_time_us_cache);
return _srs_system_time_us_cache / 1000;
return _srs_system_time_us_cache;
}
string srs_dns_resolve(string host, int& family)

4
trunk/src/kernel/srs_kernel_utility.hpp
View file

@ -29,6 +29,8 @@
#include <string>
#include <vector>
#include <srs_core_time.hpp>
class SrsBuffer;
class SrsBitBuffer;
@ -44,7 +46,7 @@ extern srs_error_t srs_avc_nalu_read_bit(SrsBitBuffer* stream, int8_t& v);
extern int64_t srs_get_system_time_ms();
extern int64_t srs_get_system_startup_time_ms();
// the deamon st-thread will update it.
extern int64_t srs_update_system_time_ms();
extern srs_utime_t srs_update_system_time();
// the any address for listener,
// it's "0.0.0.0" for ipv4, and "::" for ipv6.