tp: move statsd_module into full target from minimal
Change-Id: I24229f2298be73dc346373290ced183b9c6ef916
diff --git a/Android.bp b/Android.bp
index 8c557a4..340826e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1977,9 +1977,9 @@
":perfetto_src_trace_processor_importers_fuchsia_fuchsia_record",
":perfetto_src_trace_processor_importers_importers_full",
":perfetto_src_trace_processor_importers_memory_tracker_graph_processor",
+ ":perfetto_src_trace_processor_importers_proto_full",
+ ":perfetto_src_trace_processor_importers_proto_minimal",
":perfetto_src_trace_processor_importers_proto_packet_sequence_state_generation_hdr",
- ":perfetto_src_trace_processor_importers_proto_storage_full",
- ":perfetto_src_trace_processor_importers_proto_storage_minimal",
":perfetto_src_trace_processor_importers_systrace_systrace_line",
":perfetto_src_trace_processor_lib",
":perfetto_src_trace_processor_metatrace",
@@ -2175,9 +2175,9 @@
"perfetto_src_base_version_gen_h",
"perfetto_src_trace_processor_importers_gen_cc_chrome_track_event_descriptor",
"perfetto_src_trace_processor_importers_gen_cc_config_descriptor",
- "perfetto_src_trace_processor_importers_gen_cc_statsd_atoms_descriptor",
"perfetto_src_trace_processor_importers_gen_cc_trace_descriptor",
"perfetto_src_trace_processor_importers_gen_cc_track_event_descriptor",
+ "perfetto_src_trace_processor_importers_proto_gen_cc_statsd_atoms_descriptor",
"perfetto_src_trace_processor_metrics_gen_cc_all_chrome_metrics_descriptor",
"perfetto_src_trace_processor_metrics_gen_cc_metrics_descriptor",
"perfetto_src_trace_processor_metrics_sql_gen_amalgamated_sql_metrics",
@@ -9236,21 +9236,6 @@
],
}
-// GN: //src/trace_processor/importers:gen_cc_statsd_atoms_descriptor
-genrule {
- name: "perfetto_src_trace_processor_importers_gen_cc_statsd_atoms_descriptor",
- srcs: [
- "src/trace_processor/importers/proto/atoms.descriptor",
- ],
- cmd: "$(location tools/gen_cc_proto_descriptor.py) --gen_dir=$(genDir) --cpp_out=$(out) $(in)",
- out: [
- "src/trace_processor/importers/atoms.descriptor.h",
- ],
- tool_files: [
- "tools/gen_cc_proto_descriptor.py",
- ],
-}
-
// GN: //src/trace_processor/importers:gen_cc_trace_descriptor
genrule {
name: "perfetto_src_trace_processor_importers_gen_cc_trace_descriptor",
@@ -9336,31 +9321,50 @@
],
}
-// GN: //src/trace_processor/importers/proto:packet_sequence_state_generation_hdr
+// GN: //src/trace_processor/importers/proto:full
filegroup {
- name: "perfetto_src_trace_processor_importers_proto_packet_sequence_state_generation_hdr",
-}
-
-// GN: //src/trace_processor/importers/proto:storage_full
-filegroup {
- name: "perfetto_src_trace_processor_importers_proto_storage_full",
+ name: "perfetto_src_trace_processor_importers_proto_full",
srcs: [
"src/trace_processor/importers/proto/heap_graph_tracker.cc",
+ "src/trace_processor/importers/proto/statsd_module.cc",
],
}
-// GN: //src/trace_processor/importers/proto:storage_minimal
+// GN: //src/trace_processor/importers/proto:gen_cc_statsd_atoms_descriptor
+genrule {
+ name: "perfetto_src_trace_processor_importers_proto_gen_cc_statsd_atoms_descriptor",
+ srcs: [
+ "src/trace_processor/importers/proto/atoms.descriptor",
+ ],
+ cmd: "$(location tools/gen_cc_proto_descriptor.py) --gen_dir=$(genDir) --cpp_out=$(out) $(in)",
+ out: [
+ "src/trace_processor/importers/proto/atoms.descriptor.h",
+ ],
+ tool_files: [
+ "tools/gen_cc_proto_descriptor.py",
+ ],
+}
+
+// GN: //src/trace_processor/importers/proto:minimal
filegroup {
- name: "perfetto_src_trace_processor_importers_proto_storage_minimal",
+ name: "perfetto_src_trace_processor_importers_proto_minimal",
srcs: [
"src/trace_processor/importers/proto/active_chrome_processes_tracker.cc",
+ "src/trace_processor/importers/proto/async_track_set_tracker.cc",
+ "src/trace_processor/importers/proto/chrome_string_lookup.cc",
"src/trace_processor/importers/proto/heap_profile_tracker.cc",
"src/trace_processor/importers/proto/packet_sequence_state_generation.cc",
"src/trace_processor/importers/proto/profiler_util.cc",
+ "src/trace_processor/importers/proto/proto_importer_module.cc",
"src/trace_processor/importers/proto/stack_profile_tracker.cc",
],
}
+// GN: //src/trace_processor/importers/proto:packet_sequence_state_generation_hdr
+filegroup {
+ name: "perfetto_src_trace_processor_importers_proto_packet_sequence_state_generation_hdr",
+}
+
// GN: //src/trace_processor/importers/proto:unittests
filegroup {
name: "perfetto_src_trace_processor_importers_proto_unittests",
@@ -9738,8 +9742,6 @@
"src/trace_processor/importers/json/json_utils.cc",
"src/trace_processor/importers/ninja/ninja_log_parser.cc",
"src/trace_processor/importers/proto/android_camera_event_module.cc",
- "src/trace_processor/importers/proto/async_track_set_tracker.cc",
- "src/trace_processor/importers/proto/chrome_string_lookup.cc",
"src/trace_processor/importers/proto/chrome_system_probes_module.cc",
"src/trace_processor/importers/proto/chrome_system_probes_parser.cc",
"src/trace_processor/importers/proto/memory_tracker_snapshot_module.cc",
@@ -9749,11 +9751,9 @@
"src/trace_processor/importers/proto/perf_sample_tracker.cc",
"src/trace_processor/importers/proto/profile_module.cc",
"src/trace_processor/importers/proto/profile_packet_utils.cc",
- "src/trace_processor/importers/proto/proto_importer_module.cc",
"src/trace_processor/importers/proto/proto_trace_parser.cc",
"src/trace_processor/importers/proto/proto_trace_reader.cc",
"src/trace_processor/importers/proto/proto_trace_tokenizer.cc",
- "src/trace_processor/importers/proto/statsd_module.cc",
"src/trace_processor/importers/proto/track_event_module.cc",
"src/trace_processor/importers/proto/track_event_parser.cc",
"src/trace_processor/importers/proto/track_event_tokenizer.cc",
@@ -11244,9 +11244,9 @@
":perfetto_src_trace_processor_importers_fuchsia_fuchsia_record",
":perfetto_src_trace_processor_importers_importers_full",
":perfetto_src_trace_processor_importers_memory_tracker_graph_processor",
+ ":perfetto_src_trace_processor_importers_proto_full",
+ ":perfetto_src_trace_processor_importers_proto_minimal",
":perfetto_src_trace_processor_importers_proto_packet_sequence_state_generation_hdr",
- ":perfetto_src_trace_processor_importers_proto_storage_full",
- ":perfetto_src_trace_processor_importers_proto_storage_minimal",
":perfetto_src_trace_processor_importers_proto_unittests",
":perfetto_src_trace_processor_importers_systrace_systrace_line",
":perfetto_src_trace_processor_lib",
@@ -11477,9 +11477,9 @@
"perfetto_src_trace_processor_gen_cc_test_messages_descriptor",
"perfetto_src_trace_processor_importers_gen_cc_chrome_track_event_descriptor",
"perfetto_src_trace_processor_importers_gen_cc_config_descriptor",
- "perfetto_src_trace_processor_importers_gen_cc_statsd_atoms_descriptor",
"perfetto_src_trace_processor_importers_gen_cc_trace_descriptor",
"perfetto_src_trace_processor_importers_gen_cc_track_event_descriptor",
+ "perfetto_src_trace_processor_importers_proto_gen_cc_statsd_atoms_descriptor",
"perfetto_src_trace_processor_metrics_gen_cc_all_chrome_metrics_descriptor",
"perfetto_src_trace_processor_metrics_gen_cc_metrics_descriptor",
"perfetto_src_trace_processor_metrics_sql_gen_amalgamated_sql_metrics",
@@ -11892,9 +11892,9 @@
":perfetto_src_trace_processor_importers_fuchsia_fuchsia_record",
":perfetto_src_trace_processor_importers_importers_full",
":perfetto_src_trace_processor_importers_memory_tracker_graph_processor",
+ ":perfetto_src_trace_processor_importers_proto_full",
+ ":perfetto_src_trace_processor_importers_proto_minimal",
":perfetto_src_trace_processor_importers_proto_packet_sequence_state_generation_hdr",
- ":perfetto_src_trace_processor_importers_proto_storage_full",
- ":perfetto_src_trace_processor_importers_proto_storage_minimal",
":perfetto_src_trace_processor_importers_systrace_systrace_line",
":perfetto_src_trace_processor_lib",
":perfetto_src_trace_processor_metatrace",
@@ -11968,9 +11968,9 @@
"perfetto_src_base_version_gen_h",
"perfetto_src_trace_processor_importers_gen_cc_chrome_track_event_descriptor",
"perfetto_src_trace_processor_importers_gen_cc_config_descriptor",
- "perfetto_src_trace_processor_importers_gen_cc_statsd_atoms_descriptor",
"perfetto_src_trace_processor_importers_gen_cc_trace_descriptor",
"perfetto_src_trace_processor_importers_gen_cc_track_event_descriptor",
+ "perfetto_src_trace_processor_importers_proto_gen_cc_statsd_atoms_descriptor",
"perfetto_src_trace_processor_metrics_gen_cc_all_chrome_metrics_descriptor",
"perfetto_src_trace_processor_metrics_gen_cc_metrics_descriptor",
"perfetto_src_trace_processor_metrics_sql_gen_amalgamated_sql_metrics",
@@ -12091,9 +12091,9 @@
":perfetto_src_trace_processor_importers_fuchsia_fuchsia_record",
":perfetto_src_trace_processor_importers_importers_full",
":perfetto_src_trace_processor_importers_memory_tracker_graph_processor",
+ ":perfetto_src_trace_processor_importers_proto_full",
+ ":perfetto_src_trace_processor_importers_proto_minimal",
":perfetto_src_trace_processor_importers_proto_packet_sequence_state_generation_hdr",
- ":perfetto_src_trace_processor_importers_proto_storage_full",
- ":perfetto_src_trace_processor_importers_proto_storage_minimal",
":perfetto_src_trace_processor_importers_systrace_systrace_line",
":perfetto_src_trace_processor_lib",
":perfetto_src_trace_processor_metatrace",
@@ -12169,9 +12169,9 @@
"perfetto_src_base_version_gen_h",
"perfetto_src_trace_processor_importers_gen_cc_chrome_track_event_descriptor",
"perfetto_src_trace_processor_importers_gen_cc_config_descriptor",
- "perfetto_src_trace_processor_importers_gen_cc_statsd_atoms_descriptor",
"perfetto_src_trace_processor_importers_gen_cc_trace_descriptor",
"perfetto_src_trace_processor_importers_gen_cc_track_event_descriptor",
+ "perfetto_src_trace_processor_importers_proto_gen_cc_statsd_atoms_descriptor",
"perfetto_src_trace_processor_metrics_gen_cc_all_chrome_metrics_descriptor",
"perfetto_src_trace_processor_metrics_gen_cc_metrics_descriptor",
"perfetto_src_trace_processor_metrics_sql_gen_amalgamated_sql_metrics",
diff --git a/BUILD b/BUILD
index 34e9f5b..0ffff73 100644
--- a/BUILD
+++ b/BUILD
@@ -1171,40 +1171,59 @@
],
)
-# GN target: //src/trace_processor/importers/proto:packet_sequence_state_generation_hdr
+# GN target: //src/trace_processor/importers/proto:full
perfetto_filegroup(
- name = "src_trace_processor_importers_proto_packet_sequence_state_generation_hdr",
- srcs = [
- "src/trace_processor/importers/proto/packet_sequence_state_generation.h",
- ],
-)
-
-# GN target: //src/trace_processor/importers/proto:storage_full
-perfetto_filegroup(
- name = "src_trace_processor_importers_proto_storage_full",
+ name = "src_trace_processor_importers_proto_full",
srcs = [
"src/trace_processor/importers/proto/heap_graph_tracker.cc",
"src/trace_processor/importers/proto/heap_graph_tracker.h",
+ "src/trace_processor/importers/proto/statsd_module.cc",
+ "src/trace_processor/importers/proto/statsd_module.h",
],
)
-# GN target: //src/trace_processor/importers/proto:storage_minimal
+# GN target: //src/trace_processor/importers/proto:gen_cc_statsd_atoms_descriptor
+perfetto_cc_proto_descriptor(
+ name = "src_trace_processor_importers_proto_gen_cc_statsd_atoms_descriptor",
+ deps = [
+ "src/trace_processor/importers/proto/atoms.descriptor",
+ ],
+ outs = [
+ "src/trace_processor/importers/proto/atoms.descriptor.h",
+ ],
+)
+
+# GN target: //src/trace_processor/importers/proto:minimal
perfetto_filegroup(
- name = "src_trace_processor_importers_proto_storage_minimal",
+ name = "src_trace_processor_importers_proto_minimal",
srcs = [
"src/trace_processor/importers/proto/active_chrome_processes_tracker.cc",
"src/trace_processor/importers/proto/active_chrome_processes_tracker.h",
+ "src/trace_processor/importers/proto/async_track_set_tracker.cc",
+ "src/trace_processor/importers/proto/async_track_set_tracker.h",
+ "src/trace_processor/importers/proto/chrome_string_lookup.cc",
+ "src/trace_processor/importers/proto/chrome_string_lookup.h",
"src/trace_processor/importers/proto/heap_profile_tracker.cc",
"src/trace_processor/importers/proto/heap_profile_tracker.h",
"src/trace_processor/importers/proto/packet_sequence_state.h",
"src/trace_processor/importers/proto/packet_sequence_state_generation.cc",
"src/trace_processor/importers/proto/profiler_util.cc",
"src/trace_processor/importers/proto/profiler_util.h",
+ "src/trace_processor/importers/proto/proto_importer_module.cc",
+ "src/trace_processor/importers/proto/proto_importer_module.h",
"src/trace_processor/importers/proto/stack_profile_tracker.cc",
"src/trace_processor/importers/proto/stack_profile_tracker.h",
],
)
+# GN target: //src/trace_processor/importers/proto:packet_sequence_state_generation_hdr
+perfetto_filegroup(
+ name = "src_trace_processor_importers_proto_packet_sequence_state_generation_hdr",
+ srcs = [
+ "src/trace_processor/importers/proto/packet_sequence_state_generation.h",
+ ],
+)
+
# GN target: //src/trace_processor/importers/systrace:systrace_line
perfetto_filegroup(
name = "src_trace_processor_importers_systrace_systrace_line",
@@ -1235,17 +1254,6 @@
],
)
-# GN target: //src/trace_processor/importers:gen_cc_statsd_atoms_descriptor
-perfetto_cc_proto_descriptor(
- name = "src_trace_processor_importers_gen_cc_statsd_atoms_descriptor",
- deps = [
- "src/trace_processor/importers/proto/atoms.descriptor",
- ],
- outs = [
- "src/trace_processor/importers/atoms.descriptor.h",
- ],
-)
-
# GN target: //src/trace_processor/importers:gen_cc_trace_descriptor
perfetto_cc_proto_descriptor(
name = "src_trace_processor_importers_gen_cc_trace_descriptor",
@@ -1970,10 +1978,6 @@
"src/trace_processor/importers/ninja/ninja_log_parser.h",
"src/trace_processor/importers/proto/android_camera_event_module.cc",
"src/trace_processor/importers/proto/android_camera_event_module.h",
- "src/trace_processor/importers/proto/async_track_set_tracker.cc",
- "src/trace_processor/importers/proto/async_track_set_tracker.h",
- "src/trace_processor/importers/proto/chrome_string_lookup.cc",
- "src/trace_processor/importers/proto/chrome_string_lookup.h",
"src/trace_processor/importers/proto/chrome_system_probes_module.cc",
"src/trace_processor/importers/proto/chrome_system_probes_module.h",
"src/trace_processor/importers/proto/chrome_system_probes_parser.cc",
@@ -1992,8 +1996,6 @@
"src/trace_processor/importers/proto/profile_module.h",
"src/trace_processor/importers/proto/profile_packet_utils.cc",
"src/trace_processor/importers/proto/profile_packet_utils.h",
- "src/trace_processor/importers/proto/proto_importer_module.cc",
- "src/trace_processor/importers/proto/proto_importer_module.h",
"src/trace_processor/importers/proto/proto_incremental_state.h",
"src/trace_processor/importers/proto/proto_trace_parser.cc",
"src/trace_processor/importers/proto/proto_trace_parser.h",
@@ -2001,8 +2003,6 @@
"src/trace_processor/importers/proto/proto_trace_reader.h",
"src/trace_processor/importers/proto/proto_trace_tokenizer.cc",
"src/trace_processor/importers/proto/proto_trace_tokenizer.h",
- "src/trace_processor/importers/proto/statsd_module.cc",
- "src/trace_processor/importers/proto/statsd_module.h",
"src/trace_processor/importers/proto/track_event_module.cc",
"src/trace_processor/importers/proto/track_event_module.h",
"src/trace_processor/importers/proto/track_event_parser.cc",
@@ -4408,9 +4408,9 @@
":src_trace_processor_importers_fuchsia_fuchsia_record",
":src_trace_processor_importers_importers_full",
":src_trace_processor_importers_memory_tracker_graph_processor",
+ ":src_trace_processor_importers_proto_full",
+ ":src_trace_processor_importers_proto_minimal",
":src_trace_processor_importers_proto_packet_sequence_state_generation_hdr",
- ":src_trace_processor_importers_proto_storage_full",
- ":src_trace_processor_importers_proto_storage_minimal",
":src_trace_processor_importers_systrace_systrace_line",
":src_trace_processor_lib",
":src_trace_processor_metatrace",
@@ -4495,9 +4495,9 @@
":src_trace_processor_containers_containers",
":src_trace_processor_importers_gen_cc_chrome_track_event_descriptor",
":src_trace_processor_importers_gen_cc_config_descriptor",
- ":src_trace_processor_importers_gen_cc_statsd_atoms_descriptor",
":src_trace_processor_importers_gen_cc_trace_descriptor",
":src_trace_processor_importers_gen_cc_track_event_descriptor",
+ ":src_trace_processor_importers_proto_gen_cc_statsd_atoms_descriptor",
":src_trace_processor_metrics_gen_cc_all_chrome_metrics_descriptor",
":src_trace_processor_metrics_gen_cc_metrics_descriptor",
":src_trace_processor_metrics_sql_gen_amalgamated_sql_metrics",
@@ -4543,9 +4543,9 @@
":src_trace_processor_importers_fuchsia_fuchsia_record",
":src_trace_processor_importers_importers_full",
":src_trace_processor_importers_memory_tracker_graph_processor",
+ ":src_trace_processor_importers_proto_full",
+ ":src_trace_processor_importers_proto_minimal",
":src_trace_processor_importers_proto_packet_sequence_state_generation_hdr",
- ":src_trace_processor_importers_proto_storage_full",
- ":src_trace_processor_importers_proto_storage_minimal",
":src_trace_processor_importers_systrace_systrace_line",
":src_trace_processor_lib",
":src_trace_processor_metatrace",
@@ -4623,9 +4623,9 @@
":src_trace_processor_containers_containers",
":src_trace_processor_importers_gen_cc_chrome_track_event_descriptor",
":src_trace_processor_importers_gen_cc_config_descriptor",
- ":src_trace_processor_importers_gen_cc_statsd_atoms_descriptor",
":src_trace_processor_importers_gen_cc_trace_descriptor",
":src_trace_processor_importers_gen_cc_track_event_descriptor",
+ ":src_trace_processor_importers_proto_gen_cc_statsd_atoms_descriptor",
":src_trace_processor_metrics_gen_cc_all_chrome_metrics_descriptor",
":src_trace_processor_metrics_gen_cc_metrics_descriptor",
":src_trace_processor_metrics_sql_gen_amalgamated_sql_metrics",
@@ -4737,9 +4737,9 @@
":src_trace_processor_importers_fuchsia_fuchsia_record",
":src_trace_processor_importers_importers_full",
":src_trace_processor_importers_memory_tracker_graph_processor",
+ ":src_trace_processor_importers_proto_full",
+ ":src_trace_processor_importers_proto_minimal",
":src_trace_processor_importers_proto_packet_sequence_state_generation_hdr",
- ":src_trace_processor_importers_proto_storage_full",
- ":src_trace_processor_importers_proto_storage_minimal",
":src_trace_processor_importers_systrace_systrace_line",
":src_trace_processor_lib",
":src_trace_processor_metatrace",
@@ -4815,9 +4815,9 @@
":src_trace_processor_containers_containers",
":src_trace_processor_importers_gen_cc_chrome_track_event_descriptor",
":src_trace_processor_importers_gen_cc_config_descriptor",
- ":src_trace_processor_importers_gen_cc_statsd_atoms_descriptor",
":src_trace_processor_importers_gen_cc_trace_descriptor",
":src_trace_processor_importers_gen_cc_track_event_descriptor",
+ ":src_trace_processor_importers_proto_gen_cc_statsd_atoms_descriptor",
":src_trace_processor_metrics_gen_cc_all_chrome_metrics_descriptor",
":src_trace_processor_metrics_gen_cc_metrics_descriptor",
":src_trace_processor_metrics_sql_gen_amalgamated_sql_metrics",
diff --git a/src/trace_processor/BUILD.gn b/src/trace_processor/BUILD.gn
index 13d9f99..5c6644e 100644
--- a/src/trace_processor/BUILD.gn
+++ b/src/trace_processor/BUILD.gn
@@ -107,10 +107,6 @@
"importers/ninja/ninja_log_parser.h",
"importers/proto/android_camera_event_module.cc",
"importers/proto/android_camera_event_module.h",
- "importers/proto/async_track_set_tracker.cc",
- "importers/proto/async_track_set_tracker.h",
- "importers/proto/chrome_string_lookup.cc",
- "importers/proto/chrome_string_lookup.h",
"importers/proto/chrome_system_probes_module.cc",
"importers/proto/chrome_system_probes_module.h",
"importers/proto/chrome_system_probes_parser.cc",
@@ -129,8 +125,6 @@
"importers/proto/profile_module.h",
"importers/proto/profile_packet_utils.cc",
"importers/proto/profile_packet_utils.h",
- "importers/proto/proto_importer_module.cc",
- "importers/proto/proto_importer_module.h",
"importers/proto/proto_incremental_state.h",
"importers/proto/proto_trace_parser.cc",
"importers/proto/proto_trace_parser.h",
@@ -138,10 +132,6 @@
"importers/proto/proto_trace_reader.h",
"importers/proto/proto_trace_tokenizer.cc",
"importers/proto/proto_trace_tokenizer.h",
-
- # XXX: is this the correct place
- "importers/proto/statsd_module.cc",
- "importers/proto/statsd_module.h",
"importers/proto/track_event_module.cc",
"importers/proto/track_event_module.h",
"importers/proto/track_event_parser.cc",
@@ -166,13 +156,12 @@
"../protozero",
"containers",
"importers:gen_cc_chrome_track_event_descriptor",
- "importers:gen_cc_statsd_atoms_descriptor",
"importers:gen_cc_track_event_descriptor",
"importers/common",
"importers/common:parser_types",
"importers/fuchsia:fuchsia_record",
"importers/memory_tracker:graph_processor",
- "importers/proto:storage_minimal",
+ "importers/proto:minimal",
"importers/systrace:systrace_line",
"sorter",
"storage",
@@ -198,7 +187,6 @@
"../../protos/perfetto/trace/power:zero",
"../../protos/perfetto/trace/profiling:zero",
"../../protos/perfetto/trace/ps:zero",
- "../../protos/perfetto/trace/statsd:zero",
"../../protos/perfetto/trace/sys_stats:zero",
"../../protos/perfetto/trace/system_info:zero",
"../../protos/perfetto/trace/track_event:zero",
@@ -364,7 +352,7 @@
"importers/common:parser_types",
"importers/common:unittests",
"importers/memory_tracker:graph_processor",
- "importers/proto:storage_minimal",
+ "importers/proto:minimal",
"importers/proto:unittests",
"rpc:unittests",
"sorter",
diff --git a/src/trace_processor/dynamic/BUILD.gn b/src/trace_processor/dynamic/BUILD.gn
index b721299..82e7e06 100644
--- a/src/trace_processor/dynamic/BUILD.gn
+++ b/src/trace_processor/dynamic/BUILD.gn
@@ -48,8 +48,8 @@
"../analysis",
"../containers",
"../db",
- "../importers/proto:storage_full",
- "../importers/proto:storage_minimal",
+ "../importers/proto:full",
+ "../importers/proto:minimal",
"../sqlite:sqlite_minimal",
"../storage",
"../tables",
diff --git a/src/trace_processor/importers/BUILD.gn b/src/trace_processor/importers/BUILD.gn
index 8549539..e03a203 100644
--- a/src/trace_processor/importers/BUILD.gn
+++ b/src/trace_processor/importers/BUILD.gn
@@ -111,8 +111,8 @@
"common",
"common:parser_types",
"fuchsia:fuchsia_record",
- "proto:storage_full",
- "proto:storage_minimal",
+ "proto:full",
+ "proto:minimal",
"systrace:systrace_line",
]
if (enable_perfetto_trace_processor_json) {
@@ -120,11 +120,6 @@
}
}
-perfetto_cc_proto_descriptor("gen_cc_statsd_atoms_descriptor") {
- descriptor_name = "atoms.descriptor"
- descriptor_path = "./proto/atoms.descriptor"
-}
-
perfetto_cc_proto_descriptor("gen_cc_config_descriptor") {
descriptor_name = "config.descriptor"
descriptor_target = "../../../protos/perfetto/config:descriptor"
diff --git a/src/trace_processor/importers/proto/BUILD.gn b/src/trace_processor/importers/proto/BUILD.gn
index 8876f0e..83769f9 100644
--- a/src/trace_processor/importers/proto/BUILD.gn
+++ b/src/trace_processor/importers/proto/BUILD.gn
@@ -12,23 +12,33 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-source_set("storage_minimal") {
+import("../../../../gn/perfetto_cc_proto_descriptor.gni")
+
+source_set("minimal") {
sources = [
"active_chrome_processes_tracker.cc",
"active_chrome_processes_tracker.h",
+ "async_track_set_tracker.cc",
+ "async_track_set_tracker.h",
+ "chrome_string_lookup.cc",
+ "chrome_string_lookup.h",
"heap_profile_tracker.cc",
"heap_profile_tracker.h",
"packet_sequence_state.h",
"packet_sequence_state_generation.cc",
"profiler_util.cc",
"profiler_util.h",
+ "proto_importer_module.cc",
+ "proto_importer_module.h",
"stack_profile_tracker.cc",
"stack_profile_tracker.h",
]
deps = [
":packet_sequence_state_generation_hdr",
"../../../../gn:default_deps",
+ "../../../../protos/perfetto/trace/chrome:zero",
"../../../../protos/perfetto/trace/profiling:zero",
+ "../../../../protos/perfetto/trace/track_event:zero",
"../../../base",
"../../storage",
"../../tables",
@@ -38,20 +48,29 @@
]
}
-source_set("storage_full") {
+source_set("full") {
sources = [
"heap_graph_tracker.cc",
"heap_graph_tracker.h",
+ "statsd_module.cc",
+ "statsd_module.h",
]
deps = [
- ":storage_minimal",
+ ":gen_cc_statsd_atoms_descriptor",
+ ":minimal",
"../../../../gn:default_deps",
"../../../../protos/perfetto/trace:zero",
"../../../../protos/perfetto/trace/profiling:zero",
+ "../../../../protos/perfetto/trace/statsd:zero",
"../../../base",
+ "../../sorter",
"../../storage",
"../../tables",
"../../types",
+ "../../util:descriptors",
+ "../../util:proto_profiler",
+ "../../util:proto_to_args_parser",
+ "../common",
]
}
@@ -66,6 +85,11 @@
]
}
+perfetto_cc_proto_descriptor("gen_cc_statsd_atoms_descriptor") {
+ descriptor_name = "atoms.descriptor"
+ descriptor_path = "atoms.descriptor"
+}
+
source_set("unittests") {
testonly = true
sources = [
@@ -74,8 +98,8 @@
"heap_profile_tracker_unittest.cc",
]
deps = [
- ":storage_full",
- ":storage_minimal",
+ ":full",
+ ":minimal",
"../../../../gn:default_deps",
"../../../../gn:gtest_and_gmock",
"../../types",
diff --git a/src/trace_processor/importers/proto/statsd_module.cc b/src/trace_processor/importers/proto/statsd_module.cc
index 68f47e1..7cae811 100644
--- a/src/trace_processor/importers/proto/statsd_module.cc
+++ b/src/trace_processor/importers/proto/statsd_module.cc
@@ -20,13 +20,12 @@
#include "protos/perfetto/trace/trace_packet.pbzero.h"
#include "src/trace_processor/importers/common/slice_tracker.h"
#include "src/trace_processor/importers/common/track_tracker.h"
-#include "src/trace_processor/importers/json/json_utils.h"
#include "src/trace_processor/importers/proto/async_track_set_tracker.h"
#include "src/trace_processor/sorter/trace_sorter.h"
#include "src/trace_processor/storage/trace_storage.h"
#include "src/trace_processor/util/descriptors.h"
-#include "src/trace_processor/importers/atoms.descriptor.h"
+#include "src/trace_processor/importers/proto/atoms.descriptor.h"
namespace perfetto {
namespace trace_processor {
@@ -102,14 +101,8 @@
inserter_.AddArg(flat_key_id, key_id, variadic_val);
}
- bool AddJson(const Key& key, const protozero::ConstChars& value) override {
- auto json_value = json::ParseJsonString(value);
- if (!json_value) {
- return false;
- }
- return json::AddJsonValueToArgs(*json_value, base::StringView(key.flat_key),
- base::StringView(key.key), &storage_,
- &inserter_);
+ bool AddJson(const Key&, const protozero::ConstChars&) override {
+ PERFETTO_FATAL("Unexpected JSON value when parsing statsd data");
}
void AddNull(const Key& key) override {
diff --git a/src/trace_processor/sorter/BUILD.gn b/src/trace_processor/sorter/BUILD.gn
index 7d76fb3..53609a5 100644
--- a/src/trace_processor/sorter/BUILD.gn
+++ b/src/trace_processor/sorter/BUILD.gn
@@ -52,7 +52,7 @@
"../../../include/perfetto/trace_processor:storage",
"../../base",
"../importers/common:parser_types",
- "../importers/proto:storage_minimal",
+ "../importers/proto:minimal",
"../types",
]
}
