commit b76b98ef7dd1fb5ba4ec8dc737840f3b10fda495
author Mark Salyzyn <salyzyn@google.com> Wed Jan 20 01:26:03 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 20 01:26:03 2016 +0000
tree ef790da82caa369493a02edc0dab541a83c01f82
parent f0ce1823a07c79d5e49483e9b977b51d0472b8b8
parent df1ea7060e41c2f5bcfe6d646898ac9036f9b33c

Merge "logd: prune maintain per-id watermark (part deux)"
am: 390100305b

* commit '390100305b032d0d6bd42a1797c01b35c714d13f':
  logd: prune maintain per-id watermark (part deux)

logd/LogBuffer.cpp

diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp
index cdf5d08..9e0d451 100644
--- a/logd/LogBuffer.cpp
+++ b/logd/LogBuffer.cpp
@@ -332,13 +332,21 @@
         }
     }
 
-    bool setLast = mLastSet[id] && (it == mLast[id]);
+    bool setLast[LOG_ID_MAX];
+    bool doSetLast = false;
+    log_id_for_each(i) {
+        doSetLast |= setLast[i] = mLastSet[i] && (it == mLast[i]);
+    }
     it = mLogElements.erase(it);
-    if (setLast) {
-        if (it == mLogElements.end()) { // unlikely
-            mLastSet[id] = false;
-        } else {
-            mLast[id] = it;
+    if (doSetLast) {
+        log_id_for_each(i) {
+            if (setLast[i]) {
+                if (it == mLogElements.end()) { // unlikely
+                    mLastSet[i] = false;
+                } else {
+                    mLast[i] = it;
+                }
+            }
         }
     }
     if (coalesce) {