commit 50039e3f65b15d656bbe49ed84e1445e302041f8
author Elliott Hughes <enh@google.com> Tue Sep 26 21:19:48 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Sep 26 21:19:48 2017 +0000
tree 4052bda0aacd5dd40547772ddf04eec220a200f6
parent c81d0bf36bc466b01ee6fdbb64e43a45e1507dc6
parent c27a209860e3d9ebe96aafc24b1be112e9631371

Merge "Show the number of VMAs in the tombstone." am: 92c355cc4f am: dae30de40c
am: f89042a43a

Change-Id: I76343c08ccdc9e4cffd5d4507956cf048fce40da

debuggerd/libdebuggerd/tombstone.cpp

diff --git a/debuggerd/libdebuggerd/tombstone.cpp b/debuggerd/libdebuggerd/tombstone.cpp
index f5ecf48..418d092 100644
--- a/debuggerd/libdebuggerd/tombstone.cpp
+++ b/debuggerd/libdebuggerd/tombstone.cpp
@@ -413,15 +413,17 @@
   }
 
   ScopedBacktraceMapIteratorLock lock(map);
-  _LOG(log, logtype::MAPS, "\n");
-  if (!print_fault_address_marker) {
-    _LOG(log, logtype::MAPS, "memory map:\n");
-  } else {
-    _LOG(log, logtype::MAPS, "memory map: (fault address prefixed with --->)\n");
+  _LOG(log, logtype::MAPS,
+       "\n"
+       "memory map (%zu entries):\n",
+       map->size());
+  if (print_fault_address_marker) {
     if (map->begin() != map->end() && addr < map->begin()->start) {
       _LOG(log, logtype::MAPS, "--->Fault address falls at %s before any mapped regions\n",
            get_addr_string(addr).c_str());
       print_fault_address_marker = false;
+    } else {
+      _LOG(log, logtype::MAPS, "(fault address prefixed with --->)\n");
     }
   }
 

libbacktrace/include/backtrace/BacktraceMap.h

diff --git a/libbacktrace/include/backtrace/BacktraceMap.h b/libbacktrace/include/backtrace/BacktraceMap.h
index 963c34b..6cf8b3f 100644
--- a/libbacktrace/include/backtrace/BacktraceMap.h
+++ b/libbacktrace/include/backtrace/BacktraceMap.h
@@ -91,6 +91,8 @@
   const_iterator begin() const { return maps_.begin(); }
   const_iterator end() const { return maps_.end(); }
 
+  size_t size() const { return maps_.size(); }
+
   virtual bool Build();
 
   static inline bool IsValid(const backtrace_map_t& map) {