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

Commit bf7632e8 authored by Kevin DuBois's avatar Kevin DuBois
Browse files

SF: correct runaway RegionSamplingThread timer 

In some cases, the VSyncReactor timer would keep firing even
after the registration was stopped. This was because the
onDispSyncEvent callback would cancel its timer from within
its callback, and then VSR would not check if the callback
had stopped itself before rescheduling the callback again.

Fixes: 149221293
Test: 1 new unit test
Test: ensure timerDispatch thread is quiet when display off
Test: [todo] verify using powerStats procedure in bug.

Change-Id: I5314c8d01de7d125c31488e48c7f2c550d201701
parent 3847d8b5

services/surfaceflinger/Scheduler/VSyncReactor.cpp

+3 −0
Original line number Diff line number Diff line
@@ -98,6 +98,9 @@ private: 


        {

            std::lock_guard<std::mutex> lk(mMutex);

            if (mStopped) {

                return;

            }

            auto const schedule_result = mRegistration.schedule(calculateWorkload(), vsynctime);

            LOG_ALWAYS_FATAL_IF((schedule_result != ScheduleResult::Scheduled),

                                "Error rescheduling callback: rc %X", schedule_result);

services/surfaceflinger/tests/unittests/VSyncReactorTest.cpp

+24 −0
Original line number Diff line number Diff line
@@ -534,6 +534,30 @@ TEST_F(VSyncReactorTest, eventListenersRemovedOnDestruction) { 
    mReactor.addEventListener(mName, mPhase, &outerCb, lastCallbackTime);

}



// b/149221293

TEST_F(VSyncReactorTest, selfRemovingEventListenerStopsCallbacks) {

    class SelfRemovingCallback : public DispSync::Callback {

    public:

        SelfRemovingCallback(VSyncReactor& vsr) : mVsr(vsr) {}

        void onDispSyncEvent(nsecs_t when) final { mVsr.removeEventListener(this, &when); }



    private:

        VSyncReactor& mVsr;

    } selfRemover(mReactor);



    Sequence seq;

    EXPECT_CALL(*mMockDispatch, registerCallback(_, std::string(mName)))

            .InSequence(seq)

            .WillOnce(DoAll(SaveArg<0>(&innerCb), Return(mFakeToken)));

    EXPECT_CALL(*mMockDispatch, schedule(mFakeToken, computeWorkload(period, mPhase), mFakeNow))

            .InSequence(seq);

    EXPECT_CALL(*mMockDispatch, cancel(mFakeToken)).Times(2).InSequence(seq);

    EXPECT_CALL(*mMockDispatch, unregisterCallback(mFakeToken)).InSequence(seq);



    mReactor.addEventListener(mName, mPhase, &selfRemover, lastCallbackTime);

    innerCb(0, 0);

}



TEST_F(VSyncReactorTest, addEventListenerChangePeriod) {

    Sequence seq;

    EXPECT_CALL(*mMockDispatch, registerCallback(_, std::string(mName)))