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	Diff line number	Diff line
		@@ -654,8 +654,7 @@ public final class MessageQueue {

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

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

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

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

		long now = SystemClock.uptimeMillis();
		/*
		* 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 (found != null) {
		Message msg = found.mMessage;
		Log.d(TAG_C, " Will deliver node what: " + msg.what + " when: " + msg.when
		+ " seq: " + found.mInsertSeq + " barrier: " + found.isBarrier()
		+ " async: " + found.isAsync() + " now: "
		+ SystemClock.uptimeMillis());
		Log.d(TAG_C, "Will deliver node"
		+ " what: " + msg.what
		+ " when: " + msg.when
		+ " seq: " + found.mInsertSeq
		+ " barrier: " + found.isBarrier()
		+ " async: " + found.isAsync()
		+ " now: " + now);
		} else {
		Log.d(TAG_C, "No node to deliver");
		}
		if (next != null) {
		Message msg = next.mMessage;
		Log.d(TAG_C, "Next node what: " + msg.what + " when: " + msg.when + " seq: "
		+ next.mInsertSeq + " barrier: " + next.isBarrier() + " async: "
		+ next.isAsync()
		+ " now: " + SystemClock.uptimeMillis());
		Log.d(TAG_C, "Next node"
		+ " what: " + msg.what
		+ " when: " + msg.when
		+ " seq: " + next.mInsertSeq
		+ " barrier: " + next.isBarrier()
		+ " async: " + next.isAsync()
		+ " now: " + now);
		} else {
		Log.d(TAG_C, "No next node");
		}
		@@ -828,9 +838,10 @@ public final class MessageQueue {
		mStackStateTimedPark.mWhenToWake = now + mNextPollTimeoutMillis;
		nextOp = mStackStateTimedPark;
		if (DEBUG) {
		Log.d(TAG_C, "nextMessage next state is StackStateTimedParked timeout ms "
		+ mNextPollTimeoutMillis + " mWhenToWake: "
		+ mStackStateTimedPark.mWhenToWake + " now " + now);
		Log.d(TAG_C, "nextMessage next state is StackStateTimedParked"
		+ " timeout ms " + mNextPollTimeoutMillis
		+ " mWhenToWake: " + mStackStateTimedPark.mWhenToWake
		+ " now: " + now);
		}
		}
		}
		@@ -2168,8 +2179,10 @@ public final class MessageQueue {
		Log.d(TAG_C, "* Dump priority queue");
		while (iterator.hasNext()) {
		MessageNode msgNode = iterator.next();
		Log.d(TAG_C, "** MessageNode what: " + msgNode.mMessage.what + " when "
		+ msgNode.mMessage.when + " seq: " + msgNode.mInsertSeq);
		Log.d(TAG_C,
		"** MessageNode what: " + msgNode.mMessage.what
		+ " when " + msgNode.mMessage.when
		+ " seq: " + msgNode.mInsertSeq);
		}
		}

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

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

		final Looper myLooper = Looper.myLooper();