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 #913, APP support complex error.

Browse source
This commit is contained in:
winlin 2018-01-01 19:39:57 +08:00
parent aebbbadf42
commit 6eae93258a
47 changed files with 1098 additions and 1432 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -155,17 +155,17 @@ string srs_path_build_timestamp(string template_path)
return path;
}
int srs_kill_forced(int& pid)
srs_error_t srs_kill_forced(int& pid)
{
int ret = ERROR_SUCCESS;
srs_error_t err = srs_success;
if (pid <= 0) {
return ret;
return err;
}
// first, try kill by SIGTERM.
if (kill(pid, SIGTERM) < 0) {
return ERROR_SYSTEM_KILL;
return srs_error_new(ERROR_SYSTEM_KILL, "kill");
}
// wait to quit.
@ -174,7 +174,7 @@ int srs_kill_forced(int& pid)
int status = 0;
pid_t qpid = -1;
if ((qpid = waitpid(pid, &status, WNOHANG)) < 0) {
return ERROR_SYSTEM_KILL;
return srs_error_new(ERROR_SYSTEM_KILL, "kill");
}
// 0 is not quit yet.
@ -187,12 +187,12 @@ int srs_kill_forced(int& pid)
srs_trace("SIGTERM stop process pid=%d ok.", pid);
pid = -1;
return ret;
return err;
}
// then, try kill by SIGKILL.
if (kill(pid, SIGKILL) < 0) {
return ERROR_SYSTEM_KILL;
return srs_error_new(ERROR_SYSTEM_KILL, "kill");
}
// wait for the process to quit.
@ -211,7 +211,7 @@ int srs_kill_forced(int& pid)
srs_trace("SIGKILL stop process pid=%d ok.", pid);
pid = -1;
return ret;
return err;
}
static SrsRusage _srs_system_rusage;