tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "logd: remove start filtration from flushTo" am: c8c49988b1

Browse source 
am: 27d54dd4ac

Change-Id: Ied7a62d1ec231da5b6969c7642d4843912bf6203
This commit is contained in:
Mark Salyzyn 2017-05-16 15:24:23 +00:00 committed by android-build-merger
commit 8ab4f5eafc
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
logd/LogBuffer.cpp
View file

@ -1142,10 +1142,6 @@ 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);
@ -1172,11 +1168,10 @@ log_time LogBuffer::flushTo(SocketClient* reader, const log_time& start,
unlock();
// range locking in LastLogTimes looks after us
max = element->flushTo(reader, this, privileged, sameTid);
log_time next = element->flushTo(reader, this, privileged, sameTid);
if (max == element->FLUSH_ERROR) {
return max;
}
if (next == element->FLUSH_ERROR) return next;
if (next > max) max = next;
skip = maxSkip;
rdlock();