Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master (76cc73e9) · Commits · e / os / android_frameworks_native-old

libs/dumputils/dump_utils.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,7 @@ static const char* native_processes_to_dump[] = {
		static const char* hal_interfaces_to_dump[] {
		"android.hardware.audio@2.0::IDevicesFactory",
		"android.hardware.audio@4.0::IDevicesFactory",
		"android.hardware.biometrics.face@1.0::IBiometricsFace",
		"android.hardware.bluetooth@1.0::IBluetoothHci",
		"android.hardware.camera.provider@2.4::ICameraProvider",
		"android.hardware.drm@1.0::IDrmFactory",

libs/graphicsenv/GraphicsEnv.cpp

+4 −2

Original line number	Diff line number	Diff line
		@@ -213,7 +213,8 @@ void GraphicsEnv::setDriverToLoad(GraphicsEnv::Driver driver) {
		case GraphicsEnv::Driver::GL:
		case GraphicsEnv::Driver::GL_UPDATED:
		case GraphicsEnv::Driver::ANGLE: {
		if (mGpuStats.glDriverToLoad == GraphicsEnv::Driver::NONE) {
		if (mGpuStats.glDriverToLoad == GraphicsEnv::Driver::NONE \|\|
		mGpuStats.glDriverToLoad == GraphicsEnv::Driver::GL) {
		mGpuStats.glDriverToLoad = driver;
		break;
		}
		@@ -225,7 +226,8 @@ void GraphicsEnv::setDriverToLoad(GraphicsEnv::Driver driver) {
		}
		case Driver::VULKAN:
		case Driver::VULKAN_UPDATED: {
		if (mGpuStats.vkDriverToLoad == GraphicsEnv::Driver::NONE) {
		if (mGpuStats.vkDriverToLoad == GraphicsEnv::Driver::NONE \|\|
		mGpuStats.vkDriverToLoad == GraphicsEnv::Driver::VULKAN) {
		mGpuStats.vkDriverToLoad = driver;
		break;
		}

libs/gui/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ cc_library_shared {
		"BufferItemConsumer.cpp",
		"ConsumerBase.cpp",
		"CpuConsumer.cpp",
		"DebugEGLImageTracker.cpp",
		"DisplayEventReceiver.cpp",
		"GLConsumer.cpp",
		"GuiConfig.cpp",

libs/gui/BufferQueueProducer.cpp

+9 −0

Original line number	Diff line number	Diff line
		@@ -936,6 +936,15 @@ status_t BufferQueueProducer::queueBuffer(int slot,
		}
		}

		// Make sure to merge the damage rect from the frame we're about
		// to drop into the new frame's damage rect.
		if (last.mSurfaceDamage.bounds() == Rect::INVALID_RECT \|\|
		item.mSurfaceDamage.bounds() == Rect::INVALID_RECT) {
		item.mSurfaceDamage = Region::INVALID_REGION;
		} else {
		item.mSurfaceDamage \|= last.mSurfaceDamage;
		}

		// Overwrite the droppable buffer with the incoming one
		mCore->mQueue.editItemAt(mCore->mQueue.size() - 1) = item;
		frameReplacedListener = mCore->mConsumerListener;

libs/gui/DebugEGLImageTracker.cpp

0 → 100644

+98 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#include <android-base/stringprintf.h>
		#include <cutils/properties.h>
		#include <gui/DebugEGLImageTracker.h>

		#include <cinttypes>
		#include <unordered_map>

		using android::base::StringAppendF;

		std::mutex DebugEGLImageTracker::mInstanceLock;
		std::atomic<DebugEGLImageTracker *> DebugEGLImageTracker::mInstance;

		class DebugEGLImageTrackerNoOp : public DebugEGLImageTracker {
		public:
		DebugEGLImageTrackerNoOp() = default;
		~DebugEGLImageTrackerNoOp() override = default;
		void create(const char * /from/) override {}
		void destroy(const char * /from/) override {}

		void dump(std::string & /result/) override {}
		};

		class DebugEGLImageTrackerImpl : public DebugEGLImageTracker {
		public:
		DebugEGLImageTrackerImpl() = default;
		~DebugEGLImageTrackerImpl() override = default;
		void create(const char * /from/) override;
		void destroy(const char * /from/) override;

		void dump(std::string & /result/) override;

		private:
		std::mutex mLock;
		std::unordered_map<std::string, int64_t> mCreateTracker;
		std::unordered_map<std::string, int64_t> mDestroyTracker;

		int64_t mTotalCreated = 0;
		int64_t mTotalDestroyed = 0;
		};

		DebugEGLImageTracker *DebugEGLImageTracker::getInstance() {
		std::lock_guard lock(mInstanceLock);
		if (mInstance == nullptr) {
		char value[PROPERTY_VALUE_MAX];
		property_get("debug.sf.enable_egl_image_tracker", value, "0");
		const bool enabled = static_cast<bool>(atoi(value));

		if (enabled) {
		mInstance = new DebugEGLImageTrackerImpl();
		} else {
		mInstance = new DebugEGLImageTrackerNoOp();
		}
		}

		return mInstance;
		}

		void DebugEGLImageTrackerImpl::create(const char *from) {
		std::lock_guard lock(mLock);
		mCreateTracker[from]++;
		mTotalCreated++;
		}

		void DebugEGLImageTrackerImpl::destroy(const char *from) {
		std::lock_guard lock(mLock);
		mDestroyTracker[from]++;
		mTotalDestroyed++;
		}

		void DebugEGLImageTrackerImpl::dump(std::string &result) {
		std::lock_guard lock(mLock);
		StringAppendF(&result, "Live EGL Image objects: %" PRIi64 "\n",
		mTotalCreated - mTotalDestroyed);
		StringAppendF(&result, "Total EGL Image created: %" PRIi64 "\n", mTotalCreated);
		for (const auto &[from, count] : mCreateTracker) {
		StringAppendF(&result, "\t%s: %" PRIi64 "\n", from.c_str(), count);
		}
		StringAppendF(&result, "Total EGL Image destroyed: %" PRIi64 "\n", mTotalDestroyed);
		for (const auto &[from, count] : mDestroyTracker) {
		StringAppendF(&result, "\t%s: %" PRIi64 "\n", from.c_str(), count);
		}
		}