Replace mentions of "oom_adj" with "oom_score_adj"
Some log messages mention "oom_adj" instead of "oom_score_adj" when
referring to oom_score_adj. This is confusing because "oom_adj" is a
separate value which was supplanted by oom_score_adj, but can still be
used.
Test: trigger memory pressure and view logs
Change-Id: I23825083cecfff6bd32bfb39c6dac1f2b17a72a7
diff --git a/lmkd.cpp b/lmkd.cpp
index 74ba524..6c97757 100644
--- a/lmkd.cpp
+++ b/lmkd.cpp
@@ -2123,10 +2123,10 @@
killinfo_log(procp, min_oom_score, rss_kb, kill_reason, mi, wi, tm);
if (kill_desc) {
- ALOGI("Kill '%s' (%d), uid %d, oom_adj %d to free %" PRId64 "kB; reason: %s", taskname, pid,
- uid, procp->oomadj, rss_kb, kill_desc);
+ ALOGI("Kill '%s' (%d), uid %d, oom_score_adj %d to free %" PRId64 "kB; reason: %s",
+ taskname, pid, uid, procp->oomadj, rss_kb, kill_desc);
} 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);
}
@@ -2153,7 +2153,7 @@
}
/*
- * 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.
*/
static int find_and_kill_process(int min_score_adj, enum kill_reasons kill_reason,
@@ -2798,15 +2798,14 @@
/* Log whenever we kill or when report rate limit allows */
if (use_minfree_levels) {
- ALOGI("Reclaimed %ldkB, cache(%ldkB) and "
- "free(%" PRId64 "kB)-reserved(%" PRId64 "kB) below min(%ldkB) for oom_adj %d",
+ ALOGI("Reclaimed %ldkB, cache(%ldkB) and free(%" PRId64 "kB)-reserved(%" PRId64 "kB) "
+ "below min(%ldkB) for oom_score_adj %d",
pages_freed * page_k,
other_file * page_k, mi.field.nr_free_pages * page_k,
zi.totalreserve_pages * page_k,
minfree * page_k, min_score_adj);
} else {
- ALOGI("Reclaimed %ldkB at oom_adj %d",
- pages_freed * page_k, min_score_adj);
+ ALOGI("Reclaimed %ldkB at oom_score_adj %d", pages_freed * page_k, min_score_adj);
}
if (report_skip_count > 0) {
