Merge "debuggerd_fallback: print maps."

am: 26123d7ec0

Change-Id: I122af30e6f3e205308a44ebf9bdbc7128ce3f246
This commit is contained in:
Josh Gao 2017-09-14 05:56:46 +00:00 committed by android-build-merger
commit 4abd463d20

View file

@ -800,10 +800,22 @@ void engrave_tombstone_ucontext(int tombstone_fd, uintptr_t abort_msg_address, s
dump_abort_message(backtrace.get(), &log, abort_msg_address);
dump_registers(&log, ucontext);
// TODO: Dump registers from the ucontext.
if (backtrace->Unwind(0, ucontext)) {
dump_backtrace_and_stack(backtrace.get(), &log);
} else {
ALOGE("Unwind failed: pid = %d, tid = %d", pid, tid);
}
// TODO: Make this match the format of dump_all_maps above.
_LOG(&log, logtype::MAPS, "memory map:\n");
android::base::unique_fd maps_fd(open("/proc/self/maps", O_RDONLY | O_CLOEXEC));
if (maps_fd == -1) {
_LOG(&log, logtype::MAPS, " failed to open /proc/self/maps: %s", strerror(errno));
} else {
char buf[256];
ssize_t rc;
while ((rc = TEMP_FAILURE_RETRY(read(maps_fd.get(), buf, sizeof(buf)))) > 0) {
android::base::WriteFully(tombstone_fd, buf, rc);
}
}
}