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

Commit 8f8d251a authored by Dominik Laskowski's avatar Dominik Laskowski Committed by Android (Google) Code Review
Browse files

Merge changes I17b3b772,I21a8e98b,I68cd1274 

* changes:
  SF: Clean up dumpsys for Scheduler
  SF: Clean up dumpsys for displays
  SF: Split Scheduler::setRefreshRateSelector
parents c7edc680 03cfce8f

services/surfaceflinger/DisplayDevice.cpp

+1 −17
Original line number Diff line number Diff line
@@ -313,26 +313,10 @@ ui::Transform::RotationFlags DisplayDevice::getPrimaryDisplayRotationFlags() { 
    return sPrimaryDisplayRotationFlags;

}



std::string DisplayDevice::getDebugName() const {

    using namespace std::string_literals;



    std::string name = "Display "s + to_string(getId()) + " ("s;



    name += isVirtual() ? "virtual"s : "physical"s;



    if (isPrimary()) {

        name += ", primary"s;

    }



    return name + ", \""s + mDisplayName + "\")"s;

}



void DisplayDevice::dump(utils::Dumper& dumper) const {

    using namespace std::string_view_literals;



    dumper.dump({}, getDebugName());



    utils::Dumper::Indent indent(dumper);

    dumper.dump("name"sv, '"' + mDisplayName + '"');

    dumper.dump("powerMode"sv, mPowerMode);



    if (mRefreshRateSelector) {

services/surfaceflinger/DisplayDevice.h

+0 −4
Original line number Diff line number Diff line
@@ -248,10 +248,6 @@ public: 
    // release HWC resources (if any) for removable displays

    void disconnect();



    /* ------------------------------------------------------------------------

     * Debugging

     */

    std::string getDebugName() const;

    void dump(utils::Dumper&) const;



private:

services/surfaceflinger/DisplayHardware/Hal.h

+7 −2
Original line number Diff line number Diff line
@@ -178,7 +178,8 @@ inline std::string to_string(hardware::graphics::composer::hal::Error error) { 
}



// For utils::Dumper ADL.

namespace hardware::graphics::composer::V2_2 {

namespace hardware::graphics::composer {

namespace V2_2 {



inline std::string to_string(hardware::graphics::composer::hal::PowerMode mode) {

    switch (mode) {
@@ -197,7 +198,9 @@ inline std::string to_string(hardware::graphics::composer::hal::PowerMode mode) 
    }

}



} // namespace hardware::graphics::composer::V2_2

} // namespace V2_2



namespace V2_1 {



inline std::string to_string(hardware::graphics::composer::hal::Vsync vsync) {

    switch (vsync) {
@@ -210,4 +213,6 @@ inline std::string to_string(hardware::graphics::composer::hal::Vsync vsync) { 
    }

}



} // namespace V2_1

} // namespace hardware::graphics::composer

} // namespace android

services/surfaceflinger/Scheduler/EventThread.cpp

+1 −0
Original line number Diff line number Diff line
@@ -668,6 +668,7 @@ void EventThread::dump(std::string& result) const { 
            StringAppendF(&result, "    %s\n", toString(*connection).c_str());

        }

    }

    result += '\n';

}



const char* EventThread::toCString(State state) {

services/surfaceflinger/Scheduler/FrameRateOverrideMappings.cpp

+24 −19
Original line number Diff line number Diff line
@@ -54,10 +54,9 @@ std::optional<Fps> FrameRateOverrideMappings::getFrameRateOverrideForUid( 
std::vector<FrameRateOverride> FrameRateOverrideMappings::getAllFrameRateOverrides(

        bool supportsFrameRateOverrideByContent) {

    std::lock_guard lock(mFrameRateOverridesLock);



    std::vector<FrameRateOverride> overrides;

    overrides.reserve(std::max({mFrameRateOverridesFromGameManager.size(),

                                mFrameRateOverridesFromBackdoor.size(),

                                mFrameRateOverridesByContent.size()}));

    overrides.reserve(maxOverridesCount());



    for (const auto& [uid, frameRate] : mFrameRateOverridesFromBackdoor) {

        overrides.emplace_back(FrameRateOverride{uid, frameRate.getValue()});
@@ -83,28 +82,34 @@ std::vector<FrameRateOverride> FrameRateOverrideMappings::getAllFrameRateOverrid 
    return overrides;

}



void FrameRateOverrideMappings::dump(std::string& result) const {

    using base::StringAppendF;

void FrameRateOverrideMappings::dump(utils::Dumper& dumper) const {

    using namespace std::string_view_literals;



    std::lock_guard lock(mFrameRateOverridesLock);



    StringAppendF(&result, "Frame Rate Overrides (backdoor): {");

    for (const auto& [uid, frameRate] : mFrameRateOverridesFromBackdoor) {

        StringAppendF(&result, "[uid: %d frameRate: %s], ", uid, to_string(frameRate).c_str());

    }

    StringAppendF(&result, "}\n");

    const bool hasOverrides = maxOverridesCount() > 0;

    dumper.dump("FrameRateOverrides"sv, hasOverrides ? ""sv : "none"sv);



    StringAppendF(&result, "Frame Rate Overrides (GameManager): {");

    for (const auto& [uid, frameRate] : mFrameRateOverridesFromGameManager) {

        StringAppendF(&result, "[uid: %d frameRate: %s], ", uid, to_string(frameRate).c_str());

    if (!hasOverrides) return;



    dump(dumper, "setFrameRate"sv, mFrameRateOverridesByContent);

    dump(dumper, "GameManager"sv, mFrameRateOverridesFromGameManager);

    dump(dumper, "Backdoor"sv, mFrameRateOverridesFromBackdoor);

}

    StringAppendF(&result, "}\n");



    StringAppendF(&result, "Frame Rate Overrides (setFrameRate): {");

    for (const auto& [uid, frameRate] : mFrameRateOverridesByContent) {

        StringAppendF(&result, "[uid: %d frameRate: %s], ", uid, to_string(frameRate).c_str());

void FrameRateOverrideMappings::dump(utils::Dumper& dumper, std::string_view name,

                                     const UidToFrameRateOverride& overrides) const {

    if (overrides.empty()) return;



    utils::Dumper::Indent indent(dumper);

    dumper.dump(name);

    {

        utils::Dumper::Indent indent(dumper);

        for (const auto& [uid, frameRate] : overrides) {

            using namespace std::string_view_literals;

            dumper.dump("(uid, frameRate)"sv, uid, frameRate);

        }

    }

    StringAppendF(&result, "}\n");

}



bool FrameRateOverrideMappings::updateFrameRateOverridesByContent(