tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Use AndroidLocalUnwinder object." am: 3cf1f484b1 am: e75e9c0c30

Browse source 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2595730

Change-Id: I1757eaefd648b931e62df679a9826373e56830de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Christopher Ferris 2023-05-18 20:49:06 +00:00 committed by Automerger Merge Worker
commit e78ecc1003
2 changed files with 22 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libfdtrack/Android.bp
View file

@ -22,10 +22,16 @@ cc_library_shared {
static_libs: [
"libasync_safe",
"libbase",
"libdexfile_support",
"libunwindstack",
"liblzma",
"liblog",
],
target: {
recovery: {
exclude_static_libs: ["libdexfile_support"],
},
},
version_script: "libfdtrack.map.txt",
allow_undefined_symbols: true,

41
libfdtrack/fdtrack.cpp
View file

@ -45,10 +45,8 @@
#include <android-base/thread_annotations.h>
#include <async_safe/log.h>
#include <bionic/reserved_signals.h>
#include <unwindstack/Maps.h>
#include <unwindstack/Regs.h>
#include <unwindstack/RegsGetLocal.h>
#include <unwindstack/Unwinder.h>
#include <unwindstack/AndroidUnwinder.h>
struct FdEntry {
std::mutex mutex;
@ -70,22 +68,16 @@ static constexpr size_t kFdTableSize = 4096;
// Only unwind up to 32 frames outside of libfdtrack.so.
static constexpr size_t kStackDepth = 32;
// Skip any initial frames from libfdtrack.so.
// Also ignore frames from ART (http://b/236197847) because we'd rather spend
// our precious few frames on the actual Java calling code rather than the
// implementation of JNI!
static std::vector<std::string> kSkipFdtrackLib
[[clang::no_destroy]] = {"libfdtrack.so", "libart.so"};
static bool installed = false;
static std::array<FdEntry, kFdTableSize> stack_traces [[clang::no_destroy]];
static unwindstack::LocalUpdatableMaps& Maps() {
static android::base::NoDestructor<unwindstack::LocalUpdatableMaps> maps;
return *maps.get();
}
static std::shared_ptr<unwindstack::Memory>& ProcessMemory() {
static android::base::NoDestructor<std::shared_ptr<unwindstack::Memory>> process_memory;
return *process_memory.get();
static unwindstack::AndroidLocalUnwinder& Unwinder() {
// Skip any initial frames from libfdtrack.so.
// Also ignore frames from ART (http://b/236197847) because we'd rather spend
// our precious few frames on the actual Java calling code rather than the
// implementation of JNI!
static android::base::NoDestructor<unwindstack::AndroidLocalUnwinder> unwinder(
std::vector<std::string>{"libfdtrack.so", "libart.so"});
return *unwinder.get();
}
__attribute__((constructor)) static void ctor() {
@ -104,8 +96,8 @@ __attribute__((constructor)) static void ctor() {
sa.sa_flags = SA_SIGINFO | SA_ONSTACK;
sigaction(BIONIC_SIGNAL_FDTRACK, &sa, nullptr);
if (Maps().Parse()) {
ProcessMemory() = unwindstack::Memory::CreateProcessMemoryThreadCached(getpid());
unwindstack::ErrorData error;
if (Unwinder().Initialize(error)) {
android_fdtrack_hook_t expected = nullptr;
installed = android_fdtrack_compare_exchange_hook(&expected, &fd_hook);
}
@ -133,11 +125,10 @@ static void fd_hook(android_fdtrack_event* event) {
std::lock_guard<std::mutex> lock(entry->mutex);
entry->backtrace.clear();
std::unique_ptr<unwindstack::Regs> regs(unwindstack::Regs::CreateFromLocal());
unwindstack::RegsGetLocal(regs.get());
unwindstack::Unwinder unwinder(kStackDepth, &Maps(), regs.get(), ProcessMemory());
unwinder.Unwind(&kSkipFdtrackLib);
entry->backtrace = unwinder.ConsumeFrames();
unwindstack::AndroidUnwinderData data(kStackDepth);
if (Unwinder().Unwind(data)) {
entry->backtrace = std::move(data.frames);
}
}
} else if (event->type == ANDROID_FDTRACK_EVENT_TYPE_CLOSE) {
if (FdEntry* entry = GetFdEntry(event->fd); entry) {