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

Merge "Only skip frames for local unwinds."

Browse source 
am: 3eccc5f50e

Change-Id: I3ca928cc49a8bab00811b138669243e1649a5af6
This commit is contained in:
Christopher Ferris 2017-11-03 01:43:44 +00:00 • committed by android-build-merger
commit 58e9c6a6b8
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libbacktrace/UnwindStack.cpp
View file

@ -44,13 +44,13 @@
#include "UnwindStackMap.h" #include "UnwindStackMap.h"
bool Backtrace::Unwind(unwindstack::Regs* regs, BacktraceMap* back_map, bool Backtrace::Unwind(unwindstack::Regs* regs, BacktraceMap* back_map,
std::vector<backtrace_frame_data_t>* frames, size_t num_ignore_frames) { std::vector<backtrace_frame_data_t>* frames, size_t num_ignore_frames,
std::vector<std::string> skip_names{"libunwindstack.so", "libbacktrace.so"}; std::vector<std::string>* skip_names) {
UnwindStackMap* stack_map = reinterpret_cast<UnwindStackMap*>(back_map); UnwindStackMap* stack_map = reinterpret_cast<UnwindStackMap*>(back_map);
auto process_memory = stack_map->process_memory(); auto process_memory = stack_map->process_memory();
unwindstack::Unwinder unwinder(MAX_BACKTRACE_FRAMES + num_ignore_frames, stack_map->stack_maps(), unwindstack::Unwinder unwinder(MAX_BACKTRACE_FRAMES + num_ignore_frames, stack_map->stack_maps(),
regs, stack_map->process_memory()); regs, stack_map->process_memory());
unwinder.Unwind(&skip_names, &stack_map->GetSuffixesToIgnore()); unwinder.Unwind(skip_names, &stack_map->GetSuffixesToIgnore());
if (num_ignore_frames >= unwinder.NumFrames()) { if (num_ignore_frames >= unwinder.NumFrames()) {
frames->resize(0); frames->resize(0);
@ -104,7 +104,8 @@ bool UnwindStackCurrent::UnwindFromContext(size_t num_ignore_frames, ucontext_t*
} }
error_ = BACKTRACE_UNWIND_NO_ERROR; error_ = BACKTRACE_UNWIND_NO_ERROR;
return Backtrace::Unwind(regs.get(), GetMap(), &frames_, num_ignore_frames); std::vector<std::string> skip_names{"libunwindstack.so", "libbacktrace.so"};
return Backtrace::Unwind(regs.get(), GetMap(), &frames_, num_ignore_frames, &skip_names);
} }
UnwindStackPtrace::UnwindStackPtrace(pid_t pid, pid_t tid, BacktraceMap* map) UnwindStackPtrace::UnwindStackPtrace(pid_t pid, pid_t tid, BacktraceMap* map)
@ -124,5 +125,5 @@ bool UnwindStackPtrace::Unwind(size_t num_ignore_frames, ucontext_t* context) {
} }
error_ = BACKTRACE_UNWIND_NO_ERROR; error_ = BACKTRACE_UNWIND_NO_ERROR;
return Backtrace::Unwind(regs.get(), GetMap(), &frames_, num_ignore_frames); return Backtrace::Unwind(regs.get(), GetMap(), &frames_, num_ignore_frames, nullptr);
} }

3
libbacktrace/include/backtrace/Backtrace.h
View file

@ -109,7 +109,8 @@ public:
virtual bool Unwind(size_t num_ignore_frames, ucontext_t* context = NULL) = 0; virtual bool Unwind(size_t num_ignore_frames, ucontext_t* context = NULL) = 0;
static bool Unwind(unwindstack::Regs* regs, BacktraceMap* back_map, static bool Unwind(unwindstack::Regs* regs, BacktraceMap* back_map,
std::vector<backtrace_frame_data_t>* frames, size_t num_ignore_frames); std::vector<backtrace_frame_data_t>* frames, size_t num_ignore_frames,
std::vector<std::string>* skip_names);
// Get the function name and offset into the function given the pc. // Get the function name and offset into the function given the pc.
// If the string is empty, then no valid function name was found, // If the string is empty, then no valid function name was found,