wenchao-hao
/
lmkd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Snap for 4778776 from da88b24c9787f8babf790c7fca93e129143b41fe to pi-release 

Change-Id: I487f4e0e0b4505d3bd4f264b2f95174743107226
This commit is contained in:
android-build-team Robot 2018-05-13 07:26:59 +00:00
parent ece1fc9bde eff8233ce4
commit 7388e2ea02
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lmkd.c
View File

@ -1178,10 +1178,8 @@ static void mp_event_common(int data, uint32_t events __unused) {
} }
if (skip_count > 0) { if (skip_count > 0) {
if (debug_process_killing) { ALOGI("%lu memory pressure events were skipped after a kill!",
ALOGI("%lu memory pressure events were skipped after a kill!", skip_count);
skip_count);
}
skip_count = 0; skip_count = 0;
} }
@ -1299,25 +1297,24 @@ do_kill:
return; return;
} }
min_score_adj = level_oomadj[level]; min_score_adj = level_oomadj[level];
} else {
if (debug_process_killing) {
ALOGI("Killing because cache %ldkB is below "
"limit %ldkB for oom_adj %d\n"
" Free memory is %ldkB %s reserved",
other_file * page_k, minfree * page_k, min_score_adj,
other_free * page_k, other_free >= 0 ? "above" : "below");
}
} }
if (debug_process_killing) {
ALOGI("Trying to free %d pages", pages_to_free);
}
pages_freed = find_and_kill_processes(level, min_score_adj, pages_to_free); pages_freed = find_and_kill_processes(level, min_score_adj, pages_to_free);
if (use_minfree_levels) {
ALOGI("Killing because cache %ldkB is below "
"limit %ldkB for oom_adj %d\n"
" Free memory is %ldkB %s reserved",
other_file * page_k, minfree * page_k, min_score_adj,
other_free * page_k, other_free >= 0 ? "above" : "below");
}
if (pages_freed < pages_to_free) { if (pages_freed < pages_to_free) {
if (debug_process_killing) { ALOGI("Unable to free enough memory (pages to free=%d, pages freed=%d)",
ALOGI("Unable to free enough memory (pages freed=%d)", pages_freed); pages_to_free, pages_freed);
}
} else { } else {
ALOGI("Reclaimed enough memory (pages to free=%d, pages freed=%d)",
pages_to_free, pages_freed);
gettimeofday(&last_report_tm, NULL); gettimeofday(&last_report_tm, NULL);
} }
} }