Merge "Update docs to reflect correct time units" into mnc-dev (8e518c81) · Commits · e / os / android_frameworks_base

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

+4 −3

Original line number	Diff line number	Diff line
		@@ -272,18 +272,19 @@ public final class BatteryStatsImpl extends BatteryStats {
		final HistoryStepDetails mCurHistoryStepDetails = new HistoryStepDetails();
		final HistoryStepDetails mReadHistoryStepDetails = new HistoryStepDetails();
		final HistoryStepDetails mTmpHistoryStepDetails = new HistoryStepDetails();

		/**
		* Total time (in 1/100 sec) spent executing in user code.
		* Total time (in milliseconds) spent executing in user code.
		*/
		long mLastStepCpuUserTime;
		long mCurStepCpuUserTime;
		/**
		* Total time (in 1/100 sec) spent executing in kernel code.
		* Total time (in milliseconds) spent executing in kernel code.
		*/
		long mLastStepCpuSystemTime;
		long mCurStepCpuSystemTime;
		/**
		* Times from /proc/stat
		* Times from /proc/stat (but measured in milliseconds).
		*/
		long mLastStepStatUserTime;
		long mLastStepStatSystemTime;

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

+43 −1

Original line number	Diff line number	Diff line
		@@ -139,6 +139,8 @@ public class ProcessCpuTracker {
		private float mLoad5 = 0;
		private float mLoad15 = 0;

		// All times are in milliseconds. They are converted from jiffies to milliseconds
		// when extracted from the kernel.
		private long mCurrentSampleTime;
		private long mLastSampleTime;

		@@ -191,12 +193,34 @@ public class ProcessCpuTracker {
		// filter out kernel processes.
		public long vsize;

		/**
		* Time in milliseconds.
		*/
		public long base_uptime;

		/**
		* Time in milliseconds.
		*/
		public long rel_uptime;

		/**
		* Time in milliseconds.
		*/
		public long base_utime;

		/**
		* Time in milliseconds.
		*/
		public long base_stime;

		/**
		* Time in milliseconds.
		*/
		public int rel_utime;

		/**
		* Time in milliseconds.
		*/
		public int rel_stime;

		public long base_minfaults;
		@@ -558,7 +582,7 @@ public class ProcessCpuTracker {
		}

		/**
		* Returns the total time (in clock ticks, or 1/100 sec) spent executing in
		* Returns the total time (in milliseconds) spent executing in
		* both user and system code. Safe to call without lock held.
		*/
		public long getCpuTimeForPid(int pid) {
		@@ -575,26 +599,44 @@ public class ProcessCpuTracker {
		}
		}

		/**
		* @return time in milliseconds.
		*/
		final public int getLastUserTime() {
		return mRelUserTime;
		}

		/**
		* @return time in milliseconds.
		*/
		final public int getLastSystemTime() {
		return mRelSystemTime;
		}

		/**
		* @return time in milliseconds.
		*/
		final public int getLastIoWaitTime() {
		return mRelIoWaitTime;
		}

		/**
		* @return time in milliseconds.
		*/
		final public int getLastIrqTime() {
		return mRelIrqTime;
		}

		/**
		* @return time in milliseconds.
		*/
		final public int getLastSoftIrqTime() {
		return mRelSoftIrqTime;
		}

		/**
		* @return time in milliseconds.
		*/
		final public int getLastIdleTime() {
		return mRelIdleTime;
		}