commit 1d6279ee3d0771687a56a22e70dc1e7aa5ac3078
author Colin Cross <ccross@android.com> Mon Jul 14 01:56:55 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 14 01:56:55 2014 +0000
tree bef75692cee3be123d8d013b3c60bc70b76daec3
parent a352c8c8569a2d020fd9030bd841ef5f4c4f7755
parent 038975a5c85caa758294102d4577d063d7e02651

am 038975a5: Merge "lmkd: pass uid from ActivityManager to lmkd"

* commit '038975a5c85caa758294102d4577d063d7e02651':
  lmkd: pass uid from ActivityManager to lmkd

lmkd/lmkd.c

diff --git a/lmkd/lmkd.c b/lmkd/lmkd.c
index 5caf77d..369b5ad 100644
--- a/lmkd/lmkd.c
+++ b/lmkd/lmkd.c
@@ -104,6 +104,7 @@
 struct proc {
     struct adjslot_list asl;
     int pid;
+    uid_t uid;
     int oomadj;
     struct proc *pidhash_next;
 };
@@ -227,7 +228,7 @@
     close(fd);
 }
 
-static void cmd_procprio(int pid, int oomadj) {
+static void cmd_procprio(int pid, int uid, int oomadj) {
     struct proc *procp;
     char path[80];
     char val[20];
@@ -253,6 +254,7 @@
             }
 
             procp->pid = pid;
+            procp->uid = uid;
             procp->oomadj = oomadj;
             proc_insert(procp);
     } else {
@@ -356,9 +358,9 @@
         cmd_target(targets, &ibuf[1]);
         break;
     case LMK_PROCPRIO:
-        if (nargs != 2)
+        if (nargs != 3)
             goto wronglen;
-        cmd_procprio(ntohl(ibuf[1]), ntohl(ibuf[2]));
+        cmd_procprio(ntohl(ibuf[1]), ntohl(ibuf[2]), ntohl(ibuf[3]));
         break;
     case LMK_PROCREMOVE:
         if (nargs != 1)
@@ -565,6 +567,7 @@
 
         if (procp) {
             int pid = procp->pid;
+            uid_t uid = procp->uid;
             char *taskname;
             int tasksize;
             int r;
@@ -581,10 +584,10 @@
                 goto retry;
             }
 
-            ALOGI("Killing '%s' (%d), adj %d\n"
+            ALOGI("Killing '%s' (%d), uid %d, adj %d\n"
                   "   to free %ldkB because cache %ldkB is below limit %ldkB for oom_adj %d\n"
                   "   Free memory is %ldkB %s reserved",
-                  taskname, pid, procp->oomadj, tasksize * page_k,
+                  taskname, pid, uid, procp->oomadj, tasksize * page_k,
                   other_file * page_k, minfree * page_k, min_score_adj,
                   other_free * page_k, other_free >= 0 ? "above" : "below");
             r = kill(pid, SIGKILL);