Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c50033e authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes If992b53b,Ieab60fd1 

* changes:
  logd: rename sort() for pids to sortPids()
  logd: drop prdebug inline
parents 7a8e0c13 0f858179

logd/LogBuffer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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<const PidEntry *[]> sorted = stats.sort(

                    worst, (pid_t)0, 2, id, worst);

                std::unique_ptr<const PidEntry *[]> 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

logd/LogStatistics.h

+2 −2
Original line number Diff line number Diff line
@@ -455,8 +455,8 @@ public: 
                                             size_t len, log_id id) {

        return uidTable[id].sort(uid, pid, len);

    }

    std::unique_ptr<const PidEntry *[]> sort(uid_t uid, pid_t pid,

                                             size_t len, log_id id, uid_t) {

    std::unique_ptr<const PidEntry *[]> sortPids(uid_t uid, pid_t pid,

                                             size_t len, log_id id) {

        return pidSystemTable[id].sort(uid, pid, len);

    }

logd/main.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }