From a3a401071b5fdcc5f8eacc7d86d79246f17cc6a4 Mon Sep 17 00:00:00 2001 From: Pascal Muetschard Date: Tue, 23 Jul 2019 04:49:12 -0700 Subject: [PATCH] Update to latest Perfetto. --- tools/build/third_party/perfetto.bzl | 2 +- .../build/third_party/perfetto/perfetto.BUILD | 46 +++++++++++++------ 2 files changed, 33 insertions(+), 15 deletions(-) diff --git a/tools/build/third_party/perfetto.bzl b/tools/build/third_party/perfetto.bzl index 5a2a9b43db..e4478c989e 100644 --- a/tools/build/third_party/perfetto.bzl +++ b/tools/build/third_party/perfetto.bzl @@ -17,7 +17,7 @@ PACKAGES = [ struct( - url = "https://android.googlesource.com/platform/external/perfetto/+archive/a8e2b77ed47d432d99edb6ddaaa7e5b61d3f2041.tar.gz", + url = "https://android.googlesource.com/platform/external/perfetto/+archive/cde26f18fbf1a91dc06c99c68b3692c920dc826e.tar.gz", sha = "", strip = "", out = ".", diff --git a/tools/build/third_party/perfetto/perfetto.BUILD b/tools/build/third_party/perfetto/perfetto.BUILD index 11dc6b3f6f..9d923cab04 100644 --- a/tools/build/third_party/perfetto/perfetto.BUILD +++ b/tools/build/third_party/perfetto/perfetto.BUILD @@ -79,7 +79,6 @@ cc_library( "src/trace_processor/storage_schema.cc", "src/trace_processor/storage_table.cc", "src/trace_processor/string_pool.cc", - "src/trace_processor/string_table.cc", "src/trace_processor/syscall_tracker.cc", "src/trace_processor/systrace_parser.cc", "src/trace_processor/systrace_trace_parser.cc", @@ -91,6 +90,7 @@ cc_library( "src/trace_processor/trace_sorter.cc", "src/trace_processor/trace_storage.cc", "src/trace_processor/virtual_destructors.cc", + "src/trace_processor/virtual_track_tracker.cc", "src/trace_processor/window_operator_table.cc", ] + glob([ "src/trace_processor/**/*.h", @@ -143,18 +143,19 @@ cc_library( cc_library( name = "base", srcs = [ - "src/base/event.cc", + "src/base/paged_memory.cc", "src/base/string_splitter.cc", - "src/base/string_view.cc", "src/base/string_utils.cc", + "src/base/string_view.cc", "src/base/thread_checker.cc", "src/base/time.cc", "src/base/virtual_destructors.cc", - "src/base/paged_memory.cc", + "src/base/waitable_event.cc", ] + select({ "@gapid//tools/build:windows": [], "@gapid//tools/build:darwin": [], "@gapid//tools/build:linux": [ + "src/base/event_fd.cc", "src/base/file_utils.cc", "src/base/metatrace.cc", "src/base/pipe.cc", @@ -165,8 +166,6 @@ cc_library( # Android "//conditions:default": [ "src/base/android_task_runner.cc", - "src/base/file_utils.cc", - "src/base/metatrace.cc", "src/base/pipe.cc", "src/base/temp_file.cc", "src/base/unix_socket.cc", @@ -281,14 +280,25 @@ genrule( srcs = [ "src/trace_processor/metrics/error_statistics.sql", "src/trace_processor/metrics/android/android_batt.sql", + "src/trace_processor/metrics/android/android_cpu.sql", + "src/trace_processor/metrics/android/android_cpu_agg.sql", + "src/trace_processor/metrics/android/android_ion.sql", + "src/trace_processor/metrics/android/android_lmk.sql", "src/trace_processor/metrics/android/android_mem.sql", - "src/trace_processor/metrics/android/android_mem_lmk.sql", - "src/trace_processor/metrics/android/android_mem_proc_counters.sql", - "src/trace_processor/metrics/android/android_startup_launches.sql", - "src/trace_processor/metrics/android/android_task_state.sql", + "src/trace_processor/metrics/android/android_mem_unagg.sql", + "src/trace_processor/metrics/android/android_package_list.sql", + "src/trace_processor/metrics/android/android_powrails.sql", + "src/trace_processor/metrics/android/android_process_growth.sql", "src/trace_processor/metrics/android/android_startup.sql", "src/trace_processor/metrics/android/android_startup_cpu.sql", + "src/trace_processor/metrics/android/android_startup_launches.sql", + "src/trace_processor/metrics/android/android_task_state.sql", "src/trace_processor/metrics/android/heap_profile.sql", + "src/trace_processor/metrics/android/mem_stats_priority_breakdown.sql", + "src/trace_processor/metrics/android/process_mem.sql", + "src/trace_processor/metrics/android/process_unagg_mem_view.sql", + "src/trace_processor/metrics/android/span_view_stats.sql", + "src/trace_processor/metrics/android/upid_span_view.sql", ], outs = [ "src/trace_processor/metrics/sql_metrics.h", @@ -308,6 +318,7 @@ proto_library( "perfetto/common/commit_data_request.proto", "perfetto/common/data_source_descriptor.proto", "perfetto/common/descriptor.proto", + "perfetto/common/gpu_counter_descriptor.proto", "perfetto/common/observable_events.proto", "perfetto/common/sys_stats_counters.proto", "perfetto/common/trace_stats.proto", @@ -330,9 +341,11 @@ proto_library( name = "config_proto", srcs = [ "perfetto/config/android/android_log_config.proto", + "perfetto/config/android/packages_list_config.proto", "perfetto/config/chrome/chrome_config.proto", "perfetto/config/data_source_config.proto", "perfetto/config/ftrace/ftrace_config.proto", + "perfetto/config/gpu/gpu_counter_config.proto", "perfetto/config/inode_file/inode_file_config.proto", "perfetto/config/power/android_power_config.proto", "perfetto/config/process_stats/process_stats_config.proto", @@ -388,8 +401,15 @@ proto_library( name = "metrics_proto", srcs = [ "perfetto/metrics/android/batt_metric.proto", + "perfetto/metrics/android/cpu_metric.proto", "perfetto/metrics/android/heap_profile.proto", + "perfetto/metrics/android/ion_metric.proto", + "perfetto/metrics/android/lmk_metric.proto", "perfetto/metrics/android/mem_metric.proto", + "perfetto/metrics/android/mem_unagg_metric.proto", + "perfetto/metrics/android/package_list.proto", + "perfetto/metrics/android/powrails_metric.proto", + "perfetto/metrics/android/process_growth.proto", "perfetto/metrics/android/startup_metric.proto", "perfetto/metrics/metrics.proto", ], @@ -457,6 +477,8 @@ proto_library( "perfetto/trace/ftrace/test_bundle_wrapper.proto", "perfetto/trace/ftrace/vmscan.proto", "perfetto/trace/ftrace/workqueue.proto", + "perfetto/trace/gpu/gpu_counter_event.proto", + "perfetto/trace/gpu/gpu_render_stage_event.proto", "perfetto/trace/interned_data/interned_data.proto", "perfetto/trace/perfetto/perfetto_metatrace.proto", "perfetto/trace/power/battery_counters.proto", @@ -660,8 +682,6 @@ py_binary( cc_binary( name = "protozero_plugin", srcs = [ - "src/protozero/protoc_plugin/protozero_generator.cc", - "src/protozero/protoc_plugin/protozero_generator.h", "src/protozero/protoc_plugin/protozero_plugin.cc", ], copts = _COPTS, @@ -673,8 +693,6 @@ cc_binary( cc_binary( name = "ipc_plugin", srcs = [ - "src/ipc/protoc_plugin/ipc_generator.cc", - "src/ipc/protoc_plugin/ipc_generator.h", "src/ipc/protoc_plugin/ipc_plugin.cc", ], copts = _COPTS,