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 branch '2.0release' into develop

Browse source
This commit is contained in:
winlin 2015-08-26 23:03:01 +08:00
commit c081a5370b
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -274,8 +274,11 @@ int srs_kill_forced(int& pid)
// other signals, directly exit(123), for example:
// 9) SIGKILL 15) SIGTERM
int status = 0;
if (waitpid(pid, &status, 0) < 0) {
return ERROR_SYSTEM_KILL;
// @remark when we use SIGKILL to kill process, it must be killed,
// so we always wait it to quit by infinite loop.
while (waitpid(pid, &status, 0) < 0) {
st_usleep(10 * 1000);
continue;
}
srs_trace("SIGKILL stop process pid=%d ok.", pid);