summaryrefslogtreecommitdiff
path: root/debuggerd
diff options
context:
space:
mode:
authorJosh Gao <jmgao@google.com>2016-03-22 16:37:45 -0700
committerJosh Gao <jmgao@google.com>2016-03-23 14:27:57 -0700
commita6219eae8d5efe6c364c44a546f4d09ccccef8bb (patch)
tree1995a87186ec901c0a32b7071df2094d49b429b4 /debuggerd
parent05e1e1fb4100bb52fab2af41dc6caaf31c527819 (diff)
debuggerd: always send SIGCONT after detaching.
Bug: http://b/27330889 Change-Id: I104248af1cde03dbdbacc03c87fe7e2dffd6c037 (cherry picked from commit 24464185eb260b4af577895e1c2d35b734a7f99b)
Diffstat (limited to 'debuggerd')
-rw-r--r--debuggerd/debuggerd.cpp23
1 files changed, 11 insertions, 12 deletions
diff --git a/debuggerd/debuggerd.cpp b/debuggerd/debuggerd.cpp
index 97f40963c..18c608b1c 100644
--- a/debuggerd/debuggerd.cpp
+++ b/debuggerd/debuggerd.cpp
@@ -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) {