ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Slight change to the unwinder API."

Browse Source
This commit is contained in:
Jeff Brown 2011-11-04 20:06:42 -07:00 committed by Android (Google) Code Review
commit 343c59cc8d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/utils/CallStack.cpp
View File

@ -103,7 +103,7 @@ void CallStack::dump(const char* prefix) const {
for (size_t i = 0; i < mCount; i++) { for (size_t i = 0; i < mCount; i++) {
const backtrace_frame_t& frame = mStack[i]; const backtrace_frame_t& frame = mStack[i];
const backtrace_symbol_t& symbol = symbols[i]; const backtrace_symbol_t& symbol = symbols[i];
const char* mapName = symbol.map_info ? symbol.map_info->name : "<unknown>"; const char* mapName = symbol.map_name ? symbol.map_name : "<unknown>";
const char* symbolName = symbol.demangled_name ? symbol.demangled_name : symbol.name; const char* symbolName = symbol.demangled_name ? symbol.demangled_name : symbol.name;
if (symbolName) { if (symbolName) {
LOGD("%s#%02d pc %08x %s (%s)\n", prefix, LOGD("%s#%02d pc %08x %s (%s)\n", prefix,
@ -124,7 +124,7 @@ String8 CallStack::toString(const char* prefix) const {
for (size_t i = 0; i < mCount; i++) { for (size_t i = 0; i < mCount; i++) {
const backtrace_frame_t& frame = mStack[i]; const backtrace_frame_t& frame = mStack[i];
const backtrace_symbol_t& symbol = symbols[i]; const backtrace_symbol_t& symbol = symbols[i];
const char* mapName = symbol.map_info ? symbol.map_info->name : "<unknown>"; const char* mapName = symbol.map_name ? symbol.map_name : "<unknown>";
const char* symbolName = symbol.demangled_name ? symbol.demangled_name : symbol.name; const char* symbolName = symbol.demangled_name ? symbol.demangled_name : symbol.name;
if (symbolName) { if (symbolName) {
str.appendFormat("%s#%02d pc %08x %s (%s)\n", prefix, str.appendFormat("%s#%02d pc %08x %s (%s)\n", prefix,