Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fdtrack: emit the most common stack in the abort message."

Browse Source
This commit is contained in:
Josh Gao
2021-03-16 01:35:43 +00:00
committed by Gerrit Code Review
parent 2d7f8bcdf4 606e0d1256
commit 3a95fb9b50
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/jni/com_android_server_SystemServer.cpp
View File

@@ -100,16 +100,9 @@ static void android_server_SystemServer_initZygoteChildHeapProfiling(JNIEnv* /*
} }
static void android_server_SystemServer_fdtrackAbort(JNIEnv*, jobject) { static void android_server_SystemServer_fdtrackAbort(JNIEnv*, jobject) {
raise(BIONIC_SIGNAL_FDTRACK); sigval val;
val.sival_int = 1;
// Wait for a bit to allow fdtrack to dump backtraces to logcat. sigqueue(getpid(), BIONIC_SIGNAL_FDTRACK, val);
std::this_thread::sleep_for(5s);
// Abort on a different thread to avoid ART dumping runtime stacks.
std::thread([]() {
LOG_ALWAYS_FATAL("b/140703823: aborting due to fd leak: check logs for fd "
"backtraces");
}).join();
} }
static jlong android_server_SystemServer_startIncrementalService(JNIEnv* env, jclass klass, static jlong android_server_SystemServer_startIncrementalService(JNIEnv* env, jclass klass,