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

Merge changes I0f1d59ae,I2f63bffb am: 9f7a73fc21 am: 87caaf0da8 am: e0cbabe562

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432973

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0298ef531a86502e0da39b68193f2647a13ce01d
This commit is contained in:
Josh Gao
2021-01-14 04:43:26 +00:00
committed by Automerger Merge Worker
parent d59b2a1bd7 e0cbabe562
commit 1c687e16a6
2 changed files with 74 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
services/java/com/android/server/SystemServer.java
View File

@@ -23,6 +23,8 @@ import static android.os.IServiceManager.DUMP_FLAG_PRIORITY_NORMAL;
import static android.os.IServiceManager.DUMP_FLAG_PROTO;
import static android.os.Process.SYSTEM_UID;
import static android.os.Process.myPid;
import static android.system.OsConstants.O_CLOEXEC;
import static android.system.OsConstants.O_RDONLY;
import static android.view.Display.DEFAULT_DISPLAY;
import static com.android.server.utils.TimingsTraceAndSlog.SYSTEM_SERVER_TIMING_TAG;
@@ -77,6 +79,8 @@ import android.provider.DeviceConfig;
import android.provider.Settings;
import android.server.ServerProtoEnums;
import android.sysprop.VoldProperties;
import android.system.ErrnoException;
import android.system.Os;
import android.text.TextUtils;
import android.util.ArrayMap;
import android.util.DisplayMetrics;
@@ -429,11 +433,71 @@ public final class SystemServer implements Dumpable {
*/
private static native void initZygoteChildHeapProfiling();
private static final String SYSPROP_FDTRACK_ENABLE_THRESHOLD =
"persist.sys.debug.fdtrack_enable_threshold";
private static final String SYSPROP_FDTRACK_ABORT_THRESHOLD =
"persist.sys.debug.fdtrack_abort_threshold";
private static final String SYSPROP_FDTRACK_INTERVAL =
"persist.sys.debug.fdtrack_interval";
private static int getMaxFd() {
FileDescriptor fd = null;
try {
fd = Os.open("/dev/null", O_RDONLY | O_CLOEXEC, 0);
return fd.getInt$();
} catch (ErrnoException ex) {
Slog.e("System", "Failed to get maximum fd: " + ex);
} finally {
if (fd != null) {
try {
Os.close(fd);
} catch (ErrnoException ex) {
// If Os.close threw, something went horribly wrong.
throw new RuntimeException(ex);
}
}
}
return Integer.MAX_VALUE;
}
private static native void fdtrackAbort();
/**
* Spawn a thread that monitors for fd leaks.
*/
private static native void spawnFdLeakCheckThread();
private static void spawnFdLeakCheckThread() {
final int enableThreshold = SystemProperties.getInt(SYSPROP_FDTRACK_ENABLE_THRESHOLD, 1024);
final int abortThreshold = SystemProperties.getInt(SYSPROP_FDTRACK_ABORT_THRESHOLD, 2048);
final int checkInterval = SystemProperties.getInt(SYSPROP_FDTRACK_INTERVAL, 120);
new Thread(() -> {
boolean enabled = false;
while (true) {
int maxFd = getMaxFd();
if (maxFd > enableThreshold) {
// Do a manual GC to clean up fds that are hanging around as garbage.
System.gc();
maxFd = getMaxFd();
}
if (maxFd > enableThreshold && !enabled) {
Slog.i("System", "fdtrack enable threshold reached, enabling");
System.loadLibrary("fdtrack");
enabled = true;
} else if (maxFd > abortThreshold) {
Slog.i("System", "fdtrack abort threshold reached, dumping and aborting");
fdtrackAbort();
}
try {
Thread.sleep(checkInterval);
} catch (InterruptedException ex) {
continue;
}
}
}).start();
}
/**
* Start native Incremental Service and get its handle.