Merge "Fix crash from asynchronous GPU metrics" into main (a0536547) · Commits · e / os / android_frameworks_base

libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -115,7 +115,7 @@ IRenderPipeline::DrawResult SkiaOpenGLPipeline::draw(
		const LightGeometry& lightGeometry, LayerUpdateQueue* layerUpdateQueue,
		const Rect& contentDrawBounds, bool opaque, const LightInfo& lightInfo,
		const std::vector<sp<RenderNode>>& renderNodes, FrameInfoVisualizer* profiler,
		const HardwareBufferRenderParams& bufferParams) {
		const HardwareBufferRenderParams& bufferParams, std::mutex& profilerLock) {
		if (!isCapturingSkp() && !mHardwareBuffer) {
		mEglManager.damageFrame(frame, dirty);
		}
		@@ -167,6 +167,7 @@ IRenderPipeline::DrawResult SkiaOpenGLPipeline::draw(
		// Draw visual debugging features
		if (CC_UNLIKELY(Properties::showDirtyRegions \|\|
		ProfileType::None != Properties::getProfileType())) {
		std::scoped_lock lock(profilerLock);
		SkCanvas* profileCanvas = surface->getCanvas();
		SkiaProfileRenderer profileRenderer(profileCanvas, frame.width(), frame.height());
		profiler->draw(profileRenderer);

libs/hwui/pipeline/skia/SkiaOpenGLPipeline.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,8 @@ public:
		const LightGeometry& lightGeometry, LayerUpdateQueue* layerUpdateQueue,
		const Rect& contentDrawBounds, bool opaque, const LightInfo& lightInfo,
		const std::vector<sp<RenderNode> >& renderNodes, FrameInfoVisualizer* profiler,
		const renderthread::HardwareBufferRenderParams& bufferParams) override;
		const renderthread::HardwareBufferRenderParams& bufferParams,
		std::mutex& profilerLock) override;
		GrSurfaceOrigin getSurfaceOrigin() override { return kBottomLeft_GrSurfaceOrigin; }
		bool swapBuffers(const renderthread::Frame& frame, bool drew, const SkRect& screenDirty,
		FrameInfo* currentFrameInfo, bool* requireSwap) override;

libs/hwui/pipeline/skia/SkiaVulkanPipeline.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@ IRenderPipeline::DrawResult SkiaVulkanPipeline::draw(
		const LightGeometry& lightGeometry, LayerUpdateQueue* layerUpdateQueue,
		const Rect& contentDrawBounds, bool opaque, const LightInfo& lightInfo,
		const std::vector<sp<RenderNode>>& renderNodes, FrameInfoVisualizer* profiler,
		const HardwareBufferRenderParams& bufferParams) {
		const HardwareBufferRenderParams& bufferParams, std::mutex& profilerLock) {
		sk_sp<SkSurface> backBuffer;
		SkMatrix preTransform;
		if (mHardwareBuffer) {
		@@ -103,6 +103,7 @@ IRenderPipeline::DrawResult SkiaVulkanPipeline::draw(
		// Draw visual debugging features
		if (CC_UNLIKELY(Properties::showDirtyRegions \|\|
		ProfileType::None != Properties::getProfileType())) {
		std::scoped_lock lock(profilerLock);
		SkCanvas* profileCanvas = backBuffer->getCanvas();
		SkAutoCanvasRestore saver(profileCanvas, true);
		profileCanvas->concat(mVkSurface->getCurrentPreTransform());

libs/hwui/pipeline/skia/SkiaVulkanPipeline.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,8 @@ public:
		const LightGeometry& lightGeometry, LayerUpdateQueue* layerUpdateQueue,
		const Rect& contentDrawBounds, bool opaque, const LightInfo& lightInfo,
		const std::vector<sp<RenderNode> >& renderNodes, FrameInfoVisualizer* profiler,
		const renderthread::HardwareBufferRenderParams& bufferParams) override;
		const renderthread::HardwareBufferRenderParams& bufferParams,
		std::mutex& profilerLock) override;
		GrSurfaceOrigin getSurfaceOrigin() override { return kTopLeft_GrSurfaceOrigin; }
		bool swapBuffers(const renderthread::Frame& frame, bool drew, const SkRect& screenDirty,
		FrameInfo* currentFrameInfo, bool* requireSwap) override;

libs/hwui/renderthread/CanvasContext.cpp

+8 −12

Original line number	Diff line number	Diff line
		@@ -592,14 +592,10 @@ void CanvasContext::draw(bool solelyTextureViewUpdates) {
		{
		// FrameInfoVisualizer accesses the frame events, which cannot be mutated mid-draw
		// or it can lead to memory corruption.
		// This lock is overly broad, but it's the quickest fix since this mutex is otherwise
		// not visible to IRenderPipeline much less FrameInfoVisualizer. And since this is
		// the thread we're primarily concerned about being responsive, this being too broad
		// shouldn't pose a performance issue.
		std::scoped_lock lock(mFrameMetricsReporterMutex);
		drawResult = mRenderPipeline->draw(frame, windowDirty, dirty, mLightGeometry,
		&mLayerUpdateQueue, mContentDrawBounds, mOpaque,
		mLightInfo, mRenderNodes, &(profiler()), mBufferParams);
		mLightInfo, mRenderNodes, &(profiler()), mBufferParams,
		profilerLock());
		}

		uint64_t frameCompleteNr = getFrameNumber();
		@@ -729,7 +725,7 @@ void CanvasContext::draw(bool solelyTextureViewUpdates) {
		mCurrentFrameInfo->markFrameCompleted();
		mCurrentFrameInfo->set(FrameInfoIndex::GpuCompleted)
		= mCurrentFrameInfo->get(FrameInfoIndex::FrameCompleted);
		std::scoped_lock lock(mFrameMetricsReporterMutex);
		std::scoped_lock lock(mFrameInfoMutex);
		mJankTracker.finishFrame(*mCurrentFrameInfo, mFrameMetricsReporter, frameCompleteNr,
		mSurfaceControlGenerationId);
		}
		@@ -758,7 +754,7 @@ void CanvasContext::draw(bool solelyTextureViewUpdates) {

		void CanvasContext::reportMetricsWithPresentTime() {
		{ // acquire lock
		std::scoped_lock lock(mFrameMetricsReporterMutex);
		std::scoped_lock lock(mFrameInfoMutex);
		if (mFrameMetricsReporter == nullptr) {
		return;
		}
		@@ -793,7 +789,7 @@ void CanvasContext::reportMetricsWithPresentTime() {

		forthBehind->set(FrameInfoIndex::DisplayPresentTime) = presentTime;
		{ // acquire lock
		std::scoped_lock lock(mFrameMetricsReporterMutex);
		std::scoped_lock lock(mFrameInfoMutex);
		if (mFrameMetricsReporter != nullptr) {
		mFrameMetricsReporter->reportFrameMetrics(forthBehind->data(), true /hasPresentTime/,
		frameNumber, surfaceControlId);
		@@ -802,7 +798,7 @@ void CanvasContext::reportMetricsWithPresentTime() {
		}

		void CanvasContext::addFrameMetricsObserver(FrameMetricsObserver* observer) {
		std::scoped_lock lock(mFrameMetricsReporterMutex);
		std::scoped_lock lock(mFrameInfoMutex);
		if (mFrameMetricsReporter.get() == nullptr) {
		mFrameMetricsReporter.reset(new FrameMetricsReporter());
		}
		@@ -816,7 +812,7 @@ void CanvasContext::addFrameMetricsObserver(FrameMetricsObserver* observer) {
		}

		void CanvasContext::removeFrameMetricsObserver(FrameMetricsObserver* observer) {
		std::scoped_lock lock(mFrameMetricsReporterMutex);
		std::scoped_lock lock(mFrameInfoMutex);
		if (mFrameMetricsReporter.get() != nullptr) {
		mFrameMetricsReporter->removeObserver(observer);
		if (!mFrameMetricsReporter->hasObservers()) {
		@@ -853,7 +849,7 @@ void CanvasContext::onSurfaceStatsAvailable(void* context, int32_t surfaceContro
		FrameInfo* frameInfo = instance->getFrameInfoFromLast4(frameNumber, surfaceControlId);

		if (frameInfo != nullptr) {
		std::scoped_lock lock(instance->mFrameMetricsReporterMutex);
		std::scoped_lock lock(instance->mFrameInfoMutex);
		frameInfo->set(FrameInfoIndex::FrameCompleted) = std::max(gpuCompleteTime,
		frameInfo->get(FrameInfoIndex::SwapBuffersCompleted));
		frameInfo->set(FrameInfoIndex::GpuCompleted) = std::max(