From 36a87112607b4cef0232f2741b7ba963d564cee2 Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Fri, 15 Jul 2016 09:55:41 -0700 Subject: [PATCH 1/2] logd: drop prdebug inline Makes the prdebug helper accessible for debugging Bug: 30118730 Change-Id: Ieab60fd18221108ae27c54140a25061ab29ca1a3 --- logd/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logd/main.cpp b/logd/main.cpp index 3095f7f9d..69ba89654 100644 --- a/logd/main.cpp +++ b/logd/main.cpp @@ -212,7 +212,7 @@ bool property_get_bool(const char *key, int flag) { } static int fdDmesg = -1; -void inline android::prdebug(const char *fmt, ...) { +void android::prdebug(const char *fmt, ...) { if (fdDmesg < 0) { return; } From 0f858179851ae24e1fe27b4eb3968218b5510ca2 Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Thu, 14 Jul 2016 16:55:20 -0700 Subject: [PATCH 2/2] logd: rename sort() for pids to sortPids() Bug: 30118730 Change-Id: If992b53b52a7470427fbe82abb93c95c1b2dc57a --- logd/LogBuffer.cpp | 4 ++-- logd/LogStatistics.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp index db659780e..e5f9b41ce 100644 --- a/logd/LogBuffer.cpp +++ b/logd/LogBuffer.cpp @@ -573,8 +573,8 @@ bool LogBuffer::prune(log_id_t id, unsigned long pruneRows, uid_t caller_uid) { if ((worst == AID_SYSTEM) && mPrune.worstPidOfSystemEnabled()) { // begin scope of PID sorted list - std::unique_ptr sorted = stats.sort( - worst, (pid_t)0, 2, id, worst); + std::unique_ptr sorted = stats.sortPids( + worst, (pid_t)0, 2, id); if (sorted.get() && sorted[0] && sorted[1]) { worstPid = sorted[0]->getKey(); second_worst_sizes = worst_sizes diff --git a/logd/LogStatistics.h b/logd/LogStatistics.h index b32c27d25..52f1d5b7b 100644 --- a/logd/LogStatistics.h +++ b/logd/LogStatistics.h @@ -455,8 +455,8 @@ public: size_t len, log_id id) { return uidTable[id].sort(uid, pid, len); } - std::unique_ptr sort(uid_t uid, pid_t pid, - size_t len, log_id id, uid_t) { + std::unique_ptr sortPids(uid_t uid, pid_t pid, + size_t len, log_id id) { return pidSystemTable[id].sort(uid, pid, len); }