commit 1987fb6f7c674a551b4300d4c95e62c30982f938
author Josh Gao <jmgao@google.com> Thu Sep 14 05:59:13 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 14 05:59:13 2017 +0000
tree 2f9fa54f284229f285bd80b6d4019a4cbea3488e
parent 347685b77ddbbfc0a22b15ff9a3d0e8228cbb9b9
parent 4abd463d203f42205f89c2aef47093489cd84718

Merge "debuggerd_fallback: print maps." am: 26123d7ec0
am: 4abd463d20

Change-Id: Ic0ee23fcaa51aa1ceeef0da9df013033ff2acd37

debuggerd/libdebuggerd/tombstone.cpp

diff --git a/debuggerd/libdebuggerd/tombstone.cpp b/debuggerd/libdebuggerd/tombstone.cpp
index 50d19bd..f5ecf48 100644
--- a/debuggerd/libdebuggerd/tombstone.cpp
+++ b/debuggerd/libdebuggerd/tombstone.cpp
@@ -800,10 +800,22 @@
   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);
+    }
+  }
 }