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

Commit 5e266550 authored by Tom Cherry's avatar Tom Cherry
Browse files

Revert "logd: logcat --clear respect pruneMargin" 

This reverts commit 0878a7c1.

This is a partial revert of the above commit.  It simply removes
pruneMargin from these calculations since it is going away.

Bug: 149340579
Test: --clear works well
Change-Id: I1763be56fae7052058a800fad3b295c73cdcadf6
parent c9fa42c0

logd/LogBuffer.cpp

+7 −17
Original line number Diff line number Diff line
@@ -576,16 +576,6 @@ class LogBufferElementLast { 
    }

};



// Determine if watermark is within pruneMargin + 1s from the end of the list,

// the caller will use this result to set an internal busy flag indicating

// the prune operation could not be completed because a reader is blocking

// the request.

bool LogBuffer::isBusy(log_time watermark) {

    LogBufferElementCollection::iterator ei = mLogElements.end();

    --ei;

    return watermark < ((*ei)->getRealTime() - pruneMargin - log_time(1, 0));

}



// If the selected reader is blocking our pruning progress, decide on

// what kind of mitigation is necessary to unblock the situation.

void LogBuffer::kickMe(LogTimeEntry* me, log_id_t id, unsigned long pruneRows) {
@@ -698,8 +688,8 @@ bool LogBuffer::prune(log_id_t id, unsigned long pruneRows, uid_t caller_uid) { 
            }



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

                busy = isBusy(watermark);

                if (busy) kickMe(oldest, id, pruneRows);

                busy = true;

                kickMe(oldest, id, pruneRows);

                break;

            }
@@ -786,7 +776,7 @@ bool LogBuffer::prune(log_id_t id, unsigned long pruneRows, uid_t caller_uid) { 
            LogBufferElement* element = *it;



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

                busy = isBusy(watermark);

                busy = true;

                // Do not let chatty eliding trigger any reader mitigation

                break;

            }
@@ -938,8 +928,8 @@ bool LogBuffer::prune(log_id_t id, unsigned long pruneRows, uid_t caller_uid) { 
        }



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

            busy = isBusy(watermark);

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

            busy = true;

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

            break;

        }
@@ -971,8 +961,8 @@ bool LogBuffer::prune(log_id_t id, unsigned long pruneRows, uid_t caller_uid) { 
            }



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

                busy = isBusy(watermark);

                if (busy) kickMe(oldest, id, pruneRows);

                busy = true;

                kickMe(oldest, id, pruneRows);

                break;

            }

logd/LogBuffer.h

+0 −1
Original line number Diff line number Diff line
@@ -178,7 +178,6 @@ class LogBuffer { 
    static const log_time pruneMargin;



    void maybePrune(log_id_t id);

    bool isBusy(log_time watermark);

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



    bool prune(log_id_t id, unsigned long pruneRows, uid_t uid = AID_ROOT);