Merge "Fix a long standing locking issue with tracing thread" into rvc-dev am: a473a08b15 (2338278d) · Commits · e / os / android_frameworks_native

services/surfaceflinger/Layer.cpp

+17 −15

Original line number	Diff line number	Diff line
		@@ -2134,11 +2134,13 @@ LayerProto* Layer::writeToProto(LayersProto& layersProto, uint32_t traceFlags,
		writeToProtoDrawingState(layerProto, traceFlags);
		writeToProtoCommonState(layerProto, LayerVector::StateSet::Drawing, traceFlags);

		if (traceFlags & SurfaceTracing::TRACE_COMPOSITION) {
		// Only populate for the primary display.
		if (device) {
		const Hwc2::IComposerClient::Composition compositionType = getCompositionType(device);
		layerProto->set_hwc_composition_type(static_cast<HwcCompositionType>(compositionType));
		}
		}

		for (const sp<Layer>& layer : mDrawingChildren) {
		layer->writeToProto(layersProto, traceFlags, device);
		@@ -2180,8 +2182,10 @@ void Layer::writeToProtoDrawingState(LayerProto* layerInfo, uint32_t traceFlags)
		LayerProtoHelper::writePositionToProto(transform.tx(), transform.ty(),
		[&]() { return layerInfo->mutable_position(); });
		LayerProtoHelper::writeToProto(mBounds, [&]() { return layerInfo->mutable_bounds(); });
		if (traceFlags & SurfaceTracing::TRACE_COMPOSITION) {
		LayerProtoHelper::writeToProto(debugGetVisibleRegionOnDefaultDisplay(),
		[&]() { return layerInfo->mutable_visible_region(); });
		}
		LayerProtoHelper::writeToProto(surfaceDamageRegion,
		[&]() { return layerInfo->mutable_damage_region(); });

		@@ -2191,7 +2195,6 @@ void Layer::writeToProtoDrawingState(LayerProto* layerInfo, uint32_t traceFlags)
		}
		}

		if (traceFlags & SurfaceTracing::TRACE_EXTRA) {
		LayerProtoHelper::writeToProto(mSourceBounds,
		[&]() { return layerInfo->mutable_source_bounds(); });
		LayerProtoHelper::writeToProto(mScreenBounds,
		@@ -2200,7 +2203,6 @@ void Layer::writeToProtoDrawingState(LayerProto* layerInfo, uint32_t traceFlags)
		[&]() { return layerInfo->mutable_corner_radius_crop(); });
		layerInfo->set_shadow_radius(mEffectiveShadowRadius);
		}
		}

		void Layer::writeToProtoCommonState(LayerProto* layerInfo, LayerVector::StateSet stateSet,
		uint32_t traceFlags) const {

services/surfaceflinger/SurfaceFlinger.cpp

+14 −5

Original line number	Diff line number	Diff line
		@@ -1935,8 +1935,18 @@ void SurfaceFlinger::onMessageReceived(int32_t what) NO_THREAD_SAFETY_ANALYSIS {
		// potentially trigger a display handoff.
		updateVrFlinger();

		bool refreshNeeded = handleMessageTransaction();
		bool refreshNeeded;
		withTracingLock([&]() {
		refreshNeeded = handleMessageTransaction();
		refreshNeeded \|= handleMessageInvalidate();
		if (mTracingEnabled) {
		mAddCompositionStateToTrace =
		mTracing.flagIsSetLocked(SurfaceTracing::TRACE_COMPOSITION);
		if (mVisibleRegionsDirty && !mAddCompositionStateToTrace) {
		mTracing.notifyLocked("visibleRegionsDirty");
		}
		}
		});

		// Layers need to get updated (in the previous line) before we can use them for
		// choosing the refresh rate.
		@@ -2080,7 +2090,7 @@ void SurfaceFlinger::handleMessageRefresh() {
		mLayersWithQueuedFrames.clear();
		if (mVisibleRegionsDirty) {
		mVisibleRegionsDirty = false;
		if (mTracingEnabled) {
		if (mTracingEnabled && mAddCompositionStateToTrace) {
		mTracing.notify("visibleRegionsDirty");
		}
		}
		@@ -2962,8 +2972,7 @@ void SurfaceFlinger::initScheduler(DisplayId primaryDisplayId) {

		void SurfaceFlinger::commitTransaction()
		{
		withTracingLock([this]() { commitTransactionLocked(); });

		commitTransactionLocked();
		mTransactionPending = false;
		mAnimTransactionPending = false;
		mTransactionCV.broadcast();

services/surfaceflinger/SurfaceFlinger.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -1073,6 +1073,7 @@ private:
		std::unique_ptr<SurfaceInterceptor> mInterceptor;
		SurfaceTracing mTracing{*this};
		bool mTracingEnabled = false;
		bool mAddCompositionStateToTrace = false;
		bool mTracingEnabledChanged GUARDED_BY(mStateLock) = false;
		const std::shared_ptr<TimeStats> mTimeStats;
		const std::unique_ptr<FrameTracer> mFrameTracer;

services/surfaceflinger/SurfaceTracing.cpp

+18 −1

Original line number	Diff line number	Diff line
		@@ -60,6 +60,8 @@ LayersTraceProto SurfaceTracing::traceWhenNotified() {
		mCanStartTrace.wait(lock);
		android::base::ScopedLockAssertion assumeLock(mSfLock);
		LayersTraceProto entry = traceLayersLocked(mWhere, displayDevice);
		mTracingInProgress = false;
		mMissedTraceEntries = 0;
		lock.unlock();
		return entry;
		}
		@@ -76,7 +78,15 @@ bool SurfaceTracing::addTraceToBuffer(LayersTraceProto& entry) {

		void SurfaceTracing::notify(const char* where) {
		std::scoped_lock lock(mSfLock);
		notifyLocked(where);
		}

		void SurfaceTracing::notifyLocked(const char* where) {
		mWhere = where;
		if (mTracingInProgress) {
		mMissedTraceEntries++;
		}
		mTracingInProgress = true;
		mCanStartTrace.notify_one();
		}

		@@ -175,7 +185,10 @@ LayersTraceProto SurfaceTracing::traceLayersLocked(const char* where,
		entry.set_elapsed_realtime_nanos(elapsedRealtimeNano());
		entry.set_where(where);
		LayersProto layers(mFlinger.dumpDrawingStateProto(mTraceFlags, displayDevice));

		if (flagIsSetLocked(SurfaceTracing::TRACE_EXTRA)) {
		mFlinger.dumpOffscreenLayersProto(layers);
		}
		entry.mutable_layers()->Swap(&layers);

		if (mTraceFlags & SurfaceTracing::TRACE_HWC) {
		@@ -183,6 +196,10 @@ LayersTraceProto SurfaceTracing::traceLayersLocked(const char* where,
		mFlinger.dumpHwc(hwcDump);
		entry.set_hwc_blob(hwcDump);
		}
		if (!flagIsSetLocked(SurfaceTracing::TRACE_COMPOSITION)) {
		entry.set_excludes_composition_state(true);
		}
		entry.set_missed_entries(mMissedTraceEntries);

		return entry;
		}

services/surfaceflinger/SurfaceTracing.h

+9 −2

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ public:
		status_t writeToFile();
		bool isEnabled() const;
		void notify(const char* where);
		void notifyLocked(const char* where) NO_THREAD_SAFETY_ANALYSIS /* REQUIRES(mSfLock) */;

		void setBufferSize(size_t bufferSizeInByte);
		void writeToFileAsync();
		@@ -57,11 +58,15 @@ public:
		enum : uint32_t {
		TRACE_CRITICAL = 1 << 0,
		TRACE_INPUT = 1 << 1,
		TRACE_EXTRA = 1 << 2,
		TRACE_HWC = 1 << 3,
		TRACE_COMPOSITION = 1 << 2,
		TRACE_EXTRA = 1 << 3,
		TRACE_HWC = 1 << 4,
		TRACE_ALL = 0xffffffff
		};
		void setTraceFlags(uint32_t flags);
		bool flagIsSetLocked(uint32_t flags) NO_THREAD_SAFETY_ANALYSIS /* REQUIRES(mSfLock) */ {
		return (mTraceFlags & flags) == flags;
		}

		private:
		static constexpr auto kDefaultBufferCapInByte = 5_MB;
		@@ -103,6 +108,8 @@ private:
		std::mutex& mSfLock;
		uint32_t mTraceFlags GUARDED_BY(mSfLock) = TRACE_CRITICAL \| TRACE_INPUT;
		const char* mWhere GUARDED_BY(mSfLock) = "";
		uint32_t mMissedTraceEntries GUARDED_BY(mSfLock) = 0;
		bool mTracingInProgress GUARDED_BY(mSfLock) = false;

		mutable std::mutex mTraceLock;
		LayersTraceBuffer mBuffer GUARDED_BY(mTraceLock);