am eaeb663b: Track activity foreground CPU usage for battery stats. (138197f9) · Commits · e / os / android_frameworks_base

core/java/android/os/BatteryStats.java

+15 −8

Original line number	Diff line number	Diff line
		@@ -307,6 +307,13 @@ public abstract class BatteryStats implements Parcelable {
		* @param which one of STATS_TOTAL, STATS_LAST, or STATS_CURRENT.
		*/
		public abstract int getStarts(int which);

		/**
		* Returns the cpu time spent in microseconds while the process was in the foreground.
		* @param which one of STATS_TOTAL, STATS_LAST, STATS_CURRENT or STATS_UNPLUGGED
		* @return foreground cpu time in microseconds
		*/
		public abstract long getForegroundTime(int which);
		}

		/**
		@@ -364,7 +371,7 @@ public abstract class BatteryStats implements Parcelable {
		public abstract int getStartCount();

		/**
		* Returns the time in milliseconds that the screen has been on while the device was
		* Returns the time in microseconds that the screen has been on while the device was
		* running on battery.
		*
		* {@hide}
		@@ -384,7 +391,7 @@ public abstract class BatteryStats implements Parcelable {
		public static final int NUM_SCREEN_BRIGHTNESS_BINS = 5;

		/**
		* Returns the time in milliseconds that the screen has been on with
		* Returns the time in microseconds that the screen has been on with
		* the given brightness
		*
		* {@hide}
		@@ -395,7 +402,7 @@ public abstract class BatteryStats implements Parcelable {
		public abstract int getInputEventCount(int which);

		/**
		* Returns the time in milliseconds that the phone has been on while the device was
		* Returns the time in microseconds that the phone has been on while the device was
		* running on battery.
		*
		* {@hide}
		@@ -415,7 +422,7 @@ public abstract class BatteryStats implements Parcelable {
		public static final int NUM_SIGNAL_STRENGTH_BINS = 5;

		/**
		* Returns the time in milliseconds that the phone has been running with
		* Returns the time in microseconds that the phone has been running with
		* the given signal strength.
		*
		* {@hide}
		@@ -443,7 +450,7 @@ public abstract class BatteryStats implements Parcelable {
		public static final int NUM_DATA_CONNECTION_TYPES = 5;

		/**
		* Returns the time in milliseconds that the phone has been running with
		* Returns the time in microseconds that the phone has been running with
		* the given data connection.
		*
		* {@hide}
		@@ -460,7 +467,7 @@ public abstract class BatteryStats implements Parcelable {
		public abstract int getPhoneDataConnectionCount(int dataType, int which);

		/**
		* Returns the time in milliseconds that wifi has been on while the device was
		* Returns the time in microseconds that wifi has been on while the device was
		* running on battery.
		*
		* {@hide}
		@@ -468,7 +475,7 @@ public abstract class BatteryStats implements Parcelable {
		public abstract long getWifiOnTime(long batteryRealtime, int which);

		/**
		* Returns the time in milliseconds that wifi has been on and the driver has
		* Returns the time in microseconds that wifi has been on and the driver has
		* been in the running state while the device was running on battery.
		*
		* {@hide}
		@@ -476,7 +483,7 @@ public abstract class BatteryStats implements Parcelable {
		public abstract long getWifiRunningTime(long batteryRealtime, int which);

		/**
		* Returns the time in milliseconds that bluetooth has been on while the device was
		* Returns the time in microseconds that bluetooth has been on while the device was
		* running on battery.
		*
		* {@hide}

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

+58 −5

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ public final class BatteryStatsImpl extends BatteryStats {
		private static final int MAGIC = 0xBA757475; // 'BATSTATS'

		// Current on-disk Parcel version
		private static final int VERSION = 37;
		private static final int VERSION = 38;

		private final File mFile;
		private final File mBackupFile;
		@@ -1343,10 +1343,12 @@ public final class BatteryStatsImpl extends BatteryStats {
		return mPackageStats;
		}

		@Override
		public int getUid() {
		return mUid;
		}

		@Override
		public long getTcpBytesReceived(int which) {
		if (which == STATS_LAST) {
		return mLoadedTcpBytesReceived;
		@@ -1366,6 +1368,7 @@ public final class BatteryStatsImpl extends BatteryStats {
		? (NetStat.getUidRxBytes(mUid) - mStartedTcpBytesReceived) : 0);
		}

		@Override
		public long getTcpBytesSent(int which) {
		if (which == STATS_LAST) {
		return mLoadedTcpBytesSent;
		@@ -1755,6 +1758,7 @@ public final class BatteryStatsImpl extends BatteryStats {
		return mTimer;
		}

		@Override
		public int getHandle() {
		return mHandle;
		}
		@@ -1779,6 +1783,11 @@ public final class BatteryStatsImpl extends BatteryStats {
		*/
		int mStarts;

		/**
		* Amount of time the process was running in the foreground.
		*/
		long mForegroundTime;

		/**
		* The amount of user time loaded from a previous save.
		*/
		@@ -1794,6 +1803,11 @@ public final class BatteryStatsImpl extends BatteryStats {
		*/
		int mLoadedStarts;

		/**
		* The amount of foreground time loaded from a previous save.
		*/
		long mLoadedForegroundTime;

		/**
		* The amount of user time loaded from the previous run.
		*/
		@@ -1809,6 +1823,11 @@ public final class BatteryStatsImpl extends BatteryStats {
		*/
		int mLastStarts;

		/**
		* The amount of foreground time loaded from the previous run
		*/
		long mLastForegroundTime;

		/**
		* The amount of user time when last unplugged.
		*/
		@@ -1824,6 +1843,11 @@ public final class BatteryStatsImpl extends BatteryStats {
		*/
		int mUnpluggedStarts;

		/**
		* The amount of foreground time since unplugged.
		*/
		long mUnpluggedForegroundTime;

		Proc() {
		mUnpluggables.add(this);
		}
		@@ -1832,6 +1856,7 @@ public final class BatteryStatsImpl extends BatteryStats {
		mUnpluggedUserTime = mUserTime;
		mUnpluggedSystemTime = mSystemTime;
		mUnpluggedStarts = mStarts;
		mUnpluggedForegroundTime = mForegroundTime;
		}

		public void plug(long batteryUptime, long batteryRealtime) {
		@@ -1843,30 +1868,38 @@ public final class BatteryStatsImpl extends BatteryStats {

		out.writeLong(mUserTime);
		out.writeLong(mSystemTime);
		out.writeLong(mForegroundTime);
		out.writeInt(mStarts);
		out.writeLong(mLoadedUserTime);
		out.writeLong(mLoadedSystemTime);
		out.writeLong(mLoadedForegroundTime);
		out.writeInt(mLoadedStarts);
		out.writeLong(mLastUserTime);
		out.writeLong(mLastSystemTime);
		out.writeLong(mLastForegroundTime);
		out.writeInt(mLastStarts);
		out.writeLong(mUnpluggedUserTime);
		out.writeLong(mUnpluggedSystemTime);
		out.writeLong(mUnpluggedForegroundTime);
		out.writeInt(mUnpluggedStarts);
		}

		void readFromParcelLocked(Parcel in) {
		mUserTime = in.readLong();
		mSystemTime = in.readLong();
		mForegroundTime = in.readLong();
		mStarts = in.readInt();
		mLoadedUserTime = in.readLong();
		mLoadedSystemTime = in.readLong();
		mLoadedForegroundTime = in.readLong();
		mLoadedStarts = in.readInt();
		mLastUserTime = in.readLong();
		mLastSystemTime = in.readLong();
		mLastForegroundTime = in.readLong();
		mLastStarts = in.readInt();
		mUnpluggedUserTime = in.readLong();
		mUnpluggedSystemTime = in.readLong();
		mUnpluggedForegroundTime = in.readLong();
		mUnpluggedStarts = in.readInt();
		}

		@@ -1879,6 +1912,10 @@ public final class BatteryStatsImpl extends BatteryStats {
		mSystemTime += stime;
		}

		public void addForegroundTimeLocked(long ttime) {
		mForegroundTime += ttime;
		}

		public void incStartsLocked() {
		mStarts++;
		}
		@@ -1915,6 +1952,22 @@ public final class BatteryStatsImpl extends BatteryStats {
		return val;
		}

		@Override
		public long getForegroundTime(int which) {
		long val;
		if (which == STATS_LAST) {
		val = mLastForegroundTime;
		} else {
		val = mForegroundTime;
		if (which == STATS_CURRENT) {
		val -= mLoadedForegroundTime;
		} else if (which == STATS_UNPLUGGED) {
		val -= mUnpluggedForegroundTime;
		}
		}
		return val;
		}

		@Override
		public int getStarts(int which) {
		int val;

core/res/res/xml/power_profile_default.xml

+2 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@
		<item name="screen.on">30</item>
		<item name="bluetooth.active">103</item>
		<item name="bluetooth.on">5</item>
		<item name="screen.full">144</item>
		<item name="screen.full">114</item>
		<item name="wifi.on">23</item>
		<item name="wifi.active">200</item>
		<item name="wifi.scan">200</item>
		@@ -33,4 +33,5 @@
		<item name="dsp.video">100</item>
		<item name="radio.on">3</item>
		<item name="radio.active">175</item>
		<item name="gps.on">120</item>
		</device>

services/java/com/android/server/ProcessStats.java

+15 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,10 @@ public class ProcessStats {
		PROC_SPACE_TERM\|PROC_OUT_LONG // 14: stime
		};

		/** Stores user time and system time in 100ths of a second. */
		private final long[] mProcessStatsData = new long[2];
		/** Stores user time and system time in 100ths of a second. */
		private final long[] mSinglePidStatsData = new long[2];

		private static final int[] PROCESS_FULL_STATS_FORMAT = new int[] {
		PROC_SPACE_TERM,
		@@ -419,6 +422,17 @@ public class ProcessStats {
		return pids;
		}

		public long getCpuTimeForPid(int pid) {
		final String statFile = "/proc/" + pid + "/stat";
		final long[] statsData = mSinglePidStatsData;
		if (Process.readProcFile(statFile, PROCESS_STATS_FORMAT,
		null, statsData, null)) {
		long time = statsData[0] + statsData[1];
		return time;
		}
		return 0;
		}

		final public int getLastUserTime() {
		return mRelUserTime;
		}

services/java/com/android/server/am/ActivityManagerService.java

+32 −1

Original line number	Diff line number	Diff line
		@@ -62,6 +62,7 @@ import android.content.pm.ServiceInfo;
		import android.content.res.Configuration;
		import android.graphics.Bitmap;
		import android.net.Uri;
		import android.os.BatteryStats;
		import android.os.Binder;
		import android.os.Bundle;
		import android.os.Environment;
		@@ -2063,6 +2064,25 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
		if (prev != null) {
		prev.resumeKeyDispatchingLocked();
		}

		if (prev.app != null && prev.cpuTimeAtResume > 0 && mBatteryStatsService.isOnBattery()) {
		long diff = 0;
		synchronized (mProcessStatsThread) {
		diff = mProcessStats.getCpuTimeForPid(prev.app.pid) - prev.cpuTimeAtResume;
		}
		if (diff > 0) {
		BatteryStatsImpl bsi = mBatteryStatsService.getActiveStatistics();
		synchronized (bsi) {
		BatteryStatsImpl.Uid.Proc ps =
		bsi.getProcessStatsLocked(prev.info.applicationInfo.uid,
		prev.info.packageName);
		if (ps != null) {
		ps.addForegroundTimeLocked(diff);
		}
		}
		}
		}
		prev.cpuTimeAtResume = 0; // reset it
		}

		/**
		@@ -2095,6 +2115,17 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
		next.resumeKeyDispatchingLocked();
		ensureActivitiesVisibleLocked(null, 0);
		mWindowManager.executeAppTransition();

		// Mark the point when the activity is resuming
		// TODO: To be more accurate, the mark should be before the onCreate,
		// not after the onResume. But for subsequent starts, onResume is fine.
		if (next.app != null) {
		synchronized (mProcessStatsThread) {
		next.cpuTimeAtResume = mProcessStats.getCpuTimeForPid(next.app.pid);
		}
		} else {
		next.cpuTimeAtResume = 0; // Couldn't get the cpu time of process
		}
		}

		/**