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

Commit 7514558b authored by Tom Cherry's avatar Tom Cherry
Browse files

Revert "logd: regression in handling watermark boundary." 

This reverts commit 5836379b.

Bug: 149340579
Test: logcat output looks sane
Change-Id: Ia2bbf01a20fec59b989d206a089d8e65062816ef
parent 5e266550

logd/LogBuffer.cpp

+4 −9
Original line number Diff line number Diff line
@@ -43,8 +43,6 @@ 
// Default

#define log_buffer_size(id) mMaxSize[id]



const log_time LogBuffer::pruneMargin(3, 0);



void LogBuffer::init() {

    log_id_for_each(i) {

        mLastSet[i] = false;
@@ -664,8 +662,6 @@ bool LogBuffer::prune(log_id_t id, unsigned long pruneRows, uid_t caller_uid) { 
        }

        times++;

    }

    log_time watermark(log_time::tv_sec_max, log_time::tv_nsec_max);

    if (oldest) watermark = oldest->mStart - pruneMargin;



    LogBufferElementCollection::iterator it;
@@ -687,7 +683,7 @@ bool LogBuffer::prune(log_id_t id, unsigned long pruneRows, uid_t caller_uid) { 
                mLastSet[id] = true;

            }



            if (oldest && (watermark <= element->getRealTime())) {

            if (oldest && (oldest->mStart <= element->getRealTime().nsec())) {

                busy = true;

                kickMe(oldest, id, pruneRows);

                break;
@@ -775,7 +771,7 @@ bool LogBuffer::prune(log_id_t id, unsigned long pruneRows, uid_t caller_uid) { 
        while (it != mLogElements.end()) {

            LogBufferElement* element = *it;



            if (oldest && (watermark <= element->getRealTime())) {

            if (oldest && (oldest->mStart <= element->getRealTime().nsec())) {

                busy = true;

                // Do not let chatty eliding trigger any reader mitigation

                break;
@@ -927,7 +923,7 @@ bool LogBuffer::prune(log_id_t id, unsigned long pruneRows, uid_t caller_uid) { 
            mLastSet[id] = true;

        }



        if (oldest && (watermark <= element->getRealTime())) {

        if (oldest && (oldest->mStart <= element->getRealTime().nsec())) {

            busy = true;

            if (!whitelist) kickMe(oldest, id, pruneRows);

            break;
@@ -960,7 +956,7 @@ bool LogBuffer::prune(log_id_t id, unsigned long pruneRows, uid_t caller_uid) { 
                mLastSet[id] = true;

            }



            if (oldest && (watermark <= element->getRealTime())) {

            if (oldest && (oldest->mStart <= element->getRealTime().nsec())) {

                busy = true;

                kickMe(oldest, id, pruneRows);

                break;
@@ -1065,7 +1061,6 @@ log_time LogBuffer::flushTo(SocketClient* reader, const log_time& start, 
    } else {

        // Cap to 300 iterations we look back for out-of-order entries.

        size_t count = 300;



        // Client wants to start from some specified time. Chances are

        // we are better off starting from the end of the time sorted list.

        LogBufferElementCollection::iterator last;

logd/LogBuffer.h

+0 −1
Original line number Diff line number Diff line
@@ -175,7 +175,6 @@ class LogBuffer { 
   private:

    static constexpr size_t minPrune = 4;

    static constexpr size_t maxPrune = 256;

    static const log_time pruneMargin;



    void maybePrune(log_id_t id);

    void kickMe(LogTimeEntry* me, log_id_t id, unsigned long pruneRows);