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

Commit 243b378f authored by Yiwei Zhang's avatar Yiwei Zhang
Browse files

SF: Fix IGBP list leak 

This change fixed the IGBP list leak.

Bug: b/77602128
Test: open and close an app repeatedly and check the GraphicBufferProducers size in dumpsys SurfaceFlinger
Change-Id: I2dbf4ee2c20c4404bfb15bbc2ab89df5783d90a4
parent 63a2d825

services/surfaceflinger/SurfaceFlinger.cpp

+9 −8
Original line number Diff line number Diff line
@@ -316,8 +316,7 @@ SurfaceFlinger::SurfaceFlinger() : SurfaceFlinger(SkipInitialization) { 
    mLayerTripleBufferingDisabled = atoi(value);

    ALOGI_IF(mLayerTripleBufferingDisabled, "Disabling Triple Buffering");



    // TODO (b/74616334): Reduce the default value once we isolate the leak

    const size_t defaultListSize = 4 * MAX_LAYERS;

    const size_t defaultListSize = MAX_LAYERS;

    auto listSize = property_get_int32("debug.sf.max_igbp_list_size", int32_t(defaultListSize));

    mMaxGraphicBufferProducerListSize = (listSize > 0) ? size_t(listSize) : defaultListSize;
@@ -3150,12 +3149,14 @@ status_t SurfaceFlinger::addClientLayer(const sp<Client>& client, 
            parent->addChild(lbc);

        }



        if (gbc != nullptr) {

            mGraphicBufferProducerList.insert(IInterface::asBinder(gbc).get());

        // TODO (b/74616334): Change this back to a fatal assert once the leak is fixed

        ALOGE_IF(mGraphicBufferProducerList.size() > mMaxGraphicBufferProducerListSize,

            LOG_ALWAYS_FATAL_IF(mGraphicBufferProducerList.size() >

                                        mMaxGraphicBufferProducerListSize,

                                "Suspected IGBP leak: %zu IGBPs (%zu max), %zu Layers",

                 mGraphicBufferProducerList.size(), mMaxGraphicBufferProducerListSize,

                 mNumLayers);

                                mGraphicBufferProducerList.size(),

                                mMaxGraphicBufferProducerListSize, mNumLayers);

        }

        mLayersAdded = true;

        mNumLayers++;

    }