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

Fix race condition when using mPreserveTopNApps.

Browse Source 
Bug: 191357172
Test: atest CacheOomRankerTest
Change-Id: I8cdf96ed1ddf56261e6ee953fb1078e961a0bc41
This commit is contained in:
Misha Wagner
2021-08-10 14:12:48 +01:00
parent 8f70bad6e4
commit a0326c86ad
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/am/CacheOomRanker.java
View File

@@ -243,6 +243,7 @@ public class CacheOomRanker {
float lruWeight; float lruWeight;
float usesWeight; float usesWeight;
float rssWeight; float rssWeight;
int preserveTopNApps;
int[] lruPositions; int[] lruPositions;
RankedProcessRecord[] scoredProcessRecords; RankedProcessRecord[] scoredProcessRecords;
@@ -250,6 +251,7 @@ public class CacheOomRanker {
lruWeight = mLruWeight; lruWeight = mLruWeight;
usesWeight = mUsesWeight; usesWeight = mUsesWeight;
rssWeight = mRssWeight; rssWeight = mRssWeight;
preserveTopNApps = mPreserveTopNApps;
lruPositions = mLruPositions; lruPositions = mLruPositions;
scoredProcessRecords = mScoredProcessRecords; scoredProcessRecords = mScoredProcessRecords;
} }
@@ -276,19 +278,19 @@ public class CacheOomRanker {
++numProcessesEvaluated; ++numProcessesEvaluated;
} }
// Count how many apps we're not re-ranking (up to mPreserveTopNApps). // Count how many apps we're not re-ranking (up to preserveTopNApps).
int numProcessesNotReRanked = 0; int numProcessesNotReRanked = 0;
while (numProcessesEvaluated < lruProcessServiceStart while (numProcessesEvaluated < lruProcessServiceStart
&& numProcessesNotReRanked < mPreserveTopNApps) { && numProcessesNotReRanked < preserveTopNApps) {
ProcessRecord process = lruList.get(numProcessesEvaluated); ProcessRecord process = lruList.get(numProcessesEvaluated);
if (appCanBeReRanked(process)) { if (appCanBeReRanked(process)) {
numProcessesNotReRanked++; numProcessesNotReRanked++;
} }
numProcessesEvaluated++; numProcessesEvaluated++;
} }
// Exclude the top `mPreserveTopNApps` apps from re-ranking. // Exclude the top `preserveTopNApps` apps from re-ranking.
if (numProcessesNotReRanked < mPreserveTopNApps) { if (numProcessesNotReRanked < preserveTopNApps) {
numProcessesReRanked -= mPreserveTopNApps - numProcessesNotReRanked; numProcessesReRanked -= preserveTopNApps - numProcessesNotReRanked;
if (numProcessesReRanked < 0) { if (numProcessesReRanked < 0) {
numProcessesReRanked = 0; numProcessesReRanked = 0;
} }