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
2014-08-27 12:28:05 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
839101a036f274ac7508c0cd0d8d54be1d08d0be
839101a0
1 parent
42a43c69
reorder the config functions. add comments for st to support 100k threads, use MALLOC_STACK macro.
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
26 行增加
和
24 行删除
trunk/configure
trunk/src/app/srs_app_config.cpp
trunk/src/app/srs_app_server.cpp
trunk/configure
查看文件 @
839101a
...
...
@@ -283,7 +283,7 @@ install-api: install
@sed -i "s|^ROOT=.*|ROOT=\"\$(SRS_PREFIX)\"|g" \$(__REAL_INSTALL)/etc/init.d/srs-api
@echo ""
@echo "api installed, to link and start api:"
@echo " sudo ln -sf
/usr/local/srs
/etc/init.d/srs-api /etc/init.d/srs-api"
@echo " sudo ln -sf
\$(SRS_PREFIX)
/etc/init.d/srs-api /etc/init.d/srs-api"
@echo " /etc/init.d/srs-api start"
@echo " http://\$(shell bash auto/local_ip.sh):8085"
@echo "@see: https://github.com/winlinvip/simple-rtmp-server/wiki/LinuxService"
...
...
@@ -306,7 +306,7 @@ install:
@sed -i "s|^ROOT=.*|ROOT=\"\$(SRS_PREFIX)\"|g" \$(__REAL_INSTALL)/etc/init.d/srs
@echo ""
@echo "srs installed, to link and start srs:"
@echo " sudo ln -sf
/usr/local/srs
/etc/init.d/srs /etc/init.d/srs"
@echo " sudo ln -sf
\$(SRS_PREFIX)
/etc/init.d/srs /etc/init.d/srs"
@echo " /etc/init.d/srs start"
@echo "@see: https://github.com/winlinvip/simple-rtmp-server/wiki/LinuxService"
...
...
trunk/src/app/srs_app_config.cpp
查看文件 @
839101a
...
...
@@ -2746,58 +2746,58 @@ string SrsConfig::get_ingest_input_url(SrsConfDirective* ingest)
return
conf
->
arg0
();
}
string
SrsConfig
::
get_log
_file
()
bool
SrsConfig
::
get_log_tank
_file
()
{
srs_assert
(
root
);
SrsConfDirective
*
conf
=
root
->
get
(
"srs_log_file"
);
if
(
!
conf
||
conf
->
arg0
().
empty
())
{
return
SRS_CONF_DEFAULT_LOG_FILE
;
SrsConfDirective
*
conf
=
root
->
get
(
"srs_log_tank"
);
if
(
conf
&&
conf
->
arg0
()
==
SRS_CONF_DEFAULT_LOG_TANK_CONSOLE
)
{
return
false
;
}
return
conf
->
arg0
();
}
bool
SrsConfig
::
get_ffmpeg_log_enabled
()
{
string
log
=
get_ffmpeg_log_dir
();
return
log
!=
SRS_CONSTS_NULL_FILE
;
return
true
;
}
string
SrsConfig
::
get_
ffmpeg_log_dir
()
string
SrsConfig
::
get_
log_level
()
{
srs_assert
(
root
);
SrsConfDirective
*
conf
=
root
->
get
(
"
ff_log_dir
"
);
SrsConfDirective
*
conf
=
root
->
get
(
"
srs_log_level
"
);
if
(
!
conf
||
conf
->
arg0
().
empty
())
{
return
SRS_CONF_DEFAULT_
FF_LOG_DIR
;
return
SRS_CONF_DEFAULT_
LOG_LEVEL
;
}
return
conf
->
arg0
();
}
string
SrsConfig
::
get_log_
level
()
string
SrsConfig
::
get_log_
file
()
{
srs_assert
(
root
);
SrsConfDirective
*
conf
=
root
->
get
(
"srs_log_
level
"
);
SrsConfDirective
*
conf
=
root
->
get
(
"srs_log_
file
"
);
if
(
!
conf
||
conf
->
arg0
().
empty
())
{
return
SRS_CONF_DEFAULT_LOG_
LEVEL
;
return
SRS_CONF_DEFAULT_LOG_
FILE
;
}
return
conf
->
arg0
();
}
bool
SrsConfig
::
get_log_tank_file
()
bool
SrsConfig
::
get_ffmpeg_log_enabled
()
{
string
log
=
get_ffmpeg_log_dir
();
return
log
!=
SRS_CONSTS_NULL_FILE
;
}
string
SrsConfig
::
get_ffmpeg_log_dir
()
{
srs_assert
(
root
);
SrsConfDirective
*
conf
=
root
->
get
(
"srs_log_tank"
);
if
(
conf
&&
conf
->
arg0
()
==
SRS_CONF_DEFAULT_LOG_TANK_CONSOLE
)
{
return
false
;
SrsConfDirective
*
conf
=
root
->
get
(
"ff_log_dir"
);
if
(
!
conf
||
conf
->
arg0
().
empty
())
{
return
SRS_CONF_DEFAULT_FF_LOG_DIR
;
}
return
true
;
return
conf
->
arg0
()
;
}
SrsConfDirective
*
SrsConfig
::
get_hls
(
string
vhost
)
...
...
trunk/src/app/srs_app_server.cpp
查看文件 @
839101a
...
...
@@ -545,6 +545,8 @@ int SrsServer::initialize_st()
}
srs_verbose
(
"st_set_eventsys use linux epoll success"
);
// @remark, st alloc segment use mmap, which only support 32757 threads,
// if need to support more, for instance, 100k threads, define the macro MALLOC_STACK.
if
(
st_init
()
!=
0
){
ret
=
ERROR_ST_INITIALIZE
;
srs_error
(
"st_init failed. ret=%d"
,
ret
);
...
...
请
注册
或
登录
后发表评论