diff --git a/Android.bp b/Android.bp index 8b8de37d86..e5c5c4cff7 100644 --- a/Android.bp +++ b/Android.bp @@ -12957,6 +12957,7 @@ genrule { "src/trace_processor/metrics/sql/android/sysui_update_notif_on_ui_mode_changed_metric.sql", "src/trace_processor/metrics/sql/android/unsymbolized_frames.sql", "src/trace_processor/metrics/sql/android/wattson_app_startup_rails.sql", + "src/trace_processor/metrics/sql/android/wattson_markers_rails.sql", "src/trace_processor/metrics/sql/android/wattson_markers_threads.sql", "src/trace_processor/metrics/sql/android/wattson_rail_relations.sql", "src/trace_processor/metrics/sql/android/wattson_tasks_attribution.sql", diff --git a/BUILD b/BUILD index 1356efcfeb..5c2393cc39 100644 --- a/BUILD +++ b/BUILD @@ -2206,6 +2206,7 @@ perfetto_filegroup( "src/trace_processor/metrics/sql/android/sysui_update_notif_on_ui_mode_changed_metric.sql", "src/trace_processor/metrics/sql/android/unsymbolized_frames.sql", "src/trace_processor/metrics/sql/android/wattson_app_startup_rails.sql", + "src/trace_processor/metrics/sql/android/wattson_markers_rails.sql", "src/trace_processor/metrics/sql/android/wattson_markers_threads.sql", "src/trace_processor/metrics/sql/android/wattson_rail_relations.sql", "src/trace_processor/metrics/sql/android/wattson_tasks_attribution.sql", diff --git a/protos/perfetto/metrics/metrics.proto b/protos/perfetto/metrics/metrics.proto index 2436035634..f663db0acc 100644 --- a/protos/perfetto/metrics/metrics.proto +++ b/protos/perfetto/metrics/metrics.proto @@ -124,7 +124,7 @@ message TraceAnalysisStats { // Root message for all Perfetto-based metrics. // -// Next id: 74 +// Next id: 75 message TraceMetrics { reserved 4, 10, 13, 14, 16, 19; @@ -334,6 +334,9 @@ message TraceMetrics { // Android Wattson thread attribution during markers time window. optional AndroidWattsonTasksAttributionMetric wattson_markers_threads = 73; + // Android Wattson estimate during markers time window. + optional AndroidWattsonTimePeriodMetric wattson_markers_rails = 74; + // Android // Demo extensions. extensions 450 to 499; diff --git a/protos/perfetto/metrics/perfetto_merged_metrics.proto b/protos/perfetto/metrics/perfetto_merged_metrics.proto index 588c214198..7ef002fa1e 100644 --- a/protos/perfetto/metrics/perfetto_merged_metrics.proto +++ b/protos/perfetto/metrics/perfetto_merged_metrics.proto @@ -2998,7 +2998,7 @@ message TraceAnalysisStats { // Root message for all Perfetto-based metrics. // -// Next id: 74 +// Next id: 75 message TraceMetrics { reserved 4, 10, 13, 14, 16, 19; @@ -3208,6 +3208,9 @@ message TraceMetrics { // Android Wattson thread attribution during markers time window. optional AndroidWattsonTasksAttributionMetric wattson_markers_threads = 73; + // Android Wattson estimate during markers time window. + optional AndroidWattsonTimePeriodMetric wattson_markers_rails = 74; + // Android // Demo extensions. extensions 450 to 499; diff --git a/python/perfetto/trace_processor/metrics.descriptor b/python/perfetto/trace_processor/metrics.descriptor index c5de56769d..7b9052d784 100644 --- a/python/perfetto/trace_processor/metrics.descriptor +++ b/python/perfetto/trace_processor/metrics.descriptor @@ -1487,7 +1487,7 @@ threadName! thread_id (RthreadId process_id (R processId -ÕP +ºQ %protos/perfetto/metrics/metrics.protoperfetto.protos8protos/perfetto/metrics/android/ad_services_metric.proto2protos/perfetto/metrics/android/android_boot.proto8protos/perfetto/metrics/android/android_boot_unagg.protoMprotos/perfetto/metrics/android/android_garbage_collection_unagg_metric.proto1protos/perfetto/metrics/android/auto_metric.protoKprotos/perfetto/metrics/android/sysui_notif_shade_list_builder_metric.protoRprotos/perfetto/metrics/android/sysui_update_notif_on_ui_mode_changed_metric.protoCprotos/perfetto/metrics/android/android_frame_timeline_metric.proto0protos/perfetto/metrics/android/anr_metric.proto1protos/perfetto/metrics/android/batt_metric.protoWprotos/perfetto/metrics/android/android_sysui_notifications_blocking_calls_metric.protoGprotos/perfetto/metrics/android/android_blocking_calls_cuj_metric.protoBprotos/perfetto/metrics/android/android_blocking_calls_unagg.proto3protos/perfetto/metrics/android/codec_metrics.proto0protos/perfetto/metrics/android/cpu_metric.proto3protos/perfetto/metrics/android/camera_metric.proto9protos/perfetto/metrics/android/camera_unagg_metric.proto5protos/perfetto/metrics/android/display_metrics.proto5protos/perfetto/metrics/android/dma_heap_metric.proto1protos/perfetto/metrics/android/dvfs_metric.proto4protos/perfetto/metrics/android/fastrpc_metric.proto0protos/perfetto/metrics/android/g2d_metric.proto0protos/perfetto/metrics/android/gpu_metric.proto0protos/perfetto/metrics/android/hwcomposer.proto1protos/perfetto/metrics/android/hwui_metric.proto/protos/perfetto/metrics/android/io_metric.proto5protos/perfetto/metrics/android/io_unagg_metric.proto0protos/perfetto/metrics/android/ion_metric.proto8protos/perfetto/metrics/android/irq_runtime_metric.proto5protos/perfetto/metrics/android/jank_cuj_metric.proto9protos/perfetto/metrics/android/java_heap_histogram.proto;protos/perfetto/metrics/android/java_heap_class_stats.proto5protos/perfetto/metrics/android/java_heap_stats.proto0protos/perfetto/metrics/android/lmk_metric.proto7protos/perfetto/metrics/android/lmk_reason_metric.proto0protos/perfetto/metrics/android/mem_metric.proto6protos/perfetto/metrics/android/mem_unagg_metric.proto6protos/perfetto/metrics/android/multiuser_metric.proto4protos/perfetto/metrics/android/network_metric.proto2protos/perfetto/metrics/android/other_traces.proto2protos/perfetto/metrics/android/package_list.proto5protos/perfetto/metrics/android/powrails_metric.proto4protos/perfetto/metrics/android/profiler_smaps.proto7protos/perfetto/metrics/android/rt_runtime_metric.proto0protos/perfetto/metrics/android/simpleperf.proto4protos/perfetto/metrics/android/startup_metric.proto4protos/perfetto/metrics/android/surfaceflinger.proto0protos/perfetto/metrics/android/task_names.proto3protos/perfetto/metrics/android/trace_quality.proto?protos/perfetto/metrics/android/android_trusty_workqueues.proto9protos/perfetto/metrics/android/unsymbolized_frames.proto3protos/perfetto/metrics/android/binder_metric.proto?protos/perfetto/metrics/android/monitor_contention_metric.protoCprotos/perfetto/metrics/android/monitor_contention_agg_metric.proto?protos/perfetto/metrics/android/app_process_starts_metric.protoAprotos/perfetto/metrics/android/android_oom_adjuster_metric.proto?protos/perfetto/metrics/android/android_broadcasts_metric.proto