Merge "Re-tune low memory killer params." into lmp-mr1-dev

This commit is contained in:
Dianne Hackborn
2014-11-26 01:44:21 +00:00
committed by Android (Google) Code Review

View File

@@ -177,7 +177,7 @@ final class ProcessList {
// 1280x800 or larger screen with around 1GB RAM. Values are in KB. // 1280x800 or larger screen with around 1GB RAM. Values are in KB.
private final int[] mOomMinFreeHigh = new int[] { private final int[] mOomMinFreeHigh = new int[] {
73728, 92160, 110592, 73728, 92160, 110592,
129024, 225000, 325000 129024, 147456, 184320
}; };
// The actual OOM killer memory levels we are using. // The actual OOM killer memory levels we are using.
private final int[] mOomMinFree = new int[mOomAdj.length]; private final int[] mOomMinFree = new int[mOomAdj.length];
@@ -212,7 +212,7 @@ final class ProcessList {
private void updateOomLevels(int displayWidth, int displayHeight, boolean write) { private void updateOomLevels(int displayWidth, int displayHeight, boolean write) {
// Scale buckets from avail memory: at 300MB we use the lowest values to // Scale buckets from avail memory: at 300MB we use the lowest values to
// 700MB or more for the top values. // 700MB or more for the top values.
float scaleMem = ((float)(mTotalMemMb-300))/(700-300); float scaleMem = ((float)(mTotalMemMb-350))/(700-350);
// Scale buckets from screen size. // Scale buckets from screen size.
int minSize = 480*800; // 384000 int minSize = 480*800; // 384000
@@ -237,8 +237,8 @@ final class ProcessList {
if (Build.SUPPORTED_64_BIT_ABIS.length > 0) { if (Build.SUPPORTED_64_BIT_ABIS.length > 0) {
// Increase the high min-free levels for cached processes for 64-bit // Increase the high min-free levels for cached processes for 64-bit
mOomMinFreeHigh[4] = 225000; mOomMinFreeHigh[4] = (mOomMinFreeHigh[4]*3)/2;
mOomMinFreeHigh[5] = 325000; mOomMinFreeHigh[5] = (mOomMinFreeHigh[5]*7)/8;
} }
for (int i=0; i<mOomAdj.length; i++) { for (int i=0; i<mOomAdj.length; i++) {