Merge "Debug: Remove obsolete InstructionCount code." am: f5a8edeaf0 am: 47659c3351 (63cc787f) · Commits · e / os / android_frameworks_base

core/java/android/os/Debug.java

+4 −39

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import android.util.Log;
		import com.android.internal.util.FastPrintWriter;
		import com.android.internal.util.TypedProperties;

		import dalvik.bytecode.OpcodeInfo;
		import dalvik.system.VMDebug;

		import org.apache.harmony.dalvik.ddmc.Chunk;
		@@ -48,8 +47,6 @@ import java.util.HashMap;
		import java.util.Map;




		/**
		* Provides various debugging methods for Android applications, including
		* tracing and allocation counts.
		@@ -1959,13 +1956,7 @@ public final class Debug
		*/
		@Deprecated
		public static class InstructionCount {
		private static final int NUM_INSTR =
		OpcodeInfo.MAXIMUM_PACKED_VALUE + 1;

		private int[] mCounts;

		public InstructionCount() {
		mCounts = new int[NUM_INSTR];
		}

		/**
		@@ -1975,41 +1966,23 @@ public final class Debug
		* @return true if counting was started
		*/
		public boolean resetAndStart() {
		try {
		VMDebug.startInstructionCounting();
		VMDebug.resetInstructionCount();
		} catch (UnsupportedOperationException uoe) {
		return false;
		}
		return true;
		}

		/**
		* Collect instruction counts. May or may not stop the
		* counting process.
		*/
		public boolean collect() {
		try {
		VMDebug.stopInstructionCounting();
		VMDebug.getInstructionCount(mCounts);
		} catch (UnsupportedOperationException uoe) {
		return false;
		}
		return true;
		}

		/**
		* Return the total number of instructions executed globally (i.e. in
		* all threads).
		*/
		public int globalTotal() {
		int count = 0;

		for (int i = 0; i < NUM_INSTR; i++) {
		count += mCounts[i];
		}

		return count;
		return 0;
		}

		/**
		@@ -2017,15 +1990,7 @@ public final class Debug
		* executed globally.
		*/
		public int globalMethodInvocations() {
		int count = 0;

		for (int i = 0; i < NUM_INSTR; i++) {
		if (OpcodeInfo.isInvoke(i)) {
		count += mCounts[i];
		}
		}

		return count;
		return 0;
		}
		}