Merge "Clean up debug logging in CombinedMessageQueue" into main (27c1129c) · Commits · e / os / android_frameworks_base

core/java/android/os/CombinedMessageQueue/MessageQueue.java

+43 −26

Original line number	Original line	Diff line number	Diff line
	@@ -654,8 +654,7 @@ public final class MessageQueue {

	while (true) {		while (true) {
	if (DEBUG) {		if (DEBUG) {
	Log.d(TAG_C, "nextMessage loop #" + i);		Log.d(TAG_C, "nextMessage loop #" + i++);
	i++;
	}		}

	mDrainingLock.lock();		mDrainingLock.lock();
	@@ -720,20 +719,26 @@ public final class MessageQueue {
	/* Get the first node from each queue */		/* Get the first node from each queue */
	MessageNode msgNode = first(mPriorityQueue);		MessageNode msgNode = first(mPriorityQueue);
	MessageNode asyncMsgNode = first(mAsyncPriorityQueue);		MessageNode asyncMsgNode = first(mAsyncPriorityQueue);
			final long now = SystemClock.uptimeMillis();

	if (DEBUG) {		if (DEBUG) {
	if (msgNode != null) {		if (msgNode != null) {
	Message msg = msgNode.mMessage;		Message msg = msgNode.mMessage;
	Log.d(TAG_C, "Next found node what: " + msg.what + " when: " + msg.when		Log.d(TAG_C, "Next found node"
	+ " seq: " + msgNode.mInsertSeq + "barrier: "		+ " what: " + msg.what
	+ msgNode.isBarrier() + " now: " + SystemClock.uptimeMillis());		+ " when: " + msg.when
			+ " seq: " + msgNode.mInsertSeq
			+ " barrier: " + msgNode.isBarrier()
			+ " now: " + now);
	}		}
	if (asyncMsgNode != null) {		if (asyncMsgNode != null) {
	Message msg = asyncMsgNode.mMessage;		Message msg = asyncMsgNode.mMessage;
	Log.d(TAG_C, "Next found async node what: " + msg.what + " when: " + msg.when		Log.d(TAG_C, "Next found async node"
	+ " seq: " + asyncMsgNode.mInsertSeq + "barrier: "		+ " what: " + msg.what
	+ asyncMsgNode.isBarrier() + " now: "		+ " when: " + msg.when
	+ SystemClock.uptimeMillis());		+ " seq: " + asyncMsgNode.mInsertSeq
			+ " barrier: " + asyncMsgNode.isBarrier()
			+ " now: " + now);
	}		}
	}		}

	@@ -749,7 +754,6 @@ public final class MessageQueue {
	*/		*/
	MessageNode next = null;		MessageNode next = null;

	long now = SystemClock.uptimeMillis();
	/*		/*
	* If we have a barrier we should return the async node (if it exists and is ready)		* If we have a barrier we should return the async node (if it exists and is ready)
	*/		*/
	@@ -779,19 +783,25 @@ public final class MessageQueue {
	if (DEBUG) {		if (DEBUG) {
	if (found != null) {		if (found != null) {
	Message msg = found.mMessage;		Message msg = found.mMessage;
	Log.d(TAG_C, " Will deliver node what: " + msg.what + " when: " + msg.when		Log.d(TAG_C, "Will deliver node"
	+ " seq: " + found.mInsertSeq + " barrier: " + found.isBarrier()		+ " what: " + msg.what
	+ " async: " + found.isAsync() + " now: "		+ " when: " + msg.when
	+ SystemClock.uptimeMillis());		+ " seq: " + found.mInsertSeq
			+ " barrier: " + found.isBarrier()
			+ " async: " + found.isAsync()
			+ " now: " + now);
	} else {		} else {
	Log.d(TAG_C, "No node to deliver");		Log.d(TAG_C, "No node to deliver");
	}		}
	if (next != null) {		if (next != null) {
	Message msg = next.mMessage;		Message msg = next.mMessage;
	Log.d(TAG_C, "Next node what: " + msg.what + " when: " + msg.when + " seq: "		Log.d(TAG_C, "Next node"
	+ next.mInsertSeq + " barrier: " + next.isBarrier() + " async: "		+ " what: " + msg.what
	+ next.isAsync()		+ " when: " + msg.when
	+ " now: " + SystemClock.uptimeMillis());		+ " seq: " + next.mInsertSeq
			+ " barrier: " + next.isBarrier()
			+ " async: " + next.isAsync()
			+ " now: " + now);
	} else {		} else {
	Log.d(TAG_C, "No next node");		Log.d(TAG_C, "No next node");
	}		}
	@@ -828,9 +838,10 @@ public final class MessageQueue {
	mStackStateTimedPark.mWhenToWake = now + mNextPollTimeoutMillis;		mStackStateTimedPark.mWhenToWake = now + mNextPollTimeoutMillis;
	nextOp = mStackStateTimedPark;		nextOp = mStackStateTimedPark;
	if (DEBUG) {		if (DEBUG) {
	Log.d(TAG_C, "nextMessage next state is StackStateTimedParked timeout ms "		Log.d(TAG_C, "nextMessage next state is StackStateTimedParked"
	+ mNextPollTimeoutMillis + " mWhenToWake: "		+ " timeout ms " + mNextPollTimeoutMillis
	+ mStackStateTimedPark.mWhenToWake + " now " + now);		+ " mWhenToWake: " + mStackStateTimedPark.mWhenToWake
			+ " now: " + now);
	}		}
	}		}
	}		}
	@@ -2168,8 +2179,10 @@ public final class MessageQueue {
	Log.d(TAG_C, "* Dump priority queue");		Log.d(TAG_C, "* Dump priority queue");
	while (iterator.hasNext()) {		while (iterator.hasNext()) {
	MessageNode msgNode = iterator.next();		MessageNode msgNode = iterator.next();
	Log.d(TAG_C, "** MessageNode what: " + msgNode.mMessage.what + " when "		Log.d(TAG_C,
	+ msgNode.mMessage.when + " seq: " + msgNode.mInsertSeq);		"** MessageNode what: " + msgNode.mMessage.what
			+ " when " + msgNode.mMessage.when
			+ " seq: " + msgNode.mInsertSeq);
	}		}
	}		}

	@@ -2896,9 +2909,13 @@ public final class MessageQueue {
	incAndTraceMessageCount(msg, when);		incAndTraceMessageCount(msg, when);

	if (DEBUG) {		if (DEBUG) {
	Log.d(TAG_C, "Insert message what: " + msg.what + " when: " + msg.when + " seq: "		Log.d(TAG_C, "Insert message"
	+ node.mInsertSeq + " barrier: " + node.isBarrier() + " async: "		+ " what: " + msg.what
	+ node.isAsync() + " now: " + SystemClock.uptimeMillis());		+ " when: " + msg.when
			+ " seq: " + node.mInsertSeq
			+ " barrier: " + node.isBarrier()
			+ " async: " + node.isAsync()
			+ " now: " + SystemClock.uptimeMillis());
	}		}

	final Looper myLooper = Looper.myLooper();		final Looper myLooper = Looper.myLooper();