NotifySharedMemoryUpdate -> CommitData
This CL replaces the NotifySharedMemoryUpdate with a new
CommitData method. The new fields in the CommitDataRequest are
not used yet and will be used in the upcoming CLs.
This CL doesn't introduce any behavioral change.
The only other change here is about getting rid of
the callback in SharedMemoryArbiter. There seems to
be no good reason for that, and just makes the code
harder to read.
Test: perfetto_unittest
Bug: 73612642
Change-Id: I12c9fd7133d1916e30eb31fc50014d64b1e35be0
diff --git a/Android.bp b/Android.bp
index 8879d38..4f5c8de 100644
--- a/Android.bp
+++ b/Android.bp
@@ -57,6 +57,7 @@
"src/traced/probes/probes.cc",
"src/traced/probes/probes_producer.cc",
"src/traced/service/service.cc",
+ "src/tracing/core/commit_data_request.cc",
"src/tracing/core/data_source_config.cc",
"src/tracing/core/data_source_descriptor.cc",
"src/tracing/core/ftrace_config.cc",
@@ -133,6 +134,7 @@
"src/protozero/message_handle.cc",
"src/protozero/proto_utils.cc",
"src/protozero/scattered_stream_writer.cc",
+ "src/tracing/core/commit_data_request.cc",
"src/tracing/core/data_source_config.cc",
"src/tracing/core/data_source_descriptor.cc",
"src/tracing/core/ftrace_config.cc",
@@ -252,6 +254,7 @@
"src/protozero/proto_utils.cc",
"src/protozero/scattered_stream_writer.cc",
"src/traced/probes/probes_producer.cc",
+ "src/tracing/core/commit_data_request.cc",
"src/tracing/core/data_source_config.cc",
"src/tracing/core/data_source_descriptor.cc",
"src/tracing/core/ftrace_config.cc",
@@ -357,6 +360,7 @@
genrule {
name: "perfetto_protos_perfetto_ipc_ipc_gen",
srcs: [
+ "protos/perfetto/ipc/commit_data_request.proto",
"protos/perfetto/ipc/consumer_port.proto",
"protos/perfetto/ipc/producer_port.proto",
],
@@ -366,6 +370,8 @@
],
cmd: "mkdir -p $(genDir)/external/perfetto/protos && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/protos --proto_path=external/perfetto/protos --plugin=protoc-gen-plugin=$(location perfetto_src_ipc_protoc_plugin_ipc_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=:$(genDir)/external/perfetto/protos $(in)",
out: [
+ "external/perfetto/protos/perfetto/ipc/commit_data_request.ipc.cc",
+ "external/perfetto/protos/perfetto/ipc/commit_data_request.pb.cc",
"external/perfetto/protos/perfetto/ipc/consumer_port.ipc.cc",
"external/perfetto/protos/perfetto/ipc/consumer_port.pb.cc",
"external/perfetto/protos/perfetto/ipc/producer_port.ipc.cc",
@@ -377,6 +383,7 @@
genrule {
name: "perfetto_protos_perfetto_ipc_ipc_gen_headers",
srcs: [
+ "protos/perfetto/ipc/commit_data_request.proto",
"protos/perfetto/ipc/consumer_port.proto",
"protos/perfetto/ipc/producer_port.proto",
],
@@ -386,6 +393,8 @@
],
cmd: "mkdir -p $(genDir)/external/perfetto/protos && $(location aprotoc) --cpp_out=$(genDir)/external/perfetto/protos --proto_path=external/perfetto/protos --plugin=protoc-gen-plugin=$(location perfetto_src_ipc_protoc_plugin_ipc_plugin___gn_standalone_toolchain_gcc_like_host_) --plugin_out=:$(genDir)/external/perfetto/protos $(in)",
out: [
+ "external/perfetto/protos/perfetto/ipc/commit_data_request.ipc.h",
+ "external/perfetto/protos/perfetto/ipc/commit_data_request.pb.h",
"external/perfetto/protos/perfetto/ipc/consumer_port.ipc.h",
"external/perfetto/protos/perfetto/ipc/consumer_port.pb.h",
"external/perfetto/protos/perfetto/ipc/producer_port.ipc.h",
@@ -2849,6 +2858,7 @@
"src/protozero/message_handle.cc",
"src/protozero/proto_utils.cc",
"src/protozero/scattered_stream_writer.cc",
+ "src/tracing/core/commit_data_request.cc",
"src/tracing/core/data_source_config.cc",
"src/tracing/core/data_source_descriptor.cc",
"src/tracing/core/ftrace_config.cc",
@@ -2990,6 +3000,7 @@
"src/protozero/scattered_stream_writer_unittest.cc",
"src/protozero/test/fake_scattered_buffer.cc",
"src/protozero/test/protozero_conformance_unittest.cc",
+ "src/tracing/core/commit_data_request.cc",
"src/tracing/core/data_source_config.cc",
"src/tracing/core/data_source_descriptor.cc",
"src/tracing/core/ftrace_config.cc",