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

Merge "Show the number of VMAs in the tombstone."

Browse source
This commit is contained in:
Treehugger Robot 2017-09-26 21:01:20 +00:00 • committed by Gerrit Code Review
commit 92c355cc4f
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
debuggerd/libdebuggerd/tombstone.cpp
View file

@ -413,15 +413,17 @@ static void dump_all_maps(Backtrace* backtrace, BacktraceMap* map, log_t* log, p
} }
ScopedBacktraceMapIteratorLock lock(map); ScopedBacktraceMapIteratorLock lock(map);
_LOG(log, logtype::MAPS, "\n"); _LOG(log, logtype::MAPS,
if (!print_fault_address_marker) { "\n"
_LOG(log, logtype::MAPS, "memory map:\n"); "memory map (%zu entries):\n",
} else { map->size());
_LOG(log, logtype::MAPS, "memory map: (fault address prefixed with --->)\n"); if (print_fault_address_marker) {
if (map->begin() != map->end() && addr < map->begin()->start) { if (map->begin() != map->end() && addr < map->begin()->start) {
_LOG(log, logtype::MAPS, "--->Fault address falls at %s before any mapped regions\n", _LOG(log, logtype::MAPS, "--->Fault address falls at %s before any mapped regions\n",
get_addr_string(addr).c_str()); get_addr_string(addr).c_str());
print_fault_address_marker = false; print_fault_address_marker = false;
} else {
_LOG(log, logtype::MAPS, "(fault address prefixed with --->)\n");
} }
} }

2
libbacktrace/include/backtrace/BacktraceMap.h
View file

@ -91,6 +91,8 @@ public:
const_iterator begin() const { return maps_.begin(); } const_iterator begin() const { return maps_.begin(); }
const_iterator end() const { return maps_.end(); } const_iterator end() const { return maps_.end(); }
size_t size() const { return maps_.size(); }
virtual bool Build(); virtual bool Build();
static inline bool IsValid(const backtrace_map_t& map) { static inline bool IsValid(const backtrace_map_t& map) {