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

Commit cbaf083d authored by David Sodman's avatar David Sodman
Browse files

SF: BufferingStats state to SFBE 

Move BufferingStats state to SurfaceFlingerBE

Test: build
Change-Id: I4404607e44b078bb70dca9562c8d3b180702fe15
parent 99974d29

services/surfaceflinger/SurfaceFlinger.cpp

+5 −5
Original line number Diff line number Diff line
@@ -3695,8 +3695,8 @@ void SurfaceFlinger::dumpStaticScreenStats(String8& result) const 


void SurfaceFlinger::recordBufferingStats(const char* layerName,

        std::vector<OccupancyTracker::Segment>&& history) {

    Mutex::Autolock lock(mBufferingStatsMutex);

    auto& stats = mBufferingStats[layerName];

    Mutex::Autolock lock(getBE().mBufferingStatsMutex);

    auto& stats = getBE().mBufferingStats[layerName];

    for (const auto& segment : history) {

        if (!segment.usedThirdBuffer) {

            stats.twoBufferTime += segment.totalTime;
@@ -3725,12 +3725,12 @@ void SurfaceFlinger::dumpBufferingStats(String8& result) const { 
    result.append("Buffering stats:\n");

    result.append("  [Layer name] <Active time> <Two buffer> "

            "<Double buffered> <Triple buffered>\n");

    Mutex::Autolock lock(mBufferingStatsMutex);

    Mutex::Autolock lock(getBE().mBufferingStatsMutex);

    typedef std::tuple<std::string, float, float, float> BufferTuple;

    std::map<float, BufferTuple, std::greater<float>> sorted;

    for (const auto& statsPair : mBufferingStats) {

    for (const auto& statsPair : getBE().mBufferingStats) {

        const char* name = statsPair.first.c_str();

        const BufferingStats& stats = statsPair.second;

        const SurfaceFlingerBE::BufferingStats& stats = statsPair.second;

        if (stats.numSegments == 0) {

            continue;

        }

services/surfaceflinger/SurfaceFlinger.h

+23 −24
Original line number Diff line number Diff line
@@ -154,6 +154,29 @@ public: 
    };

    std::queue<CompositePresentTime> mCompositePresentTimes;



    // Double- vs. triple-buffering stats

    struct BufferingStats {

        BufferingStats()

          : numSegments(0),

            totalTime(0),

            twoBufferTime(0),

            doubleBufferedTime(0),

            tripleBufferedTime(0) {}



        size_t numSegments;

        nsecs_t totalTime;



        // "Two buffer" means that a third buffer was never used, whereas

        // "double-buffered" means that on average the segment only used two

        // buffers (though it may have used a third for some part of the

        // segment)

        nsecs_t twoBufferTime;

        nsecs_t doubleBufferedTime;

        nsecs_t tripleBufferedTime;

    };

    mutable Mutex mBufferingStatsMutex;

    std::unordered_map<std::string, BufferingStats> mBufferingStats;



    // The composer sequence id is a monotonically increasing integer that we

    // use to differentiate callbacks from different hardware composer

    // instances. Each hardware composer instance gets a different sequence id.
@@ -746,8 +769,6 @@ private: 
    bool mPrimaryHWVsyncEnabled;

    bool mHWVsyncAvailable;







    std::atomic<bool> mRefreshPending{false};



    /* ------------------------------------------------------------------------
@@ -771,28 +792,6 @@ private: 


    size_t mNumLayers;



    // Double- vs. triple-buffering stats

    struct BufferingStats {

        BufferingStats()

          : numSegments(0),

            totalTime(0),

            twoBufferTime(0),

            doubleBufferedTime(0),

            tripleBufferedTime(0) {}



        size_t numSegments;

        nsecs_t totalTime;



        // "Two buffer" means that a third buffer was never used, whereas

        // "double-buffered" means that on average the segment only used two

        // buffers (though it may have used a third for some part of the

        // segment)

        nsecs_t twoBufferTime;

        nsecs_t doubleBufferedTime;

        nsecs_t tripleBufferedTime;

    };

    mutable Mutex mBufferingStatsMutex;

    std::unordered_map<std::string, BufferingStats> mBufferingStats;



    // Verify that transaction is being called by an approved process:

    // either AID_GRAPHICS or AID_SYSTEM.