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

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

Merge "Revert "logd: remove start filtration from flushTo"" am: 8cfd2971 am:... 

Merge "Revert "logd: remove start filtration from flushTo"" am: 8cfd2971 am: f111b04f am: ef53957a
am: 87265fd5

Change-Id: I2da6c0a7b6ad835e21995f51e5841d583fe1d251
parents 7718e06a 87265fd5

logd/LogBuffer.cpp

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

        }



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

            continue;

        }



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

        if (filter) {

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



        // range locking in LastLogTimes looks after us

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

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



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

        if (next > max) max = next;

        if (max == element->FLUSH_ERROR) {

            return max;

        }



        skip = maxSkip;

        rdlock();