Merge "Update oom score reference state if activity state is changed" (c4609e81) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/ActivityRecord.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4489,7 +4489,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
	detachChildren();		detachChildren();
	}		}
	if (app != null) {		if (app != null) {
	app.invalidateOomScoreReferenceState(false /* computeNow */);		app.computeProcessActivityState();
	}		}

	switch (state) {		switch (state) {

services/core/java/com/android/server/wm/RootWindowContainer.java

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2728,8 +2728,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
	}, true /* traverseTopToBottom */);		}, true /* traverseTopToBottom */);

	for (int i = mTmpTaskLayerChangedProcs.size() - 1; i >= 0; i--) {		for (int i = mTmpTaskLayerChangedProcs.size() - 1; i >= 0; i--) {
	mTmpTaskLayerChangedProcs.valueAt(i).invalidateOomScoreReferenceState(		mTmpTaskLayerChangedProcs.valueAt(i).computeProcessActivityState();
	true /* computeNow */);
	}		}
	mTmpTaskLayerChangedProcs.clear();		mTmpTaskLayerChangedProcs.clear();
	}		}

services/core/java/com/android/server/wm/WindowProcessController.java

+32 −66

Original line number	Original line	Diff line number	Diff line
	@@ -225,8 +225,19 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio
	@Nullable		@Nullable
	private final BackgroundActivityStartCallback mBackgroundActivityStartCallback;		private final BackgroundActivityStartCallback mBackgroundActivityStartCallback;

	/** The state for oom-adjustment calculation. */		// The bits used for mActivityStateFlags.
	private final OomScoreReferenceState mOomRefState;		private static final int ACTIVITY_STATE_FLAG_IS_VISIBLE = 0x10000000;
			private static final int ACTIVITY_STATE_FLAG_IS_PAUSING_OR_PAUSED = 0x20000000;
			private static final int ACTIVITY_STATE_FLAG_IS_STOPPING = 0x40000000;
			private static final int ACTIVITY_STATE_FLAG_IS_STOPPING_FINISHING = 0x80000000;
			private static final int ACTIVITY_STATE_FLAG_MASK_MIN_TASK_LAYER = 0x0000ffff;

			/**
			* The state for oom-adjustment calculation. The higher 16 bits are the activity states, and the
			* lower 16 bits are the task layer rank (see {@link Task#mLayerRank}). This field is written by
			* window manager and read by activity manager.
			*/
			private volatile int mActivityStateFlags = ACTIVITY_STATE_FLAG_MASK_MIN_TASK_LAYER;

	public WindowProcessController(@NonNull ActivityTaskManagerService atm, ApplicationInfo info,		public WindowProcessController(@NonNull ActivityTaskManagerService atm, ApplicationInfo info,
	String name, int uid, int userId, Object owner,		String name, int uid, int userId, Object owner,
	@@ -240,7 +251,6 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio
	mAtm = atm;		mAtm = atm;
	mDisplayId = INVALID_DISPLAY;		mDisplayId = INVALID_DISPLAY;
	mBackgroundActivityStartCallback = mAtm.getBackgroundActivityStartCallback();		mBackgroundActivityStartCallback = mAtm.getBackgroundActivityStartCallback();
	mOomRefState = new OomScoreReferenceState(this);

	boolean isSysUiPackage = info.packageName.equals(		boolean isSysUiPackage = info.packageName.equals(
	mAtm.getSysUiServiceComponentLocked().getPackageName());		mAtm.getSysUiServiceComponentLocked().getPackageName());
	@@ -707,7 +717,7 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio

	@HotPath(caller = HotPath.OOM_ADJUSTMENT)		@HotPath(caller = HotPath.OOM_ADJUSTMENT)
	public boolean hasVisibleActivities() {		public boolean hasVisibleActivities() {
	return (mOomRefState.mActivityStateFlags & OomScoreReferenceState.FLAG_IS_VISIBLE) != 0;		return (mActivityStateFlags & ACTIVITY_STATE_FLAG_IS_VISIBLE) != 0;
	}		}

	@HotPath(caller = HotPath.LRU_UPDATE)		@HotPath(caller = HotPath.LRU_UPDATE)
	@@ -1000,34 +1010,6 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio
	mHostActivities.remove(r);		mHostActivities.remove(r);
	}		}

	private static class OomScoreReferenceState extends RootWindowContainer.LockedScheduler {
	private static final int FLAG_IS_VISIBLE = 0x10000000;
	private static final int FLAG_IS_PAUSING = 0x20000000;
	private static final int FLAG_IS_STOPPING = 0x40000000;
	private static final int FLAG_IS_STOPPING_FINISHING = 0x80000000;
	/** @see Task#mLayerRank */
	private static final int MASK_MIN_TASK_LAYER = 0x0000ffff;

	private final WindowProcessController mOwner;
	boolean mChanged;

	/**
	* The higher 16 bits are the activity states, and the lower 16 bits are the task layer
	* rank. This field is written by window manager and read by activity manager.
	*/
	volatile int mActivityStateFlags = MASK_MIN_TASK_LAYER;

	OomScoreReferenceState(WindowProcessController owner) {
	super(owner.mAtm);
	mOwner = owner;
	}

	@Override
	public void execute() {
	mOwner.computeOomScoreReferenceStateIfNeeded();
	}
	}

	public interface ComputeOomAdjCallback {		public interface ComputeOomAdjCallback {
	void onVisibleActivity();		void onVisibleActivity();
	void onPausedActivity();		void onPausedActivity();
	@@ -1041,26 +1023,21 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio
	*/		*/
	@HotPath(caller = HotPath.OOM_ADJUSTMENT)		@HotPath(caller = HotPath.OOM_ADJUSTMENT)
	public int computeOomAdjFromActivities(ComputeOomAdjCallback callback) {		public int computeOomAdjFromActivities(ComputeOomAdjCallback callback) {
	final int flags = mOomRefState.mActivityStateFlags;		final int flags = mActivityStateFlags;
	if ((flags & OomScoreReferenceState.FLAG_IS_VISIBLE) != 0) {		if ((flags & ACTIVITY_STATE_FLAG_IS_VISIBLE) != 0) {
	callback.onVisibleActivity();		callback.onVisibleActivity();
	} else if ((flags & OomScoreReferenceState.FLAG_IS_PAUSING) != 0) {		} else if ((flags & ACTIVITY_STATE_FLAG_IS_PAUSING_OR_PAUSED) != 0) {
	callback.onPausedActivity();		callback.onPausedActivity();
	} else if ((flags & OomScoreReferenceState.FLAG_IS_STOPPING) != 0) {		} else if ((flags & ACTIVITY_STATE_FLAG_IS_STOPPING) != 0) {
	callback.onStoppingActivity(		callback.onStoppingActivity(
	(flags & OomScoreReferenceState.FLAG_IS_STOPPING_FINISHING) != 0);		(flags & ACTIVITY_STATE_FLAG_IS_STOPPING_FINISHING) != 0);
	} else {		} else {
	callback.onOtherActivity();		callback.onOtherActivity();
	}		}
	return flags & OomScoreReferenceState.MASK_MIN_TASK_LAYER;		return flags & ACTIVITY_STATE_FLAG_MASK_MIN_TASK_LAYER;
	}

	void computeOomScoreReferenceStateIfNeeded() {
	if (!mOomRefState.mChanged) {
	return;
	}		}
	mOomRefState.mChanged = false;

			void computeProcessActivityState() {
	// Since there could be more than one activities in a process record, we don't need to		// Since there could be more than one activities in a process record, we don't need to
	// compute the OomAdj with each of them, just need to find out the activity with the		// compute the OomAdj with each of them, just need to find out the activity with the
	// "best" state, the order would be visible, pausing, stopping...		// "best" state, the order would be visible, pausing, stopping...
	@@ -1101,36 +1078,25 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio
	finishing &= r.finishing;		finishing &= r.finishing;
	}		}
	}		}
			}

	int stateFlags = minTaskLayer & OomScoreReferenceState.MASK_MIN_TASK_LAYER;		int stateFlags = minTaskLayer & ACTIVITY_STATE_FLAG_MASK_MIN_TASK_LAYER;
	if (visible) {		if (visible) {
	stateFlags \|= OomScoreReferenceState.FLAG_IS_VISIBLE;		stateFlags \|= ACTIVITY_STATE_FLAG_IS_VISIBLE;
	} else if (best == PAUSING) {		} else if (best == PAUSING) {
	stateFlags \|= OomScoreReferenceState.FLAG_IS_PAUSING;		stateFlags \|= ACTIVITY_STATE_FLAG_IS_PAUSING_OR_PAUSED;
	} else if (best == STOPPING) {		} else if (best == STOPPING) {
	stateFlags \|= OomScoreReferenceState.FLAG_IS_STOPPING;		stateFlags \|= ACTIVITY_STATE_FLAG_IS_STOPPING;
	if (finishing) {		if (finishing) {
	stateFlags \|= OomScoreReferenceState.FLAG_IS_STOPPING_FINISHING;		stateFlags \|= ACTIVITY_STATE_FLAG_IS_STOPPING_FINISHING;
	}
	}
	mOomRefState.mActivityStateFlags = stateFlags;
	}		}
	}		}
			mActivityStateFlags = stateFlags;
	void invalidateOomScoreReferenceState(boolean computeNow) {
	mOomRefState.mChanged = true;
	if (computeNow) {
	computeOomScoreReferenceStateIfNeeded();
	return;
	}
	mOomRefState.scheduleIfNeeded();
	}		}

	/** Called when the process has some oom related changes and it is going to update oom-adj. */		/** Called when the process has some oom related changes and it is going to update oom-adj. */
	private void prepareOomAdjustment() {		private void prepareOomAdjustment() {
	mAtm.mRootWindowContainer.rankTaskLayersIfNeeded();		mAtm.mRootWindowContainer.rankTaskLayersIfNeeded();
	// The task layer may not change but the activity state in the same task may change.
	computeOomScoreReferenceStateIfNeeded();
	}		}

	public int computeRelaunchReason() {		public int computeRelaunchReason() {

services/tests/wmtests/src/com/android/server/wm/WindowProcessControllerTests.java

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -291,25 +291,19 @@ public class WindowProcessControllerTests extends WindowTestsBase {
	assertEquals(1 /* minTaskLayer */, mWpc.computeOomAdjFromActivities(callback));		assertEquals(1 /* minTaskLayer */, mWpc.computeOomAdjFromActivities(callback));
	assertEquals(visible, callbackResult[0]);		assertEquals(visible, callbackResult[0]);

	// The oom state will be updated in handler from activity state change.
	callbackResult[0] = 0;		callbackResult[0] = 0;
	activity.mVisibleRequested = false;		activity.mVisibleRequested = false;
	activity.setState(Task.ActivityState.PAUSED, "test");		activity.setState(Task.ActivityState.PAUSED, "test");
	waitHandlerIdle(mAtm.mH);
	mWpc.computeOomAdjFromActivities(callback);		mWpc.computeOomAdjFromActivities(callback);
	assertEquals(paused, callbackResult[0]);		assertEquals(paused, callbackResult[0]);

	// updateProcessInfo with updateOomAdj=true should refresh the state immediately.
	callbackResult[0] = 0;		callbackResult[0] = 0;
	activity.setState(Task.ActivityState.STOPPING, "test");		activity.setState(Task.ActivityState.STOPPING, "test");
	mWpc.updateProcessInfo(false /* updateServiceConnectionActivities */,
	true /* activityChange /, true / updateOomAdj /, false / addPendingTopUid */);
	mWpc.computeOomAdjFromActivities(callback);		mWpc.computeOomAdjFromActivities(callback);
	assertEquals(stopping, callbackResult[0]);		assertEquals(stopping, callbackResult[0]);

	callbackResult[0] = 0;		callbackResult[0] = 0;
	activity.setState(Task.ActivityState.STOPPED, "test");		activity.setState(Task.ActivityState.STOPPED, "test");
	waitHandlerIdle(mAtm.mH);
	mWpc.computeOomAdjFromActivities(callback);		mWpc.computeOomAdjFromActivities(callback);
	assertEquals(other, callbackResult[0]);		assertEquals(other, callbackResult[0]);
	}		}