commit 7514558b81615913829d523e586e7b7be8db5aef
author Tom Cherry <tomcherry@google.com> Wed Aug 21 13:43:45 2019 -0700
committer Tom Cherry <tomcherry@google.com> Thu Apr 09 17:23:34 2020 +0000
tree 168b4bfd6d79f5117498a578986eb916f7ea663c
parent 5e2665500f52d508f5cca522226f0f27979c3b60

Revert "logd: regression in handling watermark boundary."

This reverts commit 5836379b2114f47c53485b42ab157104c29b2c4e.

Bug: 149340579
Test: logcat output looks sane
Change-Id: Ia2bbf01a20fec59b989d206a089d8e65062816ef

logd/LogBuffer.cpp

diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp
index 28ea089..f21b94c 100644
--- a/logd/LogBuffer.cpp
+++ b/logd/LogBuffer.cpp
@@ -43,8 +43,6 @@
 // Default
 #define log_buffer_size(id) mMaxSize[id]
 
-const log_time LogBuffer::pruneMargin(3, 0);
-
 void LogBuffer::init() {
     log_id_for_each(i) {
         mLastSet[i] = false;
@@ -664,8 +662,6 @@
         }
         times++;
     }
-    log_time watermark(log_time::tv_sec_max, log_time::tv_nsec_max);
-    if (oldest) watermark = oldest->mStart - pruneMargin;
 
     LogBufferElementCollection::iterator it;
 
@@ -687,7 +683,7 @@
                 mLastSet[id] = true;
             }
 
-            if (oldest && (watermark <= element->getRealTime())) {
+            if (oldest && (oldest->mStart <= element->getRealTime().nsec())) {
                 busy = true;
                 kickMe(oldest, id, pruneRows);
                 break;
@@ -775,7 +771,7 @@
         while (it != mLogElements.end()) {
             LogBufferElement* element = *it;
 
-            if (oldest && (watermark <= element->getRealTime())) {
+            if (oldest && (oldest->mStart <= element->getRealTime().nsec())) {
                 busy = true;
                 // Do not let chatty eliding trigger any reader mitigation
                 break;
@@ -927,7 +923,7 @@
             mLastSet[id] = true;
         }
 
-        if (oldest && (watermark <= element->getRealTime())) {
+        if (oldest && (oldest->mStart <= element->getRealTime().nsec())) {
             busy = true;
             if (!whitelist) kickMe(oldest, id, pruneRows);
             break;
@@ -960,7 +956,7 @@
                 mLastSet[id] = true;
             }
 
-            if (oldest && (watermark <= element->getRealTime())) {
+            if (oldest && (oldest->mStart <= element->getRealTime().nsec())) {
                 busy = true;
                 kickMe(oldest, id, pruneRows);
                 break;
@@ -1065,7 +1061,6 @@
     } else {
         // Cap to 300 iterations we look back for out-of-order entries.
         size_t count = 300;
-
         // Client wants to start from some specified time. Chances are
         // we are better off starting from the end of the time sorted list.
         LogBufferElementCollection::iterator last;