commit ba8abb517d1eddebeda62bf907fa446e3c3b81f6
author jp abgrall <jpa@google.com> Mon Mar 11 18:09:35 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 11 18:09:35 2013 +0000
tree e0ab70f40b9dae2791fec8de3602d8bee86603c0
parent bfb2aa46529ebe4889940ff2e11e00d38b04aace
parent e7b6cf13f94f66ea446c95ab34040b0a577e43dc

Merge "Ensure dumpstate children die"

cmds/dumpstate/utils.c

diff --git a/cmds/dumpstate/utils.c b/cmds/dumpstate/utils.c
index 8f132d5..eaef3d4 100644
--- a/cmds/dumpstate/utils.c
+++ b/cmds/dumpstate/utils.c
@@ -31,6 +31,7 @@
 #include <sys/klog.h>
 #include <time.h>
 #include <unistd.h>
+#include <sys/prctl.h>
 
 #include <cutils/debugger.h>
 #include <cutils/properties.h>
@@ -199,6 +200,9 @@
         const char *args[1024] = {command};
         size_t arg;
 
+        /* make sure the child dies when dumpstate dies */
+        prctl(PR_SET_PDEATHSIG, SIGKILL);
+
         va_list ap;
         va_start(ap, command);
         if (title) printf("------ %s (%s", title, command);