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

Commit 792e94a6 authored by Isaac J. Manjarres's avatar Isaac J. Manjarres Committed by Automerger Merge Worker
Browse files

Add Debug.getKernelCmaUsageKb() am: fda96163 

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



Change-Id: I31d3aa82cbd4af83fbe127dc7158e688a4926928
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d3ac96cd fda96163

core/java/android/os/Debug.java

+8 −0
Original line number Diff line number Diff line
@@ -2741,4 +2741,12 @@ public final class Debug 
     */

    public static native boolean logAllocatorStats();



    /**

     * Return the amount of memory (in kB) allocated by kernel drivers through CMA.

     * @return a non-negative value or -1 on error.

     *

     * @hide

     */

    public static native long getKernelCmaUsageKb();



}

core/jni/android_os_Debug.cpp

+12 −0
Original line number Diff line number Diff line
@@ -729,6 +729,17 @@ static jlong android_os_Debug_getGpuPrivateMemoryKb(JNIEnv* env, jobject clazz) 
    return gpuPrivateMem / 1024;

}



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

    jlong totalKernelCmaUsageKb = -1;

    uint64_t size;



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

        totalKernelCmaUsageKb = size;

    }



    return totalKernelCmaUsageKb;

}



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

    jlong dmabufPss = 0;

    std::vector<dmabufinfo::DmaBuffer> dmabufs;
@@ -836,6 +847,7 @@ static const JNINativeMethod gMethods[] = { 
        {"getGpuTotalUsageKb", "()J", (void*)android_os_Debug_getGpuTotalUsageKb},

        {"isVmapStack", "()Z", (void*)android_os_Debug_isVmapStack},

        {"logAllocatorStats", "()Z", (void*)android_os_Debug_logAllocatorStats},

        {"getKernelCmaUsageKb", "()J", (void*)android_os_Debug_getKernelCmaUsageKb},

};



int register_android_os_Debug(JNIEnv *env)