Merge "Deleting unused ProcessRecordNode list code" into main (1dfaa3ec) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/OomAdjusterImpl.java

+2 −65

Original line number	Diff line number	Diff line
		@@ -374,29 +374,6 @@ public class OomAdjusterImpl extends OomAdjuster {
		node.unlink();
		}

		void append(@NonNull ProcessRecordInternal app) {
		append(app, getCurrentSlot(app));
		}

		void append(@NonNull ProcessRecordInternal app, int targetSlot) {
		append(app.mLinkedNodes[mType], targetSlot);
		}

		void append(@NonNull ProcessRecordNode node, int targetSlot) {
		node.unlink();
		mProcessRecordNodes[targetSlot].append(node);
		}

		private int getCurrentSlot(@NonNull ProcessRecordInternal app) {
		switch (mType) {
		case ProcessRecordNode.NODE_TYPE_PROC_STATE:
		return processStateToSlot(app.getCurProcState());
		case ProcessRecordNode.NODE_TYPE_ADJ:
		return adjToSlot(app.getCurRawAdj());
		}
		return ADJ_SLOT_INVALID;
		}

		/**
		* A simple version of {@link java.util.LinkedList}, as here we don't allocate new node
		* while adding an object to it.
		@@ -436,13 +413,6 @@ public class OomAdjusterImpl extends OomAdjuster {
		curNode.mNext = node;
		}

		void append(@NonNull ProcessRecordNode node) {
		node.mNext = TAIL;
		node.mPrev = TAIL.mPrev;
		TAIL.mPrev.mNext = node;
		TAIL.mPrev = node;
		}

		@VisibleForTesting
		void reset() {
		if (HEAD.mNext != TAIL) {
		@@ -451,26 +421,6 @@ public class OomAdjusterImpl extends OomAdjuster {
		HEAD.mNext = TAIL;
		TAIL.mPrev = HEAD;
		}

		String toString(int logUid) {
		final StringBuilder sb = new StringBuilder();
		sb.append("LinkedProcessRecordList{");
		sb.append(HEAD);
		sb.append(' ');
		sb.append(TAIL);
		sb.append('[');
		ProcessRecordNode node = HEAD.mNext;
		while (node != TAIL) {
		if (node.mApp != null && node.mApp.uid == logUid) {
		sb.append(node);
		sb.append(',');
		}
		node = node.mNext;
		}
		sb.append(']');
		sb.append('}');
		return sb.toString();
		}
		}
		}

		@@ -668,11 +618,6 @@ public class OomAdjusterImpl extends OomAdjuster {
		ProcessRecordNode.NODE_TYPE_ADJ, ADJ_SLOT_VALUES.length);
		private final OomAdjusterArgs mTmpOomAdjusterArgs = new OomAdjusterArgs();

		void linkProcessRecordToList(@NonNull ProcessRecordInternal app) {
		mProcessRecordProcStateNodes.append(app);
		mProcessRecordAdjNodes.append(app);
		}

		void unlinkProcessRecordFromList(@NonNull ProcessRecordInternal app) {
		mProcessRecordProcStateNodes.unlink(app);
		mProcessRecordAdjNodes.unlink(app);
		@@ -711,20 +656,12 @@ public class OomAdjusterImpl extends OomAdjuster {
		}
		}

		private void updateAdjSlot(ProcessRecordInternal app) {
		mProcessRecordAdjNodes.offer(app);
		}

		private void updateProcStateSlotIfNecessary(ProcessRecordInternal app, int prevProcState) {
		if (app.getCurProcState() != prevProcState) {
		mProcessRecordProcStateNodes.offer(app);
		}
		}

		private void updateProcStateSlot(ProcessRecordInternal app) {
		mProcessRecordProcStateNodes.offer(app);
		}

		@Override
		protected void performUpdateOomAdjLSP(@OomAdjReason int oomAdjReason) {
		mProcessStateCurTop = getTopProcessState();
		@@ -962,8 +899,8 @@ public class OomAdjusterImpl extends OomAdjuster {
		initReachables \|= selfImportanceLoweredLSP(target, prevProcState, prevAdj,
		prevCapability, prevShouldNotFreeze);

		updateProcStateSlot(target);
		updateAdjSlot(target);
		mProcessRecordProcStateNodes.offer(target);
		mProcessRecordAdjNodes.offer(target);
		}

		if (!initReachables) {