pa-fazil
/
android_bionic
mirror of https://github.com/fazilsheik96/android_bionic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fdtrack: increase backtrace depth. 

Bug: http://b/155136951
Bug: http://b/157789860
Test: treehugger
Change-Id: I1e575fdef7d520f5a896130844eefb1a1ba46694
This commit is contained in:
Josh Gao 2020-06-02 15:54:32 -07:00
parent 700f753c50
commit 55b91af828
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libfdtrack/fdtrack.cpp
View File

@ -57,7 +57,10 @@ static void fd_hook(android_fdtrack_event* event);
// Backtraces for the first 4k file descriptors ought to be enough to diagnose an fd leak. // Backtraces for the first 4k file descriptors ought to be enough to diagnose an fd leak.
static constexpr size_t kFdTableSize = 4096; static constexpr size_t kFdTableSize = 4096;
static constexpr size_t kStackDepth = 10;
// 32 frames, plus two to skip from fdtrack itself.
static constexpr size_t kStackDepth = 34;
static constexpr size_t kStackFrameSkip = 2;
static bool installed = false; static bool installed = false;
static std::array<FdEntry, kFdTableSize> stack_traces [[clang::no_destroy]]; static std::array<FdEntry, kFdTableSize> stack_traces [[clang::no_destroy]];
@ -134,15 +137,14 @@ void fdtrack_iterate(fdtrack_callback_t callback, void* arg) {
continue; continue;
} }
constexpr size_t frame_skip = 2; for (size_t i = kStackFrameSkip; i < entry->backtrace.size(); ++i) {
for (size_t i = frame_skip; i < entry->backtrace.size(); ++i) { size_t j = i - kStackFrameSkip;
size_t j = i - frame_skip;
function_names[j] = entry->backtrace[i].function_name.c_str(); function_names[j] = entry->backtrace[i].function_name.c_str();
function_offsets[j] = entry->backtrace[i].function_offset; function_offsets[j] = entry->backtrace[i].function_offset;
} }
bool should_continue = bool should_continue = callback(fd, function_names, function_offsets,
callback(fd, function_names, function_offsets, entry->backtrace.size() - frame_skip, arg); entry->backtrace.size() - kStackFrameSkip, arg);
entry->mutex.unlock(); entry->mutex.unlock();