openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

am: dae30de40c

Change-Id: Ie0a74c69155d7a6cb06fbd4e20caef2d69def631
This commit is contained in:
Elliott Hughes 2017-09-26 21:13:02 +00:00 committed by android-build-merger
parent 1db0e0e5b7 dae30de40c
commit f89042a43a
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);
_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");
}
}

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

@ -91,6 +91,8 @@ public:
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) {