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

Commit 0caac497 authored by Joe Onorato's avatar Joe Onorato Committed by android-build-merger
Browse files

Merge "Make logd more aggressive when scanning for the position from which to... 

Merge "Make logd more aggressive when scanning for the position from which to resume logging." into pi-dev am: 4ae7d5c3
am: b3063a28

Change-Id: Idb1e5fe14452c529bad81bc56f4f0d985a995e12
parents 6e08ad9a b3063a28

logd/LogBuffer.cpp

+1 −4
Original line number Diff line number Diff line
@@ -1115,9 +1115,6 @@ log_time LogBuffer::flushTo(SocketClient* reader, const log_time& start, 
        // client wants to start from the beginning

        it = mLogElements.begin();

    } else {

        // 3 second limit to continue search for out-of-order entries.

        log_time min = start - pruneMargin;



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

        size_t count = 300;
@@ -1133,7 +1130,7 @@ log_time LogBuffer::flushTo(SocketClient* reader, const log_time& start, 
            } else if (element->getRealTime() == start) {

                last = ++it;

                break;

            } else if (!--count || (element->getRealTime() < min)) {

            } else if (!--count) {

                break;

            }

        }