Merge "Battery stats: parse wakeup sources stats for android-3.4" (12da2722) · Commits · e / os / android_frameworks_base

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

+47 −17

Original line number	Diff line number	Diff line
		@@ -320,6 +320,18 @@ public final class BatteryStatsImpl extends BatteryStats {
		Process.PROC_TAB_TERM\|Process.PROC_OUT_LONG, // 5: totalTime
		};

		private static final int[] WAKEUP_SOURCES_FORMAT = new int[] {
		Process.PROC_TAB_TERM\|Process.PROC_OUT_STRING, // 0: name
		Process.PROC_TAB_TERM\|Process.PROC_COMBINE\|
		Process.PROC_OUT_LONG, // 1: count
		Process.PROC_TAB_TERM\|Process.PROC_COMBINE,
		Process.PROC_TAB_TERM\|Process.PROC_COMBINE,
		Process.PROC_TAB_TERM\|Process.PROC_COMBINE,
		Process.PROC_TAB_TERM\|Process.PROC_COMBINE,
		Process.PROC_TAB_TERM\|Process.PROC_COMBINE
		\|Process.PROC_OUT_LONG, // 6: totalTime
		};

		private final String[] mProcWakelocksName = new String[3];
		private final long[] mProcWakelocksData = new long[3];

		@@ -1028,13 +1040,28 @@ public final class BatteryStatsImpl extends BatteryStats {

		private final Map<String, KernelWakelockStats> readKernelWakelockStats() {

		FileInputStream is;
		byte[] buffer = new byte[8192];
		int len;
		boolean wakeup_sources = false;

		try {
		FileInputStream is = new FileInputStream("/proc/wakelocks");
		try {
		is = new FileInputStream("/proc/wakelocks");
		} catch (java.io.FileNotFoundException e) {
		try {
		is = new FileInputStream("/d/wakeup_sources");
		wakeup_sources = true;
		} catch (java.io.FileNotFoundException e2) {
		return null;
		}
		}

		len = is.read(buffer);
		is.close();
		} catch (java.io.IOException e) {
		return null;
		}

		if (len > 0) {
		int i;
		@@ -1045,17 +1072,12 @@ public final class BatteryStatsImpl extends BatteryStats {
		}
		}
		}
		} catch (java.io.FileNotFoundException e) {
		return null;
		} catch (java.io.IOException e) {
		return null;
		}

		return parseProcWakelocks(buffer, len);
		return parseProcWakelocks(buffer, len, wakeup_sources);
		}

		private final Map<String, KernelWakelockStats> parseProcWakelocks(
		byte[] wlBuffer, int len) {
		byte[] wlBuffer, int len, boolean wakeup_sources) {
		String name;
		int count;
		long totalTime;
		@@ -1092,12 +1114,20 @@ public final class BatteryStatsImpl extends BatteryStats {
		if ((wlBuffer[j] & 0x80) != 0) wlBuffer[j] = (byte) '?';
		}
		boolean parsed = Process.parseProcLine(wlBuffer, startIndex, endIndex,
		PROC_WAKELOCKS_FORMAT, nameStringArray, wlData, null);
		wakeup_sources ? WAKEUP_SOURCES_FORMAT :
		PROC_WAKELOCKS_FORMAT,
		nameStringArray, wlData, null);

		name = nameStringArray[0];
		count = (int) wlData[1];

		if (wakeup_sources) {
		// convert milliseconds to microseconds
		totalTime = wlData[2] * 1000;
		} else {
		// convert nanoseconds to microseconds with rounding.
		totalTime = (wlData[2] + 500) / 1000;
		}

		if (parsed && name.length() > 0) {
		if (!m.containsKey(name)) {