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

Commit 1d6343e2 authored by Leon Scroggins's avatar Leon Scroggins Committed by Automerger Merge Worker
Browse files

Merge "EventThread: add annotations for mVsyncSchedule" into udc-dev am: 4038250f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/22236938



Change-Id: I5c45b38522a57a112e17da151c9276b5e67e462c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 494e9ab3 4038250f

services/surfaceflinger/Scheduler/EventThread.cpp

+1 −1
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ void EventThread::threadMain(std::unique_lock<std::mutex>& lock) { 


bool EventThread::shouldConsumeEvent(const DisplayEventReceiver::Event& event,

                                     const sp<EventThreadConnection>& connection) const {

    const auto throttleVsync = [&] {

    const auto throttleVsync = [&]() REQUIRES(mMutex) {

        const auto& vsyncData = event.vsync.vsyncData;

        if (connection->frameRate.isValid()) {

            return !mVsyncSchedule->getTracker()

services/surfaceflinger/Scheduler/EventThread.h

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ private: 
    TracedOrdinal<int> mVsyncTracer;

    TracedOrdinal<std::chrono::nanoseconds> mWorkDuration GUARDED_BY(mMutex);

    std::chrono::nanoseconds mReadyDuration GUARDED_BY(mMutex);

    std::shared_ptr<scheduler::VsyncSchedule> mVsyncSchedule;

    std::shared_ptr<scheduler::VsyncSchedule> mVsyncSchedule GUARDED_BY(mMutex);

    TimePoint mLastVsyncCallbackTime GUARDED_BY(mMutex) = TimePoint::now();

    scheduler::VSyncCallbackRegistration mVsyncRegistration GUARDED_BY(mMutex);

    frametimeline::TokenManager* const mTokenManager;