diff options
author | Steven Laver <lavers@google.com> | 2019-12-12 15:29:36 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-12-12 15:29:36 +0000 |
commit | a239544c7b06814b70fd970de7eaac234682fa52 (patch) | |
tree | a4298d61f9b73642f350799b1157e49b65f4e1e8 /logd/LogBuffer.cpp | |
parent | 63de1e1c8d7824c241f22de67edf54f4f1eaeea5 (diff) | |
parent | 5319412e5305a3b4bcecf251a2955c09a6e9837e (diff) |
Merge "Merge RP1A.191203.001" into r-keystone-qcom-dev
Diffstat (limited to 'logd/LogBuffer.cpp')
-rw-r--r-- | logd/LogBuffer.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp index ba05a064f..834b20b6b 100644 --- a/logd/LogBuffer.cpp +++ b/logd/LogBuffer.cpp @@ -638,6 +638,8 @@ void LogBuffer::kickMe(LogTimeEntry* me, log_id_t id, unsigned long pruneRows) { if (stats.sizes(id) > (2 * log_buffer_size(id))) { // +100% // A misbehaving or slow reader has its connection // dropped if we hit too much memory pressure. + android::prdebug("Kicking blocked reader, pid %d, from LogBuffer::kickMe()\n", + me->mClient->getPid()); me->release_Locked(); } else if (me->mTimeout.tv_sec || me->mTimeout.tv_nsec) { // Allow a blocked WRAP timeout reader to @@ -645,6 +647,9 @@ void LogBuffer::kickMe(LogTimeEntry* me, log_id_t id, unsigned long pruneRows) { me->triggerReader_Locked(); } else { // tell slow reader to skip entries to catch up + android::prdebug( + "Skipping %lu entries from slow reader, pid %d, from LogBuffer::kickMe()\n", + pruneRows, me->mClient->getPid()); me->triggerSkip_Locked(id, pruneRows); } } @@ -1051,6 +1056,9 @@ bool LogBuffer::clear(log_id_t id, uid_t uid) { LogTimeEntry* entry = times->get(); // Killer punch if (entry->isWatching(id)) { + android::prdebug( + "Kicking blocked reader, pid %d, from LogBuffer::clear()\n", + entry->mClient->getPid()); entry->release_Locked(); } times++; |