openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "debuggerd: always send SIGCONT after detaching."

This commit is contained in:
Josh Gao 2016-03-23 21:09:21 +00:00 committed by Gerrit Code Review
parent 6c03e3111d 24464185eb
commit 6e183586e3
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
debuggerd/debuggerd.cpp
View File

@ -586,9 +586,7 @@ static void monitor_worker_process(int child_pid, const debugger_request_t& requ
kill_worker = true;
kill_target = true;
kill_self = true;
}
if (WIFSIGNALED(status)) {
} else if (WIFSIGNALED(status)) {
ALOGE("debuggerd: worker process %d terminated due to signal %d", child_pid, WTERMSIG(status));
kill_worker = false;
kill_target = true;
@ -612,15 +610,16 @@ static void monitor_worker_process(int child_pid, const debugger_request_t& requ
}
}
if (kill_target) {
// Resume or kill the target, depending on what the initial request was.
if (request.action == DEBUGGER_ACTION_CRASH) {
ALOGE("debuggerd: killing target %d", request.pid);
kill(request.pid, SIGKILL);
} else {
ALOGE("debuggerd: resuming target %d", request.pid);
kill(request.pid, SIGCONT);
}
int exit_signal = SIGCONT;
if (kill_target && request.action == DEBUGGER_ACTION_CRASH) {
ALOGE("debuggerd: killing target %d", request.pid);
exit_signal = SIGKILL;
} else {
ALOGW("debuggerd: resuming target %d", request.pid);
}
if (kill(request.pid, exit_signal) != 0) {
ALOGE("debuggerd: failed to send signal %d to target: %s", exit_signal, strerror(errno));
}
if (kill_self) {