commit 6867a54cd48a7fb377bb83f5b3fc7e7b8ad9d3ed
author Mark Salyzyn <salyzyn@google.com> Thu Apr 23 14:41:48 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 23 14:41:48 2015 +0000
tree 1c1345810a282393a1cf52b311648de5afb9febd
parent 725f4f785517bbf4f74e4051582921a01acb94cd
parent c16de8e55a2a4cf6686207cbb6563e53e9e71088

Merge "logd: per UID less aggressive 12.5% threshold"

logd/LogBuffer.cpp

diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp
index 83a6b1d..1dced11 100644
--- a/logd/LogBuffer.cpp
+++ b/logd/LogBuffer.cpp
@@ -365,9 +365,16 @@
 
             if (sorted.get()) {
                 if (sorted[0] && sorted[1]) {
-                    worst = sorted[0]->getKey();
                     worst_sizes = sorted[0]->getSizes();
-                    second_worst_sizes = sorted[1]->getSizes();
+                    // Calculate threshold as 12.5% of available storage
+                    size_t threshold = log_buffer_size(id) / 8;
+                    if (worst_sizes > threshold) {
+                        worst = sorted[0]->getKey();
+                        second_worst_sizes = sorted[1]->getSizes();
+                        if (second_worst_sizes < threshold) {
+                            second_worst_sizes = threshold;
+                        }
+                    }
                 }
             }
         }