summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2013-08-09 13:23:46 -0700
committerColin Cross <ccross@google.com>2013-08-09 20:37:23 +0000
commitcb4728f247e3793e7fc1baa031290aa732bb77a7 (patch)
tree02767c80f5cca1e2ee9f3815d69b23c5af99c6a7
parentd81a15c6b77c94109d0a08bc7355f62301fe9234 (diff)
downloadframeworks_base-cb4728f247e3793e7fc1baa031290aa732bb77a7.zip
frameworks_base-cb4728f247e3793e7fc1baa031290aa732bb77a7.tar.gz
frameworks_base-cb4728f247e3793e7fc1baa031290aa732bb77a7.tar.bz2
parse named anonymous memory for dumpsys meminfo
Treat [anon:libc_malloc] as native heap and anything else that starts with [anon: as unknown. Bug: 10212959 Change-Id: Ifd120ae86e7a22291383df37d2b96f9f2dcd68b9
-rw-r--r--core/jni/android_os_Debug.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp
index 61ace4a..f5eb389 100644
--- a/core/jni/android_os_Debug.cpp
+++ b/core/jni/android_os_Debug.cpp
@@ -220,6 +220,8 @@ static void read_mapinfo(FILE *fp, stats_t* stats)
} else {
whichHeap = HEAP_ASHMEM;
}
+ } else if (strncmp(name, "[anon:libc_malloc]", 18) == 0) {
+ whichHeap = HEAP_NATIVE;
} else if (strncmp(name, "[stack", 6) == 0) {
whichHeap = HEAP_STACK;
} else if (strncmp(name, "/dev/", 5) == 0) {
@@ -246,6 +248,8 @@ static void read_mapinfo(FILE *fp, stats_t* stats)
} else if (nameLen > 4 && strcmp(name+nameLen-4, ".art") == 0) {
whichHeap = HEAP_ART;
is_swappable = true;
+ } else if (strncmp(name, "[anon:", 6) == 0) {
+ whichHeap = HEAP_UNKNOWN;
} else if (nameLen > 0) {
whichHeap = HEAP_UNKNOWN_MAP;
} else if (start == prevEnd && prevHeap == HEAP_SO) {