Merge "Add sample profiling option to am." into lmp-dev (0dedb722) · Commits · e / os / android_frameworks_base

cmds/am/src/com/android/commands/am/Am.java

+23 −10

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import android.app.IActivityController;
		import android.app.IActivityManager;
		import android.app.IInstrumentationWatcher;
		import android.app.Instrumentation;
		import android.app.ProfilerInfo;
		import android.app.UiAutomationConnection;
		import android.content.ComponentName;
		import android.content.IIntentReceiver;
		@@ -76,6 +77,8 @@ public class Am extends BaseCommand {
		private String mReceiverPermission;

		private String mProfileFile;
		private int mSamplingInterval;
		private boolean mAutoStop;

		/**
		* Command-line entry point.
		@@ -91,7 +94,7 @@ public class Am extends BaseCommand {
		out.println(
		"usage: am [subcommand] [options]\n" +
		"usage: am start [-D] [-W] [-P <FILE>] [--start-profiler <FILE>]\n" +
		" [--R COUNT] [-S] [--opengl-trace]\n" +
		" [--sampling INTERVAL] [-R COUNT] [-S] [--opengl-trace]\n" +
		" [--user <USER_ID> \| current] <INTENT>\n" +
		" am startservice [--user <USER_ID> \| current] <INTENT>\n" +
		" am stopservice [--user <USER_ID> \| current] <INTENT>\n" +
		@@ -133,6 +136,8 @@ public class Am extends BaseCommand {
		" -D: enable debugging\n" +
		" -W: wait for launch to complete\n" +
		" --start-profiler <FILE>: start profiler and send results to <FILE>\n" +
		" --sampling INTERVAL: use sample profiling with INTERVAL microseconds\n" +
		" between samples (use with --start-profiler)\n" +
		" -P <FILE>: like above, but profiling stops when app goes idle\n" +
		" -R: repeat the activity launch <COUNT> times. Prior to each repeat,\n" +
		" the top activity will be finished.\n" +
		@@ -360,6 +365,8 @@ public class Am extends BaseCommand {
		mStopOption = false;
		mRepeat = 0;
		mProfileFile = null;
		mSamplingInterval = 0;
		mAutoStop = false;
		mUserId = defUser;
		Uri data = null;
		String type = null;
		@@ -526,10 +533,12 @@ public class Am extends BaseCommand {
		mWaitOption = true;
		} else if (opt.equals("-P")) {
		mProfileFile = nextArgRequired();
		mStartFlags \|= ActivityManager.START_FLAG_AUTO_STOP_PROFILER;
		mAutoStop = true;
		} else if (opt.equals("--start-profiler")) {
		mProfileFile = nextArgRequired();
		mStartFlags &= ~ActivityManager.START_FLAG_AUTO_STOP_PROFILER;
		mAutoStop = false;
		} else if (opt.equals("--sampling")) {
		mSamplingInterval = Integer.parseInt(nextArgRequired());
		} else if (opt.equals("-R")) {
		mRepeat = Integer.parseInt(nextArgRequired());
		} else if (opt.equals("-S")) {
		@@ -690,6 +699,7 @@ public class Am extends BaseCommand {
		intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

		ParcelFileDescriptor fd = null;
		ProfilerInfo profilerInfo = null;

		if (mProfileFile != null) {
		try {
		@@ -702,17 +712,18 @@ public class Am extends BaseCommand {
		System.err.println("Error: Unable to open file: " + mProfileFile);
		return;
		}
		profilerInfo = new ProfilerInfo(mProfileFile, fd, mSamplingInterval, mAutoStop);
		}

		IActivityManager.WaitResult result = null;
		int res;
		if (mWaitOption) {
		result = mAm.startActivityAndWait(null, null, intent, mimeType,
		null, null, 0, mStartFlags, mProfileFile, fd, null, mUserId);
		null, null, 0, mStartFlags, profilerInfo, null, mUserId);
		res = result.result;
		} else {
		res = mAm.startActivityAsUser(null, null, intent, mimeType,
		null, null, 0, mStartFlags, mProfileFile, fd, null, mUserId);
		null, null, 0, mStartFlags, profilerInfo, null, mUserId);
		}
		PrintStream out = mWaitOption ? System.out : System.err;
		boolean launched = false;
		@@ -996,6 +1007,7 @@ public class Am extends BaseCommand {
		}

		ParcelFileDescriptor fd = null;
		ProfilerInfo profilerInfo = null;

		if (start) {
		profileFile = nextArgRequired();
		@@ -1009,6 +1021,7 @@ public class Am extends BaseCommand {
		System.err.println("Error: Unable to open file: " + profileFile);
		return;
		}
		profilerInfo = new ProfilerInfo(profileFile, fd, 0, false);
		}

		try {
		@@ -1022,7 +1035,7 @@ public class Am extends BaseCommand {
		} else if (start) {
		//removeWallOption();
		}
		if (!mAm.profileControl(process, userId, start, profileFile, fd, profileType)) {
		if (!mAm.profileControl(process, userId, start, profilerInfo, profileType)) {
		wall = false;
		throw new AndroidException("PROFILE FAILED on process " + process);
		}

core/java/android/app/Activity.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -4145,10 +4145,9 @@ public class Activity extends ContextThemeWrapper
		intent.prepareToLeaveProcess();
		result = ActivityManagerNative.getDefault()
		.startActivity(mMainThread.getApplicationThread(), getBasePackageName(),
		intent, intent.resolveTypeIfNeeded(getContentResolver()),
		mToken, mEmbeddedID, requestCode,
		ActivityManager.START_FLAG_ONLY_IF_NEEDED, null, null,
		options);
		intent, intent.resolveTypeIfNeeded(getContentResolver()), mToken,
		mEmbeddedID, requestCode, ActivityManager.START_FLAG_ONLY_IF_NEEDED,
		null, options);
		} catch (RemoteException e) {
		// Empty
		}

core/java/android/app/ActivityManager.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -192,13 +192,6 @@ public class ActivityManager {
		*/
		public static final int START_FLAG_OPENGL_TRACES = 1<<2;

		/**
		* Flag for IActivityManaqer.startActivity: if the app is being
		* launched for profiling, automatically stop the profiler once done.
		* @hide
		*/
		public static final int START_FLAG_AUTO_STOP_PROFILER = 1<<3;

		/**
		* Result for IActivityManaqer.broadcastIntent: success!
		* @hide

core/java/android/app/ActivityManagerNative.java

+45 −63

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package android.app;

		import android.app.ActivityManager.StackInfo;
		import android.app.ProfilerInfo;
		import android.content.ComponentName;
		import android.content.IIntentReceiver;
		import android.content.IIntentSender;
		@@ -132,14 +133,12 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
		String resultWho = data.readString();
		int requestCode = data.readInt();
		int startFlags = data.readInt();
		String profileFile = data.readString();
		ParcelFileDescriptor profileFd = data.readInt() != 0
		? data.readFileDescriptor() : null;
		ProfilerInfo profilerInfo = data.readInt() != 0
		? ProfilerInfo.CREATOR.createFromParcel(data) : null;
		Bundle options = data.readInt() != 0
		? Bundle.CREATOR.createFromParcel(data) : null;
		int result = startActivity(app, callingPackage, intent, resolvedType,
		resultTo, resultWho, requestCode, startFlags,
		profileFile, profileFd, options);
		resultTo, resultWho, requestCode, startFlags, profilerInfo, options);
		reply.writeNoException();
		reply.writeInt(result);
		return true;
		@@ -157,15 +156,13 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
		String resultWho = data.readString();
		int requestCode = data.readInt();
		int startFlags = data.readInt();
		String profileFile = data.readString();
		ParcelFileDescriptor profileFd = data.readInt() != 0
		? ParcelFileDescriptor.CREATOR.createFromParcel(data) : null;
		ProfilerInfo profilerInfo = data.readInt() != 0
		? ProfilerInfo.CREATOR.createFromParcel(data) : null;
		Bundle options = data.readInt() != 0
		? Bundle.CREATOR.createFromParcel(data) : null;
		int userId = data.readInt();
		int result = startActivityAsUser(app, callingPackage, intent, resolvedType,
		resultTo, resultWho, requestCode, startFlags,
		profileFile, profileFd, options, userId);
		resultTo, resultWho, requestCode, startFlags, profilerInfo, options, userId);
		reply.writeNoException();
		reply.writeInt(result);
		return true;
		@@ -183,14 +180,12 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
		String resultWho = data.readString();
		int requestCode = data.readInt();
		int startFlags = data.readInt();
		String profileFile = data.readString();
		ParcelFileDescriptor profileFd = data.readInt() != 0
		? data.readFileDescriptor() : null;
		ProfilerInfo profilerInfo = data.readInt() != 0
		? ProfilerInfo.CREATOR.createFromParcel(data) : null;
		Bundle options = data.readInt() != 0
		? Bundle.CREATOR.createFromParcel(data) : null;
		int result = startActivityAsCaller(app, callingPackage, intent, resolvedType,
		resultTo, resultWho, requestCode, startFlags,
		profileFile, profileFd, options);
		resultTo, resultWho, requestCode, startFlags, profilerInfo, options);
		reply.writeNoException();
		reply.writeInt(result);
		return true;
		@@ -208,15 +203,13 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
		String resultWho = data.readString();
		int requestCode = data.readInt();
		int startFlags = data.readInt();
		String profileFile = data.readString();
		ParcelFileDescriptor profileFd = data.readInt() != 0
		? ParcelFileDescriptor.CREATOR.createFromParcel(data) : null;
		ProfilerInfo profilerInfo = data.readInt() != 0
		? ProfilerInfo.CREATOR.createFromParcel(data) : null;
		Bundle options = data.readInt() != 0
		? Bundle.CREATOR.createFromParcel(data) : null;
		int userId = data.readInt();
		WaitResult result = startActivityAndWait(app, callingPackage, intent, resolvedType,
		resultTo, resultWho, requestCode, startFlags,
		profileFile, profileFd, options, userId);
		resultTo, resultWho, requestCode, startFlags, profilerInfo, options, userId);
		reply.writeNoException();
		result.writeToParcel(reply, 0);
		return true;
		@@ -284,15 +277,13 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
		IVoiceInteractor interactor = IVoiceInteractor.Stub.asInterface(
		data.readStrongBinder());
		int startFlags = data.readInt();
		String profileFile = data.readString();
		ParcelFileDescriptor profileFd = data.readInt() != 0
		? ParcelFileDescriptor.CREATOR.createFromParcel(data) : null;
		ProfilerInfo profilerInfo = data.readInt() != 0
		? ProfilerInfo.CREATOR.createFromParcel(data) : null;
		Bundle options = data.readInt() != 0
		? Bundle.CREATOR.createFromParcel(data) : null;
		int userId = data.readInt();
		int result = startVoiceActivity(callingPackage, callingPid, callingUid,
		intent, resolvedType, session, interactor, startFlags,
		profileFile, profileFd, options, userId);
		int result = startVoiceActivity(callingPackage, callingPid, callingUid, intent,
		resolvedType, session, interactor, startFlags, profilerInfo, options, userId);
		reply.writeNoException();
		reply.writeInt(result);
		return true;
		@@ -1475,10 +1466,9 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
		int userId = data.readInt();
		boolean start = data.readInt() != 0;
		int profileType = data.readInt();
		String path = data.readString();
		ParcelFileDescriptor fd = data.readInt() != 0
		? ParcelFileDescriptor.CREATOR.createFromParcel(data) : null;
		boolean res = profileControl(process, userId, start, path, fd, profileType);
		ProfilerInfo profilerInfo = data.readInt() != 0
		? ProfilerInfo.CREATOR.createFromParcel(data) : null;
		boolean res = profileControl(process, userId, start, profilerInfo, profileType);
		reply.writeNoException();
		reply.writeInt(res ? 1 : 0);
		return true;
		@@ -2343,8 +2333,7 @@ class ActivityManagerProxy implements IActivityManager

		public int startActivity(IApplicationThread caller, String callingPackage, Intent intent,
		String resolvedType, IBinder resultTo, String resultWho, int requestCode,
		int startFlags, String profileFile,
		ParcelFileDescriptor profileFd, Bundle options) throws RemoteException {
		int startFlags, ProfilerInfo profilerInfo, Bundle options) throws RemoteException {
		Parcel data = Parcel.obtain();
		Parcel reply = Parcel.obtain();
		data.writeInterfaceToken(IActivityManager.descriptor);
		@@ -2356,10 +2345,9 @@ class ActivityManagerProxy implements IActivityManager
		data.writeString(resultWho);
		data.writeInt(requestCode);
		data.writeInt(startFlags);
		data.writeString(profileFile);
		if (profileFd != null) {
		if (profilerInfo != null) {
		data.writeInt(1);
		profileFd.writeToParcel(data, Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
		profilerInfo.writeToParcel(data, Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
		} else {
		data.writeInt(0);
		}
		@@ -2379,8 +2367,8 @@ class ActivityManagerProxy implements IActivityManager

		public int startActivityAsUser(IApplicationThread caller, String callingPackage, Intent intent,
		String resolvedType, IBinder resultTo, String resultWho, int requestCode,
		int startFlags, String profileFile,
		ParcelFileDescriptor profileFd, Bundle options, int userId) throws RemoteException {
		int startFlags, ProfilerInfo profilerInfo, Bundle options,
		int userId) throws RemoteException {
		Parcel data = Parcel.obtain();
		Parcel reply = Parcel.obtain();
		data.writeInterfaceToken(IActivityManager.descriptor);
		@@ -2392,10 +2380,9 @@ class ActivityManagerProxy implements IActivityManager
		data.writeString(resultWho);
		data.writeInt(requestCode);
		data.writeInt(startFlags);
		data.writeString(profileFile);
		if (profileFd != null) {
		if (profilerInfo != null) {
		data.writeInt(1);
		profileFd.writeToParcel(data, Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
		profilerInfo.writeToParcel(data, Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
		} else {
		data.writeInt(0);
		}
		@@ -2415,8 +2402,7 @@ class ActivityManagerProxy implements IActivityManager
		}
		public int startActivityAsCaller(IApplicationThread caller, String callingPackage,
		Intent intent, String resolvedType, IBinder resultTo, String resultWho, int requestCode,
		int startFlags, String profileFile,
		ParcelFileDescriptor profileFd, Bundle options) throws RemoteException {
		int startFlags, ProfilerInfo profilerInfo, Bundle options) throws RemoteException {
		Parcel data = Parcel.obtain();
		Parcel reply = Parcel.obtain();
		data.writeInterfaceToken(IActivityManager.descriptor);
		@@ -2428,10 +2414,9 @@ class ActivityManagerProxy implements IActivityManager
		data.writeString(resultWho);
		data.writeInt(requestCode);
		data.writeInt(startFlags);
		data.writeString(profileFile);
		if (profileFd != null) {
		if (profilerInfo != null) {
		data.writeInt(1);
		profileFd.writeToParcel(data, Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
		profilerInfo.writeToParcel(data, Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
		} else {
		data.writeInt(0);
		}
		@@ -2450,8 +2435,8 @@ class ActivityManagerProxy implements IActivityManager
		}
		public WaitResult startActivityAndWait(IApplicationThread caller, String callingPackage,
		Intent intent, String resolvedType, IBinder resultTo, String resultWho,
		int requestCode, int startFlags, String profileFile,
		ParcelFileDescriptor profileFd, Bundle options, int userId) throws RemoteException {
		int requestCode, int startFlags, ProfilerInfo profilerInfo, Bundle options,
		int userId) throws RemoteException {
		Parcel data = Parcel.obtain();
		Parcel reply = Parcel.obtain();
		data.writeInterfaceToken(IActivityManager.descriptor);
		@@ -2463,10 +2448,9 @@ class ActivityManagerProxy implements IActivityManager
		data.writeString(resultWho);
		data.writeInt(requestCode);
		data.writeInt(startFlags);
		data.writeString(profileFile);
		if (profileFd != null) {
		if (profilerInfo != null) {
		data.writeInt(1);
		profileFd.writeToParcel(data, Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
		profilerInfo.writeToParcel(data, Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
		} else {
		data.writeInt(0);
		}
		@@ -2550,8 +2534,8 @@ class ActivityManagerProxy implements IActivityManager
		}
		public int startVoiceActivity(String callingPackage, int callingPid, int callingUid,
		Intent intent, String resolvedType, IVoiceInteractionSession session,
		IVoiceInteractor interactor, int startFlags, String profileFile,
		ParcelFileDescriptor profileFd, Bundle options, int userId) throws RemoteException {
		IVoiceInteractor interactor, int startFlags, ProfilerInfo profilerInfo,
		Bundle options, int userId) throws RemoteException {
		Parcel data = Parcel.obtain();
		Parcel reply = Parcel.obtain();
		data.writeInterfaceToken(IActivityManager.descriptor);
		@@ -2563,10 +2547,9 @@ class ActivityManagerProxy implements IActivityManager
		data.writeStrongBinder(session.asBinder());
		data.writeStrongBinder(interactor.asBinder());
		data.writeInt(startFlags);
		data.writeString(profileFile);
		if (profileFd != null) {
		if (profilerInfo != null) {
		data.writeInt(1);
		profileFd.writeToParcel(data, Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
		profilerInfo.writeToParcel(data, Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
		} else {
		data.writeInt(0);
		}
		@@ -4191,7 +4174,7 @@ class ActivityManagerProxy implements IActivityManager
		}

		public boolean profileControl(String process, int userId, boolean start,
		String path, ParcelFileDescriptor fd, int profileType) throws RemoteException
		ProfilerInfo profilerInfo, int profileType) throws RemoteException
		{
		Parcel data = Parcel.obtain();
		Parcel reply = Parcel.obtain();
		@@ -4200,10 +4183,9 @@ class ActivityManagerProxy implements IActivityManager
		data.writeInt(userId);
		data.writeInt(start ? 1 : 0);
		data.writeInt(profileType);
		data.writeString(path);
		if (fd != null) {
		if (profilerInfo != null) {
		data.writeInt(1);
		fd.writeToParcel(data, Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
		profilerInfo.writeToParcel(data, Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
		} else {
		data.writeInt(0);
		}

core/java/android/app/ActivityThread.java

+35 −47

File changed.

Preview size limit exceeded, changes collapsed.