ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use the timeout stack dump functions.

Browse Source 
Use the native stack dumping functions that allows time outs. If
debuggerd locks up, before a bugreport would hang forever. Now
it will timeout properly and still get all of the other information.

Bug: 18766581

(cherry picked from commit 457731f69e)

Change-Id: I39e8e9c60209e3ef9efac795fedb8e1edce2bd3e
This commit is contained in:
Christopher Ferris 2015-01-14 13:23:30 -08:00
parent 4df903dbc7
commit 31ef85529d
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmds/dumpstate/utils.c
View File

@ -619,20 +619,28 @@ const char *dump_traces() {
if (lseek(fd, 0, SEEK_END) < 0) { if (lseek(fd, 0, SEEK_END) < 0) {
fprintf(stderr, "lseek: %s\n", strerror(errno)); fprintf(stderr, "lseek: %s\n", strerror(errno));
} else { } else {
snprintf(data, sizeof(data), "[dump dalvik stack %d: %.3fs elapsed]\n", dprintf(fd, "[dump dalvik stack %d: %.3fs elapsed]\n",
pid, (float)(nanotime() - start) / NANOS_PER_SEC); pid, (float)(nanotime() - start) / NANOS_PER_SEC);
write(fd, data, strlen(data));
} }
} else if (should_dump_native_traces(data)) { } else if (should_dump_native_traces(data)) {
/* dump native process if appropriate */ /* dump native process if appropriate */
if (lseek(fd, 0, SEEK_END) < 0) { if (lseek(fd, 0, SEEK_END) < 0) {
fprintf(stderr, "lseek: %s\n", strerror(errno)); fprintf(stderr, "lseek: %s\n", strerror(errno));
} else { } else {
static uint16_t timeout_failures = 0;
int64_t start = nanotime(); int64_t start = nanotime();
dump_backtrace_to_file(pid, fd);
snprintf(data, sizeof(data), "[dump native stack %d: %.3fs elapsed]\n", /* If 3 backtrace dumps fail in a row, consider debuggerd dead. */
if (timeout_failures == 3) {
dprintf(fd, "too many stack dump failures, skipping...\n");
} else if (dump_backtrace_to_file_timeout(pid, fd, 20) == -1) {
dprintf(fd, "dumping failed, likely due to a timeout\n");
timeout_failures++;
} else {
timeout_failures = 0;
}
dprintf(fd, "[dump native stack %d: %.3fs elapsed]\n",
pid, (float)(nanotime() - start) / NANOS_PER_SEC); pid, (float)(nanotime() - start) / NANOS_PER_SEC);
write(fd, data, strlen(data));
} }
} }
} }