Merge "debuggerd: waitpid for all children, and log the result."
am: 8aeabe1
* commit '8aeabe15dd38093029714dabb1713724400cf5f1':
debuggerd: waitpid for all children, and log the result.
diff --git a/debuggerd/debuggerd.cpp b/debuggerd/debuggerd.cpp
index 94be9bf..6064568 100644
--- a/debuggerd/debuggerd.cpp
+++ b/debuggerd/debuggerd.cpp
@@ -580,9 +580,20 @@
siginfo_t siginfo;
int signal = TEMP_FAILURE_RETRY(sigtimedwait(&signal_set, &siginfo, &timeout));
if (signal == SIGCHLD) {
- pid_t rc = waitpid(0, &status, WNOHANG | WUNTRACED);
+ pid_t rc = waitpid(-1, &status, WNOHANG | WUNTRACED);
if (rc != child_pid) {
ALOGE("debuggerd: waitpid returned unexpected pid (%d), committing murder-suicide", rc);
+
+ if (WIFEXITED(status)) {
+ ALOGW("debuggerd: pid %d exited with status %d", rc, WEXITSTATUS(status));
+ } else if (WIFSIGNALED(status)) {
+ ALOGW("debuggerd: pid %d received signal %d", rc, WTERMSIG(status));
+ } else if (WIFSTOPPED(status)) {
+ ALOGW("debuggerd: pid %d stopped by signal %d", rc, WSTOPSIG(status));
+ } else if (WIFCONTINUED(status)) {
+ ALOGW("debuggerd: pid %d continued", rc);
+ }
+
kill_worker = true;
kill_target = true;
kill_self = true;