ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "lmkd: Skip memory.stat usage when per-app memcgs are not used"

Browse source
This commit is contained in:
Treehugger Robot 2018-08-08 16:44:22 +00:00 • committed by Gerrit Code Review
commit 1e0e1b44bd
1 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
lmkd/lmkd.c
View file

@ -755,24 +755,31 @@ static void memory_stat_parse_line(char *line, struct memory_stat *mem_st) {
} }
static int memory_stat_parse(struct memory_stat *mem_st, int pid, uid_t uid) { static int memory_stat_parse(struct memory_stat *mem_st, int pid, uid_t uid) {
FILE *fp; FILE *fp;
char buf[PATH_MAX]; char buf[PATH_MAX];
snprintf(buf, sizeof(buf), MEMCG_PROCESS_MEMORY_STAT_PATH, uid, pid); /*
* Per-application memory.stat files are available only when
* per-application memcgs are enabled.
*/
if (!per_app_memcg)
return -1;
fp = fopen(buf, "r"); snprintf(buf, sizeof(buf), MEMCG_PROCESS_MEMORY_STAT_PATH, uid, pid);
if (fp == NULL) { fp = fopen(buf, "r");
ALOGE("%s open failed: %s", buf, strerror(errno));
return -1;
}
while (fgets(buf, PAGE_SIZE, fp) != NULL ) { if (fp == NULL) {
memory_stat_parse_line(buf, mem_st); ALOGE("%s open failed: %s", buf, strerror(errno));
} return -1;
fclose(fp); }
return 0; while (fgets(buf, PAGE_SIZE, fp) != NULL ) {
memory_stat_parse_line(buf, mem_st);
}
fclose(fp);
return 0;
} }
#endif #endif