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

Merge "logd: print a message when kicking a client or skipping entries"

Browse source
This commit is contained in:
Tom Cherry 2019-11-21 16:24:55 +00:00 • committed by Gerrit Code Review
commit 6d4e9b1920
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
logd/LogBuffer.cpp
View file

@ -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% if (stats.sizes(id) > (2 * log_buffer_size(id))) { // +100%
// A misbehaving or slow reader has its connection // A misbehaving or slow reader has its connection
// dropped if we hit too much memory pressure. // 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(); me->release_Locked();
} else if (me->mTimeout.tv_sec || me->mTimeout.tv_nsec) { } else if (me->mTimeout.tv_sec || me->mTimeout.tv_nsec) {
// Allow a blocked WRAP timeout reader to // 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(); me->triggerReader_Locked();
} else { } else {
// tell slow reader to skip entries to catch up // 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); me->triggerSkip_Locked(id, pruneRows);
} }
} }
@ -1051,6 +1056,9 @@ bool LogBuffer::clear(log_id_t id, uid_t uid) {
LogTimeEntry* entry = times->get(); LogTimeEntry* entry = times->get();
// Killer punch // Killer punch
if (entry->isWatching(id)) { if (entry->isWatching(id)) {
android::prdebug(
"Kicking blocked reader, pid %d, from LogBuffer::clear()\n",
entry->mClient->getPid());
entry->release_Locked(); entry->release_Locked();
} }
times++; times++;