mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
fix isse #35: the gettimeofday jitter, log warn message
This commit is contained in:
parent
4f284b20f0
commit
fdad7c25f0
9 changed files with 185 additions and 113 deletions
55
trunk/src/kernel/srs_kernel_utility.cpp
Normal file
55
trunk/src/kernel/srs_kernel_utility.cpp
Normal file
|
@ -0,0 +1,55 @@
|
|||
/*
|
||||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) 2013-2014 winlin
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||
this software and associated documentation files (the "Software"), to deal in
|
||||
the Software without restriction, including without limitation the rights to
|
||||
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
||||
the Software, and to permit persons to whom the Software is furnished to do so,
|
||||
subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
||||
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
||||
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
||||
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <srs_kernel_utility.hpp>
|
||||
|
||||
#include <sys/time.h>
|
||||
|
||||
#include <srs_kernel_log.hpp>
|
||||
|
||||
static int64_t _srs_system_time_us_cache = 0;
|
||||
|
||||
int64_t srs_get_system_time_ms()
|
||||
{
|
||||
return _srs_system_time_us_cache / 1000;
|
||||
}
|
||||
|
||||
void srs_update_system_time_ms()
|
||||
{
|
||||
timeval now;
|
||||
|
||||
if (gettimeofday(&now, NULL) < 0) {
|
||||
srs_warn("gettimeofday failed, ignore");
|
||||
return;
|
||||
}
|
||||
|
||||
// @see: https://github.com/winlinvip/simple-rtmp-server/issues/35
|
||||
// we must convert the tv_sec/tv_usec to int64_t.
|
||||
int64_t now_us = ((int64_t)now.tv_sec) * 1000 * 1000 + (int64_t)now.tv_usec;
|
||||
if (now_us < _srs_system_time_us_cache) {
|
||||
srs_warn("system time negative, "
|
||||
"history=%"PRId64"us, now=%"PRId64"", _srs_system_time_us_cache, now_us);
|
||||
}
|
||||
|
||||
_srs_system_time_us_cache = now_us;
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue