Snap for 4796401 from 93d48fe0b6e891d785caefdc02065da58e749c69 to pi-release

Change-Id: I9d5a3d4d48b6944b00e032511151eb1a4a391d4b
This commit is contained in:
android-build-team Robot 2018-05-22 07:27:05 +00:00
commit f4a8a1aa26
1 changed files with 40 additions and 31 deletions

11
lmkd.c
View File

@ -459,6 +459,7 @@ static void cmd_procprio(LMKD_CTRL_PACKET packet) {
if (use_inkernel_interface)
return;
if (low_ram_device) {
if (params.oomadj >= 900) {
soft_limit_mult = 0;
} else if (params.oomadj >= 800) {
@ -492,6 +493,7 @@ static void cmd_procprio(LMKD_CTRL_PACKET packet) {
params.uid, params.pid);
snprintf(val, sizeof(val), "%d", soft_limit_mult * EIGHT_MEGA);
writefilestring(path, val);
}
procp = pid_lookup(params.pid);
if (!procp) {
@ -1214,8 +1216,15 @@ static void mp_event_common(int data, uint32_t events __unused) {
}
}
if (min_score_adj == OOM_SCORE_ADJ_MAX + 1)
if (min_score_adj == OOM_SCORE_ADJ_MAX + 1) {
if (debug_process_killing) {
ALOGI("Ignore %s memory pressure event "
"(free memory=%ldkB, cache=%ldkB, limit=%ldkB)",
level_name[level], other_free * page_k, other_file * page_k,
(long)lowmem_minfree[lowmem_targets_size - 1] * page_k);
}
return;
}
/* Free up enough pages to push over the highest minfree level */
pages_to_free = lowmem_minfree[lowmem_targets_size - 1] -