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

am: 83f1cd2ae4

* commit '83f1cd2ae43823e7f1bce2aadd3a7e193f34262f':
  logd: pruning time horizon
This commit is contained in:
Mark Salyzyn 2015-11-04 00:47:27 +00:00 committed by android-build-merger
commit 52aa4244ca

View file

@ -436,7 +436,10 @@ bool LogBuffer::prune(log_id_t id, unsigned long pruneRows, uid_t caller_uid) {
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) {