Merge "Refactor ProcessStats, ProcessTracker." (614b4c4c) · Commits · e / os / android_frameworks_base

core/java/android/os/Binder.java

+15 −2

Original line number	Diff line number	Diff line
		@@ -296,7 +296,21 @@ public class Binder implements IBinder {
		disabled = sDumpDisabled;
		}
		if (disabled == null) {
		try {
		dump(fd, pw, args);
		} catch (SecurityException e) {
		pw.println();
		pw.println("Security exception: " + e.getMessage());
		throw e;
		} catch (Throwable e) {
		// Unlike usual calls, in this case if an exception gets thrown
		// back to us we want to print it back in to the dump data, since
		// that is where the caller expects all interesting information to
		// go.
		pw.println();
		pw.println("Exception occurred while dumping:");
		e.printStackTrace(pw);
		}
		} else {
		pw.println(sDumpDisabled);
		}
		@@ -443,7 +457,6 @@ final class BinderProxy implements IBinder {
		data.writeStringArray(args);
		try {
		transact(DUMP_TRANSACTION, data, reply, FLAG_ONEWAY);
		reply.readException();
		} finally {
		data.recycle();
		reply.recycle();

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

+39 −39

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ import java.util.Collections;
		import java.util.Comparator;
		import java.util.StringTokenizer;

		public class ProcessStats {
		public class ProcessCpuTracker {
		private static final String TAG = "ProcessStats";
		private static final boolean DEBUG = false;
		private static final boolean localLOGV = DEBUG \|\| false;
		@@ -256,7 +256,7 @@ public class ProcessStats {
		};


		public ProcessStats(boolean includeThreads) {
		public ProcessCpuTracker(boolean includeThreads) {
		mIncludeThreads = includeThreads;
		}

packages/SystemUI/src/com/android/systemui/LoadAverageService.java

+9 −9

Original line number	Diff line number	Diff line
		@@ -29,18 +29,18 @@ import android.view.Gravity;
		import android.view.View;
		import android.view.WindowManager;

		import com.android.internal.os.ProcessStats;
		import com.android.internal.os.ProcessCpuTracker;

		public class LoadAverageService extends Service {
		private View mView;

		private static final class Stats extends ProcessStats {
		private static final class CpuTracker extends ProcessCpuTracker {
		String mLoadText;
		int mLoadWidth;

		private final Paint mPaint;

		Stats(Paint paint) {
		CpuTracker(Paint paint) {
		super(false);
		mPaint = paint;
		}
		@@ -70,7 +70,7 @@ public class LoadAverageService extends Service {
		}
		};

		private final Stats mStats;
		private final CpuTracker mStats;

		private Paint mLoadPaint;
		private Paint mAddedPaint;
		@@ -150,7 +150,7 @@ public class LoadAverageService extends Service {
		float descent = mLoadPaint.descent();
		mFH = (int)(descent - mAscent + .5f);

		mStats = new Stats(mLoadPaint);
		mStats = new CpuTracker(mLoadPaint);
		mStats.init();
		updateDisplay();
		}
		@@ -179,7 +179,7 @@ public class LoadAverageService extends Service {
		final int W = mNeededWidth;
		final int RIGHT = getWidth()-1;

		final Stats stats = mStats;
		final CpuTracker stats = mStats;
		final int userTime = stats.getLastUserTime();
		final int systemTime = stats.getLastSystemTime();
		final int iowaitTime = stats.getLastIoWaitTime();
		@@ -226,7 +226,7 @@ public class LoadAverageService extends Service {

		int N = stats.countWorkingStats();
		for (int i=0; i<N; i++) {
		Stats.Stats st = stats.getWorkingStats(i);
		CpuTracker.Stats st = stats.getWorkingStats(i);
		y += mFH;
		top += mFH;
		bottom += mFH;
		@@ -259,12 +259,12 @@ public class LoadAverageService extends Service {
		}

		void updateDisplay() {
		final Stats stats = mStats;
		final CpuTracker stats = mStats;
		final int NW = stats.countWorkingStats();

		int maxWidth = stats.mLoadWidth;
		for (int i=0; i<NW; i++) {
		Stats.Stats st = stats.getWorkingStats(i);
		CpuTracker.Stats st = stats.getWorkingStats(i);
		if (st.nameWidth > maxWidth) {
		maxWidth = st.nameWidth;
		}