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

Merge "logd: worst uid record watermark part three"

Browse source
This commit is contained in:
Mark Salyzyn 2015-08-31 20:52:29 +00:00 • committed by Gerrit Code Review
commit 6bb48f07db
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
logd/LogBuffer.cpp
View file

@ -413,6 +413,12 @@ void LogBuffer::prune(log_id_t id, unsigned long pruneRows, uid_t caller_uid) {
it = f->second; it = f->second;
} }
} }
static const timespec too_old = {
EXPIRE_HOUR_THRESHOLD * 60 * 60, 0
};
LogBufferElementCollection::iterator lastt;
lastt = mLogElements.end();
--lastt;
LogBufferElementLast last; LogBufferElementLast last;
while (it != mLogElements.end()) { while (it != mLogElements.end()) {
LogBufferElement *e = *it; LogBufferElement *e = *it;
@ -464,6 +470,11 @@ void LogBuffer::prune(log_id_t id, unsigned long pruneRows, uid_t caller_uid) {
continue; continue;
} }
if ((e->getRealTime() < ((*lastt)->getRealTime() - too_old))
|| (e->getRealTime() > (*lastt)->getRealTime())) {
break;
}
// unmerged drop message // unmerged drop message
if (dropped) { if (dropped) {
last.add(e); last.add(e);
@ -477,18 +488,6 @@ void LogBuffer::prune(log_id_t id, unsigned long pruneRows, uid_t caller_uid) {
} }
if (e->getUid() != worst) { if (e->getUid() != worst) {
if (leading) {
static const timespec too_old = {
EXPIRE_HOUR_THRESHOLD * 60 * 60, 0
};
LogBufferElementCollection::iterator last;
last = mLogElements.end();
--last;
if ((e->getRealTime() < ((*last)->getRealTime() - too_old))
|| (e->getRealTime() > (*last)->getRealTime())) {
break;
}
}
leading = false; leading = false;
last.clear(e); last.clear(e);
++it; ++it;