external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 11:51:57 +00:00
Code Issues Releases Wiki Activity

Refine get_heartbeat_interval in time unit

Browse source
This commit is contained in:
winlin 2019-04-09 08:47:18 +08:00
parent 5937304717
commit 60f9561d2d
4 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
trunk/src/app/srs_app_config.cpp
View file

@ -6944,9 +6944,9 @@ bool SrsConfig::get_heartbeat_enabled()
return SRS_CONF_PERFER_FALSE(conf->arg0()); return SRS_CONF_PERFER_FALSE(conf->arg0());
} }
int64_t SrsConfig::get_heartbeat_interval() srs_utime_t SrsConfig::get_heartbeat_interval()
{ {
static int64_t DEFAULT = (int64_t)(9.9 * 1000); static srs_utime_t DEFAULT = (srs_utime_t)(9.9 * SRS_UTIME_SECONDS);
SrsConfDirective* conf = get_heartbeart(); SrsConfDirective* conf = get_heartbeart();
if (!conf) { if (!conf) {
@ -6958,7 +6958,7 @@ int64_t SrsConfig::get_heartbeat_interval()
return DEFAULT; return DEFAULT;
} }
return (int64_t)(::atof(conf->arg0().c_str()) * 1000); return (srs_utime_t)(::atof(conf->arg0().c_str()) * SRS_UTIME_SECONDS);
} }
string SrsConfig::get_heartbeat_url() string SrsConfig::get_heartbeat_url()

4
trunk/src/app/srs_app_config.hpp
View file

@ -1423,9 +1423,9 @@ public:
*/ */
virtual bool get_heartbeat_enabled(); virtual bool get_heartbeat_enabled();
/** /**
* get the heartbeat interval, in ms. * get the heartbeat interval, in srs_utime_t.
*/ */
virtual int64_t get_heartbeat_interval(); virtual srs_utime_t get_heartbeat_interval();
/** /**
* get the heartbeat report url. * get the heartbeat report url.
*/ */

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

@ -910,7 +910,7 @@ srs_error_t SrsServer::do_cycle()
} }
// the interval in config. // the interval in config.
int heartbeat_max_resolution = (int)(_srs_config->get_heartbeat_interval() * SRS_UTIME_MILLISECONDS / SRS_SYS_CYCLE_INTERVAL); int heartbeat_max_resolution = (int)(_srs_config->get_heartbeat_interval() / SRS_SYS_CYCLE_INTERVAL);
// dynamic fetch the max. // dynamic fetch the max.
int dynamic_max = srs_max(max, heartbeat_max_resolution); int dynamic_max = srs_max(max, heartbeat_max_resolution);

9
trunk/src/utest/srs_utest_config.cpp
View file

@ -1807,6 +1807,7 @@ VOID TEST(ConfigMainTest, CheckConf_vhost_ingest_id)
VOID TEST(ConfigUnitTest, CheckDefaultValues) VOID TEST(ConfigUnitTest, CheckDefaultValues)
{ {
MockSrsConfig conf; MockSrsConfig conf;
if (true) { if (true) {
EXPECT_TRUE(ERROR_SUCCESS == conf.parse(_MIN_OK_CONF)); EXPECT_TRUE(ERROR_SUCCESS == conf.parse(_MIN_OK_CONF));
EXPECT_EQ(30 * SRS_UTIME_SECONDS, conf.get_bw_check_interval("")); EXPECT_EQ(30 * SRS_UTIME_SECONDS, conf.get_bw_check_interval(""));
@ -1826,5 +1827,13 @@ VOID TEST(ConfigUnitTest, CheckDefaultValues)
EXPECT_EQ(40 * SRS_UTIME_SECONDS, conf.get_dash_update_period("v")); EXPECT_EQ(40 * SRS_UTIME_SECONDS, conf.get_dash_update_period("v"));
EXPECT_EQ(70 * SRS_UTIME_SECONDS, conf.get_dash_timeshift("v")); EXPECT_EQ(70 * SRS_UTIME_SECONDS, conf.get_dash_timeshift("v"));
} }
if (true) {
EXPECT_TRUE(ERROR_SUCCESS == conf.parse(_MIN_OK_CONF));
EXPECT_EQ(srs_utime_t(9.9 * SRS_UTIME_SECONDS), conf.get_heartbeat_interval());
EXPECT_TRUE(ERROR_SUCCESS == conf.parse(_MIN_OK_CONF"heartbeat{interval 10;}"));
EXPECT_EQ(10 * SRS_UTIME_SECONDS, conf.get_heartbeat_interval());
}
} }