Revert^2 Integrate layer tracing with perfetto
Define the perfetto custom data source LayerDataSource.
LayerDataSource is registered with perfetto. The data source
is used to listen to perfetto events (setup, start, stop, flush)
and to write trace packets to perfetto.
The user can configure/start/stop tracing via /system/bin/perfetto.
Tracing can operate in the following modes.
ACTIVE mode:
A layers snapshot is taken and written to perfetto for each vsyncid commit.
GENERATED mode:
Listens to the perfetto 'flush' event (e.g. when a bugreport is taken).
When a 'flush' event is received, the ring buffer of transactions (hold by TransactionTracing)
is processed by LayerTraceGenerator, a sequence of layers snapshots is generated
and written to perfetto.
DUMP mode:
When the 'start' event is received a single layers snapshot is taken
and written to perfetto.
Bug: b/284424784
Test: atest libsurfaceflinger_unittest && atest transactiontrace_testsuite
Change-Id: Ic1b10a040ec4533f0b56a4c8087c5a2898e3e34d
diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h
index 693bf3b..dc4e7cf 100644
--- a/services/surfaceflinger/SurfaceFlinger.h
+++ b/services/surfaceflinger/SurfaceFlinger.h
@@ -368,7 +368,6 @@
friend class RefreshRateOverlay;
friend class RegionSamplingThread;
friend class LayerRenderArea;
- friend class LayerTracing;
friend class SurfaceComposerAIDL;
friend class DisplayRenderArea;
@@ -1096,7 +1095,10 @@
void dumpOffscreenLayersProto(perfetto::protos::LayersProto& layersProto,
uint32_t traceFlags = LayerTracing::TRACE_ALL) const;
google::protobuf::RepeatedPtrField<perfetto::protos::DisplayProto> dumpDisplayProto() const;
- void addToLayerTracing(bool visibleRegionDirty, TimePoint, VsyncId)
+ void doActiveLayersTracingIfNeeded(bool isCompositionComputed, bool visibleRegionDirty,
+ TimePoint, VsyncId) REQUIRES(kMainThreadContext);
+ perfetto::protos::LayersSnapshotProto takeLayersSnapshotProto(uint32_t flags, TimePoint,
+ VsyncId, bool visibleRegionDirty)
REQUIRES(kMainThreadContext);
// Dumps state from HW Composer
@@ -1261,10 +1263,7 @@
bool mBackpressureGpuComposition = false;
LayerTracing mLayerTracing;
- bool mLayerTracingEnabled = false;
-
std::optional<TransactionTracing> mTransactionTracing;
- std::atomic<bool> mTracingEnabledChanged = false;
const std::shared_ptr<TimeStats> mTimeStats;
const std::unique_ptr<FrameTracer> mFrameTracer;