From 1886a155f21ea33b71ed76871eb22cdb6a3dbe3f Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Mon, 10 Apr 2017 18:28:03 -0700 Subject: [PATCH] Fix some maps to be HEAP_DALVIK_CODE_CACHE instead of HEAP_DALVIK_ACCOUNTING dalvik-data-code-cache and dalvik-CompilerMetadata should be counted in JITCache instead of .GC in dumpsys. Bug: 37224159 Test: adb shell dumpsys meminfo -d (cherry picked from commit 874c4cf56c0a9ea3b48468a13ec7fb78a3e2594b) Change-Id: I41def949d91b2fdef0b3f502fe16ae436d058051 --- core/jni/android_os_Debug.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp index a75848973b064..68a0851910677 100644 --- a/core/jni/android_os_Debug.cpp +++ b/core/jni/android_os_Debug.cpp @@ -333,7 +333,9 @@ static void read_mapinfo(FILE *fp, stats_t* stats, bool* foundSwapPss) subHeap = HEAP_DALVIK_ZYGOTE; } else if (strstr(name, "/dev/ashmem/dalvik-indirect ref") == name) { subHeap = HEAP_DALVIK_INDIRECT_REFERENCE_TABLE; - } else if (strstr(name, "/dev/ashmem/dalvik-jit-code-cache") == name) { + } else if (strstr(name, "/dev/ashmem/dalvik-jit-code-cache") == name || + strstr(name, "/dev/ashmem/dalvik-data-code-cache") == name || + strstr(name, "/dev/ashmem/dalvik-CompilerMetadata") == name) { subHeap = HEAP_DALVIK_CODE_CACHE; } else { subHeap = HEAP_DALVIK_ACCOUNTING; // Default to accounting.