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

Merge branch '2.0release' into develop

Browse source
This commit is contained in:
winlin 2015-03-17 22:36:04 +08:00
commit 9bf6c9e9c6
3 changed files with 5 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -836,6 +836,7 @@ 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();
@ -868,6 +869,7 @@ int SrsServer::do_cycle()
}
}
#endif
#endif
#endif
srs_info("server main thread loop");
}