diff options
| author | 2013-08-09 21:24:08 +0000 | |
|---|---|---|
| committer | 2013-08-09 21:24:08 +0000 | |
| commit | dd78a0fb0d537e0bb2aa5b7a7b58bce55bb57029 (patch) | |
| tree | bb328d4cf127a02d190d2cf445eec34a0781a7f2 | |
| parent | 4bcc8ee682bb879f1020942be03616b506d2c802 (diff) | |
| parent | cb4728f247e3793e7fc1baa031290aa732bb77a7 (diff) | |
Merge "parse named anonymous memory for dumpsys meminfo" into klp-dev
| -rw-r--r-- | core/jni/android_os_Debug.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp index 61ace4a19bc5..f5eb38988ef2 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) { |