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

Commit d8ab8fc7 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by Gerrit Code Review
Browse files

Merge "logd: persistent reader threads"

parents 8750fa76 a16f761f

logd/LogTimes.cpp

+11 −18
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ LogTimeEntry::LogTimeEntry(LogReader &reader, SocketClient *client, 
        , mRelease(false)

        , mError(false)

        , threadRunning(false)

        , threadTriggered(true)

        , mReader(reader)

        , mLogMask(logMask)

        , mPid(pid)
@@ -45,7 +44,9 @@ LogTimeEntry::LogTimeEntry(LogReader &reader, SocketClient *client, 
        , mStart(start)

        , mNonBlock(nonBlock)

        , mEnd(CLOCK_MONOTONIC)

{ }

{

        pthread_cond_init(&threadTriggeredCondition, NULL);

}



void LogTimeEntry::startReader_Locked(void) {

    pthread_attr_t attr;
@@ -74,7 +75,6 @@ void LogTimeEntry::threadStop(void *obj) { 


    lock();



    me->threadRunning = false;

    if (me->mNonBlock) {

        me->error_Locked();

    }
@@ -103,6 +103,7 @@ void LogTimeEntry::threadStop(void *obj) { 
        client->decRef();

    }



    me->threadRunning = false;

    me->decRef_Locked();



    unlock();
@@ -118,7 +119,7 @@ void *LogTimeEntry::threadStart(void *obj) { 
    SocketClient *client = me->mClient;

    if (!client) {

        me->error();

        pthread_exit(NULL);

        return NULL;

    }



    LogBuffer &logbuf = me->mReader.logbuf();
@@ -127,12 +128,7 @@ void *LogTimeEntry::threadStart(void *obj) { 


    lock();



    me->threadTriggered = true;



    while(me->threadTriggered && !me->isError_Locked()) {



        me->threadTriggered = false;



    while (me->threadRunning && !me->isError_Locked()) {

        log_time start = me->mStart;



        unlock();
@@ -142,24 +138,21 @@ void *LogTimeEntry::threadStart(void *obj) { 
        }

        start = logbuf.flushTo(client, start, privileged, FilterSecondPass, me);



        lock();



        if (start == LogBufferElement::FLUSH_ERROR) {

            me->error();

            me->error_Locked();

        }



        if (me->mNonBlock) {

            lock();

        if (me->mNonBlock || !me->threadRunning || me->isError_Locked()) {

            break;

        }



        sched_yield();



        lock();

        pthread_cond_wait(&me->threadTriggeredCondition, &timesLock);

    }



    unlock();



    pthread_exit(NULL);



    pthread_cleanup_pop(true);



    return NULL;

logd/LogTimes.h

+7 −3
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ class LogTimeEntry { 
    bool mRelease;

    bool mError;

    bool threadRunning;

    bool threadTriggered;

    pthread_cond_t threadTriggeredCondition;

    pthread_t mThread;

    LogReader &mReader;

    static void *threadStart(void *me);
@@ -63,12 +63,16 @@ public: 
    bool runningReader_Locked(void) const {

        return threadRunning || mRelease || mError || mNonBlock;

    }

    void triggerReader_Locked(void) { threadTriggered = true; }

    void triggerReader_Locked(void) {

        pthread_cond_signal(&threadTriggeredCondition);

    }



    void triggerSkip_Locked(unsigned int skip) { skipAhead = skip; }



    // Called after LogTimeEntry removed from list, lock implicitly held

    void release_Locked(void) {

        mRelease = true;

        pthread_cond_signal(&threadTriggeredCondition);

        if (mRefCount || threadRunning) {

            return;

        }
@@ -78,7 +82,7 @@ public: 


    // Called to mark socket in jeopardy

    void error_Locked(void) { mError = true; }

    void error(void) { lock(); mError = true; unlock(); }

    void error(void) { lock(); error_Locked(); unlock(); }



    bool isError_Locked(void) const { return mRelease || mError; }