commit 0645b1e2316c4ab3e2ef95ad7c874f1c2c777128
author Mark Salyzyn <salyzyn@google.com> Tue Sep 01 20:31:30 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 01 20:31:30 2015 +0000
tree 9da1007a80695037dace3f36b678956631825aec
parent 6df12a5d42f8e69f45ca2e606624b1aac097ffb7
parent dab530b26597a8d312d74815d581f22aaed399e4

am 3f5c5a1e: Merge "logd: worst uid record watermark part three" into mnc-dr-dev

* commit '3f5c5a1e6986a7cdafc4af10f17ddd631da83e40':
  logd: worst uid record watermark part three

logd/LogBuffer.cpp

diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp
index e732b8e..9605ef8 100644
--- a/logd/LogBuffer.cpp
+++ b/logd/LogBuffer.cpp
@@ -413,6 +413,12 @@
                 it = f->second;
             }
         }
+        static const timespec too_old = {
+            EXPIRE_HOUR_THRESHOLD * 60 * 60, 0
+        };
+        LogBufferElementCollection::iterator lastt;
+        lastt = mLogElements.end();
+        --lastt;
         LogBufferElementLast last;
         while (it != mLogElements.end()) {
             LogBufferElement *e = *it;
@@ -464,6 +470,11 @@
                 continue;
             }
 
+            if ((e->getRealTime() < ((*lastt)->getRealTime() - too_old))
+                    || (e->getRealTime() > (*lastt)->getRealTime())) {
+                break;
+            }
+
             // unmerged drop message
             if (dropped) {
                 last.add(e);
@@ -477,18 +488,6 @@
             }
 
             if (e->getUid() != worst) {
-                if (leading) {
-                    static const timespec too_old = {
-                        EXPIRE_HOUR_THRESHOLD * 60 * 60, 0
-                    };
-                    LogBufferElementCollection::iterator last;
-                    last = mLogElements.end();
-                    --last;
-                    if ((e->getRealTime() < ((*last)->getRealTime() - too_old))
-                            || (e->getRealTime() > (*last)->getRealTime())) {
-                        break;
-                    }
-                }
                 leading = false;
                 last.clear(e);
                 ++it;