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

Merge "logd: worst-UID only to preserve a day"

Browse source
This commit is contained in:
Mark Salyzyn 2015-05-20 17:00:09 +00:00 committed by Gerrit Code Review
commit 9ab8c97331
2 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
logd/LogBuffer.cpp
View file

@ -295,7 +295,8 @@ public:
ssize_t index = -1;
while((index = next(index)) >= 0) {
LogBufferElement *l = editEntryAt(index).getLast();
if ((l->getDropped() >= 4) && (current > l->getRealTime().nsec())) {
if ((l->getDropped() >= EXPIRE_THRESHOLD)
&& (current > l->getRealTime().nsec())) {
removeAt(index);
index = -1;
}
@ -387,6 +388,7 @@ void LogBuffer::prune(log_id_t id, unsigned long pruneRows, uid_t caller_uid) {
bool kick = false;
bool leading = true;
LogBufferElementLast last;
log_time start(log_time::EPOCH);
for(it = mLogElements.begin(); it != mLogElements.end();) {
LogBufferElement *e = *it;
@ -446,11 +448,29 @@ void LogBuffer::prune(log_id_t id, unsigned long pruneRows, uid_t caller_uid) {
}
if (e->getUid() != worst) {
if (start != log_time::EPOCH) {
static const timespec too_old = {
EXPIRE_HOUR_THRESHOLD * 60 * 60, 0
};
start = e->getRealTime() + too_old;
}
last.clear(e);
++it;
continue;
}
if ((start != log_time::EPOCH) && (e->getRealTime() > start)) {
// KISS. Really a heuristic rather than algorithmically strong,
// a crude mechanism, the following loops will move the oldest
// watermark possibly wiping out the extra EXPIRE_HOUR_THRESHOLD
// we just thought we were preserving. We count on the typical
// pruneRows of 10% of total not being a sledgehammer.
// A stronger algorithm would have us loop back to the top if
// we have worst-UID enabled and we start expiring messages
// below less than EXPIRE_HOUR_THRESHOLD old.
break;
}
pruneRows--;
if (pruneRows == 0) {
break;

5
logd/LogBufferElement.h
View file

@ -48,6 +48,11 @@ static inline bool worstUidEnabledForLogid(log_id_t id) {
class LogBuffer;
#define EXPIRE_HOUR_THRESHOLD 24 // Only expire chatty UID logs to preserve
// non-chatty UIDs less than this age in hours
#define EXPIRE_THRESHOLD 4 // A smaller expire count is considered too
// chatty for the temporal expire messages
class LogBufferElement {
const log_id_t mLogId;
const uid_t mUid;