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

For #906, #902, replace the endless thread with coroutine

Browse source
This commit is contained in:
winlin 2017-05-29 17:56:26 +08:00
parent fc380fe48d
commit 44f542f77f
7 changed files with 28 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -355,13 +355,13 @@ SrsUdpCasterListener::~SrsUdpCasterListener()
SrsSignalManager* SrsSignalManager::instance = NULL;
SrsSignalManager::SrsSignalManager(SrsServer* server)
SrsSignalManager::SrsSignalManager(SrsServer* s)
{
SrsSignalManager::instance = this;
_server = server;
server = s;
sig_pipe[0] = sig_pipe[1] = -1;
pthread = new SrsEndlessThread("signal", this);
trd = new SrsCoroutine("signal", this);
signal_read_stfd = NULL;
}
@ -376,7 +376,7 @@ SrsSignalManager::~SrsSignalManager()
::close(sig_pipe[1]);
}
srs_freep(pthread);
srs_freep(trd);
}
int SrsSignalManager::initialize()
@ -432,20 +432,22 @@ int SrsSignalManager::start()
srs_trace("signal installed, reload=%d, reopen=%d, grace_quit=%d",
SRS_SIGNAL_RELOAD, SRS_SIGNAL_REOPEN_LOG, SRS_SIGNAL_GRACEFULLY_QUIT);
return pthread->start();
return trd->start();
}
int SrsSignalManager::cycle()
{
int ret = ERROR_SUCCESS;
int signo;
/* Read the next signal from the pipe */
st_read(signal_read_stfd, &signo, sizeof(int), ST_UTIME_NO_TIMEOUT);
/* Process signal synchronously */
_server->on_signal(signo);
while (!trd->pull()) {
int signo;
/* Read the next signal from the pipe */
st_read(signal_read_stfd, &signo, sizeof(int), ST_UTIME_NO_TIMEOUT);
/* Process signal synchronously */
server->on_signal(signo);
}
return ret;
}