ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "debuggerd: wait for dump completion on crashes."

Browse source
This commit is contained in:
Treehugger Robot 2017-12-23 00:11:34 +00:00 • committed by Gerrit Code Review
commit 1f3b605c41
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
debuggerd/handler/debuggerd_handler.cpp
View file

@ -395,9 +395,6 @@ static int debuggerd_dispatch_pseudothread(void* arg) {
// crash_dump is ptracing us, fork off a copy of our address space for it to use.
create_vm_process();
input_read.reset();
input_write.reset();
// Don't leave a zombie child.
int status;
if (TEMP_FAILURE_RETRY(waitpid(crash_dump_pid, &status, 0)) == -1) {
@ -406,6 +403,14 @@ static int debuggerd_dispatch_pseudothread(void* arg) {
} else if (WIFSTOPPED(status) || WIFSIGNALED(status)) {
async_safe_format_log(ANDROID_LOG_FATAL, "libc", "crash_dump helper crashed or stopped");
}
if (thread_info->siginfo->si_signo != DEBUGGER_SIGNAL) {
// For crashes, we don't need to minimize pause latency.
// Wait for the dump to complete before having the process exit, to avoid being murdered by
// ActivityManager or init.
TEMP_FAILURE_RETRY(read(input_read, &buf, sizeof(buf)));
}
return 0;
}