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

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

Merge changes I3d727530,Ia17bc5a0 

* changes:
  SurfaceFlinger: use TFD_TIMER_ABSTIME for VSP timer
  VSR: dispatch cbs skipped due to timer lag.
parents 3f21eafa 5ff4bb8f

services/surfaceflinger/Scheduler/TimeKeeper.h

+2 −2
Original line number Diff line number Diff line
@@ -43,10 +43,10 @@ public: 
    virtual ~TimeKeeper();



    /*

     * Arms callback to fired in time nanoseconds.

     * Arms callback to fired when time is current based on CLOCK_MONOTONIC

     * There is only one timer, and subsequent calls will reset the callback function and the time.

     */

    virtual void alarmIn(std::function<void()> const& callback, nsecs_t time) = 0;

    virtual void alarmAt(std::function<void()> const& callback, nsecs_t time) = 0;



    /*

     * Cancels an existing pending callback

services/surfaceflinger/Scheduler/Timer.cpp

+4 −4
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ nsecs_t Timer::now() const { 
    return systemTime(SYSTEM_TIME_MONOTONIC);

}



void Timer::alarmIn(std::function<void()> const& cb, nsecs_t fireIn) {

void Timer::alarmAt(std::function<void()> const& cb, nsecs_t time) {

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

    using namespace std::literals;

    static constexpr int ns_per_s =
@@ -99,11 +99,11 @@ void Timer::alarmIn(std::function<void()> const& cb, nsecs_t fireIn) { 
    struct itimerspec old_timer;

    struct itimerspec new_timer {

        .it_interval = {.tv_sec = 0, .tv_nsec = 0},

        .it_value = {.tv_sec = static_cast<long>(fireIn / ns_per_s),

                     .tv_nsec = static_cast<long>(fireIn % ns_per_s)},

        .it_value = {.tv_sec = static_cast<long>(time / ns_per_s),

                     .tv_nsec = static_cast<long>(time % ns_per_s)},

    };



    if (timerfd_settime(mTimerFd, 0, &new_timer, &old_timer)) {

    if (timerfd_settime(mTimerFd, TFD_TIMER_ABSTIME, &new_timer, &old_timer)) {

        ALOGW("Failed to set timerfd %s (%i)", strerror(errno), errno);

    }

}

services/surfaceflinger/Scheduler/Timer.h

+2 −2
Original line number Diff line number Diff line
@@ -30,9 +30,9 @@ public: 
    ~Timer();

    nsecs_t now() const final;



    // NB: alarmIn and alarmCancel are threadsafe; with the last-returning function being effectual

    // NB: alarmAt and alarmCancel are threadsafe; with the last-returning function being effectual

    //     Most users will want to serialize thes calls so as to be aware of the timer state.

    void alarmIn(std::function<void()> const& cb, nsecs_t fireIn) final;

    void alarmAt(std::function<void()> const& cb, nsecs_t time) final;

    void alarmCancel() final;

    void dump(std::string& result) const final;

services/surfaceflinger/Scheduler/VSyncDispatchTimerQueue.cpp

+7 −5
Original line number Diff line number Diff line
@@ -180,10 +180,10 @@ void VSyncDispatchTimerQueue::cancelTimer() { 
    mTimeKeeper->alarmCancel();

}



void VSyncDispatchTimerQueue::setTimer(nsecs_t targetTime, nsecs_t now) {

void VSyncDispatchTimerQueue::setTimer(nsecs_t targetTime, nsecs_t /*now*/) {

    mIntendedWakeupTime = targetTime;

    mTimeKeeper->alarmIn(std::bind(&VSyncDispatchTimerQueue::timerCallback, this),

                         targetTime - now);

    mTimeKeeper->alarmAt(std::bind(&VSyncDispatchTimerQueue::timerCallback, this),

                         mIntendedWakeupTime);

    mLastTimerSchedule = mTimeKeeper->now();

}
@@ -243,7 +243,8 @@ void VSyncDispatchTimerQueue::timerCallback() { 
    std::vector<Invocation> invocations;

    {

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

        mLastTimerCallback = mTimeKeeper->now();

        auto const now = mTimeKeeper->now();

        mLastTimerCallback = now;

        for (auto it = mCallbacks.begin(); it != mCallbacks.end(); it++) {

            auto& callback = it->second;

            auto const wakeupTime = callback->wakeupTime();
@@ -251,7 +252,8 @@ void VSyncDispatchTimerQueue::timerCallback() { 
                continue;

            }



            if (*wakeupTime < mIntendedWakeupTime + mTimerSlack) {

            auto const lagAllowance = std::max(now - mIntendedWakeupTime, static_cast<nsecs_t>(0));

            if (*wakeupTime < mIntendedWakeupTime + mTimerSlack + lagAllowance) {

                callback->executing();

                invocations.emplace_back(

                        Invocation{callback, *callback->lastExecutedVsyncTarget(), *wakeupTime});

services/surfaceflinger/tests/unittests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ cc_test { 
        "RegionSamplingTest.cpp",

        "TimeStatsTest.cpp",

        "FrameTracerTest.cpp",

        "TimerTest.cpp",

        "TransactionApplicationTest.cpp",

        "StrongTypingTest.cpp",

        "VSyncDispatchTimerQueueTest.cpp",