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

Commit 3ed76439 authored by Mathieu Chartier's avatar Mathieu Chartier
Browse files

Look at map extensions before /dev/ + ashmem. 

Prevents stuff like:
dalvik-classes.dex appearing as GC overhead.

(cherry picked from commit 9308462a)

Bug: 20752953
Change-Id: Iab0935e882a5d938651ec2581845d8242aaf98af
parent adcb47a5

core/jni/android_os_Debug.cpp

+40 −40
Original line number Diff line number Diff line
@@ -270,6 +270,35 @@ static void read_mapinfo(FILE *fp, stats_t* stats) 


            if ((strstr(name, "[heap]") == name)) {

                whichHeap = HEAP_NATIVE;

            } else if (strncmp(name, "[anon:libc_malloc]", 18) == 0) {

                whichHeap = HEAP_NATIVE;

            } else if (strncmp(name, "[stack", 6) == 0) {

                whichHeap = HEAP_STACK;

            } else if (nameLen > 3 && strcmp(name+nameLen-3, ".so") == 0) {

                whichHeap = HEAP_SO;

                is_swappable = true;

            } else if (nameLen > 4 && strcmp(name+nameLen-4, ".jar") == 0) {

                whichHeap = HEAP_JAR;

                is_swappable = true;

            } else if (nameLen > 4 && strcmp(name+nameLen-4, ".apk") == 0) {

                whichHeap = HEAP_APK;

                is_swappable = true;

            } else if (nameLen > 4 && strcmp(name+nameLen-4, ".ttf") == 0) {

                whichHeap = HEAP_TTF;

                is_swappable = true;

            } else if ((nameLen > 4 && strstr(name, ".dex") != NULL) ||

                       (nameLen > 5 && strcmp(name+nameLen-5, ".odex") == 0)) {

                whichHeap = HEAP_DEX;

                is_swappable = true;

            } else if (nameLen > 4 && strcmp(name+nameLen-4, ".oat") == 0) {

                whichHeap = HEAP_OAT;

                is_swappable = true;

            } else if (nameLen > 4 && strcmp(name+nameLen-4, ".art") == 0) {

                whichHeap = HEAP_ART;

                is_swappable = true;

            } else if (strncmp(name, "/dev/", 5) == 0) {

                if (strncmp(name, "/dev/kgsl-3d0", 13) == 0) {

                    whichHeap = HEAP_GL_DEV;

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

                    if (strncmp(name, "/dev/ashmem/dalvik-", 19) == 0) {

                        whichHeap = HEAP_DALVIK_OTHER;
@@ -303,38 +332,9 @@ 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) {

                if (strncmp(name, "/dev/kgsl-3d0", 13) == 0) {

                    whichHeap = HEAP_GL_DEV;

                } else {

                    whichHeap = HEAP_UNKNOWN_DEV;

                }

            } else if (nameLen > 3 && strcmp(name+nameLen-3, ".so") == 0) {

                whichHeap = HEAP_SO;

                is_swappable = true;

            } else if (nameLen > 4 && strcmp(name+nameLen-4, ".jar") == 0) {

                whichHeap = HEAP_JAR;

                is_swappable = true;

            } else if (nameLen > 4 && strcmp(name+nameLen-4, ".apk") == 0) {

                whichHeap = HEAP_APK;

                is_swappable = true;

            } else if (nameLen > 4 && strcmp(name+nameLen-4, ".ttf") == 0) {

                whichHeap = HEAP_TTF;

                is_swappable = true;

            } else if ((nameLen > 4 && strcmp(name+nameLen-4, ".dex") == 0) ||

                       (nameLen > 5 && strcmp(name+nameLen-5, ".odex") == 0)) {

                whichHeap = HEAP_DEX;

                is_swappable = true;

            } else if (nameLen > 4 && strcmp(name+nameLen-4, ".oat") == 0) {

                whichHeap = HEAP_OAT;

                is_swappable = true;

            } 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) {