commit 3e4fe7852f87a63ccbcd6631e5fb5fb937586681
author Mark Salyzyn <salyzyn@google.com> Wed Nov 04 00:31:53 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 04 00:31:53 2015 +0000
tree 065e607411efd4add5ea70e9fec85f84f5bf75a9
parent 0ac1ad3f65f0a86627c9c3d7df123d1dd458c148
parent 029215bbfcddf856b02527dec5f19e782777764e

Merge "liblog: logd: support logd.timestamp = monotonic"

logd/LogBuffer.cpp

diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp
index c661203..fd5c066 100644
--- a/logd/LogBuffer.cpp
+++ b/logd/LogBuffer.cpp
@@ -476,7 +476,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) {