commit acf0bebcf92351b3ff2fe1d3cc200717151d727c
author Tom Cherry <tomcherry@google.com> Fri Apr 10 20:53:59 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 10 20:53:59 2020 +0000
tree e2f6a764028b13823755adaf519261b22b1f097c
parent 5d93b127f57e50e799fff680fea2ce3d9206f787
parent ad7d6b210d69a35d6170394b4705e7ff7fdca49f

Merge "Revert "logd: iterator corruption paranoia""

logd/LogBuffer.cpp

diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp
index 5bec076..1f8ad05 100644
--- a/logd/LogBuffer.cpp
+++ b/logd/LogBuffer.cpp
@@ -1072,22 +1072,9 @@
 
     uint64_t curr = start;
 
-    LogBufferElement* lastElement = nullptr;  // iterator corruption paranoia
-    static const size_t maxSkip = 4194304;    // maximum entries to skip
-    size_t skip = maxSkip;
     for (; it != mLogElements.end(); ++it) {
         LogBufferElement* element = *it;
 
-        if (!--skip) {
-            android::prdebug("reader.per: too many elements skipped");
-            break;
-        }
-        if (element == lastElement) {
-            android::prdebug("reader.per: identical elements");
-            break;
-        }
-        lastElement = element;
-
         if (!privileged && (element->getUid() != uid)) {
             continue;
         }
@@ -1128,7 +1115,6 @@
             return curr;
         }
 
-        skip = maxSkip;
         rdlock();
     }
     unlock();