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

Merge "Use libcorkscrew to format the stack trace."

Browse Source
This commit is contained in:
Jeff Brown 2011-11-22 12:57:08 -08:00 committed by Android (Google) Code Review
commit 4265ed75f7
1 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libs/utils/CallStack.cpp
View File

@ -101,17 +101,10 @@ void CallStack::dump(const char* prefix) const {
get_backtrace_symbols(mStack, mCount, symbols);
for (size_t i = 0; i < mCount; i++) {
const backtrace_frame_t& frame = mStack[i];
const backtrace_symbol_t& symbol = symbols[i];
const char* mapName = symbol.map_name ? symbol.map_name : "<unknown>";
const char* symbolName = symbol.demangled_name ? symbol.demangled_name : symbol.name;
if (symbolName) {
LOGD("%s#%02d pc %08x %s (%s)\n", prefix,
int(i), uint32_t(symbol.relative_pc), mapName, symbolName);
} else {
LOGD("%s#%02d pc %08x %s\n", prefix,
int(i), uint32_t(symbol.relative_pc), mapName);
}
char line[MAX_BACKTRACE_LINE_LENGTH];
format_backtrace_line(i, &mStack[i], &symbols[i],
line, MAX_BACKTRACE_LINE_LENGTH);
LOGD("%s%s", prefix, line);
}
free_backtrace_symbols(symbols, mCount);
}
@ -122,17 +115,12 @@ String8 CallStack::toString(const char* prefix) const {
get_backtrace_symbols(mStack, mCount, symbols);
for (size_t i = 0; i < mCount; i++) {
const backtrace_frame_t& frame = mStack[i];
const backtrace_symbol_t& symbol = symbols[i];
const char* mapName = symbol.map_name ? symbol.map_name : "<unknown>";
const char* symbolName = symbol.demangled_name ? symbol.demangled_name : symbol.name;
if (symbolName) {
str.appendFormat("%s#%02d pc %08x %s (%s)\n", prefix,
int(i), uint32_t(symbol.relative_pc), mapName, symbolName);
} else {
str.appendFormat("%s#%02d pc %08x %s\n", prefix,
int(i), uint32_t(symbol.relative_pc), mapName);
}
char line[MAX_BACKTRACE_LINE_LENGTH];
format_backtrace_line(i, &mStack[i], &symbols[i],
line, MAX_BACKTRACE_LINE_LENGTH);
str.append(prefix);
str.append(line);
str.append("\n");
}
free_backtrace_symbols(symbols, mCount);
return str;