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: cap out-of-order entry search" am: b15882faab am: 1b559e2f8d 

am: 3cb28fd064

Change-Id: I78eae5076547e541c09e0a8d9c684c9a3e358e57
This commit is contained in:
Mark Salyzyn 2017-04-04 20:22:03 +00:00 committed by android-build-merger
parent 7ecf6c0e79 3cb28fd064
commit 5adcb3e3e7
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;
}
}