openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "logd: remove start filtration from flushTo" 

am: c8c49988b1

Change-Id: I7be86455b6bb3930e8e37810208f237df202af31
This commit is contained in:
Mark Salyzyn 2017-05-16 15:21:23 +00:00 committed by android-build-merger
parent d1a2aac294 c8c49988b1
commit 27d54dd4ac
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();