Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3385c27 authored by Mathieu Chartier's avatar Mathieu Chartier Committed by Android Git Automerger
Browse files

am 787d0256: am 890ef765: am 025b8203: am 443c7647: am a061388d: Merge "Fix... 

am 787d0256: am 890ef765: am 025b8203: am 443c7647: am a061388d: Merge "Fix dalvik map names" into lmp-dev

* commit '787d02560eda49ba5f304b9880ebc4758dbe7ba0':
  Fix dalvik map names
parents 6e47ea69 4084fe72

core/jni/android_os_Debug.cpp

+8 −16
Original line number Original line Diff line number Diff line
@@ -271,27 +271,19 @@ static void read_mapinfo(FILE *fp, stats_t* stats) 
                    whichHeap = HEAP_DALVIK_OTHER;

                    whichHeap = HEAP_DALVIK_OTHER;

                    if (strstr(name, "/dev/ashmem/dalvik-LinearAlloc") == name) {

                    if (strstr(name, "/dev/ashmem/dalvik-LinearAlloc") == name) {

                        subHeap = HEAP_DALVIK_LINEARALLOC;

                        subHeap = HEAP_DALVIK_LINEARALLOC;

                    } else if ((strstr(name, "/dev/ashmem/dalvik-mark") == name) ||

                    } else if ((strstr(name, "/dev/ashmem/dalvik-alloc space") == name) ||

                               (strstr(name, "/dev/ashmem/dalvik-allocspace alloc space live-bitmap") == name) ||

                               (strstr(name, "/dev/ashmem/dalvik-main space") == name) ||

                               (strstr(name, "/dev/ashmem/dalvik-allocspace alloc space mark-bitmap") == name) ||

                               (strstr(name, "/dev/ashmem/dalvik-non moving space") == name)) {

                               (strstr(name, "/dev/ashmem/dalvik-card table") == name) ||

                        // This is the regular Dalvik heap.

                               (strstr(name, "/dev/ashmem/dalvik-allocation stack") == name) ||

                        whichHeap = HEAP_DALVIK;

                               (strstr(name, "/dev/ashmem/dalvik-live stack") == name) ||

                        subHeap = HEAP_DALVIK_NORMAL;

                               (strstr(name, "/dev/ashmem/dalvik-imagespace") == name) ||

                    } else if (strstr(name, "/dev/ashmem/dalvik-large object space") == name) {

                               (strstr(name, "/dev/ashmem/dalvik-bitmap") == name) ||

                               (strstr(name, "/dev/ashmem/dalvik-card-table") == name) ||

                               (strstr(name, "/dev/ashmem/dalvik-mark-stack") == name) ||

                               (strstr(name, "/dev/ashmem/dalvik-aux-structure") == name)) {

                        subHeap = HEAP_DALVIK_ACCOUNTING;

                    } else if (strstr(name, "/dev/ashmem/dalvik-large") == name) {

                        whichHeap = HEAP_DALVIK;

                        whichHeap = HEAP_DALVIK;

                        subHeap = HEAP_DALVIK_LARGE;

                        subHeap = HEAP_DALVIK_LARGE;

                    } else if (strstr(name, "/dev/ashmem/dalvik-jit-code-cache") == name) {

                    } else if (strstr(name, "/dev/ashmem/dalvik-jit-code-cache") == name) {

                        subHeap = HEAP_DALVIK_CODE_CACHE;

                        subHeap = HEAP_DALVIK_CODE_CACHE;

                    } else {

                    } else {

                        // This is the regular Dalvik heap.

                        subHeap = HEAP_DALVIK_ACCOUNTING;  // Default to accounting.

                        whichHeap = HEAP_DALVIK;

                        subHeap = HEAP_DALVIK_NORMAL;

                    }

                    }

                } else if (strncmp(name, "/dev/ashmem/CursorWindow", 24) == 0) {

                } else if (strncmp(name, "/dev/ashmem/CursorWindow", 24) == 0) {

                    whichHeap = HEAP_CURSOR;

                    whichHeap = HEAP_CURSOR;