Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2015-03-17 22:35:47 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
cf3becbc17be2c43066636daab88314e82540c24
cf3becbc
1 parent
ab673e13
for #155, osx(darwin) enable http api and stat, rusage is ok.
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
5 行增加
和
12 行删除
trunk/auto/depends.sh
trunk/auto/options.sh
trunk/src/app/srs_app_server.cpp
trunk/auto/depends.sh
查看文件 @
cf3becb
...
...
@@ -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
)
\"
"
...
...
trunk/auto/options.sh
查看文件 @
cf3becb
...
...
@@ -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
...
...
trunk/src/app/srs_app_server.cpp
查看文件 @
cf3becb
...
...
@@ -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"
);
}
}
...
...
请
注册
或
登录
后发表评论