Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-07 18:04:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 235887eecb56 (bug 836654)

Browse Source
This commit is contained in:
Ed Morley 2013-02-14 10:02:46 +00:00
parent 9953a08d9c
commit 606424254e
4 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
b2g/app/b2g.js
View File

@ -552,13 +552,11 @@ pref("dom.ipc.processPriorityManager.temporaryPriorityMS", 5000);
pref("gonk.systemMemoryPressureRecoveryPollMS", 5000);
pref("hal.processPriorityManager.gonk.masterOomScoreAdjust", 0);
pref("hal.processPriorityManager.gonk.masterKillUnderMB", 1);
pref("hal.processPriorityManager.gonk.foregroundHighOomScoreAdjust", 67);
pref("hal.processPriorityManager.gonk.foregroundHighKillUnderMB", 3);
pref("hal.processPriorityManager.gonk.foregroundOomScoreAdjust", 134);
pref("hal.processPriorityManager.gonk.foregroundOomScoreAdjust", 67);
pref("hal.processPriorityManager.gonk.foregroundKillUnderMB", 4);
pref("hal.processPriorityManager.gonk.backgroundPerceivableOomScoreAdjust", 200);
pref("hal.processPriorityManager.gonk.backgroundPerceivableOomScoreAdjust", 134);
pref("hal.processPriorityManager.gonk.backgroundPerceivableKillUnderMB", 5);
pref("hal.processPriorityManager.gonk.backgroundHomescreenOomScoreAdjust", 267);
pref("hal.processPriorityManager.gonk.backgroundHomescreenOomScoreAdjust", 200);
pref("hal.processPriorityManager.gonk.backgroundHomescreenKillUnderMB", 5);
pref("hal.processPriorityManager.gonk.backgroundOomScoreAdjust", 400);
pref("hal.processPriorityManager.gonk.backgroundKillUnderMB", 8);
@ -566,8 +564,7 @@ pref("hal.processPriorityManager.gonk.notifyLowMemUnderMB", 10);
// Niceness values (i.e., CPU priorities) for B2G processes.
pref("hal.processPriorityManager.gonk.masterNice", 0);
pref("hal.processPriorityManager.gonk.foregroundHighNice", 1);
pref("hal.processPriorityManager.gonk.foregroundNice", 2);
pref("hal.processPriorityManager.gonk.foregroundNice", 1);
pref("hal.processPriorityManager.gonk.backgroundPerceivableNice", 10);
pref("hal.processPriorityManager.gonk.backgroundHomescreenNice", 20);
pref("hal.processPriorityManager.gonk.backgroundNice", 20);

2
hal/Hal.cpp
View File

@ -853,8 +853,6 @@ ProcessPriorityToString(ProcessPriority aPriority)
switch (aPriority) {
case PROCESS_PRIORITY_MASTER:
return "MASTER";
case PROCESS_PRIORITY_FOREGROUND_HIGH:
return "FOREGROUND_HIGH";
case PROCESS_PRIORITY_FOREGROUND:
return "FOREGROUND";
case PROCESS_PRIORITY_BACKGROUND_PERCEIVABLE:

1
hal/HalTypes.h
View File

@ -81,7 +81,6 @@ enum ProcessPriority {
// "foreground" for the purposes of priority testing, for example
// CurrentProcessIsForeground().
PROCESS_PRIORITY_FOREGROUND,
PROCESS_PRIORITY_FOREGROUND_HIGH,
PROCESS_PRIORITY_MASTER,
NUM_PROCESS_PRIORITY
};

11
hal/gonk/GonkHal.cpp
View File

@ -1049,28 +1049,24 @@ EnsureKernelLowMemKillerParamsSet()
const char* priorityClasses[] = {
"master",
"foregroundHigh",
"foreground",
"backgroundPerceivable",
"backgroundHomescreen",
"background"
};
for (size_t i = 0; i < NS_ARRAY_LENGTH(priorityClasses); i++) {
// The system doesn't function correctly if we're missing these prefs, so
// crash loudly.
int32_t oomScoreAdj;
if (!NS_SUCCEEDED(Preferences::GetInt(nsPrintfCString(
"hal.processPriorityManager.gonk.%sOomScoreAdjust",
priorityClasses[i]).get(), &oomScoreAdj))) {
MOZ_CRASH();
continue;
}
int32_t killUnderMB;
if (!NS_SUCCEEDED(Preferences::GetInt(nsPrintfCString(
"hal.processPriorityManager.gonk.%sKillUnderMB",
priorityClasses[i]).get(), &killUnderMB))) {
MOZ_CRASH();
continue;
}
// adj is in oom_adj units.
@ -1128,9 +1124,6 @@ SetProcessPriority(int aPid, ProcessPriority aPriority)
case PROCESS_PRIORITY_FOREGROUND:
priorityStr = "foreground";
break;
case PROCESS_PRIORITY_FOREGROUND_HIGH:
priorityStr = "foregroundHigh";
break;
case PROCESS_PRIORITY_MASTER:
priorityStr = "master";
break;