Clean up debug logging in CombinedMessageQueue
Flag: EXEMPT refactor
Change-Id: I6f784a12562fcccf1f6727f3a4a6158eec6bc1a3
diff --git a/core/java/android/os/CombinedMessageQueue/MessageQueue.java b/core/java/android/os/CombinedMessageQueue/MessageQueue.java
index 0127a5a..0dbd164 100644
--- a/core/java/android/os/CombinedMessageQueue/MessageQueue.java
+++ b/core/java/android/os/CombinedMessageQueue/MessageQueue.java
@@ -656,8 +656,7 @@
while (true) {
if (DEBUG) {
- Log.d(TAG_C, "nextMessage loop #" + i);
- i++;
+ Log.d(TAG_C, "nextMessage loop #" + i++);
}
mDrainingLock.lock();
@@ -722,20 +721,26 @@
/* 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);
}
}
@@ -751,7 +756,6 @@
*/
MessageNode next = null;
- long now = SystemClock.uptimeMillis();
/*
* If we have a barrier we should return the async node (if it exists and is ready)
*/
@@ -781,19 +785,25 @@
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");
}
@@ -830,9 +840,10 @@
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);
}
}
}
@@ -2179,8 +2190,10 @@
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);
}
}
@@ -2907,9 +2920,13 @@
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();
