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

Commit 3aaca7dd authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I38c76bb2,I81a55e92 

* changes:
  logd: clear all from non system user status request
  logd: crash in prune mLastWorstPidOfSystem
parents b7aef300 43a5f31e

logd/LogBuffer.cpp

+6 −3
Original line number Original line Diff line number Diff line
@@ -508,7 +508,8 @@ bool LogBuffer::prune(log_id_t id, unsigned long pruneRows, uid_t caller_uid) { 
    LogBufferElementCollection::iterator it;

    LogBufferElementCollection::iterator it;





    if (caller_uid != AID_ROOT) {

    if (caller_uid != AID_ROOT) {

        // Only here if clearAll condition (pruneRows == ULONG_MAX)

        // Only here if clear all request from non system source, so chatty

        // filter logistics is not required.

        it = mLastSet[id] ? mLast[id] : mLogElements.begin();

        it = mLastSet[id] ? mLast[id] : mLogElements.begin();

        while (it != mLogElements.end()) {

        while (it != mLogElements.end()) {

            LogBufferElement *element = *it;

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

            }





            it = erase(it);

            it = erase(it);

            pruneRows--;

            if (--pruneRows == 0) {

                break;

            }

        }

        }

        LogTimeEntry::unlock();

        LogTimeEntry::unlock();

        return busy;

        return busy;
@@ -678,7 +681,7 @@ bool LogBuffer::prune(log_id_t id, unsigned long pruneRows, uid_t caller_uid) { 
                        && ((!gc && (element->getPid() == worstPid))

                        && ((!gc && (element->getPid() == worstPid))

                           || (mLastWorstPidOfSystem[id].find(element->getPid())

                           || (mLastWorstPidOfSystem[id].find(element->getPid())

                                == mLastWorstPidOfSystem[id].end()))) {

                                == mLastWorstPidOfSystem[id].end()))) {

                    mLastWorstPidOfSystem[id][key] = it;

                    mLastWorstPidOfSystem[id][element->getPid()] = it;

                }

                }

                if ((!gc && !worstPid && (key == worst))

                if ((!gc && !worstPid && (key == worst))

                        || (mLastWorst[id].find(key) == mLastWorst[id].end())) {

                        || (mLastWorst[id].find(key) == mLastWorst[id].end())) {