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

Commit bc6c8601 authored by Dominik Laskowski's avatar Dominik Laskowski
Browse files

SF: Make thread safety macros zero-cost 

ON_MAIN_THREAD(mDisplays) incurred a copy. In other words, this failed:

    decltype(auto) displays = ON_MAIN_THREAD(mDisplays);
    static_assert(std::is_lvalue_reference_v<decltype(displays)>);

Bug: 182939859
Test: static_assert
Test: simpleperf
Change-Id: I19900d0350b832cd71457e5a6f11fa65b16e0412
parent 9f410f0a

services/surfaceflinger/SurfaceFlinger.cpp

+6 −8
Original line number Diff line number Diff line
@@ -147,15 +147,16 @@ 


#define MAIN_THREAD ACQUIRE(mStateLock) RELEASE(mStateLock)



// Note: The parentheses around `expr` are needed to deduce an lvalue or rvalue reference.

#define ON_MAIN_THREAD(expr)                                       \

    [&] {                                                          \

    [&]() -> decltype(auto) {                                      \

        LOG_FATAL_IF(std::this_thread::get_id() != mMainThreadId); \

        UnnecessaryLock lock(mStateLock);                          \

        return (expr);                                             \

    }()



#define MAIN_THREAD_GUARD(expr)                                    \

    [&] {                                                          \

    [&]() -> decltype(auto) {                                      \

        LOG_FATAL_IF(std::this_thread::get_id() != mMainThreadId); \

        MainThreadScopedGuard lock(SF_MAIN_THREAD);                \

        return (expr);                                             \
@@ -1345,9 +1346,8 @@ void SurfaceFlinger::disableExpensiveRendering() { 
    auto future = mScheduler->schedule([=]() MAIN_THREAD {

        ATRACE_CALL();

        if (mPowerAdvisor.isUsingExpensiveRendering()) {

            const auto& displays = ON_MAIN_THREAD(mDisplays);

            for (const auto& [_, display] : displays) {

                const static constexpr auto kDisable = false;

            for (const auto& [_, display] : mDisplays) {

                constexpr bool kDisable = false;

                mPowerAdvisor.setExpensiveRenderingExpected(display->getId(), kDisable);

            }

        }
@@ -3236,9 +3236,7 @@ void SurfaceFlinger::persistDisplayBrightness(bool needsComposite) { 
        return;

    }



    const auto& displays = ON_MAIN_THREAD(mDisplays);



    for (const auto& [_, display] : displays) {

    for (const auto& [_, display] : ON_MAIN_THREAD(mDisplays)) {

        if (const auto brightness = display->getStagedBrightness(); brightness) {

            if (!needsComposite) {

                const status_t error =