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

for #155, add todo for osx. 2.0.146

Browse source
This commit is contained in:
winlin 2015-03-21 15:22:45 +08:00
parent 6776065b04
commit 33cca3e027
4 changed files with 51 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -836,7 +836,6 @@ int SrsServer::do_cycle()
srs_info("update resource info, rss.");
srs_update_system_rusage();
}
#ifndef SRS_OSX
if ((i % SRS_SYS_CPU_STAT_RESOLUTION_TIMES) == 0) {
srs_info("update cpu info, cpu usage.");
srs_update_proc_stat();
@ -849,12 +848,10 @@ int SrsServer::do_cycle()
srs_info("update memory info, usage/free.");
srs_update_meminfo();
}
#endif
if ((i % SRS_SYS_PLATFORM_INFO_RESOLUTION_TIMES) == 0) {
srs_info("update platform info, uptime/load.");
srs_update_platform_info();
}
#ifndef SRS_OSX
if ((i % SRS_SYS_NETWORK_DEVICE_RESOLUTION_TIMES) == 0) {
srs_info("update network devices info.");
srs_update_network_devices();
@ -871,7 +868,6 @@ int SrsServer::do_cycle()
}
}
#endif
#endif
#endif
srs_info("server main thread loop");
}