Merge "Fix some maps to be HEAP_DALVIK_CODE_CACHE instead of HEAP_DALVIK_ACCOUNTING"

am: d269f30d62

Change-Id: I2830356fd9288feef334e19a1281c720c6fd7fca
This commit is contained in:
Mathieu Chartier
2017-04-12 00:09:47 +00:00
committed by android-build-merger

View File

@@ -333,7 +333,9 @@ static void read_mapinfo(FILE *fp, stats_t* stats, bool* foundSwapPss)
subHeap = HEAP_DALVIK_ZYGOTE; subHeap = HEAP_DALVIK_ZYGOTE;
} else if (strstr(name, "/dev/ashmem/dalvik-indirect ref") == name) { } else if (strstr(name, "/dev/ashmem/dalvik-indirect ref") == name) {
subHeap = HEAP_DALVIK_INDIRECT_REFERENCE_TABLE; 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; subHeap = HEAP_DALVIK_CODE_CACHE;
} else { } else {
subHeap = HEAP_DALVIK_ACCOUNTING; // Default to accounting. subHeap = HEAP_DALVIK_ACCOUNTING; // Default to accounting.