Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev am: 7f2deeeef5

am: df0cc41a7b

* commit 'df0cc41a7bfa480ce5584420bceda850ad0c56c8':
  Fix read_mapinfo to recognize free list large object space
This commit is contained in:
Mathieu Chartier
2015-10-19 23:29:56 +00:00
committed by android-build-merger

View File

@@ -309,7 +309,9 @@ static void read_mapinfo(FILE *fp, stats_t* stats)
// This is the regular Dalvik heap.
whichHeap = HEAP_DALVIK;
subHeap = HEAP_DALVIK_NORMAL;
} else if (strstr(name, "/dev/ashmem/dalvik-large object space") == name) {
} else if (strstr(name, "/dev/ashmem/dalvik-large object space") == name ||
strstr(name, "/dev/ashmem/dalvik-free list large object space")
== name) {
whichHeap = HEAP_DALVIK;
subHeap = HEAP_DALVIK_LARGE;
} else if (strstr(name, "/dev/ashmem/dalvik-non moving space") == name) {