ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "logd: remove start filtration from flushTo"

Browse source 
Regressed by introducing too much overlap in the results.

This reverts commit 982ad208b5.

Bug: 38341453
Change-Id: I9d630a6b9f3e464f523424b640090f7e268da9bd
This commit is contained in:
Mark Salyzyn 2017-05-17 19:55:12 +00:00
parent 982ad208b5
commit eb45db2cf4
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
logd/LogBuffer.cpp
View file

@ -1142,6 +1142,10 @@ log_time LogBuffer::flushTo(SocketClient* reader, const log_time& start,
continue;
}
if (element->getRealTime() <= start) {
continue;
}
// NB: calling out to another object with wrlock() held (safe)
if (filter) {
int ret = (*filter)(element, arg);
@ -1168,10 +1172,11 @@ log_time LogBuffer::flushTo(SocketClient* reader, const log_time& start,
unlock();
// range locking in LastLogTimes looks after us
log_time next = element->flushTo(reader, this, privileged, sameTid);
max = element->flushTo(reader, this, privileged, sameTid);
if (next == element->FLUSH_ERROR) return next;
if (next > max) max = next;
if (max == element->FLUSH_ERROR) {
return max;
}
skip = maxSkip;
rdlock();