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

fix isse #35: the gettimeofday jitter, log warn message

Browse source
This commit is contained in:
winlin 2014-03-21 17:56:27 +08:00
parent 4f284b20f0
commit fdad7c25f0
9 changed files with 185 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/configure vendored
View file

@ -338,7 +338,7 @@ CORE_OBJS="${MODULE_OBJS[@]}"
MODULE_ID="KERNEL" MODULE_ID="KERNEL"
MODULE_DEPENDS=("CORE") MODULE_DEPENDS=("CORE")
ModuleLibIncs=(${SRS_OBJS}) ModuleLibIncs=(${SRS_OBJS})
MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_stream" "srs_kernel_buffer") MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_stream" "srs_kernel_buffer" "srs_kernel_utility")
KERNEL_INCS="src/kernel"; MODULE_DIR=${KERNEL_INCS} . auto/modules.sh KERNEL_INCS="src/kernel"; MODULE_DIR=${KERNEL_INCS} . auto/modules.sh
KERNEL_OBJS="${MODULE_OBJS[@]}" KERNEL_OBJS="${MODULE_OBJS[@]}"
# #

1
trunk/src/app/srs_app_bandwidth.cpp
View file

@ -34,6 +34,7 @@ using namespace std;
#include <srs_protocol_rtmp_stack.hpp> #include <srs_protocol_rtmp_stack.hpp>
#include <srs_app_config.hpp> #include <srs_app_config.hpp>
#include <srs_core_autofree.hpp> #include <srs_core_autofree.hpp>
#include <srs_kernel_utility.hpp>
SrsBandwidth::SrsBandwidth() SrsBandwidth::SrsBandwidth()
{ {

1
trunk/src/app/srs_app_server.cpp
View file

@ -37,6 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_kernel_error.hpp> #include <srs_kernel_error.hpp>
#include <srs_app_client.hpp> #include <srs_app_client.hpp>
#include <srs_app_config.hpp> #include <srs_app_config.hpp>
#include <srs_kernel_utility.hpp>
#define SERVER_LISTEN_BACKLOG 512 #define SERVER_LISTEN_BACKLOG 512
#define SRS_TIME_RESOLUTION_MS 500 #define SRS_TIME_RESOLUTION_MS 500

1
trunk/src/app/srs_app_socket.cpp
View file

@ -24,6 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_app_socket.hpp> #include <srs_app_socket.hpp>
#include <srs_kernel_error.hpp> #include <srs_kernel_error.hpp>
#include <srs_kernel_utility.hpp>
SrsSocket::SrsSocket(st_netfd_t client_stfd) SrsSocket::SrsSocket(st_netfd_t client_stfd)
{ {

21
trunk/src/core/srs_core.cpp
View file

@ -24,30 +24,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core.hpp> #include <srs_core.hpp>
#include <string.h> #include <string.h>
#include <sys/time.h>
#include <netdb.h> #include <netdb.h>
#include <arpa/inet.h> #include <arpa/inet.h>
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;
gettimeofday(&now, NULL);
// @see: https://github.com/winlinvip/simple-rtmp-server/issues/35
// we must convert the tv_sec/tv_usec to int64_t.
_srs_system_time_us_cache = ((int64_t)now.tv_sec) * 1000 * 1000 + (int64_t)now.tv_usec;
_srs_system_time_us_cache = srs_max(0, _srs_system_time_us_cache);
}
std::string srs_replace(std::string str, std::string old_str, std::string new_str) std::string srs_replace(std::string str, std::string old_str, std::string new_str)
{ {
std::string ret = str; std::string ret = str;

5
trunk/src/core/srs_core.hpp
View file

@ -86,11 +86,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define srs_min(a, b) (((a) < (b))? (a) : (b)) #define srs_min(a, b) (((a) < (b))? (a) : (b))
#define srs_max(a, b) (((a) < (b))? (b) : (a)) #define srs_max(a, b) (((a) < (b))? (b) : (a))
// get current system time in ms, use cache to avoid performance problem
extern int64_t srs_get_system_time_ms();
// the deamon st-thread will update it.
extern void srs_update_system_time_ms();
// signal defines. // signal defines.
#define SIGNAL_RELOAD SIGHUP #define SIGNAL_RELOAD SIGHUP

55
trunk/src/kernel/srs_kernel_utility.cpp Normal file
View 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;
}

38
trunk/src/kernel/srs_kernel_utility.hpp Normal file
View file

@ -0,0 +1,38 @@
/*
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.
*/
#ifndef SRS_KERNEL_UTILITY_HPP
#define SRS_KERNEL_UTILITY_HPP
/*
#include <srs_kernel_utility.hpp>
*/
#include <srs_core.hpp>
// get current system time in ms, use cache to avoid performance problem
extern int64_t srs_get_system_time_ms();
// the deamon st-thread will update it.
extern void srs_update_system_time_ms();
#endif

174
trunk/src/srs/srs.upp
View file

@ -1,90 +1,92 @@
file file
main readonly separator, main readonly separator,
..\main\srs_main_server.cpp, ..\main\srs_main_server.cpp,
..\main\srs_main_bandcheck.cpp, ..\main\srs_main_bandcheck.cpp,
auto readonly separator, auto readonly separator,
..\..\objs\srs_auto_headers.hpp, ..\..\objs\srs_auto_headers.hpp,
libs readonly separator, libs readonly separator,
..\libs\srs_librtmp.hpp, ..\libs\srs_librtmp.hpp,
..\libs\srs_librtmp.cpp, ..\libs\srs_librtmp.cpp,
..\libs\srs_lib_simple_socket.hpp, ..\libs\srs_lib_simple_socket.hpp,
..\libs\srs_lib_simple_socket.cpp, ..\libs\srs_lib_simple_socket.cpp,
core readonly separator, core readonly separator,
..\core\srs_core.hpp, ..\core\srs_core.hpp,
..\core\srs_core.cpp, ..\core\srs_core.cpp,
..\core\srs_core_autofree.hpp, ..\core\srs_core_autofree.hpp,
..\core\srs_core_autofree.cpp, ..\core\srs_core_autofree.cpp,
kernel readonly separator, kernel readonly separator,
..\kernel\srs_kernel_buffer.hpp, ..\kernel\srs_kernel_buffer.hpp,
..\kernel\srs_kernel_buffer.cpp, ..\kernel\srs_kernel_buffer.cpp,
..\kernel\srs_kernel_error.hpp, ..\kernel\srs_kernel_error.hpp,
..\kernel\srs_kernel_error.cpp, ..\kernel\srs_kernel_error.cpp,
..\kernel\srs_kernel_log.hpp, ..\kernel\srs_kernel_log.hpp,
..\kernel\srs_kernel_log.cpp, ..\kernel\srs_kernel_log.cpp,
..\kernel\srs_kernel_stream.hpp, ..\kernel\srs_kernel_stream.hpp,
..\kernel\srs_kernel_stream.cpp, ..\kernel\srs_kernel_stream.cpp,
rtmp-protocol readonly separator, ..\kernel\srs_kernel_utility.hpp,
..\rtmp\srs_protocol_amf0.hpp, ..\kernel\srs_kernel_utility.cpp,
..\rtmp\srs_protocol_amf0.cpp, rtmp-protocol readonly separator,
..\rtmp\srs_protocol_handshake.hpp, ..\rtmp\srs_protocol_amf0.hpp,
..\rtmp\srs_protocol_handshake.cpp, ..\rtmp\srs_protocol_amf0.cpp,
..\rtmp\srs_protocol_io.hpp, ..\rtmp\srs_protocol_handshake.hpp,
..\rtmp\srs_protocol_io.cpp, ..\rtmp\srs_protocol_handshake.cpp,
..\rtmp\srs_protocol_rtmp.hpp, ..\rtmp\srs_protocol_io.hpp,
..\rtmp\srs_protocol_rtmp.cpp, ..\rtmp\srs_protocol_io.cpp,
..\rtmp\srs_protocol_rtmp_stack.hpp, ..\rtmp\srs_protocol_rtmp.hpp,
..\rtmp\srs_protocol_rtmp_stack.cpp, ..\rtmp\srs_protocol_rtmp.cpp,
..\rtmp\srs_protocol_utility.hpp, ..\rtmp\srs_protocol_rtmp_stack.hpp,
..\rtmp\srs_protocol_utility.cpp, ..\rtmp\srs_protocol_rtmp_stack.cpp,
app readonly separator, ..\rtmp\srs_protocol_utility.hpp,
..\app\srs_app_bandwidth.hpp, ..\rtmp\srs_protocol_utility.cpp,
..\app\srs_app_bandwidth.cpp, app readonly separator,
..\app\srs_app_client.hpp, ..\app\srs_app_bandwidth.hpp,
..\app\srs_app_client.cpp, ..\app\srs_app_bandwidth.cpp,
..\app\srs_app_codec.hpp, ..\app\srs_app_client.hpp,
..\app\srs_app_codec.cpp, ..\app\srs_app_client.cpp,
..\app\srs_app_conn.hpp, ..\app\srs_app_codec.hpp,
..\app\srs_app_conn.cpp, ..\app\srs_app_codec.cpp,
..\app\srs_app_config.hpp, ..\app\srs_app_conn.hpp,
..\app\srs_app_config.cpp, ..\app\srs_app_conn.cpp,
..\app\srs_app_encoder.hpp, ..\app\srs_app_config.hpp,
..\app\srs_app_encoder.cpp, ..\app\srs_app_config.cpp,
..\app\srs_app_forward.hpp, ..\app\srs_app_encoder.hpp,
..\app\srs_app_forward.cpp, ..\app\srs_app_encoder.cpp,
..\app\srs_app_hls.hpp, ..\app\srs_app_forward.hpp,
..\app\srs_app_hls.cpp, ..\app\srs_app_forward.cpp,
..\app\srs_app_http.hpp, ..\app\srs_app_hls.hpp,
..\app\srs_app_http.cpp, ..\app\srs_app_hls.cpp,
..\app\srs_app_log.hpp, ..\app\srs_app_http.hpp,
..\app\srs_app_log.cpp, ..\app\srs_app_http.cpp,
..\app\srs_app_refer.hpp, ..\app\srs_app_log.hpp,
..\app\srs_app_refer.cpp, ..\app\srs_app_log.cpp,
..\app\srs_app_reload.hpp, ..\app\srs_app_refer.hpp,
..\app\srs_app_reload.cpp, ..\app\srs_app_refer.cpp,
..\app\srs_app_pithy_print.hpp, ..\app\srs_app_reload.hpp,
..\app\srs_app_pithy_print.cpp, ..\app\srs_app_reload.cpp,
..\app\srs_app_thread.hpp, ..\app\srs_app_pithy_print.hpp,
..\app\srs_app_thread.cpp, ..\app\srs_app_pithy_print.cpp,
..\app\srs_app_server.hpp, ..\app\srs_app_thread.hpp,
..\app\srs_app_server.cpp, ..\app\srs_app_thread.cpp,
..\app\srs_app_st.hpp, ..\app\srs_app_server.hpp,
..\app\srs_app_st.cpp, ..\app\srs_app_server.cpp,
..\app\srs_app_socket.hpp, ..\app\srs_app_st.hpp,
..\app\srs_app_socket.cpp, ..\app\srs_app_st.cpp,
..\app\srs_app_source.hpp, ..\app\srs_app_socket.hpp,
..\app\srs_app_source.cpp, ..\app\srs_app_socket.cpp,
utest readonly separator, ..\app\srs_app_source.hpp,
..\utest\srs_utest.hpp, ..\app\srs_app_source.cpp,
..\utest\srs_utest.cpp, utest readonly separator,
..\utest\srs_utest_amf0.hpp, ..\utest\srs_utest.hpp,
..\utest\srs_utest_amf0.cpp, ..\utest\srs_utest.cpp,
..\utest\srs_utest_handshake.hpp, ..\utest\srs_utest_amf0.hpp,
..\utest\srs_utest_handshake.cpp, ..\utest\srs_utest_amf0.cpp,
research readonly separator, ..\utest\srs_utest_handshake.hpp,
..\..\research\librtmp\srs_play.c, ..\utest\srs_utest_handshake.cpp,
..\..\research\librtmp\srs_publish.c, research readonly separator,
..\..\research\hls\ts_info.cc; ..\..\research\librtmp\srs_play.c,
..\..\research\librtmp\srs_publish.c,
..\..\research\hls\ts_info.cc;
mainconfig mainconfig
"" = "MAIN"; "" = "MAIN";