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 SRT

Browse source
This commit is contained in:
winlin 2020-01-24 16:10:40 +08:00
commit 5f174552f3
29 changed files with 3068 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -565,11 +565,6 @@ srs_error_t SrsServer::initialize_st()
{
srs_error_t err = srs_success;
// init st
if ((err = srs_st_init()) != srs_success) {
return srs_error_wrap(err, "initialize st failed");
}
// @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.
// TODO: FIXME: maybe can use "sysctl vm.max_map_count" to refine.
@ -688,7 +683,7 @@ srs_error_t SrsServer::listen()
if ((err = conn_manager->start()) != srs_success) {
return srs_error_wrap(err, "connection manager");
}
return err;
}