From 67bf272f5da217aa74c5725602598137479b8e9d Mon Sep 17 00:00:00 2001 From: Jim Warner Date: Fri, 15 Apr 2016 00:00:00 -0500 Subject: [PATCH] library: trade a deprecated oomem field for proper one Now that the conditional OOMEM_ENABLE has been removed and, after reviewing current library support, it turns out we've been using a deprecated /proc//oom_adj. What we should use instead is that more recent tunable /proc//oom_score_adj. This new field will provide a range of -1000 thru +1000 (former was -17 thru +15). Reference(s): . removal of misguided OOMEM_ENABLE commit 64238730fa45e92bc40b2aa28d107c2469ac29e9 . linux, partial oom_adj revert (Nov, 2012) commit fa0cbbf145aabbf29c6f28f8a11935c0b0fd86fc . linux, removal oom_adj (Oct, 2012) commit 01dc52ebdf472f77cca623ca693ca24cfc0f1bbe Signed-off-by: Jim Warner --- proc/readproc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/proc/readproc.c b/proc/readproc.c index aaf3466d..99f5b9d0 100644 --- a/proc/readproc.c +++ b/proc/readproc.c @@ -474,12 +474,12 @@ static void supgrps_from_supgids (proc_t *p) { } /////////////////////////////////////////////////////////////////////// -static void oomscore2proc(const char* S, proc_t *restrict P) +static inline void oomscore2proc(const char* S, proc_t *restrict P) { sscanf(S, "%d", &P->oom_score); } -static void oomadj2proc(const char* S, proc_t *restrict P) +static inline void oomadj2proc(const char* S, proc_t *restrict P) { sscanf(S, "%d", &P->oom_adj); } @@ -962,7 +962,7 @@ static proc_t* simple_readproc(PROCTAB *restrict const PT, proc_t *restrict cons if (unlikely(flags & PROC_FILLOOM)) { if (likely(file2str(path, "oom_score", &ub) != -1)) oomscore2proc(ub.buf, p); - if (likely(file2str(path, "oom_adj", &ub) != -1)) + if (likely(file2str(path, "oom_score_adj", &ub) != -1)) oomadj2proc(ub.buf, p); } @@ -1120,7 +1120,7 @@ static proc_t* simple_readtask(PROCTAB *restrict const PT, const proc_t *restric if (unlikely(flags & PROC_FILLOOM)) { if (likely(file2str(path, "oom_score", &ub) != -1)) oomscore2proc(ub.buf, t); - if (likely(file2str(path, "oom_adj", &ub) != -1)) + if (likely(file2str(path, "oom_score_adj", &ub) != -1)) oomadj2proc(ub.buf, t); }