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

Commit 27d54dd4 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "logd: remove start filtration from flushTo" 

am: c8c49988

Change-Id: I7be86455b6bb3930e8e37810208f237df202af31
parents d1a2aac2 c8c49988

logd/LogBuffer.cpp

+3 −8
Original line number Original line Diff line number Diff line
@@ -1142,10 +1142,6 @@ log_time LogBuffer::flushTo(SocketClient* reader, const log_time& start, 
            continue;

            continue;

        }

        }





        if (element->getRealTime() <= start) {

            continue;

        }



        // NB: calling out to another object with wrlock() held (safe)

        // NB: calling out to another object with wrlock() held (safe)

        if (filter) {

        if (filter) {

            int ret = (*filter)(element, arg);

            int ret = (*filter)(element, arg);
@@ -1172,11 +1168,10 @@ log_time LogBuffer::flushTo(SocketClient* reader, const log_time& start, 
        unlock();

        unlock();





        // range locking in LastLogTimes looks after us

        // range locking in LastLogTimes looks after us

        max = element->flushTo(reader, this, privileged, sameTid);

        log_time next = element->flushTo(reader, this, privileged, sameTid);





        if (max == element->FLUSH_ERROR) {

        if (next == element->FLUSH_ERROR) return next;

            return max;

        if (next > max) max = next;

        }





        skip = maxSkip;

        skip = maxSkip;

        rdlock();

        rdlock();