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

Commit c103c849 authored by Ady Abraham's avatar Ady Abraham Committed by Android (Google) Code Review
Browse files

Merge "SF: cleanup VSP traces"

parents 1e1a3878 d9b9a040

services/surfaceflinger/Scheduler/VSyncPredictor.cpp

+10 −5
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ VSyncPredictor::~VSyncPredictor() = default; 


VSyncPredictor::VSyncPredictor(nsecs_t idealPeriod, size_t historySize,

                               size_t minimumSamplesForPrediction, uint32_t outlierTolerancePercent)

      : mTraceOn(property_get_bool("debug.sf.vsp_trace", true)),

      : mTraceOn(property_get_bool("debug.sf.vsp_trace", false)),

        kHistorySize(historySize),

        kMinimumSamplesForPrediction(minimumSamplesForPrediction),

        kOutlierTolerancePercent(std::min(outlierTolerancePercent, kMaxPercent)),
@@ -61,6 +61,10 @@ inline void VSyncPredictor::traceInt64If(const char* name, int64_t value) const 
    }

}



inline void VSyncPredictor::traceInt64(const char* name, int64_t value) const {

    ATRACE_INT64(name, value);

}



inline size_t VSyncPredictor::next(size_t i) const {

    return (i + 1) % mTimestamps.size();

}
@@ -124,6 +128,8 @@ bool VSyncPredictor::addVsyncTimestamp(nsecs_t timestamp) { 
        mTimestamps[mLastTimestampIndex] = timestamp;

    }



    traceInt64If("VSP-ts", timestamp);



    const size_t numSamples = mTimestamps.size();

    if (numSamples < kMinimumSamplesForPrediction) {

        mRateMap[mIdealPeriod] = {mIdealPeriod, 0};
@@ -161,8 +167,6 @@ bool VSyncPredictor::addVsyncTimestamp(nsecs_t timestamp) { 
    nsecs_t meanOrdinal = 0;



    for (size_t i = 0; i < numSamples; i++) {

        traceInt64If("VSP-ts", mTimestamps[i]);



        const auto timestamp = mTimestamps[i] - oldestTS;

        vsyncTS[i] = timestamp;

        meanTS += timestamp;
@@ -219,7 +223,7 @@ nsecs_t VSyncPredictor::nextAnticipatedVSyncTimeFromLocked(nsecs_t timePoint) co 
    auto const [slope, intercept] = getVSyncPredictionModelLocked();



    if (mTimestamps.empty()) {

        traceInt64If("VSP-mode", 1);

        traceInt64("VSP-mode", 1);

        auto const knownTimestamp = mKnownTimestamp ? *mKnownTimestamp : timePoint;

        auto const numPeriodsOut = ((timePoint - knownTimestamp) / mIdealPeriod) + 1;

        return knownTimestamp + numPeriodsOut * mIdealPeriod;
@@ -232,7 +236,7 @@ nsecs_t VSyncPredictor::nextAnticipatedVSyncTimeFromLocked(nsecs_t timePoint) co 
    auto const ordinalRequest = (timePoint - zeroPoint + slope) / slope;

    auto const prediction = (ordinalRequest * slope) + intercept + oldest;



    traceInt64If("VSP-mode", 0);

    traceInt64("VSP-mode", 0);

    traceInt64If("VSP-timePoint", timePoint);

    traceInt64If("VSP-prediction", prediction);
@@ -340,6 +344,7 @@ VSyncPredictor::Model VSyncPredictor::getVSyncPredictionModelLocked() const { 


void VSyncPredictor::setPeriod(nsecs_t period) {

    ATRACE_CALL();

    traceInt64("VSP-setPeriod", period);



    std::lock_guard lock(mMutex);

    static constexpr size_t kSizeLimit = 30;

services/surfaceflinger/Scheduler/VSyncPredictor.h

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ private: 
    void clearTimestamps() REQUIRES(mMutex);



    inline void traceInt64If(const char* name, int64_t value) const;

    inline void traceInt64(const char* name, int64_t value) const;

    bool const mTraceOn;



    size_t const kHistorySize;

services/surfaceflinger/Scheduler/VSyncReactor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ void VSyncReactor::endPeriodTransition() { 
}



void VSyncReactor::startPeriodTransition(nsecs_t period) {

    ATRACE_INT64("VSR-setPeriod", period);

    ATRACE_INT64("VSR-startPeriodTransition", period);

    std::lock_guard lock(mMutex);

    mLastHwVsync.reset();