From a6fe4e80d36a06eef5a0e62f66ee78b6aa92c75b Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 20 Jan 2020 11:25:39 +0800 Subject: [PATCH] For #1547, remove the SRS_OSX macro in code --- trunk/auto/depends.sh | 2 +- trunk/src/app/srs_app_utility.cpp | 92 ++---------------------------- trunk/src/main/srs_main_server.cpp | 15 +---- trunk/src/utest/srs_utest.cpp | 5 -- trunk/src/utest/srs_utest_app.cpp | 5 -- 5 files changed, 9 insertions(+), 110 deletions(-) diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 7d301b637b..d87ebd0cb3 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -96,7 +96,7 @@ function Ubuntu_prepare() if [[ $SRS_VALGRIND == YES ]]; then if [[ ! -f /usr/include/valgrind/valgrind.h ]]; then echo "Installing valgrind-dev." - require_sudoer "sudo apt-get install -y --force-yes valgrind-dev" + require_sudoer "sudo apt-get install -y --force-yes valgrind-dbg" sudo apt-get install -y --force-yes valgrind-dev; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi echo "The valgrind-dev is installed." fi diff --git a/trunk/src/app/srs_app_utility.cpp b/trunk/src/app/srs_app_utility.cpp index 2dc149ddc4..04ece71840 100644 --- a/trunk/src/app/srs_app_utility.cpp +++ b/trunk/src/app/srs_app_utility.cpp @@ -31,9 +31,6 @@ #include #include -#ifdef SRS_OSX -#include -#endif #include #include #include @@ -329,7 +326,6 @@ SrsProcSystemStat* srs_get_system_proc_stat() bool get_proc_system_stat(SrsProcSystemStat& r) { -#ifndef SRS_OSX FILE* f = fopen("/proc/stat", "r"); if (f == NULL) { srs_warn("open system cpu stat failed, ignore"); @@ -359,10 +355,7 @@ bool get_proc_system_stat(SrsProcSystemStat& r) } fclose(f); -#else - // TODO: FIXME: impelments it. -#endif - + r.ok = true; return true; @@ -370,7 +363,6 @@ bool get_proc_system_stat(SrsProcSystemStat& r) bool get_proc_self_stat(SrsProcSelfStat& r) { -#ifndef SRS_OSX FILE* f = fopen("/proc/self/stat", "r"); if (f == NULL) { srs_warn("open self cpu stat failed, ignore"); @@ -397,10 +389,7 @@ bool get_proc_self_stat(SrsProcSelfStat& r) &r.guest_time, &r.cguest_time); fclose(f); -#else - // TODO: FIXME: impelments it. -#endif - + r.ok = true; return true; @@ -495,7 +484,6 @@ SrsDiskStat* srs_get_disk_stat() bool srs_get_disk_vmstat_stat(SrsDiskStat& r) { -#ifndef SRS_OSX FILE* f = fopen("/proc/vmstat", "r"); if (f == NULL) { srs_warn("open vmstat failed, ignore"); @@ -515,10 +503,7 @@ bool srs_get_disk_vmstat_stat(SrsDiskStat& r) } fclose(f); -#else - // TODO: FIXME: impelments it. -#endif - + r.ok = true; return true; @@ -535,7 +520,6 @@ bool srs_get_disk_diskstats_stat(SrsDiskStat& r) return true; } -#ifndef SRS_OSX FILE* f = fopen("/proc/diskstats", "r"); if (f == NULL) { srs_warn("open vmstat failed, ignore"); @@ -600,10 +584,7 @@ bool srs_get_disk_diskstats_stat(SrsDiskStat& r) } fclose(f); -#else - // TODO: FIXME: impelments it. -#endif - + r.ok = true; return true; @@ -695,7 +676,6 @@ void srs_update_meminfo() { SrsMemInfo& r = _srs_system_meminfo; -#ifndef SRS_OSX FILE* f = fopen("/proc/meminfo", "r"); if (f == NULL) { srs_warn("open meminfo failed, ignore"); @@ -721,10 +701,7 @@ void srs_update_meminfo() } fclose(f); -#else - // TODO: FIXME: impelments it. -#endif - + r.sample_time = srsu2ms(srs_get_system_time()); r.MemActive = r.MemTotal - r.MemFree; r.RealInUse = r.MemActive - r.Buffers - r.Cached; @@ -791,7 +768,6 @@ void srs_update_platform_info() r.srs_startup_time = srsu2ms(srs_get_system_startup_time()); -#ifndef SRS_OSX if (true) { FILE* f = fopen("/proc/uptime", "r"); if (f == NULL) { @@ -820,43 +796,6 @@ void srs_update_platform_info() fclose(f); } -#else - // man 3 sysctl - if (true) { - struct timeval tv; - size_t len = sizeof(timeval); - - int mib[2]; - mib[0] = CTL_KERN; - mib[1] = KERN_BOOTTIME; - if (sysctl(mib, 2, &tv, &len, NULL, 0) < 0) { - srs_warn("sysctl boottime failed, ignore"); - return; - } - - time_t bsec = tv.tv_sec; - time_t csec = ::time(NULL); - r.os_uptime = difftime(csec, bsec); - } - - // man 3 sysctl - if (true) { - struct loadavg la; - size_t len = sizeof(loadavg); - - int mib[2]; - mib[0] = CTL_VM; - mib[1] = VM_LOADAVG; - if (sysctl(mib, 2, &la, &len, NULL, 0) < 0) { - srs_warn("sysctl loadavg failed, ignore"); - return; - } - - r.load_one_minutes = (double)la.ldavg[0] / la.fscale; - r.load_five_minutes = (double)la.ldavg[1] / la.fscale; - r.load_fifteen_minutes = (double)la.ldavg[2] / la.fscale; - } -#endif r.ok = true; } @@ -903,7 +842,6 @@ int srs_get_network_devices_count() void srs_update_network_devices() { -#ifndef SRS_OSX if (true) { FILE* f = fopen("/proc/net/dev", "r"); if (f == NULL) { @@ -940,9 +878,6 @@ void srs_update_network_devices() fclose(f); } -#else - // TODO: FIXME: impelments it. -#endif } SrsNetworkRtmpServer::SrsNetworkRtmpServer() @@ -990,7 +925,6 @@ void srs_update_rtmp_server(int nb_conn, SrsKbps* kbps) int nb_tcp_mem = 0; int nb_udp4 = 0; -#ifndef SRS_OSX if (true) { FILE* f = fopen("/proc/net/sockstat", "r"); if (f == NULL) { @@ -1020,20 +954,9 @@ void srs_update_rtmp_server(int nb_conn, SrsKbps* kbps) fclose(f); } -#else - // TODO: FIXME: impelments it. - nb_socks = 0; - nb_tcp4_hashed = 0; - nb_tcp_orphans = 0; - nb_tcp_tws = 0; - nb_tcp_total = 0; - nb_tcp_mem = 0; - nb_udp4 = 0; -#endif int nb_tcp_estab = 0; -#ifndef SRS_OSX if (true) { FILE* f = fopen("/proc/net/snmp", "r"); if (f == NULL) { @@ -1063,10 +986,7 @@ void srs_update_rtmp_server(int nb_conn, SrsKbps* kbps) fclose(f); } -#else - // TODO: FIXME: impelments it. -#endif - + // @see: https://github.com/shemminger/iproute2/blob/master/misc/ss.c // TODO: FIXME: ignore the slabstat, @see: get_slabstat() if (true) { diff --git a/trunk/src/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp index 3bfd9ebb13..85e3f193dd 100644 --- a/trunk/src/main/srs_main_server.cpp +++ b/trunk/src/main/srs_main_server.cpp @@ -236,16 +236,6 @@ void show_macro_features() if (true) { stringstream ss; ss << "SRS on "; -#ifdef SRS_OSX - ss << "OSX"; -#endif -#ifdef SRS_PI - ss << "RespberryPi"; -#endif -#ifdef SRS_CUBIE - ss << "CubieBoard"; -#endif - #if defined(__amd64__) ss << " amd64"; #endif @@ -258,9 +248,8 @@ void show_macro_features() #if defined(__arm__) ss << "arm"; #endif - -#ifndef SRS_OSX - ss << ", glibc" << (int)__GLIBC__ << "." << (int)__GLIBC_MINOR__; +#if defined(__aarch64__) + ss << " aarch64"; #endif ss << ", conf:" << _srs_config->config() << ", limit:" << _srs_config->get_max_connections() diff --git a/trunk/src/utest/srs_utest.cpp b/trunk/src/utest/srs_utest.cpp index 74b7021672..19f3d84999 100644 --- a/trunk/src/utest/srs_utest.cpp +++ b/trunk/src/utest/srs_utest.cpp @@ -46,23 +46,18 @@ ISrsThreadContext* _srs_context = new ISrsThreadContext(); SrsConfig* _srs_config = NULL; SrsServer* _srs_server = NULL; -// Disable coroutine test for OSX. -#if !defined(SRS_OSX) #include -#endif // Initialize global settings. srs_error_t prepare_main() { srs_error_t err = srs_success; - #if !defined(SRS_OSX) if ((err = srs_st_init()) != srs_success) { return srs_error_wrap(err, "init st"); } srs_freep(_srs_context); _srs_context = new SrsThreadContext(); - #endif return err; } diff --git a/trunk/src/utest/srs_utest_app.cpp b/trunk/src/utest/srs_utest_app.cpp index 344cc0f43f..5d158d5d6d 100644 --- a/trunk/src/utest/srs_utest_app.cpp +++ b/trunk/src/utest/srs_utest_app.cpp @@ -27,9 +27,6 @@ using namespace std; #include #include -// Disable coroutine test for OSX. -#if !defined(SRS_OSX) - #include VOID TEST(AppCoroutineTest, Dummy) @@ -375,5 +372,3 @@ VOID TEST(AppFragmentTest, CheckDuration) } } -#endif -