commit 5643815efa7125e77c164decc203d3c33d30c720
author Mark Salyzyn <salyzyn@google.com> Wed Nov 04 00:43:03 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 04 00:43:03 2015 +0000
tree 50fc448ec142ba68309b0febc772123cff74c65b
parent 26a4a5d2e905cd4ffe0777252fdd92f4cb842dfc
parent 0ac1ad3f65f0a86627c9c3d7df123d1dd458c148

Merge "logd: pruning time horizon"
am: 183df3ddf7

* commit '183df3ddf72e5b7685f8fe4ae4c1f918968afa5d':
  logd: pruning time horizon

logd/LogBuffer.cpp

diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp
index 1de8e64..4ada788 100644
--- a/logd/LogBuffer.cpp
+++ b/logd/LogBuffer.cpp
@@ -436,7 +436,10 @@
                     worst_sizes = sorted[0]->getSizes();
                     // Calculate threshold as 12.5% of available storage
                     size_t threshold = log_buffer_size(id) / 8;
-                    if (worst_sizes > threshold) {
+                    if ((worst_sizes > threshold)
+                        // Allow time horizon to extend roughly tenfold, assume
+                        // average entry length is 100 characters.
+                            && (worst_sizes > (10 * sorted[0]->getDropped()))) {
                         worst = sorted[0]->getKey();
                         second_worst_sizes = sorted[1]->getSizes();
                         if (second_worst_sizes < threshold) {