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

Merge "Revert "logd: remove start filtration from flushTo""

Browse source 
am: 8cfd2971ec

Change-Id: Ic52a26216b04ee36b15f4665d9c7741079e192ea
This commit is contained in:
Mark Salyzyn 2017-05-17 21:41:08 +00:00 • committed by android-build-merger
commit f111b04f15
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; continue;
} }
if (element->getRealTime() <= start) {
continue;
}
// NB: calling out to another object with wrlock() held (safe) // NB: calling out to another object with wrlock() held (safe)
if (filter) { if (filter) {
int ret = (*filter)(element, arg); int ret = (*filter)(element, arg);
@ -1168,10 +1172,11 @@ log_time LogBuffer::flushTo(SocketClient* reader, const log_time& start,
unlock(); unlock();
// range locking in LastLogTimes looks after us // 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 (max == element->FLUSH_ERROR) {
if (next > max) max = next; return max;
}
skip = maxSkip; skip = maxSkip;
rdlock(); rdlock();