Merge "SF: Fix IGBP list leak" into pi-dev (891f1c0c) · Commits · e / os / android_frameworks_native-old

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;

		@@ -3140,12 +3139,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++;
		}