am 574d6902: am ba8abb51: Merge "Ensure dumpstate children die"

* commit '574d6902b7e30a1e9c2375481549c8e8a712d6e6':
  Ensure dumpstate children die
This commit is contained in:
jp abgrall 2013-03-11 19:34:13 +00:00 committed by Android Git Automerger
commit 1e928f404f

View File

@ -31,6 +31,7 @@
#include <sys/klog.h> #include <sys/klog.h>
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include <sys/prctl.h>
#include <cutils/debugger.h> #include <cutils/debugger.h>
#include <cutils/properties.h> #include <cutils/properties.h>
@ -264,6 +265,9 @@ int run_command(const char *title, int timeout_seconds, const char *command, ...
const char *args[1024] = {command}; const char *args[1024] = {command};
size_t arg; size_t arg;
/* make sure the child dies when dumpstate dies */
prctl(PR_SET_PDEATHSIG, SIGKILL);
va_list ap; va_list ap;
va_start(ap, command); va_start(ap, command);
if (title) printf("------ %s (%s", title, command); if (title) printf("------ %s (%s", title, command);