commit 9c1f9bb7205e59d4bdc6f9e9601bc4b3ef210b3b
author Wei Wang <wvw@google.com> Tue Jun 28 14:32:35 2016 -0700
committer Wei Wang <wvw@google.com> Tue Jun 28 14:34:35 2016 -0700
tree 646211eca869bc6993f7e1c52d2242f965946393
parent a4ab3e7474e8215fa695d2cfdf8cf4982572ac86

dumpstate: change OOM adjustment proc interface for modern kernel

Bug: 29831067
Change-Id: I72e2862daad5da99e7d767d7e41bde96750840ce

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 47e9f62..279c010 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -1118,10 +1118,18 @@
 
     /* set as high priority, and protect from OOM killer */
     setpriority(PRIO_PROCESS, 0, -20);
-    FILE *oom_adj = fopen("/proc/self/oom_adj", "we");
+
+    FILE *oom_adj = fopen("/proc/self/oom_score_adj", "we");
     if (oom_adj) {
-        fputs("-17", oom_adj);
+        fputs("-1000", oom_adj);
         fclose(oom_adj);
+    } else {
+        /* fallback to kernels <= 2.6.35 */
+        oom_adj = fopen("/proc/self/oom_adj", "we");
+        if (oom_adj) {
+            fputs("-17", oom_adj);
+            fclose(oom_adj);
+        }
     }
 
     /* parse arguments */