Merge "Add traces for window manager and activity manager." into jb-dev (8e6159b8) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+61 −0

Original line number	Diff line number	Diff line
		@@ -61,6 +61,7 @@ import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.os.StrictMode;
		import android.os.SystemClock;
		import android.os.Trace;
		import android.os.UserId;
		import android.util.AndroidRuntimeException;
		import android.util.DisplayMetrics;
		@@ -1177,49 +1178,73 @@ public final class ActivityThread {
		if (DEBUG_MESSAGES) Slog.v(TAG, ">>> handling: " + msg.what);
		switch (msg.what) {
		case LAUNCH_ACTIVITY: {
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "activityStart");
		ActivityClientRecord r = (ActivityClientRecord)msg.obj;

		r.packageInfo = getPackageInfoNoCheck(
		r.activityInfo.applicationInfo, r.compatInfo);
		handleLaunchActivity(r, null);
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		} break;
		case RELAUNCH_ACTIVITY: {
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "activityRestart");
		ActivityClientRecord r = (ActivityClientRecord)msg.obj;
		handleRelaunchActivity(r);
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		} break;
		case PAUSE_ACTIVITY:
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "activityPause");
		handlePauseActivity((IBinder)msg.obj, false, msg.arg1 != 0, msg.arg2);
		maybeSnapshot();
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		break;
		case PAUSE_ACTIVITY_FINISHING:
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "activityPause");
		handlePauseActivity((IBinder)msg.obj, true, msg.arg1 != 0, msg.arg2);
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		break;
		case STOP_ACTIVITY_SHOW:
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "activityStop");
		handleStopActivity((IBinder)msg.obj, true, msg.arg2);
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		break;
		case STOP_ACTIVITY_HIDE:
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "activityStop");
		handleStopActivity((IBinder)msg.obj, false, msg.arg2);
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		break;
		case SHOW_WINDOW:
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "activityShowWindow");
		handleWindowVisibility((IBinder)msg.obj, true);
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		break;
		case HIDE_WINDOW:
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "activityHideWindow");
		handleWindowVisibility((IBinder)msg.obj, false);
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		break;
		case RESUME_ACTIVITY:
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "activityResume");
		handleResumeActivity((IBinder)msg.obj, true,
		msg.arg1 != 0);
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		break;
		case SEND_RESULT:
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "activityDeliverResult");
		handleSendResult((ResultData)msg.obj);
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		break;
		case DESTROY_ACTIVITY:
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "activityDestroy");
		handleDestroyActivity((IBinder)msg.obj, msg.arg1 != 0,
		msg.arg2, false);
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		break;
		case BIND_APPLICATION:
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "bindApplication");
		AppBindData data = (AppBindData)msg.obj;
		handleBindApplication(data);
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		break;
		case EXIT_APPLICATION:
		if (mInitialApplication != null) {
		@@ -1228,33 +1253,51 @@ public final class ActivityThread {
		Looper.myLooper().quit();
		break;
		case NEW_INTENT:
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "activityNewIntent");
		handleNewIntent((NewIntentData)msg.obj);
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		break;
		case RECEIVER:
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "broadcastReceiveComp");
		handleReceiver((ReceiverData)msg.obj);
		maybeSnapshot();
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		break;
		case CREATE_SERVICE:
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "serviceCreate");
		handleCreateService((CreateServiceData)msg.obj);
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		break;
		case BIND_SERVICE:
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "serviceBind");
		handleBindService((BindServiceData)msg.obj);
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		break;
		case UNBIND_SERVICE:
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "serviceUnbind");
		handleUnbindService((BindServiceData)msg.obj);
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		break;
		case SERVICE_ARGS:
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "serviceStart");
		handleServiceArgs((ServiceArgsData)msg.obj);
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		break;
		case STOP_SERVICE:
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "serviceStop");
		handleStopService((IBinder)msg.obj);
		maybeSnapshot();
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		break;
		case REQUEST_THUMBNAIL:
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "requestThumbnail");
		handleRequestThumbnail((IBinder)msg.obj);
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		break;
		case CONFIGURATION_CHANGED:
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "configChanged");
		handleConfigurationChanged((Configuration)msg.obj, null);
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		break;
		case CLEAN_UP_CONTEXT:
		ContextCleanupInfo cci = (ContextCleanupInfo)msg.obj;
		@@ -1267,31 +1310,43 @@ public final class ActivityThread {
		handleDumpService((DumpComponentInfo)msg.obj);
		break;
		case LOW_MEMORY:
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "lowMemory");
		handleLowMemory();
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		break;
		case ACTIVITY_CONFIGURATION_CHANGED:
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "activityConfigChanged");
		handleActivityConfigurationChanged((IBinder)msg.obj);
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		break;
		case PROFILER_CONTROL:
		handleProfilerControl(msg.arg1 != 0, (ProfilerControlData)msg.obj, msg.arg2);
		break;
		case CREATE_BACKUP_AGENT:
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "backupCreateAgent");
		handleCreateBackupAgent((CreateBackupAgentData)msg.obj);
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		break;
		case DESTROY_BACKUP_AGENT:
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "backupDestroyAgent");
		handleDestroyBackupAgent((CreateBackupAgentData)msg.obj);
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		break;
		case SUICIDE:
		Process.killProcess(Process.myPid());
		break;
		case REMOVE_PROVIDER:
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "providerRemove");
		completeRemoveProvider((IContentProvider)msg.obj);
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		break;
		case ENABLE_JIT:
		ensureJitEnabled();
		break;
		case DISPATCH_PACKAGE_BROADCAST:
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "broadcastPackage");
		handleDispatchPackageBroadcast(msg.arg1, (String[])msg.obj);
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		break;
		case SCHEDULE_CRASH:
		throw new RemoteServiceException((String)msg.obj);
		@@ -1305,16 +1360,22 @@ public final class ActivityThread {
		handleDumpProvider((DumpComponentInfo)msg.obj);
		break;
		case SLEEPING:
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "sleeping");
		handleSleeping((IBinder)msg.obj, msg.arg1 != 0);
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		break;
		case SET_CORE_SETTINGS:
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "setCoreSettings");
		handleSetCoreSettings((Bundle) msg.obj);
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		break;
		case UPDATE_PACKAGE_COMPATIBILITY_INFO:
		handleUpdatePackageCompatibilityInfo((UpdateCompatibilityData)msg.obj);
		break;
		case TRIM_MEMORY:
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "trimMemory");
		handleTrimMemory(msg.arg1);
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		break;
		}
		if (DEBUG_MESSAGES) Slog.v(TAG, "<<< done: " + msg.what);

core/java/android/app/LoadedApk.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ import android.os.IBinder;
		import android.os.Process;
		import android.os.RemoteException;
		import android.os.StrictMode;
		import android.os.Trace;
		import android.os.UserId;
		import android.util.AndroidRuntimeException;
		import android.util.Slog;
		@@ -745,6 +746,7 @@ public final class LoadedApk {
		return;
		}

		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "broadcastReceiveReg");
		try {
		ClassLoader cl = mReceiver.getClass().getClassLoader();
		intent.setExtrasClassLoader(cl);
		@@ -759,6 +761,7 @@ public final class LoadedApk {
		}
		if (mInstrumentation == null \|\|
		!mInstrumentation.onException(mReceiver, e)) {
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		throw new RuntimeException(
		"Error receiving broadcast " + intent
		+ " in " + mReceiver, e);
		@@ -768,6 +771,7 @@ public final class LoadedApk {
		if (receiver.getPendingResult() != null) {
		finish();
		}
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		}
		}

core/java/android/os/Trace.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,8 @@ public final class Trace {
		public static final long TRACE_TAG_INPUT = 1L << 2;
		public static final long TRACE_TAG_VIEW = 1L << 3;
		public static final long TRACE_TAG_WEBVIEW = 1L << 4;
		public static final long TRACE_TAG_WINDOW_MANAGER = 1L << 5;
		public static final long TRACE_TAG_ACTIVITY_MANAGER = 1L << 6;

		private static final long sEnabledTags = nativeGetEnabledTags();

services/java/com/android/server/wm/WindowManagerService.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -91,6 +91,7 @@ import android.os.StrictMode;
		import android.os.SystemClock;
		import android.os.SystemProperties;
		import android.os.TokenWatcher;
		import android.os.Trace;
		import android.provider.Settings;
		import android.util.DisplayMetrics;
		import android.util.EventLog;
		@@ -631,6 +632,7 @@ public class WindowManagerService extends IWindowManager.Stub
		// Update animations of all applications, including those
		// associated with exiting/removed apps
		synchronized (mAnimator) {
		Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "wmAnimate");
		final ArrayList<WindowStateAnimator> winAnimators = mAnimator.mWinAnimators;
		winAnimators.clear();
		final int N = mWindows.size();
		@@ -641,6 +643,7 @@ public class WindowManagerService extends IWindowManager.Stub
		}
		}
		mAnimator.animate();
		Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);
		}
		}
		}
		@@ -7518,6 +7521,7 @@ public class WindowManagerService extends IWindowManager.Stub
		return;
		}

		Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "wmLayout");
		mInLayout = true;
		boolean recoveringMemory = false;

		@@ -7562,7 +7566,10 @@ public class WindowManagerService extends IWindowManager.Stub
		mInLayout = false;
		assignLayersLocked();
		mLayoutNeeded = true;
		// XXX this recursion seems broken!
		Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);
		performLayoutAndPlaceSurfacesLocked();
		Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "wmLayout");

		} else {
		mInLayout = false;
		@@ -7587,6 +7594,8 @@ public class WindowManagerService extends IWindowManager.Stub
		mInLayout = false;
		Log.wtf(TAG, "Unhandled exception while laying out windows", e);
		}

		Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);
		}

		private final void performLayoutLockedInner(boolean initial, boolean updateInputWindows) {
		@@ -8814,6 +8823,7 @@ public class WindowManagerService extends IWindowManager.Stub
		private boolean updateFocusedWindowLocked(int mode, boolean updateInputWindows) {
		WindowState newFocus = computeFocusedWindowLocked();
		if (mCurrentFocus != newFocus) {
		Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "wmUpdateFocus");
		// This check makes sure that we don't already have the focus
		// change message pending.
		mH.removeMessages(H.REPORT_FOCUS_CHANGE);
		@@ -8856,6 +8866,8 @@ public class WindowManagerService extends IWindowManager.Stub
		// doing this part.
		finishUpdateFocusedWindowAfterAssignLayersLocked(updateInputWindows);
		}

		Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);
		return true;
		}
		return false;