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

Commit 4ab1e52d authored by Suren Baghdasaryan's avatar Suren Baghdasaryan Committed by Automerger Merge Worker
Browse files

Merge "Add total GPU usage report into dumpsys meminfo output" am: 50a824ab am: 0eed51c4 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1472569

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3aa0cf7b052dad50273e1370218bbb4e4ecb375
parents 25dd5b08 0eed51c4

core/java/android/os/Debug.java

+7 −0
Original line number Diff line number Diff line
@@ -2575,6 +2575,13 @@ public final class Debug 
     */

    public static native long getIonMappedSizeKb();



    /**

     * Return memory size in kilobytes used by GPU.

     *

     * @hide

     */

    public static native long getGpuTotalUsageKb();



    /**

     * Return whether virtually-mapped kernel stacks are enabled (CONFIG_VMAP_STACK).

     * Note: caller needs config_gz read sepolicy permission

core/jni/android_os_Debug.cpp

+13 −0
Original line number Diff line number Diff line
@@ -844,6 +844,17 @@ static jlong android_os_Debug_getIonMappedSizeKb(JNIEnv* env, jobject clazz) { 
    return ionPss;

}



static jlong android_os_Debug_getGpuTotalUsageKb(JNIEnv* env, jobject clazz) {

    jlong sizeKb = -1;

    uint64_t size;



    if (meminfo::ReadGpuTotalUsageKb(&size)) {

        sizeKb = size;

    }



    return sizeKb;

}



static jboolean android_os_Debug_isVmapStack(JNIEnv *env, jobject clazz)

{

    static enum {
@@ -912,6 +923,8 @@ static const JNINativeMethod gMethods[] = { 
            (void*)android_os_Debug_getIonPoolsSizeKb },

    { "getIonMappedSizeKb", "()J",

            (void*)android_os_Debug_getIonMappedSizeKb },

    { "getGpuTotalUsageKb", "()J",

            (void*)android_os_Debug_getGpuTotalUsageKb },

    { "isVmapStack", "()Z",

            (void*)android_os_Debug_isVmapStack },

};

services/core/java/com/android/server/am/ActivityManagerService.java

+10 −0
Original line number Diff line number Diff line
@@ -13743,6 +13743,10 @@ public class ActivityManagerService extends IActivityManager.Stub 
                // set on ION VMAs, therefore consider the entire ION heap as used kernel memory

                kernelUsed += ionHeap;

            }

            final long gpuUsage = Debug.getGpuTotalUsageKb();

            if (gpuUsage >= 0) {

                pw.print("      GPU: "); pw.println(stringifyKBSize(gpuUsage));

            }

            final long lostRAM = memInfo.getTotalSizeKb() - (totalPss - totalSwapPss)

                    - memInfo.getFreeSizeKb() - memInfo.getCachedSizeKb()

                    - kernelUsed - memInfo.getZramTotalSizeKb();
@@ -14551,6 +14555,12 @@ public class ActivityManagerService extends IActivityManager.Stub 
            // set on ION VMAs, therefore consider the entire ION heap as used kernel memory

            kernelUsed += ionHeap;

        }

        final long gpuUsage = Debug.getGpuTotalUsageKb();

        if (gpuUsage >= 0) {

            memInfoBuilder.append("       GPU: ");

            memInfoBuilder.append(stringifyKBSize(gpuUsage));

            memInfoBuilder.append("\n");

        }

        memInfoBuilder.append("  Used RAM: ");

        memInfoBuilder.append(stringifyKBSize(

                                  totalPss - cachedPss + kernelUsed));