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

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

@ -29,6 +29,8 @@ using namespace std;
#include <srs_kernel_error.hpp>
#include <srs_app_source.hpp>
#include <srs_core_performance.hpp>
#include <srs_kernel_utility.hpp>
#include <srs_service_st.hpp>
MockSrsConfigBuffer::MockSrsConfigBuffer(string buf)
{
@ -1856,5 +1858,21 @@ VOID TEST(ConfigUnitTest, CheckDefaultValues)
EXPECT_EQ(100 * SRS_UTIME_MILLISECONDS, conf.get_publish_1stpkt_timeout("v"));
EXPECT_EQ(100 * SRS_UTIME_MILLISECONDS, conf.get_publish_normal_timeout("v"));
}
if (true) {
EXPECT_TRUE(ERROR_SUCCESS == conf.parse(_MIN_OK_CONF));
EXPECT_EQ(30 * SRS_UTIME_SECONDS, conf.get_dvr_duration(""));
EXPECT_TRUE(ERROR_SUCCESS == conf.parse(_MIN_OK_CONF"vhost v{dvr{dvr_duration 10;}}"));
EXPECT_EQ(10 * SRS_UTIME_SECONDS, conf.get_dvr_duration("v"));
}
if (true) {
srs_utime_t t0 = srs_update_system_time();
srs_usleep(10 * SRS_UTIME_MILLISECONDS);
srs_utime_t t1 = srs_update_system_time();
EXPECT_TRUE(t1 - t0 >= 10 * SRS_UTIME_MILLISECONDS);
}
}

6
trunk/src/utest/srs_utest_kernel.cpp
View file

@ -1489,7 +1489,7 @@ VOID TEST(KernelUtilityTest, UtilityTime)
EXPECT_EQ(time, time1);
usleep(1000);
srs_update_system_time_ms();
srs_update_system_time();
time1 = srs_get_system_time_ms();
EXPECT_TRUE(time1 > time);
}
@ -1506,7 +1506,7 @@ VOID TEST(KernelUtilityTest, UtilityStartupTime)
EXPECT_EQ(time, time1);
usleep(1000);
srs_update_system_time_ms();
srs_update_system_time();
time1 = srs_get_system_startup_time_ms();
EXPECT_EQ(time, time1);
}
@ -3185,7 +3185,7 @@ VOID TEST(KernelUtilityTest, CoverTimeUtilityAll)
EXPECT_TRUE(srs_get_system_startup_time_ms() > 0);
_srs_system_time_us_cache -= 300*1000 * 1000 + 1;
EXPECT_TRUE(srs_update_system_time_ms() > 0);
EXPECT_TRUE(srs_update_system_time() > 0);
if (true) {
string host;