commit a70505d0ae87df242cd73c43e976325f1c69c6b2
author Mark Salyzyn <salyzyn@google.com> Thu Sep 01 15:48:36 2016 -0700
committer Mark Salyzyn <salyzyn@google.com> Fri Sep 02 07:41:27 2016 -0700
tree 6ee18e3b277e89e33d00d01e704e865b8e1bb29b
parent 42fba517adb486a34f56e078edc9151c564cc523

logd: clear all from non system user status request

pruneRows not necessarily ULONG_MAX when uid not system source,
allow for speed up for status response if pruneRows exhausted.

Change-Id: I38c76bb20215e3d96513a575e2e3bc85a5e5b41c

logd/LogBuffer.cpp

diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp
index 0b195a6..1ecf99c 100644
--- a/logd/LogBuffer.cpp
+++ b/logd/LogBuffer.cpp
@@ -508,7 +508,8 @@
     LogBufferElementCollection::iterator it;
 
     if (caller_uid != AID_ROOT) {
-        // Only here if clearAll condition (pruneRows == ULONG_MAX)
+        // Only here if clear all request from non system source, so chatty
+        // filter logistics is not required.
         it = mLastSet[id] ? mLast[id] : mLogElements.begin();
         while (it != mLogElements.end()) {
             LogBufferElement *element = *it;
@@ -534,7 +535,9 @@
             }
 
             it = erase(it);
-            pruneRows--;
+            if (--pruneRows == 0) {
+                break;
+            }
         }
         LogTimeEntry::unlock();
         return busy;