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

Commit 74e258d6 authored by Evan Millar's avatar Evan Millar Committed by The Android Open Source Project
Browse files

AI 146854: am: CL 146853 Add kernel wakelock data to batteryinfo dump. 

  Original author: emillar

Automated import of CL 146854
parent 1bc5c264

core/java/android/os/BatteryStats.java

+60 −26
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ public abstract class BatteryStats implements Parcelable { 
    /**

     * Bump the version on this if the checkin format changes.

     */

    private static final int BATTERY_STATS_CHECKIN_VERSION = 4;

    private static final int BATTERY_STATS_CHECKIN_VERSION = 5;

    

    private static final long BYTES_PER_KB = 1024;

    private static final long BYTES_PER_MB = 1048576; // 1024^2
@@ -100,6 +100,7 @@ public abstract class BatteryStats implements Parcelable { 
    private static final String PROCESS_DATA = "pr";

    private static final String SENSOR_DATA = "sr";

    private static final String WAKELOCK_DATA = "wl";

    private static final String KERNEL_WAKELOCK_DATA = "kwl";

    private static final String NETWORK_DATA = "nt";

    private static final String USER_ACTIVITY_DATA = "ua";

    private static final String BATTERY_DATA = "bt";
@@ -126,7 +127,7 @@ public abstract class BatteryStats implements Parcelable { 
         *

         * @param which one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT

         */

        public abstract int getCount(int which);

        public abstract int getCountLocked(int which);



        /**

         * Temporary for debugging.
@@ -145,7 +146,7 @@ public abstract class BatteryStats implements Parcelable { 
         *

         * @param which one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT

         */

        public abstract int getCount(int which);

        public abstract int getCountLocked(int which);



        /**

         * Returns the total time in microseconds associated with this Timer for the
@@ -155,7 +156,7 @@ public abstract class BatteryStats implements Parcelable { 
         * @param which one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT

         * @return a time in microseconds

         */

        public abstract long getTotalTime(long batteryRealtime, int which);

        public abstract long getTotalTimeLocked(long batteryRealtime, int which);

        

        /**

         * Temporary for debugging.
@@ -519,6 +520,8 @@ public abstract class BatteryStats implements Parcelable { 
     */

    public abstract long computeRealtime(long curTime, int which);

    

    public abstract Map<String, ? extends Timer> getKernelWakelockStats();



    private final static void formatTime(StringBuilder out, long seconds) {

        long days = seconds / (60 * 60 * 24);

        if (days != 0) {
@@ -607,14 +610,14 @@ public abstract class BatteryStats implements Parcelable { 
        

        if (timer != null) {

            // Convert from microseconds to milliseconds with rounding

            long totalTimeMicros = timer.getTotalTime(batteryRealtime, which);

            long totalTimeMicros = timer.getTotalTimeLocked(batteryRealtime, which);

            long totalTimeMillis = (totalTimeMicros + 500) / 1000;

            

            int count = timer.getCount(which);

            int count = timer.getCountLocked(which);

            if (totalTimeMillis != 0) {

                sb.append(linePrefix);

                sb.append(formatTimeMs(totalTimeMillis));

                sb.append(name);

                sb.append(name != null ? name : "");

                sb.append(' ');

                sb.append('(');

                sb.append(count);
@@ -641,14 +644,13 @@ public abstract class BatteryStats implements Parcelable { 
        long totalTimeMicros = 0;

        int count = 0;

        if (timer != null) {

            totalTimeMicros = timer.getTotalTime(now, which);

            count = timer.getCount(which); 

            totalTimeMicros = timer.getTotalTimeLocked(now, which);

            count = timer.getCountLocked(which); 

        }

        sb.append(linePrefix);

        sb.append((totalTimeMicros + 500) / 1000); // microseconds to milliseconds with rounding

        sb.append(',');

        sb.append(name);

        sb.append(',');

        sb.append(name != null ? name + "," : "");

        sb.append(count);

        return ",";

    }
@@ -730,12 +732,12 @@ public abstract class BatteryStats implements Parcelable { 
                    

                    Timer fullWakeTimer = wl.getWakeTime(WAKE_TYPE_FULL);

                    if (fullWakeTimer != null) {

                        fullWakeLockTimeTotal += fullWakeTimer.getTotalTime(batteryRealtime, which);

                        fullWakeLockTimeTotal += fullWakeTimer.getTotalTimeLocked(batteryRealtime, which);

                    }



                    Timer partialWakeTimer = wl.getWakeTime(WAKE_TYPE_PARTIAL);

                    if (partialWakeTimer != null) {

                        partialWakeLockTimeTotal += partialWakeTimer.getTotalTime(

                        partialWakeLockTimeTotal += partialWakeTimer.getTotalTimeLocked(

                            batteryRealtime, which);

                    }

                }
@@ -783,6 +785,17 @@ public abstract class BatteryStats implements Parcelable { 
                    getDischargeCurrentLevel());

        }

        

        Map<String, ? extends BatteryStats.Timer> kernelWakelocks = getKernelWakelockStats();

        if (kernelWakelocks.size() > 0) {

            for (Map.Entry<String, ? extends BatteryStats.Timer> ent : kernelWakelocks.entrySet()) {

                sb.setLength(0);

                printWakeLockCheckin(sb, ent.getValue(), batteryRealtime, null, which, "");



                dumpLine(pw, 0 /* uid */, category, KERNEL_WAKELOCK_DATA, ent.getKey(), 

                        sb.toString());

            }

        }

        

        for (int iu = 0; iu < NU; iu++) {

            final int uid = uidStats.keyAt(iu);

            Uid u = uidStats.valueAt(iu);
@@ -821,12 +834,12 @@ public abstract class BatteryStats implements Parcelable { 
                    Uid.Wakelock wl = ent.getValue();

                    String linePrefix = "";

                    sb.setLength(0);

                    linePrefix = printWakeLockCheckin(sb, wl.getWakeTime(WAKE_TYPE_FULL), batteryRealtime,

                            "f", which, linePrefix);

                    linePrefix = printWakeLockCheckin(sb, wl.getWakeTime(WAKE_TYPE_PARTIAL), batteryRealtime,

                            "p", which, linePrefix);

                    linePrefix = printWakeLockCheckin(sb, wl.getWakeTime(WAKE_TYPE_WINDOW), batteryRealtime,

                            "w", which, linePrefix);

                    linePrefix = printWakeLockCheckin(sb, wl.getWakeTime(WAKE_TYPE_FULL), 

                            batteryRealtime, "f", which, linePrefix);

                    linePrefix = printWakeLockCheckin(sb, wl.getWakeTime(WAKE_TYPE_PARTIAL), 

                            batteryRealtime, "p", which, linePrefix);

                    linePrefix = printWakeLockCheckin(sb, wl.getWakeTime(WAKE_TYPE_WINDOW), 

                            batteryRealtime, "w", which, linePrefix);

                    

                    // Only log if we had at lease one wakelock...

                    if (sb.length() > 0) {
@@ -844,8 +857,8 @@ public abstract class BatteryStats implements Parcelable { 
                    Timer timer = se.getSensorTime();

                    if (timer != null) {

                        // Convert from microseconds to milliseconds with rounding

                        long totalTime = (timer.getTotalTime(batteryRealtime, which) + 500) / 1000;

                        int count = timer.getCount(which);

                        long totalTime = (timer.getTotalTimeLocked(batteryRealtime, which) + 500) / 1000;

                        int count = timer.getCountLocked(which);

                        if (totalTime != 0) {

                            dumpLine(pw, uid, category, SENSOR_DATA, sensorNumber, totalTime, count);

                        }
@@ -971,6 +984,26 @@ public abstract class BatteryStats implements Parcelable { 
        long fullWakeLockTimeTotalMicros = 0;

        long partialWakeLockTimeTotalMicros = 0;

        

        Map<String, ? extends BatteryStats.Timer> kernelWakelocks = getKernelWakelockStats();

        if (kernelWakelocks.size() > 0) {

            for (Map.Entry<String, ? extends BatteryStats.Timer> ent : kernelWakelocks.entrySet()) {

                

                String linePrefix = ": ";

                sb.setLength(0);

                sb.append(prefix);

                sb.append("  Kernel Wake lock ");

                sb.append(ent.getKey());

                linePrefix = printWakeLock(sb, ent.getValue(), batteryRealtime, null, which, 

                        linePrefix);

                if (!linePrefix.equals(": ")) {

                    sb.append(" realtime");

                } else {

                    sb.append(": (nothing executed)");

                }

                pw.println(sb.toString());

            }

        }

    

        for (int iu = 0; iu < NU; iu++) {

            Uid u = uidStats.valueAt(iu);

            rxTotal += u.getTcpBytesReceived(which);
@@ -984,13 +1017,13 @@ public abstract class BatteryStats implements Parcelable { 
                    

                    Timer fullWakeTimer = wl.getWakeTime(WAKE_TYPE_FULL);

                    if (fullWakeTimer != null) {

                        fullWakeLockTimeTotalMicros += fullWakeTimer.getTotalTime(

                        fullWakeLockTimeTotalMicros += fullWakeTimer.getTotalTimeLocked(

                                batteryRealtime, which);

                    }



                    Timer partialWakeTimer = wl.getWakeTime(WAKE_TYPE_PARTIAL);

                    if (partialWakeTimer != null) {

                        partialWakeLockTimeTotalMicros += partialWakeTimer.getTotalTime(

                        partialWakeLockTimeTotalMicros += partialWakeTimer.getTotalTimeLocked(

                                batteryRealtime, which);

                    }

                }
@@ -1179,8 +1212,9 @@ public abstract class BatteryStats implements Parcelable { 
                    Timer timer = se.getSensorTime();

                    if (timer != null) {

                        // Convert from microseconds to milliseconds with rounding

                        long totalTime = (timer.getTotalTime(batteryRealtime, which) + 500) / 1000;

                        int count = timer.getCount(which);

                        long totalTime = (timer.getTotalTimeLocked(

                                batteryRealtime, which) + 500) / 1000;

                        int count = timer.getCountLocked(which);

                        //timer.logState();

                        if (totalTime != 0) {

                            sb.append(formatTimeMs(totalTime));

core/java/android/os/Process.java

+6 −0
Original line number Diff line number Diff line
@@ -680,6 +680,8 @@ public class Process { 
    /** @hide */

    public static final int PROC_SPACE_TERM = (int)' ';

    /** @hide */

    public static final int PROC_TAB_TERM = (int)'\t';

    /** @hide */

    public static final int PROC_COMBINE = 0x100;

    /** @hide */

    public static final int PROC_PARENS = 0x200;
@@ -694,6 +696,10 @@ public class Process { 
    public static final native boolean readProcFile(String file, int[] format,

            String[] outStrings, long[] outLongs, float[] outFloats);

    

    /** @hide */

    public static final native boolean parseProcLine(byte[] buffer, int startIndex, 

            int endIndex, int[] format, String[] outStrings, long[] outLongs, float[] outFloats);



    /**

     * Gets the total Pss value for a given process, in bytes.

     *

core/java/com/android/internal/os/BatteryStatsImpl.java

+568 −141

File changed.

Preview size limit exceeded, changes collapsed.

core/jni/android_util_Process.cpp

+62 −39
Original line number Diff line number Diff line
@@ -516,39 +516,10 @@ enum { 
    PROC_OUT_FLOAT = 0x4000,

};



jboolean android_os_Process_readProcFile(JNIEnv* env, jobject clazz,

        jstring file, jintArray format, jobjectArray outStrings,

        jlongArray outLongs, jfloatArray outFloats)

jboolean android_os_Process_parseProcLineArray(JNIEnv* env, jobject clazz,

        char* buffer, jint startIndex, jint endIndex, jintArray format, 

        jobjectArray outStrings, jlongArray outLongs, jfloatArray outFloats)

{

    if (file == NULL || format == NULL) {

        jniThrowException(env, "java/lang/NullPointerException", NULL);

        return JNI_FALSE;

    }

    

    const char* file8 = env->GetStringUTFChars(file, NULL);

    if (file8 == NULL) {

        jniThrowException(env, "java/lang/OutOfMemoryError", NULL);

        return JNI_FALSE;

    }

    int fd = open(file8, O_RDONLY);

    env->ReleaseStringUTFChars(file, file8);

    

    if (fd < 0) {

        //LOGW("Unable to open process file: %s\n", file8);

        return JNI_FALSE;

    }

    

    char buffer[256];

    const int len = read(fd, buffer, sizeof(buffer)-1);

    close(fd);

    

    if (len < 0) {

        //LOGW("Unable to open process file: %s fd=%d\n", file8, fd);

        return JNI_FALSE;

    }

    buffer[len] = 0;

    

    //LOGI("Process file %s: %s\n", file8, buffer);

    

    const jsize NF = env->GetArrayLength(format);

    const jsize NS = outStrings ? env->GetArrayLength(outStrings) : 0;
@@ -575,7 +546,7 @@ jboolean android_os_Process_readProcFile(JNIEnv* env, jobject clazz, 
        return JNI_FALSE;

    }



    jsize i = 0;

    jsize i = startIndex;

    jsize di = 0;

    

    jboolean res = JNI_TRUE;
@@ -587,30 +558,30 @@ jboolean android_os_Process_readProcFile(JNIEnv* env, jobject clazz, 
        }

        const char term = (char)(mode&PROC_TERM_MASK);

        const jsize start = i;

        if (i >= len) {

        if (i >= endIndex) {

            res = JNI_FALSE;

            break;

        }

        

        jsize end = -1;

        if ((mode&PROC_PARENS) != 0) {

            while (buffer[i] != ')' && i < len) {

            while (buffer[i] != ')' && i < endIndex) {

                i++;

            }

            end = i;

            i++;

        }

        while (buffer[i] != term && i < len) {

        while (buffer[i] != term && i < endIndex) {

            i++;

        }

        if (end < 0) {

            end = i;

        }

        

        if (i < len) {

        if (i < endIndex) {

            i++;

            if ((mode&PROC_COMBINE) != 0) {

                while (buffer[i] == term && i < len) {

                while (buffer[i] == term && i < endIndex) {

                    i++;

                }

            }
@@ -649,6 +620,58 @@ jboolean android_os_Process_readProcFile(JNIEnv* env, jobject clazz, 
    return res;

}



jboolean android_os_Process_parseProcLine(JNIEnv* env, jobject clazz,

        jbyteArray buffer, jint startIndex, jint endIndex, jintArray format, 

        jobjectArray outStrings, jlongArray outLongs, jfloatArray outFloats)

{

        jbyte* bufferArray = env->GetByteArrayElements(buffer, NULL);



        jboolean result = android_os_Process_parseProcLineArray(env, clazz, 

                (char*) bufferArray, startIndex, endIndex, format, outStrings, 

                outLongs, outFloats);

                

        env->ReleaseByteArrayElements(buffer, bufferArray, 0);

        

        return result;

}



jboolean android_os_Process_readProcFile(JNIEnv* env, jobject clazz,

        jstring file, jintArray format, jobjectArray outStrings,

        jlongArray outLongs, jfloatArray outFloats)

{

    if (file == NULL || format == NULL) {

        jniThrowException(env, "java/lang/NullPointerException", NULL);

        return JNI_FALSE;

    }



    const char* file8 = env->GetStringUTFChars(file, NULL);

    if (file8 == NULL) {

        jniThrowException(env, "java/lang/OutOfMemoryError", NULL);

        return JNI_FALSE;

    }

    int fd = open(file8, O_RDONLY);

    env->ReleaseStringUTFChars(file, file8);

    

    if (fd < 0) {

        //LOGW("Unable to open process file: %s\n", file8);

        return JNI_FALSE;

    }

    

    char buffer[256];

    const int len = read(fd, buffer, sizeof(buffer)-1);

    close(fd);

    

    if (len < 0) {

        //LOGW("Unable to open process file: %s fd=%d\n", file8, fd);

        return JNI_FALSE;

    }

    buffer[len] = 0;

    

    return android_os_Process_parseProcLineArray(env, clazz, buffer, 0, len, 

            format, outStrings, outLongs, outFloats);

    

}



void android_os_Process_setApplicationObject(JNIEnv* env, jobject clazz,

                                             jobject binderObject)

{
@@ -728,6 +751,7 @@ static const JNINativeMethod methods[] = { 
    {"readProcLines", "(Ljava/lang/String;[Ljava/lang/String;[J)V", (void*)android_os_Process_readProcLines},

    {"getPids", "(Ljava/lang/String;[I)[I", (void*)android_os_Process_getPids},

    {"readProcFile", "(Ljava/lang/String;[I[Ljava/lang/String;[J[F)Z", (void*)android_os_Process_readProcFile},

    {"parseProcLine", "([BII[I[Ljava/lang/String;[J[F)Z", (void*)android_os_Process_parseProcLine},

    {"getElapsedCpuTime", "()J", (void*)android_os_Process_getElapsedCpuTime},

    {"getPss", "(I)J", (void*)android_os_Process_getPss},

    //{"setApplicationObject", "(Landroid/os/IBinder;)V", (void*)android_os_Process_setApplicationObject},
@@ -746,4 +770,3 @@ int register_android_os_Process(JNIEnv* env) 
        env, kProcessPathName,

        methods, NELEM(methods));

}