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

Commit e96e79fa authored by Ady Abraham's avatar Ady Abraham
Browse files

SF: use a pointer for out param in classifyJankLocked 

Due to a potential HWASAN bug (b/341741835) changing the out
parameter semantics from reference to pointer.

Bug: 340633280
Change-Id: I230d2073af69e3ec9312d8208d245cb5b743ec35
Test: presubmit
parent db4d15ce

services/surfaceflinger/FrameTimeline/FrameTimeline.cpp

+13 −7
Original line number Diff line number Diff line
@@ -543,12 +543,14 @@ std::string SurfaceFrame::miniDump() const { 
}



void SurfaceFrame::classifyJankLocked(int32_t displayFrameJankType, const Fps& refreshRate,

                                      Fps displayFrameRenderRate, nsecs_t& deadlineDelta) {

                                      Fps displayFrameRenderRate, nsecs_t* outDeadlineDelta) {

    if (mActuals.presentTime == Fence::SIGNAL_TIME_INVALID) {

        // Cannot do any classification for invalid present time.

        mJankType = JankType::Unknown;

        mJankSeverityType = JankSeverityType::Unknown;

        deadlineDelta = -1;

        if (outDeadlineDelta) {

            *outDeadlineDelta = -1;

        }

        return;

    }
@@ -559,7 +561,9 @@ void SurfaceFrame::classifyJankLocked(int32_t displayFrameJankType, const Fps& r 
        mJankType = mPresentState != PresentState::Presented ? JankType::Dropped

                                                             : JankType::AppDeadlineMissed;

        mJankSeverityType = JankSeverityType::Unknown;

        deadlineDelta = -1;

        if (outDeadlineDelta) {

            *outDeadlineDelta = -1;

        }

        return;

    }
@@ -568,11 +572,14 @@ void SurfaceFrame::classifyJankLocked(int32_t displayFrameJankType, const Fps& r 
        return;

    }



    deadlineDelta = mActuals.endTime - mPredictions.endTime;

    const nsecs_t presentDelta = mActuals.presentTime - mPredictions.presentTime;

    const nsecs_t deltaToVsync = refreshRate.getPeriodNsecs() > 0

            ? std::abs(presentDelta) % refreshRate.getPeriodNsecs()

            : 0;

    const nsecs_t deadlineDelta = mActuals.endTime - mPredictions.endTime;

    if (outDeadlineDelta) {

        *outDeadlineDelta = deadlineDelta;

    }



    if (deadlineDelta > mJankClassificationThresholds.deadlineThreshold) {

        mFrameReadyMetadata = FrameReadyMetadata::LateFinish;
@@ -671,7 +678,7 @@ void SurfaceFrame::onPresent(nsecs_t presentTime, int32_t displayFrameJankType, 
    mActuals.presentTime = presentTime;

    nsecs_t deadlineDelta = 0;



    classifyJankLocked(displayFrameJankType, refreshRate, displayFrameRenderRate, deadlineDelta);

    classifyJankLocked(displayFrameJankType, refreshRate, displayFrameRenderRate, &deadlineDelta);



    if (mPredictionState != PredictionState::None) {

        // Only update janky frames if the app used vsync predictions
@@ -686,8 +693,7 @@ void SurfaceFrame::onCommitNotComposited(Fps refreshRate, Fps displayFrameRender 


    mDisplayFrameRenderRate = displayFrameRenderRate;

    mActuals.presentTime = mPredictions.presentTime;

    nsecs_t deadlineDelta = 0;

    classifyJankLocked(JankType::None, refreshRate, displayFrameRenderRate, deadlineDelta);

    classifyJankLocked(JankType::None, refreshRate, displayFrameRenderRate, nullptr);

}



void SurfaceFrame::tracePredictions(int64_t displayFrameToken, nsecs_t monoBootOffset) const {

services/surfaceflinger/FrameTimeline/FrameTimeline.h

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ private: 
    void tracePredictions(int64_t displayFrameToken, nsecs_t monoBootOffset) const;

    void traceActuals(int64_t displayFrameToken, nsecs_t monoBootOffset) const;

    void classifyJankLocked(int32_t displayFrameJankType, const Fps& refreshRate,

                            Fps displayFrameRenderRate, nsecs_t& deadlineDelta) REQUIRES(mMutex);

                            Fps displayFrameRenderRate, nsecs_t* outDeadlineDelta) REQUIRES(mMutex);



    const int64_t mToken;

    const int32_t mInputEventId;