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

Merge "logd: cap out-of-order entry search" into oc-dev

Browse source
This commit is contained in:
Mark Salyzyn 2017-04-04 20:49:07 +00:00 • committed by Android (Google) Code Review
commit 3dcd014ef4
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
logd/LogBuffer.cpp
View file

@ -1093,8 +1093,10 @@ log_time LogBuffer::flushTo(SocketClient* reader, const log_time& start,
it = mLogElements.begin();
} else {
LogBufferElementCollection::iterator last;
// 30 second limit to continue search for out-of-order entries.
log_time min = start - log_time(30, 0);
// 3 second limit to continue search for out-of-order entries.
log_time min = start - log_time(3, 0);
// Cap to 300 iterations we look back for out-of-order entries.
size_t count = 300;
// Client wants to start from some specified time. Chances are
// we are better off starting from the end of the time sorted list.
for (last = it = mLogElements.end(); it != mLogElements.begin();
@ -1103,7 +1105,7 @@ log_time LogBuffer::flushTo(SocketClient* reader, const log_time& start,
LogBufferElement* element = *it;
if (element->getRealTime() > start) {
last = it;
} else if (element->getRealTime() < min) {
} else if (!--count || (element->getRealTime() < min)) {
break;
}
}