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: I8baaae9c512284a0d4fc926094dd8ed6eb23a43f
diff --git a/services/surfaceflinger/tests/tracing/TransactionTraceTestSuite.cpp b/services/surfaceflinger/tests/tracing/TransactionTraceTestSuite.cpp
index 333768a..7a07634 100644
--- a/services/surfaceflinger/tests/tracing/TransactionTraceTestSuite.cpp
+++ b/services/surfaceflinger/tests/tracing/TransactionTraceTestSuite.cpp
@@ -23,8 +23,8 @@
#include <unordered_map>
#include <LayerProtoHelper.h>
-#include <LayerTraceGenerator.h>
#include <Tracing/TransactionProtoParser.h>
+#include <Tracing/tools/LayerTraceGenerator.h>
#include <layerproto/LayerProtoHeader.h>
#include <log/log.h>
@@ -40,9 +40,9 @@
static constexpr std::string_view sLayersTracePrefix = "layers_trace_";
static constexpr std::string_view sTracePostfix = ".winscope";
- proto::TransactionTraceFile mTransactionTrace;
- LayersTraceFileProto mExpectedLayersTraceProto;
- LayersTraceFileProto mActualLayersTraceProto;
+ perfetto::protos::TransactionTraceFile mTransactionTrace;
+ perfetto::protos::LayersTraceFileProto mExpectedLayersTraceProto;
+ perfetto::protos::LayersTraceFileProto mActualLayersTraceProto;
protected:
void SetUp() override {
@@ -56,18 +56,23 @@
EXPECT_TRUE(std::filesystem::exists(std::filesystem::path(expectedLayersTracePath)));
parseLayersTraceFromFile(expectedLayersTracePath.c_str(), mExpectedLayersTraceProto);
TemporaryDir temp_dir;
+
std::string actualLayersTracePath =
std::string(temp_dir.path) + "/" + expectedLayersFilename + "_actual";
+ {
+ auto traceFlags = LayerTracing::TRACE_INPUT | LayerTracing::TRACE_BUFFERS;
+ std::ofstream outStream{actualLayersTracePath, std::ios::binary | std::ios::app};
+ EXPECT_TRUE(LayerTraceGenerator().generate(mTransactionTrace, traceFlags, outStream,
+ /*onlyLastEntry=*/true))
+ << "Failed to generate layers trace from " << transactionTracePath;
+ }
- EXPECT_TRUE(LayerTraceGenerator().generate(mTransactionTrace, actualLayersTracePath.c_str(),
- /*onlyLastEntry=*/true))
- << "Failed to generate layers trace from " << transactionTracePath;
EXPECT_TRUE(std::filesystem::exists(std::filesystem::path(actualLayersTracePath)));
parseLayersTraceFromFile(actualLayersTracePath.c_str(), mActualLayersTraceProto);
}
void parseTransactionTraceFromFile(const char* transactionTracePath,
- proto::TransactionTraceFile& outProto) {
+ perfetto::protos::TransactionTraceFile& outProto) {
ALOGD("Parsing file %s...", transactionTracePath);
std::fstream input(transactionTracePath, std::ios::in | std::ios::binary);
EXPECT_TRUE(input) << "Error could not open " << transactionTracePath;
@@ -75,7 +80,8 @@
<< "Failed to parse " << transactionTracePath;
}
- void parseLayersTraceFromFile(const char* layersTracePath, LayersTraceFileProto& outProto) {
+ void parseLayersTraceFromFile(const char* layersTracePath,
+ perfetto::protos::LayersTraceFileProto& outProto) {
ALOGD("Parsing file %s...", layersTracePath);
std::fstream input(layersTracePath, std::ios::in | std::ios::binary);
EXPECT_TRUE(input) << "Error could not open " << layersTracePath;
@@ -124,7 +130,7 @@
bool operator()(LayerInfo const& m) const { return m.id == id; }
};
-static LayerInfo getLayerInfoFromProto(::android::surfaceflinger::LayerProto& proto) {
+static LayerInfo getLayerInfoFromProto(perfetto::protos::LayerProto& proto) {
Rect touchableRegionBounds = Rect::INVALID_RECT;
// ignore touchable region for layers without buffers, the new fe aggressively avoids
// calculating state for layers that are not visible which could lead to mismatches
@@ -148,8 +154,7 @@
touchableRegionBounds};
}
-static std::vector<LayerInfo> getLayerInfosFromProto(
- perfetto::protos::pbzero::LayersSnapshotProto& entry) {
+static std::vector<LayerInfo> getLayerInfosFromProto(perfetto::protos::LayersSnapshotProto& entry) {
std::unordered_map<uint64_t /* snapshotId*/, uint64_t /*layerId*/> snapshotIdToLayerId;
std::vector<LayerInfo> layers;
layers.reserve(static_cast<size_t>(entry.layers().layers_size()));