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

Commit bfc7891b authored by Jason Sams's avatar Jason Sams
Browse files

Fix the RS frame timeout. 

Previous a slow app would block from receiving new
commands until the timer expired.  This change will
expire the timer immediatly.

Change-Id: I42b949d21f98ee0f1d3156763cd723c3e9cabb67
parent 6e97ed21

libs/rs/rsContext.cpp

+16 −10
Original line number Diff line number Diff line
@@ -245,20 +245,32 @@ void * Context::threadProc(void *vrsc) { 


    rsc->mRunning = true;

    bool mDraw = true;

    bool doWait = true;



    uint64_t targetTime = rsc->getTime();

    while (!rsc->mExit) {

        mDraw |= rsc->mIO.playCoreCommands(rsc, !mDraw);

        uint64_t waitTime = 0;

        uint64_t now = rsc->getTime();

        if (now < targetTime) {

            waitTime = targetTime - now;

        } else {

            doWait = false;

        }



        mDraw |= rsc->mIO.playCoreCommands(rsc, doWait, waitTime);

        mDraw &= (rsc->mRootScript.get() != NULL);

        mDraw &= rsc->mHasSurface;



        uint32_t targetTime = 0;

        if (mDraw && rsc->mIsGraphicsContext) {

            targetTime = rsc->runRootScript();

            uint64_t delay = rsc->runRootScript() * 1000000;

            targetTime = rsc->getTime() + delay;

            doWait = delay != 0;



            if (rsc->props.mLogVisual) {

                rsc->displayDebugStats();

            }



            mDraw = targetTime && !rsc->mPaused;

            mDraw = !rsc->mPaused;

            rsc->timerSet(RS_TIMER_CLEAR_SWAP);

            rsc->mHal.funcs.swap(rsc);

            rsc->timerFrame();
@@ -266,12 +278,6 @@ void * Context::threadProc(void *vrsc) { 
            rsc->timerPrint();

            rsc->timerReset();

        }

        if (targetTime > 1) {

            int32_t t = (targetTime - (int32_t)(rsc->mTimeMSLastScript + rsc->mTimeMSLastSwap)) * 1000;

            if (t > 0) {

                usleep(t);

            }

        }

    }



    LOGV("%p, RS Thread exiting", rsc);

libs/rs/rsLocklessFifo.cpp

+8 −6
Original line number Diff line number Diff line
@@ -129,21 +129,23 @@ void LocklessCommandFifo::flush() { 
    //dumpState("flush 2");

}



void LocklessCommandFifo::wait() {

bool LocklessCommandFifo::wait(uint64_t timeout) {

    while (isEmpty() && !mInShutdown) {

        mSignalToControl.set();

        mSignalToWorker.wait();

        return mSignalToWorker.wait(timeout);

    }

    return true;

}



const void * LocklessCommandFifo::get(uint32_t *command, uint32_t *bytesData) {

const void * LocklessCommandFifo::get(uint32_t *command, uint32_t *bytesData, uint64_t timeout) {

    while (1) {

        //dumpState("get");

        wait();

        if (mInShutdown) {

        wait(timeout);



        if (isEmpty() || mInShutdown) {

            *command = 0;

            *bytesData = 0;

            return 0;

            return NULL;

        }



        *command = reinterpret_cast<const uint16_t *>(mGet)[0];

libs/rs/rsLocklessFifo.h

+2 −2
Original line number Diff line number Diff line
@@ -57,9 +57,9 @@ public: 
    void commitSync(uint32_t command, uint32_t bytes);



    void flush();

    void wait();

    bool wait(uint64_t timeout = 0);



    const void * get(uint32_t *command, uint32_t *bytesData);

    const void * get(uint32_t *command, uint32_t *bytesData, uint64_t timeout = 0);

    void next();



    void makeSpace(uint32_t bytes);

libs/rs/rsSignal.cpp

+23 −6
Original line number Diff line number Diff line
@@ -68,26 +68,43 @@ void Signal::set() { 
    }

}



void Signal::wait() {

bool Signal::wait(uint64_t timeout) {

    int status;

    bool ret = false;



    status = pthread_mutex_lock(&mMutex);

    if (status) {

        LOGE("LocklessCommandFifo: error %i locking for condition.", status);

        return;

        return false;

    }



    if (!mSet) {

        if (!timeout) {

            status = pthread_cond_wait(&mCondition, &mMutex);

        if (status) {

            LOGE("LocklessCommandFifo: error %i waiting on condition.", status);

        } else {

#if defined(HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE)

            status = pthread_cond_timeout_np(&mCondition, &mMutex, timeout / 1000000);

#else

            // This is safe it will just make things less reponsive

            status = pthread_cond_wait(&mCondition, &mMutex);

#endif

        }

    }



    if (!status) {

        mSet = false;

        ret = true;

    } else {

        if (status != ETIMEDOUT) {

            LOGE("LocklessCommandFifo: error %i waiting for condition.", status);

        }

    }



    status = pthread_mutex_unlock(&mMutex);

    if (status) {

        LOGE("LocklessCommandFifo: error %i unlocking for condition.", status);

    }



    return ret;

}

libs/rs/rsSignal.h

+4 −1
Original line number Diff line number Diff line
@@ -31,7 +31,10 @@ public: 
    bool init();



    void set();

    void wait();



    // returns true if the signal occured

    // false for timeout

    bool wait(uint64_t timeout = 0);



protected:

    bool mSet;