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

Commit 5911b9ef authored by Suren Baghdasaryan's avatar Suren Baghdasaryan
Browse files

Add JNI API to query sizes of ION heaps, pools and mapped part of the heaps 



Provide means for system_server to query ION memory usage. The new API
allows to get total size of ION heaps, pools and part of ION heaps that
is mapped into user space.

Bug: 138148041
Test: dumpsys meminfo
Change-Id: I6d76d534bbab5ee1646e8e3e3fe5210dcf76bc23
Merged-In: I6d76d534bbab5ee1646e8e3e3fe5210dcf76bc23
Signed-off-by: default avatarSuren Baghdasaryan <surenb@google.com>
parent 69615f86

core/java/android/os/Debug.java

+23 −0
Original line number Diff line number Diff line
@@ -2503,4 +2503,27 @@ public final class Debug 
     * @hide

     */

    public static native long getZramFreeKb();



    /**

     * Return memory size in kilobytes allocated for ION heaps.

     *

     * @hide

     */

    public static native long getIonHeapsSizeKb();



    /**

     * Return memory size in kilobytes allocated for ION pools.

     *

     * @hide

     */

    public static native long getIonPoolsSizeKb();



    /**

     * Return ION memory mapped by processes in kB.

     * Notes:

     *  * Warning: Might impact performance as it reads /proc/<pid>/maps files for each process.

     *

     * @hide

     */

    public static native long getIonMappedSizeKb();

}

core/jni/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ cc_library_shared { 


    static_libs: [

        "libasync_safe",

        "libdmabufinfo",

        "libgif",

        "libseccomp_policy",

        "libgrallocusage",

core/jni/android_os_Debug.cpp

+60 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include <nativehelper/JNIHelp.h>

#include <nativehelper/ScopedUtfChars.h>

#include "jni.h"

#include <dmabufinfo/dmabufinfo.h>

#include <meminfo/procmeminfo.h>

#include <meminfo/sysmeminfo.h>

#include <memtrack/memtrack.h>
@@ -779,6 +780,59 @@ static jlong android_os_Debug_getFreeZramKb(JNIEnv* env, jobject clazz) { 
    return zramFreeKb;

}



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

    jlong heapsSizeKb = 0;

    uint64_t size;



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

        heapsSizeKb = size;

    }



    return heapsSizeKb;

}



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

    jlong poolsSizeKb = 0;

    uint64_t size;



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

        poolsSizeKb = size;

    }



    return poolsSizeKb;

}



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

    jlong ionPss = 0;

    std::vector<dmabufinfo::DmaBuffer> dmabufs;



    std::unique_ptr<DIR, int (*)(DIR*)> dir(opendir("/proc"), closedir);

    if (!dir) {

        LOG(ERROR) << "Failed to open /proc directory";

        return false;

    }



    struct dirent* dent;

    while ((dent = readdir(dir.get()))) {

        if (dent->d_type != DT_DIR) continue;



        int pid = atoi(dent->d_name);

        if (pid == 0) {

            continue;

        }



        if (!AppendDmaBufInfo(pid, &dmabufs, false)) {

            LOG(ERROR) << "Failed to read maps for pid " << pid;

        }

    }



    for (dmabufinfo::DmaBuffer buf : dmabufs) {

        ionPss += buf.size() / 1024;

    }



    return ionPss;

}



/*

 * JNI registration.

 */
@@ -822,6 +876,12 @@ static const JNINativeMethod gMethods[] = { 
            (void*)android_os_Debug_getUnreachableMemory },

    { "getZramFreeKb", "()J",

            (void*)android_os_Debug_getFreeZramKb },

    { "getIonHeapsSizeKb", "()J",

            (void*)android_os_Debug_getIonHeapsSizeKb },

    { "getIonPoolsSizeKb", "()J",

            (void*)android_os_Debug_getIonPoolsSizeKb },

    { "getIonMappedSizeKb", "()J",

            (void*)android_os_Debug_getIonMappedSizeKb },

};



int register_android_os_Debug(JNIEnv *env)