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

Replace mentions of "oom_adj" with "oom_score_adj" am: 74b4df95b4 am: 2c432eaf62 

Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1607288

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0f3dc88df88e2166c6e801ab66b7c1b1c095718b
This commit is contained in:
Chris Morin 2021-02-26 18:16:15 +00:00 committed by Automerger Merge Worker
parent 93f513941c 2c432eaf62
commit 8ae13ca324
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lmkd.cpp
View File

@ -2123,10 +2123,10 @@ static int kill_one_process(struct proc* procp, int min_oom_score, enum kill_rea
killinfo_log(procp, min_oom_score, rss_kb, kill_reason, mi, wi, tm); killinfo_log(procp, min_oom_score, rss_kb, kill_reason, mi, wi, tm);
if (kill_desc) { if (kill_desc) {
ALOGI("Kill '%s' (%d), uid %d, oom_adj %d to free %" PRId64 "kB; reason: %s", taskname, pid, ALOGI("Kill '%s' (%d), uid %d, oom_score_adj %d to free %" PRId64 "kB; reason: %s",
uid, procp->oomadj, rss_kb, kill_desc); taskname, pid, uid, procp->oomadj, rss_kb, kill_desc);
} else { } else {
ALOGI("Kill '%s' (%d), uid %d, oom_adj %d to free %" PRId64 "kB", taskname, pid, ALOGI("Kill '%s' (%d), uid %d, oom_score_adj %d to free %" PRId64 "kB", taskname, pid,
uid, procp->oomadj, rss_kb); uid, procp->oomadj, rss_kb);
} }
@ -2153,7 +2153,7 @@ out:
} }
/* /*
* Find one process to kill at or above the given oom_adj level. * Find one process to kill at or above the given oom_score_adj level.
* Returns size of the killed process. * Returns size of the killed process.
*/ */
static int find_and_kill_process(int min_score_adj, enum kill_reasons kill_reason, static int find_and_kill_process(int min_score_adj, enum kill_reasons kill_reason,
@ -2798,15 +2798,14 @@ do_kill:
/* Log whenever we kill or when report rate limit allows */ /* Log whenever we kill or when report rate limit allows */
if (use_minfree_levels) { if (use_minfree_levels) {
ALOGI("Reclaimed %ldkB, cache(%ldkB) and " ALOGI("Reclaimed %ldkB, cache(%ldkB) and free(%" PRId64 "kB)-reserved(%" PRId64 "kB) "
"free(%" PRId64 "kB)-reserved(%" PRId64 "kB) below min(%ldkB) for oom_adj %d", "below min(%ldkB) for oom_score_adj %d",
pages_freed * page_k, pages_freed * page_k,
other_file * page_k, mi.field.nr_free_pages * page_k, other_file * page_k, mi.field.nr_free_pages * page_k,
zi.totalreserve_pages * page_k, zi.totalreserve_pages * page_k,
minfree * page_k, min_score_adj); minfree * page_k, min_score_adj);
} else { } else {
ALOGI("Reclaimed %ldkB at oom_adj %d", ALOGI("Reclaimed %ldkB at oom_score_adj %d", pages_freed * page_k, min_score_adj);
pages_freed * page_k, min_score_adj);
} }
if (report_skip_count > 0) { if (report_skip_count > 0) {