winlin

for #155, osx(darwin) enable http api and stat, rusage is ok.

... ... @@ -266,17 +266,8 @@ function OSX_prepare()
echo "OSX detected, must specifies the --osx"
exit 1
fi
# TODO: FIXME: support following features.
if [ $SRS_HTTP_API = YES ]; then
echo "OSX does not support http-api, use --without-http-api"
exit 1
fi
if [ $SRS_STAT = YES ]; then
echo "OSX does not support stat, use --without-stat"
exit 1
fi
fi
brew --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
echo "install brew"
echo "ruby -e \"$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)\""
... ...
... ... @@ -592,12 +592,12 @@ function apply_user_presets() {
SRS_FFMPEG_TOOL=NO
SRS_TRANSCODE=YES
SRS_INGEST=YES
SRS_STAT=NO
SRS_STAT=YES
SRS_HTTP_PARSER=YES
SRS_HTTP_CALLBACK=YES
SRS_HTTP_SERVER=YES
SRS_STREAM_CASTER=NO
SRS_HTTP_API=NO
SRS_HTTP_API=YES
SRS_LIBRTMP=YES
SRS_RESEARCH=NO
SRS_UTEST=NO
... ...
... ... @@ -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();
... ... @@ -869,6 +870,7 @@ int SrsServer::do_cycle()
}
#endif
#endif
#endif
srs_info("server main thread loop");
}
}
... ...