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

Merge "lmkd: Suppress error when accessing soft_limit_in_bytes for system_server" am: d4463fd9d7 

am: ec2bc88aa1

Change-Id: I10f524189c88dded9cce608cd2bec18cf03497f4
This commit is contained in:
Suren Baghdasaryan 2018-03-21 19:35:22 +00:00 committed by android-build-merger
parent 9c5eaeb68f bb7747bec2
commit 618e3f621c
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lmkd.c
View File

@ -18,6 +18,7 @@
#include <errno.h> #include <errno.h>
#include <inttypes.h> #include <inttypes.h>
#include <pwd.h>
#include <sched.h> #include <sched.h>
#include <signal.h> #include <signal.h>
#include <stdbool.h> #include <stdbool.h>
@ -76,6 +77,9 @@
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x))) #define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
#define EIGHT_MEGA (1 << 23) #define EIGHT_MEGA (1 << 23)
/* Defined as ProcessList.SYSTEM_ADJ in ProcessList.java */
#define SYSTEM_ADJ (-900)
/* default to old in-kernel interface if no memory pressure events */ /* default to old in-kernel interface if no memory pressure events */
static int use_inkernel_interface = 1; static int use_inkernel_interface = 1;
static bool has_inkernel_module; static bool has_inkernel_module;
@ -311,6 +315,8 @@ static void cmd_procprio(LMKD_CTRL_PACKET packet) {
char val[20]; char val[20];
int soft_limit_mult; int soft_limit_mult;
struct lmk_procprio params; struct lmk_procprio params;
bool is_system_server;
struct passwd *pwdrec;
lmkd_pack_get_procprio(packet, &params); lmkd_pack_get_procprio(packet, &params);
@ -364,7 +370,15 @@ static void cmd_procprio(LMKD_CTRL_PACKET packet) {
"/dev/memcg/apps/uid_%d/pid_%d/memory.soft_limit_in_bytes", "/dev/memcg/apps/uid_%d/pid_%d/memory.soft_limit_in_bytes",
params.uid, params.pid); params.uid, params.pid);
snprintf(val, sizeof(val), "%d", soft_limit_mult * EIGHT_MEGA); snprintf(val, sizeof(val), "%d", soft_limit_mult * EIGHT_MEGA);
writefilestring(path, val, true);
/*
* system_server process has no memcg under /dev/memcg/apps but should be
* registered with lmkd. This is the best way so far to identify it.
*/
is_system_server = (params.oomadj == SYSTEM_ADJ &&
(pwdrec = getpwnam("system")) != NULL &&
params.uid == pwdrec->pw_uid);
writefilestring(path, val, !is_system_server);
procp = pid_lookup(params.pid); procp = pid_lookup(params.pid);
if (!procp) { if (!procp) {