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

Commit 4a36e938 authored by David Sodman's avatar David Sodman
Browse files

SF: FrameBuckets state to SFBE 

Move FrameBuckets state to SurfaceFlingerBE

Test: build
Change-Id: Ib44ab2dc189e0ba31ab8ec5a157c9c3b7cd9808a
parent cbaf083d

services/surfaceflinger/SurfaceFlinger.cpp

+15 −15
Original line number Diff line number Diff line
@@ -156,6 +156,9 @@ bool useTrebleTestingOverride() { 
SurfaceFlingerBE::SurfaceFlingerBE()

      : mHwcServiceName(getHwcServiceName()),

        mRenderEngine(nullptr),

        mFrameBuckets(),

        mTotalTime(0),

        mLastSwapTime(0),

        mComposerSequenceId(0) {

}
@@ -188,9 +191,6 @@ SurfaceFlinger::SurfaceFlinger() 
        mHWVsyncAvailable(false),

        mHasColorMatrix(false),

        mHasPoweredOff(false),

        mFrameBuckets(),

        mTotalTime(0),

        mLastSwapTime(0),

        mNumLayers(0),

        mVrFlingerRequestsDisplay(false),

        mMainThreadId(std::this_thread::get_id())
@@ -1742,16 +1742,16 @@ void SurfaceFlinger::postComposition(nsecs_t refreshStartTime) 
    if (mHasPoweredOff) {

        mHasPoweredOff = false;

    } else {

        nsecs_t elapsedTime = currentTime - mLastSwapTime;

        nsecs_t elapsedTime = currentTime - getBE().mLastSwapTime;

        size_t numPeriods = static_cast<size_t>(elapsedTime / vsyncInterval);

        if (numPeriods < NUM_BUCKETS - 1) {

            mFrameBuckets[numPeriods] += elapsedTime;

        if (numPeriods < SurfaceFlingerBE::NUM_BUCKETS - 1) {

            getBE().mFrameBuckets[numPeriods] += elapsedTime;

        } else {

            mFrameBuckets[NUM_BUCKETS - 1] += elapsedTime;

            getBE().mFrameBuckets[SurfaceFlingerBE::NUM_BUCKETS - 1] += elapsedTime;

        }

        mTotalTime += elapsedTime;

        getBE().mTotalTime += elapsedTime;

    }

    mLastSwapTime = currentTime;

    getBE().mLastSwapTime = currentTime;

}



void SurfaceFlinger::rebuildLayerStacks() {
@@ -3679,18 +3679,18 @@ void SurfaceFlinger::appendSfConfigString(String8& result) const 
void SurfaceFlinger::dumpStaticScreenStats(String8& result) const

{

    result.appendFormat("Static screen stats:\n");

    for (size_t b = 0; b < NUM_BUCKETS - 1; ++b) {

        float bucketTimeSec = mFrameBuckets[b] / 1e9;

    for (size_t b = 0; b < SurfaceFlingerBE::NUM_BUCKETS - 1; ++b) {

        float bucketTimeSec = getBE().mFrameBuckets[b] / 1e9;

        float percent = 100.0f *

                static_cast<float>(mFrameBuckets[b]) / mTotalTime;

                static_cast<float>(getBE().mFrameBuckets[b]) / getBE().mTotalTime;

        result.appendFormat("  < %zd frames: %.3f s (%.1f%%)\n",

                b + 1, bucketTimeSec, percent);

    }

    float bucketTimeSec = mFrameBuckets[NUM_BUCKETS - 1] / 1e9;

    float bucketTimeSec = getBE().mFrameBuckets[SurfaceFlingerBE::NUM_BUCKETS - 1] / 1e9;

    float percent = 100.0f *

            static_cast<float>(mFrameBuckets[NUM_BUCKETS - 1]) / mTotalTime;

            static_cast<float>(getBE().mFrameBuckets[SurfaceFlingerBE::NUM_BUCKETS - 1]) / getBE().mTotalTime;

    result.appendFormat("  %zd+ frames: %.3f s (%.1f%%)\n",

            NUM_BUCKETS - 1, bucketTimeSec, percent);

            SurfaceFlingerBE::NUM_BUCKETS - 1, bucketTimeSec, percent);

}



void SurfaceFlinger::recordBufferingStats(const char* layerName,

services/surfaceflinger/SurfaceFlinger.h

+5 −4
Original line number Diff line number Diff line
@@ -154,6 +154,11 @@ public: 
    };

    std::queue<CompositePresentTime> mCompositePresentTimes;



    static const size_t NUM_BUCKETS = 8; // < 1-7, 7+

    nsecs_t mFrameBuckets[NUM_BUCKETS];

    nsecs_t mTotalTime;

    std::atomic<nsecs_t> mLastSwapTime;



    // Double- vs. triple-buffering stats

    struct BufferingStats {

        BufferingStats()
@@ -785,10 +790,6 @@ private: 


    // Static screen stats

    bool mHasPoweredOff;

    static const size_t NUM_BUCKETS = 8; // < 1-7, 7+

    nsecs_t mFrameBuckets[NUM_BUCKETS];

    nsecs_t mTotalTime;

    std::atomic<nsecs_t> mLastSwapTime;



    size_t mNumLayers;