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

Merge "Optimize Freezer deadlock detection" into udc-dev

Browse Source
This commit is contained in:
Li Li
2023-04-06 18:45:13 +00:00
committed by Android (Google) Code Review
parent a27b117a7f 7bcf8f1d6b
commit 319c4fb9a3
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
services/core/java/com/android/server/am/CachedAppOptimizer.java
View File

@@ -178,6 +178,7 @@ public final class CachedAppOptimizer {
private static final String ATRACE_FREEZER_TRACK = "Freezer"; private static final String ATRACE_FREEZER_TRACK = "Freezer";
private static final int FREEZE_BINDER_TIMEOUT_MS = 100; private static final int FREEZE_BINDER_TIMEOUT_MS = 100;
private static final int FREEZE_DEADLOCK_TIMEOUT_MS = 1000;
@VisibleForTesting static final boolean ENABLE_FILE_COMPACT = false; @VisibleForTesting static final boolean ENABLE_FILE_COMPACT = false;
@@ -244,6 +245,7 @@ public final class CachedAppOptimizer {
static final int REPORT_UNFREEZE_MSG = 4; static final int REPORT_UNFREEZE_MSG = 4;
static final int COMPACT_NATIVE_MSG = 5; static final int COMPACT_NATIVE_MSG = 5;
static final int UID_FROZEN_STATE_CHANGED_MSG = 6; static final int UID_FROZEN_STATE_CHANGED_MSG = 6;
static final int DEADLOCK_WATCHDOG_MSG = 7;
// When free swap falls below this percentage threshold any full (file + anon) // When free swap falls below this percentage threshold any full (file + anon)
// compactions will be downgraded to file only compactions to reduce pressure // compactions will be downgraded to file only compactions to reduce pressure
@@ -1947,29 +1949,15 @@ public final class CachedAppOptimizer {
public void handleMessage(Message msg) { public void handleMessage(Message msg) {
switch (msg.what) { switch (msg.what) {
case SET_FROZEN_PROCESS_MSG: case SET_FROZEN_PROCESS_MSG:
{
ProcessRecord proc = (ProcessRecord) msg.obj; ProcessRecord proc = (ProcessRecord) msg.obj;
int pid = proc.getPid();
final String name = proc.processName;
synchronized (mAm) { synchronized (mAm) {
freezeProcess(proc); freezeProcess(proc);
} }
try {
// post-check to prevent deadlock
mProcLocksReader.handleBlockingFileLocks(this);
} catch (Exception e) {
Slog.e(TAG_AM, "Unable to check file locks for "
+ name + "(" + pid + "): " + e);
synchronized (mAm) {
synchronized (mProcLock) {
unfreezeAppLSP(proc, UNFREEZE_REASON_FILE_LOCK_CHECK_FAILURE);
}
}
}
if (proc.mOptRecord.isFrozen()) { if (proc.mOptRecord.isFrozen()) {
onProcessFrozen(proc); onProcessFrozen(proc);
removeMessages(DEADLOCK_WATCHDOG_MSG);
sendEmptyMessageDelayed(DEADLOCK_WATCHDOG_MSG, FREEZE_DEADLOCK_TIMEOUT_MS);
} }
}
break; break;
case REPORT_UNFREEZE_MSG: case REPORT_UNFREEZE_MSG:
int pid = msg.arg1; int pid = msg.arg1;
@@ -1981,8 +1969,18 @@ public final class CachedAppOptimizer {
reportUnfreeze(pid, frozenDuration, processName, reason); reportUnfreeze(pid, frozenDuration, processName, reason);
break; break;
case UID_FROZEN_STATE_CHANGED_MSG: case UID_FROZEN_STATE_CHANGED_MSG:
ProcessRecord proc = (ProcessRecord) msg.obj; reportOneUidFrozenStateChanged(((ProcessRecord) msg.obj).uid, true);
reportOneUidFrozenStateChanged(proc.uid, true); break;
case DEADLOCK_WATCHDOG_MSG:
try {
// post-check to prevent deadlock
if (DEBUG_FREEZER) {
Slog.d(TAG_AM, "Freezer deadlock watchdog");
}
mProcLocksReader.handleBlockingFileLocks(this);
} catch (IOException e) {
Slog.w(TAG_AM, "Unable to check file locks");
}
break; break;
default: default:
return; return;