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

Commit 0408772e authored by Mathias Agopian's avatar Mathias Agopian
Browse files

fix [2297155] SurfaceFlinger's freeze-timeout doesn't work 

There was bug in the logic that calculated the relative timeout, the start time was
reset each time an event was received, which caused the timeout to never occur if
an application was constantly redrawing.

Now we always check for a timeout when we come back from the waitEvent() and
process the "anti-freeze" if needed, regardless of whether an event was received.
parent 18facb7c

libs/surfaceflinger/SurfaceFlinger.cpp

+17 −12
Original line number Diff line number Diff line
@@ -417,9 +417,9 @@ void SurfaceFlinger::waitForEvent() 
{

    while (true) {

        nsecs_t timeout = -1;

        const nsecs_t freezeDisplayTimeout = ms2ns(5000);

        if (UNLIKELY(isFrozen())) {

            // wait 5 seconds

            const nsecs_t freezeDisplayTimeout = ms2ns(5000);

            const nsecs_t now = systemTime();

            if (mFreezeDisplayTime == 0) {

                mFreezeDisplayTime = now;
@@ -429,21 +429,25 @@ void SurfaceFlinger::waitForEvent() 
        }



        MessageList::value_type msg = mEventQueue.waitMessage(timeout);

        if (msg != 0) {

            mFreezeDisplayTime = 0;

            switch (msg->what) {

                case MessageQueue::INVALIDATE:

                    // invalidate message, just return to the main loop

                    return;

            }

        } else {

            // we timed out



        // see if we timed out

        if (isFrozen()) {

            const nsecs_t now = systemTime();

            nsecs_t frozenTime = (now - mFreezeDisplayTime);

            if (frozenTime >= freezeDisplayTimeout) {

                // we timed out and are still frozen

                LOGW("timeout expired mFreezeDisplay=%d, mFreezeCount=%d",

                        mFreezeDisplay, mFreezeCount);

                mFreezeDisplayTime = 0;

                mFreezeCount = 0;

                mFreezeDisplay = false;

            }

        }



        if (msg != 0) {

            switch (msg->what) {

                case MessageQueue::INVALIDATE:

                    // invalidate message, just return to the main loop

                    return;

            }

        }
@@ -1646,6 +1650,7 @@ status_t SurfaceFlinger::onTransact( 
            }

            case 1007: // set mFreezeCount

                mFreezeCount = data.readInt32();

                mFreezeDisplayTime = 0;

                return NO_ERROR;

            case 1010:  // interrogate.

                reply->writeInt32(0);

libs/surfaceflinger/SurfaceFlinger.h

+5 −1
Original line number Diff line number Diff line
@@ -291,7 +291,11 @@ private: 


            friend class FreezeLock;

            sp<FreezeLock> getFreezeLock() const;

            inline void incFreezeCount() { mFreezeCount++; }

            inline void incFreezeCount() {

                if (mFreezeCount == 0)

                    mFreezeDisplayTime = 0;

                mFreezeCount++;

            }

            inline void decFreezeCount() { if (mFreezeCount > 0) mFreezeCount--; }

            inline bool hasFreezeRequest() const { return mFreezeDisplay; }

            inline bool isFrozen() const {