Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't count lowmem mappings as memory used." into mnc-dev

Browse Source
This commit is contained in:
Martijn Coenen
2015-05-26 08:11:26 +00:00
committed by Android (Google) Code Review
parent 912696e797 ab3576e58a
commit 99fbb56a0a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/jni/android_os_Debug.cpp
View File

@@ -580,8 +580,8 @@ static long get_allocated_vmalloc_memory() {
break; break;
} }
if (!strstr(line, "ioremap")) { if (!strstr(line, "ioremap") && !strstr(line, "map_lowmem")) {
// Ignore ioremap regions, since they don't actually consume memory // Ignore ioremap and map_lowmem regions, since they don't actually consume memory
if (sscanf(line, "%*x-%*x %ld", &size) == 1) { if (sscanf(line, "%*x-%*x %ld", &size) == 1) {
vmalloc_allocated_size += size; vmalloc_allocated_size += size;
} }