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

Commit 00b581de authored by Colin Cross's avatar Colin Cross Committed by Android Git Automerger
Browse files

am dd78a0fb: Merge "parse named anonymous memory for dumpsys meminfo" into klp-dev 

* commit 'dd78a0fb':
  parse named anonymous memory for dumpsys meminfo
parents b59dbedc dd78a0fb

core/jni/android_os_Debug.cpp

+4 −0
Original line number Diff line number Diff line
@@ -220,6 +220,8 @@ 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) {
@@ -246,6 +248,8 @@ static void read_mapinfo(FILE *fp, stats_t* stats) 
            } 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) {

                whichHeap = HEAP_UNKNOWN_MAP;

            } else if (start == prevEnd && prevHeap == HEAP_SO) {