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

Commit 0567cd4c authored by Nicolas Geoffray's avatar Nicolas Geoffray
Browse files

Adjust and update dumpsys meminfo output. 

Adjust for JIT zygote.

Test: dumpsys meminfo
Bug: 119800099

(cherry picked from commit 08fcd758)

Change-Id: I84e0d41619558ff3528d7ac8670b1fac04afd34e
Merged-In: Ie0e7d6b938b6ee81c01191d6830f1196fa2121c1
parent d5752955

core/java/android/os/Debug.java

+16 −11
Original line number Diff line number Diff line
@@ -278,11 +278,13 @@ public final class Debug 
        /** @hide */

        public static final int OTHER_DALVIK_OTHER_ACCOUNTING = 22;

        /** @hide */

        public static final int OTHER_DALVIK_OTHER_CODE_CACHE = 23;

        public static final int OTHER_DALVIK_OTHER_ZYGOTE_CODE_CACHE = 23;

        /** @hide */

        public static final int OTHER_DALVIK_OTHER_COMPILER_METADATA = 24;

        public static final int OTHER_DALVIK_OTHER_APP_CODE_CACHE = 24;

        /** @hide */

        public static final int OTHER_DALVIK_OTHER_INDIRECT_REFERENCE_TABLE = 25;

        public static final int OTHER_DALVIK_OTHER_COMPILER_METADATA = 25;

        /** @hide */

        public static final int OTHER_DALVIK_OTHER_INDIRECT_REFERENCE_TABLE = 26;

        /** @hide */

        public static final int OTHER_DVK_STAT_DALVIK_OTHER_START =

                OTHER_DALVIK_OTHER_LINEARALLOC - NUM_OTHER_STATS;
@@ -292,11 +294,11 @@ public final class Debug 


        // Dex subsections (Boot vdex, App dex, and App vdex).

        /** @hide */

        public static final int OTHER_DEX_BOOT_VDEX = 26;

        public static final int OTHER_DEX_BOOT_VDEX = 27;

        /** @hide */

        public static final int OTHER_DEX_APP_DEX = 27;

        public static final int OTHER_DEX_APP_DEX = 28;

        /** @hide */

        public static final int OTHER_DEX_APP_VDEX = 28;

        public static final int OTHER_DEX_APP_VDEX = 29;

        /** @hide */

        public static final int OTHER_DVK_STAT_DEX_START = OTHER_DEX_BOOT_VDEX - NUM_OTHER_STATS;

        /** @hide */
@@ -304,9 +306,9 @@ public final class Debug 


        // Art subsections (App image, boot image).

        /** @hide */

        public static final int OTHER_ART_APP = 29;

        public static final int OTHER_ART_APP = 30;

        /** @hide */

        public static final int OTHER_ART_BOOT = 30;

        public static final int OTHER_ART_BOOT = 31;

        /** @hide */

        public static final int OTHER_DVK_STAT_ART_START = OTHER_ART_APP - NUM_OTHER_STATS;

        /** @hide */
@@ -314,7 +316,7 @@ public final class Debug 


        /** @hide */

        @UnsupportedAppUsage

        public static final int NUM_DVK_STATS = 14;

        public static final int NUM_DVK_STATS = OTHER_ART_BOOT + 1 - OTHER_DALVIK_NORMAL;



        /** @hide */

        public static final int NUM_CATEGORIES = 9;
@@ -540,7 +542,8 @@ public final class Debug 
                case OTHER_DALVIK_NON_MOVING: return ".NonMoving";

                case OTHER_DALVIK_OTHER_LINEARALLOC: return ".LinearAlloc";

                case OTHER_DALVIK_OTHER_ACCOUNTING: return ".GC";

                case OTHER_DALVIK_OTHER_CODE_CACHE: return ".JITCache";

                case OTHER_DALVIK_OTHER_ZYGOTE_CODE_CACHE: return ".ZygoteJIT";

                case OTHER_DALVIK_OTHER_APP_CODE_CACHE: return ".AppJIT";

                case OTHER_DALVIK_OTHER_COMPILER_METADATA: return ".CompilerMetadata";

                case OTHER_DALVIK_OTHER_INDIRECT_REFERENCE_TABLE: return ".IndirectRef";

                case OTHER_DEX_BOOT_VDEX: return ".Boot vdex";
@@ -722,7 +725,9 @@ public final class Debug 
              + getOtherPrivate(OTHER_APK)

              + getOtherPrivate(OTHER_TTF)

              + getOtherPrivate(OTHER_DEX)

              + getOtherPrivate(OTHER_OAT);

                + getOtherPrivate(OTHER_OAT)

                + getOtherPrivate(OTHER_DALVIK_OTHER_ZYGOTE_CODE_CACHE)

                + getOtherPrivate(OTHER_DALVIK_OTHER_APP_CODE_CACHE);

        }



        /**

core/jni/android_os_Debug.cpp

+15 −6
Original line number Diff line number Diff line
@@ -85,7 +85,8 @@ enum { 
    // Dalvik other extra sections.

    HEAP_DALVIK_OTHER_LINEARALLOC,

    HEAP_DALVIK_OTHER_ACCOUNTING,

    HEAP_DALVIK_OTHER_CODE_CACHE,

    HEAP_DALVIK_OTHER_ZYGOTE_CODE_CACHE,

    HEAP_DALVIK_OTHER_APP_CODE_CACHE,

    HEAP_DALVIK_OTHER_COMPILER_METADATA,

    HEAP_DALVIK_OTHER_INDIRECT_REFERENCE_TABLE,
@@ -282,9 +283,10 @@ static void load_maps(int pid, stats_t* stats, bool* foundSwapPss) 
            is_swappable = true;

        } else if (base::EndsWith(name, ".vdex")) {

            which_heap = HEAP_DEX;

            // Handle system@framework@boot and system/framework/boot

            // Handle system@framework@boot and system/framework/boot|apex

            if ((strstr(name.c_str(), "@boot") != nullptr) ||

                    (strstr(name.c_str(), "/boot"))) {

                    (strstr(name.c_str(), "/boot") != nullptr) ||

                    (strstr(name.c_str(), "/apex") != nullptr)) {

                sub_heap = HEAP_DEX_BOOT_VDEX;

            } else {

                sub_heap = HEAP_DEX_APP_VDEX;
@@ -295,9 +297,10 @@ static void load_maps(int pid, stats_t* stats, bool* foundSwapPss) 
            is_swappable = true;

        } else if (base::EndsWith(name, ".art") || base::EndsWith(name, ".art]")) {

            which_heap = HEAP_ART;

            // Handle system@framework@boot* and system/framework/boot*

            // Handle system@framework@boot* and system/framework/boot|apex*

            if ((strstr(name.c_str(), "@boot") != nullptr) ||

                    (strstr(name.c_str(), "/boot"))) {

                    (strstr(name.c_str(), "/boot") != nullptr) ||

                    (strstr(name.c_str(), "/apex") != nullptr)) {

                sub_heap = HEAP_ART_BOOT;

            } else {

                sub_heap = HEAP_ART_APP;
@@ -309,9 +312,15 @@ static void load_maps(int pid, stats_t* stats, bool* foundSwapPss) 
                which_heap = HEAP_GL_DEV;

            } else if (base::StartsWith(name, "/dev/ashmem/CursorWindow")) {

                which_heap = HEAP_CURSOR;

            } else if (base::StartsWith(name, "/dev/ashmem/jit-zygote-cache")) {

                which_heap = HEAP_DALVIK_OTHER;

                sub_heap = HEAP_DALVIK_OTHER_ZYGOTE_CODE_CACHE;

            } else if (base::StartsWith(name, "/dev/ashmem")) {

                which_heap = HEAP_ASHMEM;

            }

        } else if (base::StartsWith(name, "/memfd:jit-cache")) {

          which_heap = HEAP_DALVIK_OTHER;

          sub_heap = HEAP_DALVIK_OTHER_APP_CODE_CACHE;

        } else if (base::StartsWith(name, "[anon:")) {

            which_heap = HEAP_UNKNOWN;

            if (base::StartsWith(name, "[anon:dalvik-")) {
@@ -339,7 +348,7 @@ static void load_maps(int pid, stats_t* stats, bool* foundSwapPss) 
                    sub_heap = HEAP_DALVIK_OTHER_INDIRECT_REFERENCE_TABLE;

                } else if (base::StartsWith(name, "[anon:dalvik-jit-code-cache") ||

                        base::StartsWith(name, "[anon:dalvik-data-code-cache")) {

                    sub_heap = HEAP_DALVIK_OTHER_CODE_CACHE;

                    sub_heap = HEAP_DALVIK_OTHER_APP_CODE_CACHE;

                } else if (base::StartsWith(name, "[anon:dalvik-CompilerMetadata")) {

                    sub_heap = HEAP_DALVIK_OTHER_COMPILER_METADATA;

                } else {