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

Commit e0764857 authored by Martijn Coenen's avatar Martijn Coenen Committed by Thierry Strudel
Browse files

Report SwapPss usage if available as part of Pss 



Parse "SwapPss:" lines from /proc/pid/smaps if it exist, and store them
in a seperate stat entry.
Report SwapPss if made available by kernel, otherwise we fall back to
legacy Swap.

Fix getTotalSwappablePss documentation.

Change-Id: I361928c0f44c7dc9b959b91c127c916215063866
Signed-off-by: default avatarThierry Strudel <tstrudel@google.com>
parent 866d37d3

core/java/android/app/ActivityThread.java

+54 −20
Original line number Diff line number Diff line
@@ -2107,35 +2107,44 @@ public final class ActivityThread { 
        if (!dumpSummaryOnly) {

            if (dumpFullInfo) {

                printRow(pw, HEAP_FULL_COLUMN, "", "Pss", "Pss", "Shared", "Private",

                        "Shared", "Private", "Swapped", "Heap", "Heap", "Heap");

                        "Shared", "Private", memInfo.hasSwappedOutPss ? "SwapPss" : "Swap",

                        "Heap", "Heap", "Heap");

                printRow(pw, HEAP_FULL_COLUMN, "", "Total", "Clean", "Dirty", "Dirty",

                        "Clean", "Clean", "Dirty", "Size", "Alloc", "Free");

                        "Clean", "Clean", "Dirty",

                        "Size", "Alloc", "Free");

                printRow(pw, HEAP_FULL_COLUMN, "", "------", "------", "------", "------",

                        "------", "------", "------", "------", "------", "------");

                printRow(pw, HEAP_FULL_COLUMN, "Native Heap", memInfo.nativePss,

                        memInfo.nativeSwappablePss, memInfo.nativeSharedDirty,

                        memInfo.nativePrivateDirty, memInfo.nativeSharedClean,

                        memInfo.nativePrivateClean, memInfo.nativeSwappedOut,

                        memInfo.nativePrivateClean, memInfo.hasSwappedOutPss ?

                        memInfo.nativeSwappedOut : memInfo.nativeSwappedOutPss,

                        nativeMax, nativeAllocated, nativeFree);

                printRow(pw, HEAP_FULL_COLUMN, "Dalvik Heap", memInfo.dalvikPss,

                        memInfo.dalvikSwappablePss, memInfo.dalvikSharedDirty,

                        memInfo.dalvikPrivateDirty, memInfo.dalvikSharedClean,

                        memInfo.dalvikPrivateClean, memInfo.dalvikSwappedOut,

                        memInfo.dalvikPrivateClean, memInfo.hasSwappedOutPss ?

                        memInfo.dalvikSwappedOut : memInfo.dalvikSwappedOutPss,

                        dalvikMax, dalvikAllocated, dalvikFree);

            } else {

                printRow(pw, HEAP_COLUMN, "", "Pss", "Private",

                        "Private", "Swapped", "Heap", "Heap", "Heap");

                        "Private", memInfo.hasSwappedOutPss ? "SwapPss" : "Swap",

                        "Heap", "Heap", "Heap");

                printRow(pw, HEAP_COLUMN, "", "Total", "Dirty",

                        "Clean", "Dirty", "Size", "Alloc", "Free");

                printRow(pw, HEAP_COLUMN, "", "------", "------", "------",

                        "------", "------", "------", "------", "------");

                printRow(pw, HEAP_COLUMN, "Native Heap", memInfo.nativePss,

                        memInfo.nativePrivateDirty,

                        memInfo.nativePrivateClean, memInfo.nativeSwappedOut,

                        memInfo.nativePrivateClean,

                        memInfo.hasSwappedOutPss ? memInfo.nativeSwappedOutPss :

                        memInfo.nativeSwappedOut,

                        nativeMax, nativeAllocated, nativeFree);

                printRow(pw, HEAP_COLUMN, "Dalvik Heap", memInfo.dalvikPss,

                        memInfo.dalvikPrivateDirty,

                        memInfo.dalvikPrivateClean, memInfo.dalvikSwappedOut,

                        memInfo.dalvikPrivateClean,

                        memInfo.hasSwappedOutPss ? memInfo.dalvikSwappedOutPss :

                        memInfo.dalvikSwappedOut,

                        dalvikMax, dalvikAllocated, dalvikFree);

            }
@@ -2146,6 +2155,7 @@ public final class ActivityThread { 
            int otherSharedClean = memInfo.otherSharedClean;

            int otherPrivateClean = memInfo.otherPrivateClean;

            int otherSwappedOut = memInfo.otherSwappedOut;

            int otherSwappedOutPss = memInfo.otherSwappedOutPss;



            for (int i=0; i<Debug.MemoryInfo.NUM_OTHER_STATS; i++) {

                final int myPss = memInfo.getOtherPss(i);
@@ -2155,16 +2165,22 @@ public final class ActivityThread { 
                final int mySharedClean = memInfo.getOtherSharedClean(i);

                final int myPrivateClean = memInfo.getOtherPrivateClean(i);

                final int mySwappedOut = memInfo.getOtherSwappedOut(i);

                final int mySwappedOutPss = memInfo.getOtherSwappedOutPss(i);

                if (myPss != 0 || mySharedDirty != 0 || myPrivateDirty != 0

                        || mySharedClean != 0 || myPrivateClean != 0 || mySwappedOut != 0) {

                        || mySharedClean != 0 || myPrivateClean != 0

                        || (memInfo.hasSwappedOutPss ? mySwappedOutPss : mySwappedOut) != 0) {

                    if (dumpFullInfo) {

                        printRow(pw, HEAP_FULL_COLUMN, Debug.MemoryInfo.getOtherLabel(i),

                                myPss, mySwappablePss, mySharedDirty, myPrivateDirty,

                                mySharedClean, myPrivateClean, mySwappedOut, "", "", "");

                                mySharedClean, myPrivateClean,

                                memInfo.hasSwappedOutPss ? mySwappedOutPss : mySwappedOut,

                                "", "", "");

                    } else {

                        printRow(pw, HEAP_COLUMN, Debug.MemoryInfo.getOtherLabel(i),

                                myPss, myPrivateDirty,

                                myPrivateClean, mySwappedOut, "", "", "");

                                myPrivateClean,

                                memInfo.hasSwappedOutPss ? mySwappedOutPss : mySwappedOut,

                                "", "", "");

                    }

                    otherPss -= myPss;

                    otherSwappablePss -= mySwappablePss;
@@ -2173,26 +2189,32 @@ public final class ActivityThread { 
                    otherSharedClean -= mySharedClean;

                    otherPrivateClean -= myPrivateClean;

                    otherSwappedOut -= mySwappedOut;

                    otherSwappedOutPss -= mySwappedOutPss;

                }

            }



            if (dumpFullInfo) {

                printRow(pw, HEAP_FULL_COLUMN, "Unknown", otherPss, otherSwappablePss,

                        otherSharedDirty, otherPrivateDirty, otherSharedClean, otherPrivateClean,

                        otherSwappedOut, "", "", "");

                        memInfo.hasSwappedOutPss ? otherSwappedOutPss : otherSwappedOut,

                        "", "", "");

                printRow(pw, HEAP_FULL_COLUMN, "TOTAL", memInfo.getTotalPss(),

                        memInfo.getTotalSwappablePss(),

                        memInfo.getTotalSharedDirty(), memInfo.getTotalPrivateDirty(),

                        memInfo.getTotalSharedClean(), memInfo.getTotalPrivateClean(),

                        memInfo.getTotalSwappedOut(), nativeMax+dalvikMax,

                        nativeAllocated+dalvikAllocated, nativeFree+dalvikFree);

                        memInfo.hasSwappedOutPss ? memInfo.getTotalSwappedOut() :

                        memInfo.getTotalSwappedOutPss(),

                        nativeMax+dalvikMax, nativeAllocated+dalvikAllocated,

                        nativeFree+dalvikFree);

            } else {

                printRow(pw, HEAP_COLUMN, "Unknown", otherPss,

                        otherPrivateDirty, otherPrivateClean, otherSwappedOut,

                        otherPrivateDirty, otherPrivateClean,

                        memInfo.hasSwappedOutPss ? otherSwappedOutPss : otherSwappedOut,

                        "", "", "");

                printRow(pw, HEAP_COLUMN, "TOTAL", memInfo.getTotalPss(),

                        memInfo.getTotalPrivateDirty(),

                        memInfo.getTotalPrivateClean(),

                        memInfo.hasSwappedOutPss ? memInfo.getTotalSwappedOutPss() :

                        memInfo.getTotalSwappedOut(),

                        nativeMax+dalvikMax,

                        nativeAllocated+dalvikAllocated, nativeFree+dalvikFree);
@@ -2211,16 +2233,22 @@ public final class ActivityThread { 
                    final int mySharedClean = memInfo.getOtherSharedClean(i);

                    final int myPrivateClean = memInfo.getOtherPrivateClean(i);

                    final int mySwappedOut = memInfo.getOtherSwappedOut(i);

                    final int mySwappedOutPss = memInfo.getOtherSwappedOutPss(i);

                    if (myPss != 0 || mySharedDirty != 0 || myPrivateDirty != 0

                            || mySharedClean != 0 || myPrivateClean != 0) {

                            || mySharedClean != 0 || myPrivateClean != 0

                            || (memInfo.hasSwappedOutPss ? mySwappedOutPss : mySwappedOut) != 0) {

                        if (dumpFullInfo) {

                            printRow(pw, HEAP_FULL_COLUMN, Debug.MemoryInfo.getOtherLabel(i),

                                    myPss, mySwappablePss, mySharedDirty, myPrivateDirty,

                                    mySharedClean, myPrivateClean, mySwappedOut, "", "", "");

                                    mySharedClean, myPrivateClean,

                                    memInfo.hasSwappedOutPss ? mySwappedOutPss : mySwappedOut,

                                    "", "", "");

                        } else {

                            printRow(pw, HEAP_COLUMN, Debug.MemoryInfo.getOtherLabel(i),

                                    myPss, myPrivateDirty,

                                    myPrivateClean, mySwappedOut, "", "", "");

                                    myPrivateClean,

                                    memInfo.hasSwappedOutPss ? mySwappedOutPss : mySwappedOut,

                                    "", "", "");

                        }

                    }

                }
@@ -2246,10 +2274,16 @@ public final class ActivityThread { 
        printRow(pw, ONE_COUNT_COLUMN,

            "System:", memInfo.getSummarySystem());

        pw.println(" ");

        if (memInfo.hasSwappedOutPss) {

            printRow(pw, TWO_COUNT_COLUMNS,

                "TOTAL:", memInfo.getSummaryTotalPss(),

                "TOTAL SWAP PSS:", memInfo.getSummaryTotalSwapPss());

        } else {

            printRow(pw, TWO_COUNT_COLUMNS,

                "TOTAL:", memInfo.getSummaryTotalPss(),

                "TOTAL SWAP (KB):", memInfo.getSummaryTotalSwap());

        }

    }



    public void registerOnActivityPausedListener(Activity activity,

            OnActivityPausedListener listener) {

core/java/android/os/Debug.java

+53 −7
Original line number Diff line number Diff line
@@ -130,6 +130,9 @@ public final class Debug 
        /** The dirty dalvik pages that have been swapped out. */

        /** @hide We may want to expose this, eventually. */

        public int dalvikSwappedOut;

        /** The dirty dalvik pages that have been swapped out, proportional. */

        /** @hide We may want to expose this, eventually. */

        public int dalvikSwappedOutPss;



        /** The proportional set size for the native heap. */

        public int nativePss;
@@ -149,6 +152,9 @@ public final class Debug 
        /** The dirty native pages that have been swapped out. */

        /** @hide We may want to expose this, eventually. */

        public int nativeSwappedOut;

        /** The dirty native pages that have been swapped out, proportional. */

        /** @hide We may want to expose this, eventually. */

        public int nativeSwappedOutPss;



        /** The proportional set size for everything else. */

        public int otherPss;
@@ -168,6 +174,13 @@ public final class Debug 
        /** The dirty pages used by anyting else that have been swapped out. */

        /** @hide We may want to expose this, eventually. */

        public int otherSwappedOut;

        /** The dirty pages used by anyting else that have been swapped out, proportional. */

        /** @hide We may want to expose this, eventually. */

        public int otherSwappedOutPss;



        /** Whether the kernel reports proportional swap usage */

        /** @hide */

        public boolean hasSwappedOutPss;



        /** @hide */

        public static final int HEAP_UNKNOWN = 0;
@@ -235,7 +248,7 @@ public final class Debug 
        public static final int NUM_DVK_STATS = 8;



        /** @hide */

        public static final int NUM_CATEGORIES = 7;

        public static final int NUM_CATEGORIES = 8;



        /** @hide */

        public static final int offsetPss = 0;
@@ -251,6 +264,8 @@ public final class Debug 
        public static final int offsetSharedClean = 5;

        /** @hide */

        public static final int offsetSwappedOut = 6;

        /** @hide */

        public static final int offsetSwappedOutPss = 7;



        private int[] otherStats = new int[(NUM_OTHER_STATS+NUM_DVK_STATS)*NUM_CATEGORIES];
@@ -261,7 +276,7 @@ public final class Debug 
         * Return total PSS memory usage in kB.

         */

        public int getTotalPss() {

            return dalvikPss + nativePss + otherPss;

            return dalvikPss + nativePss + otherPss + getTotalSwappedOutPss();

        }



        /**
@@ -274,7 +289,8 @@ public final class Debug 
        }



        /**

         * Return total PSS memory usage in kB.

         * Return total PSS memory usage in kB mapping a file of one of the following extension:

         * .so, .jar, .apk, .ttf, .dex, .odex, .oat, .art .

         */

        public int getTotalSwappablePss() {

            return dalvikSwappablePss + nativeSwappablePss + otherSwappablePss;
@@ -316,6 +332,14 @@ public final class Debug 
            return dalvikSwappedOut + nativeSwappedOut + otherSwappedOut;

        }



        /**

         * Return total swapped out memory in kB, proportional.

         * @hide

         */

        public int getTotalSwappedOutPss() {

            return dalvikSwappedOutPss + nativeSwappedOutPss + otherSwappedOutPss;

        }



        /** @hide */

        public int getOtherPss(int which) {

            return otherStats[which*NUM_CATEGORIES + offsetPss];
@@ -358,6 +382,11 @@ public final class Debug 
            return otherStats[which*NUM_CATEGORIES + offsetSwappedOut];

        }



        /** @hide */

        public int getOtherSwappedOutPss(int which) {

            return otherStats[which*NUM_CATEGORIES + offsetSwappedOutPss];

        }



        /** @hide */

        public static String getOtherLabel(int which) {

            switch (which) {
@@ -632,12 +661,24 @@ public final class Debug 
         *    know if the Swap memory is shared or private, so we don't know

         *    what to blame on the application and what on the system.

         *    For now, just lump all the Swap in one place.

         *    For kernels reporting SwapPss {@link #getSummaryTotalSwapPss()}

         *    will report the application proportional Swap.

         * @hide

         */

        public int getSummaryTotalSwap() {

            return getTotalSwappedOut();

        }



        /**

         * Total proportional Swap in KB.

         * Notes:

         *  * Always 0 if {@link #hasSwappedOutPss} is false.

         * @hide

         */

        public int getSummaryTotalSwapPss() {

            return getTotalSwappedOutPss();

        }



        public int describeContents() {

            return 0;

        }
@@ -664,6 +705,8 @@ public final class Debug 
            dest.writeInt(otherPrivateClean);

            dest.writeInt(otherSharedClean);

            dest.writeInt(otherSwappedOut);

            dest.writeInt(hasSwappedOutPss ? 1 : 0);

            dest.writeInt(otherSwappedOutPss);

            dest.writeIntArray(otherStats);

        }
@@ -689,6 +732,8 @@ public final class Debug 
            otherPrivateClean = source.readInt();

            otherSharedClean = source.readInt();

            otherSwappedOut = source.readInt();

            hasSwappedOutPss = source.readInt() != 0;

            otherSwappedOutPss = source.readInt();

            otherStats = source.createIntArray();

        }
@@ -1563,11 +1608,12 @@ href="{@docRoot}guide/developing/tools/traceview.html">Traceview: A Graphical Lo 


    /**

     * Retrieves the PSS memory used by the process as given by the

     * smaps.  Optionally supply a long array of 1 entry to also

     * receive the uss of the process, and another array to also

     * retrieve the separate memtrack size.  @hide

     * smaps.  Optionally supply a long array of 2 entries to also

     * receive the Uss and SwapPss of the process, and another array to also

     * retrieve the separate memtrack size.

     * @hide

     */

    public static native long getPss(int pid, long[] outUss, long[] outMemtrack);

    public static native long getPss(int pid, long[] outUssSwapPss, long[] outMemtrack);



    /** @hide */

    public static final int MEMINFO_TOTAL = 0;

core/jni/android_os_Debug.cpp

+49 −16
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ struct stat_fields { 
    jfieldID privateClean_field;

    jfieldID sharedClean_field;

    jfieldID swappedOut_field;

    jfieldID swappedOutPss_field;

};



struct stat_field_names {
@@ -94,20 +95,22 @@ struct stat_field_names { 
    const char* privateClean_name;

    const char* sharedClean_name;

    const char* swappedOut_name;

    const char* swappedOutPss_name;

};



static stat_fields stat_fields[_NUM_CORE_HEAP];



static stat_field_names stat_field_names[_NUM_CORE_HEAP] = {

    { "otherPss", "otherSwappablePss", "otherPrivateDirty", "otherSharedDirty",

        "otherPrivateClean", "otherSharedClean", "otherSwappedOut" },

        "otherPrivateClean", "otherSharedClean", "otherSwappedOut", "otherSwappedOutPss" },

    { "dalvikPss", "dalvikSwappablePss", "dalvikPrivateDirty", "dalvikSharedDirty",

        "dalvikPrivateClean", "dalvikSharedClean", "dalvikSwappedOut" },

        "dalvikPrivateClean", "dalvikSharedClean", "dalvikSwappedOut", "dalvikSwappedOutPss" },

    { "nativePss", "nativeSwappablePss", "nativePrivateDirty", "nativeSharedDirty",

        "nativePrivateClean", "nativeSharedClean", "nativeSwappedOut" }

        "nativePrivateClean", "nativeSharedClean", "nativeSwappedOut", "nativeSwappedOutPss" }

};



jfieldID otherStats_field;

jfieldID hasSwappedOutPss_field;



static bool memtrackLoaded;
@@ -119,6 +122,7 @@ struct stats_t { 
    int privateClean;

    int sharedClean;

    int swappedOut;

    int swappedOutPss;

};



#define BINDER_STATS "/proc/binder/stats"
@@ -206,7 +210,7 @@ static int read_memtrack_memory(int pid, struct graphics_memory_pss* graphics_me 
    return err;

}



static void read_mapinfo(FILE *fp, stats_t* stats)

static void read_mapinfo(FILE *fp, stats_t* stats, bool* foundSwapPss)

{

    char line[1024];

    int len, nameLen;
@@ -216,7 +220,7 @@ static void read_mapinfo(FILE *fp, stats_t* stats) 
    float sharing_proportion = 0.0;

    unsigned shared_clean = 0, shared_dirty = 0;

    unsigned private_clean = 0, private_dirty = 0;

    unsigned swapped_out = 0;

    unsigned swapped_out = 0, swapped_out_pss = 0;

    bool is_swappable = false;

    unsigned temp;
@@ -230,6 +234,8 @@ static void read_mapinfo(FILE *fp, stats_t* stats) 
    int subHeap = HEAP_UNKNOWN;

    int prevHeap = HEAP_UNKNOWN;



    *foundSwapPss = false;



    if(fgets(line, sizeof(line), fp) == 0) return;



    while (!done) {
@@ -340,6 +346,7 @@ static void read_mapinfo(FILE *fp, stats_t* stats) 
        private_clean = 0;

        private_dirty = 0;

        swapped_out = 0;

        swapped_out_pss = 0;



        while (true) {

            if (fgets(line, 1024, fp) == 0) {
@@ -365,6 +372,9 @@ static void read_mapinfo(FILE *fp, stats_t* stats) 
                /* referenced = temp; */

            } else if (line[0] == 'S' && sscanf(line, "Swap: %d kB", &temp) == 1) {

                swapped_out = temp;

            } else if (line[0] == 'S' && sscanf(line, "SwapPss: %d kB", &temp) == 1) {

                *foundSwapPss = true;

                swapped_out_pss = temp;

            } else if (sscanf(line, "%" SCNx64 "-%" SCNx64 " %*s %*x %*x:%*x %*d", &start, &end) == 2) {

                // looks like a new mapping

                // example: "10000000-10001000 ---p 10000000 00:00 0"
@@ -390,6 +400,7 @@ static void read_mapinfo(FILE *fp, stats_t* stats) 
            stats[whichHeap].privateClean += private_clean;

            stats[whichHeap].sharedClean += shared_clean;

            stats[whichHeap].swappedOut += swapped_out;

            stats[whichHeap].swappedOutPss += swapped_out_pss;

            if (whichHeap == HEAP_DALVIK || whichHeap == HEAP_DALVIK_OTHER) {

                stats[subHeap].pss += pss;

                stats[subHeap].swappablePss += swappable_pss;
@@ -398,12 +409,13 @@ static void read_mapinfo(FILE *fp, stats_t* stats) 
                stats[subHeap].privateClean += private_clean;

                stats[subHeap].sharedClean += shared_clean;

                stats[subHeap].swappedOut += swapped_out;

                stats[subHeap].swappedOutPss += swapped_out_pss;

            }

        }

    }

}



static void load_maps(int pid, stats_t* stats)

static void load_maps(int pid, stats_t* stats, bool* foundSwapPss)

{

    char tmp[128];

    FILE *fp;
@@ -412,17 +424,18 @@ static void load_maps(int pid, stats_t* stats) 
    fp = fopen(tmp, "r");

    if (fp == 0) return;



    read_mapinfo(fp, stats);

    read_mapinfo(fp, stats, foundSwapPss);

    fclose(fp);

}



static void android_os_Debug_getDirtyPagesPid(JNIEnv *env, jobject clazz,

        jint pid, jobject object)

{

    bool foundSwapPss;

    stats_t stats[_NUM_HEAP];

    memset(&stats, 0, sizeof(stats));



    load_maps(pid, stats);

    load_maps(pid, stats, &foundSwapPss);



    struct graphics_memory_pss graphics_mem;

    if (read_memtrack_memory(pid, &graphics_mem) == 0) {
@@ -442,6 +455,7 @@ static void android_os_Debug_getDirtyPagesPid(JNIEnv *env, jobject clazz, 
        stats[HEAP_UNKNOWN].privateClean += stats[i].privateClean;

        stats[HEAP_UNKNOWN].sharedClean += stats[i].sharedClean;

        stats[HEAP_UNKNOWN].swappedOut += stats[i].swappedOut;

        stats[HEAP_UNKNOWN].swappedOutPss += stats[i].swappedOutPss;

    }



    for (int i=0; i<_NUM_CORE_HEAP; i++) {
@@ -452,9 +466,11 @@ static void android_os_Debug_getDirtyPagesPid(JNIEnv *env, jobject clazz, 
        env->SetIntField(object, stat_fields[i].privateClean_field, stats[i].privateClean);

        env->SetIntField(object, stat_fields[i].sharedClean_field, stats[i].sharedClean);

        env->SetIntField(object, stat_fields[i].swappedOut_field, stats[i].swappedOut);

        env->SetIntField(object, stat_fields[i].swappedOutPss_field, stats[i].swappedOutPss);

    }





    env->SetBooleanField(object, hasSwappedOutPss_field, foundSwapPss);

    jintArray otherIntArray = (jintArray)env->GetObjectField(object, otherStats_field);



    jint* otherArray = (jint*)env->GetPrimitiveArrayCritical(otherIntArray, 0);
@@ -471,6 +487,7 @@ static void android_os_Debug_getDirtyPagesPid(JNIEnv *env, jobject clazz, 
        otherArray[j++] = stats[i].privateClean;

        otherArray[j++] = stats[i].sharedClean;

        otherArray[j++] = stats[i].swappedOut;

        otherArray[j++] = stats[i].swappedOutPss;

    }



    env->ReleasePrimitiveArrayCritical(otherIntArray, otherArray, 0);
@@ -481,11 +498,12 @@ static void android_os_Debug_getDirtyPages(JNIEnv *env, jobject clazz, jobject o 
    android_os_Debug_getDirtyPagesPid(env, clazz, getpid(), object);

}



static jlong android_os_Debug_getPssPid(JNIEnv *env, jobject clazz, jint pid, jlongArray outUss,

        jlongArray outMemtrack)

static jlong android_os_Debug_getPssPid(JNIEnv *env, jobject clazz, jint pid,

        jlongArray outUssSwapPss, jlongArray outMemtrack)

{

    char line[1024];

    jlong pss = 0;

    jlong swapPss = 0;

    jlong uss = 0;

    jlong memtrack = 0;
@@ -521,19 +539,31 @@ static jlong android_os_Debug_getPssPid(JNIEnv *env, jobject clazz, jint pid, jl 
                    }

                    uss += atoi(c);

                }

            } else if (line[0] == 'S' && strncmp(line, "SwapPss:", 8) == 0) {

                char* c = line + 8;

                jlong lSwapPss;

                while (*c != 0 && (*c < '0' || *c > '9')) {

                    c++;

                }

                lSwapPss = atoi(c);

                swapPss += lSwapPss;

                pss += lSwapPss; // Also in swap, those pages would be accounted as Pss without SWAP

            }

        }



        fclose(fp);

    }



    if (outUss != NULL) {

        if (env->GetArrayLength(outUss) >= 1) {

            jlong* outUssArray = env->GetLongArrayElements(outUss, 0);

            if (outUssArray != NULL) {

                outUssArray[0] = uss;

    if (outUssSwapPss != NULL) {

        if (env->GetArrayLength(outUssSwapPss) >= 1) {

            jlong* outUssSwapPssArray = env->GetLongArrayElements(outUssSwapPss, 0);

            if (outUssSwapPssArray != NULL) {

                outUssSwapPssArray[0] = uss;

                if (env->GetArrayLength(outUssSwapPss) >= 2) {

                    outUssSwapPssArray[1] = swapPss;

                }

            }

            env->ReleaseLongArrayElements(outUss, outUssArray, 0);

            env->ReleaseLongArrayElements(outUssSwapPss, outUssSwapPssArray, 0);

        }

    }
@@ -1056,6 +1086,7 @@ int register_android_os_Debug(JNIEnv *env) 
    }



    otherStats_field = env->GetFieldID(clazz, "otherStats", "[I");

    hasSwappedOutPss_field = env->GetFieldID(clazz, "hasSwappedOutPss", "Z");



    for (int i=0; i<_NUM_CORE_HEAP; i++) {

        stat_fields[i].pss_field =
@@ -1072,6 +1103,8 @@ int register_android_os_Debug(JNIEnv *env) 
                env->GetFieldID(clazz, stat_field_names[i].sharedClean_name, "I");

        stat_fields[i].swappedOut_field =

                env->GetFieldID(clazz, stat_field_names[i].swappedOut_name, "I");

        stat_fields[i].swappedOutPss_field =

                env->GetFieldID(clazz, stat_field_names[i].swappedOutPss_name, "I");

    }



    return jniRegisterNativeMethods(env, "android/os/Debug", gMethods, NELEM(gMethods));