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

Commit 52f94081 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Android (Google) Code Review
Browse files

Merge "Changed mNumLayers to atomic"

parents 43f63694 eadf0d45

services/surfaceflinger/SurfaceFlinger.cpp

+3 −3
Original line number Diff line number Diff line
@@ -3429,7 +3429,7 @@ status_t SurfaceFlinger::addClientLayer(const sp<Client>& client, const sp<IBind 
        }



        if (mNumLayers >= MAX_LAYERS) {

            ALOGE("AddClientLayer failed, mNumLayers (%zu) >= MAX_LAYERS (%zu)", mNumLayers,

            ALOGE("AddClientLayer failed, mNumLayers (%zu) >= MAX_LAYERS (%zu)", mNumLayers.load(),

                  MAX_LAYERS);

            return NO_MEMORY;

        }
@@ -3453,7 +3453,7 @@ status_t SurfaceFlinger::addClientLayer(const sp<Client>& client, const sp<IBind 
                                        mMaxGraphicBufferProducerListSize,

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

                                mGraphicBufferProducerList.size(),

                                mMaxGraphicBufferProducerListSize, mNumLayers);

                                mMaxGraphicBufferProducerListSize, mNumLayers.load());

        }

        mLayersAdded = true;

    }
@@ -4806,7 +4806,7 @@ void SurfaceFlinger::dumpAllLocked(const DumpArgs& args, std::string& result) co 
     * Dump the visible layer list

     */

    colorizer.bold(result);

    StringAppendF(&result, "Visible layers (count = %zu)\n", mNumLayers);

    StringAppendF(&result, "Visible layers (count = %zu)\n", mNumLayers.load());

    StringAppendF(&result, "GraphicBufferProducers: %zu, max %zu\n",

                  mGraphicBufferProducerList.size(), mMaxGraphicBufferProducerListSize);

    colorizer.reset(result);

services/surfaceflinger/SurfaceFlinger.h

+1 −1
Original line number Diff line number Diff line
@@ -1071,7 +1071,7 @@ private: 
    // Static screen stats

    bool mHasPoweredOff = false;



    size_t mNumLayers = 0;

    std::atomic<size_t> mNumLayers = 0;



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

    // either AID_GRAPHICS or AID_SYSTEM.