commit 4ccdab7b251522a4dbd464bb586fcc0a42a31169
author Mark Salyzyn <salyzyn@google.com> Mon Aug 24 13:43:27 2015 -0700
committer Mark Salyzyn <salyzyn@google.com> Mon Aug 31 13:55:54 2015 -0700
tree 3de019991d211023445d2ee38707ce76a0a6fe0b
parent d615e8b32dc8662079a34aaa07e52a56d47ae672

logd: worst uid record watermark part deux

(cherry pick from commit 49afe0d00fdc163e5b8a1ab2f859c4688613d5b8)

Only record watermark if not known, or represents the worst UID
currently under focus. This has resulted in a halving of the average
prune time in the face of heavy spam because we get less processing
spikes.

Bug: 23327476
Bug: 23681639
Bug: 23685592
Change-Id: I19f297042b9fc2c98d902695c1c36df1bf5cd6f6

logd/LogBuffer.cpp

diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp
index db3f26c..e732b8e 100644
--- a/logd/LogBuffer.cpp
+++ b/logd/LogBuffer.cpp
@@ -467,7 +467,11 @@
             // unmerged drop message
             if (dropped) {
                 last.add(e);
-                mLastWorstUid[id][e->getUid()] = it;
+                if ((e->getUid() == worst)
+                        || (mLastWorstUid[id].find(e->getUid())
+                            == mLastWorstUid[id].end())) {
+                    mLastWorstUid[id][e->getUid()] = it;
+                }
                 ++it;
                 continue;
             }