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

am f94727b4: am 40502e1a: Merge "logd: ratelimit drop messages to 1/sec" 

* commit 'f94727b4c6b10be576e145415bd6493a5e81c4a1':
  logd: ratelimit drop messages to 1/sec
This commit is contained in:
Mark Salyzyn 2015-04-23 14:51:26 +00:00 committed by Android Git Automerger
parent 8a457c7927 f94727b4c6
commit 92391131c4
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
logd/LogBuffer.cpp
View File

@ -247,7 +247,7 @@ public:
uint64_t getKey() { return value; }
};
struct LogBufferElementEntry {
class LogBufferElementEntry {
const uint64_t key;
LogBufferElement *last;
@ -259,8 +259,9 @@ public:
LogBufferElement *getLast() { return last; }
};
struct LogBufferElementLast : public android::BasicHashtable<uint64_t, LogBufferElementEntry> {
class LogBufferElementLast : public android::BasicHashtable<uint64_t, LogBufferElementEntry> {
public:
bool merge(LogBufferElement *e, unsigned short dropped) {
LogBufferElementKey key(e->getUid(), e->getPid(), e->getTid());
android::hash_t hash = android::hash_type(key.getKey());
@ -286,6 +287,21 @@ struct LogBufferElementLast : public android::BasicHashtable<uint64_t, LogBuffer
add(hash, LogBufferElementEntry(key.getKey(), e));
}
inline void clear() {
android::BasicHashtable<uint64_t, LogBufferElementEntry>::clear();
}
void clear(LogBufferElement *e) {
uint64_t current = e->getRealTime().nsec() - NS_PER_SEC;
ssize_t index = -1;
while((index = next(index)) >= 0) {
if (current > editEntryAt(index).getLast()->getRealTime().nsec()) {
removeAt(index);
index = -1;
}
}
}
};
// prune "pruneRows" of type "id" from the buffer.
@ -395,7 +411,7 @@ void LogBuffer::prune(log_id_t id, unsigned long pruneRows, uid_t caller_uid) {
leading = false;
if (hasBlacklist && mPrune.naughty(e)) {
last.clear();
last.clear(e);
it = erase(it);
if (dropped) {
continue;
@ -423,7 +439,7 @@ void LogBuffer::prune(log_id_t id, unsigned long pruneRows, uid_t caller_uid) {
}
if (e->getUid() != worst) {
last.clear();
last.clear(e);
++it;
continue;
}