commit 48a955aeb028ac005b963e04dddae4e3a4e99778
author Yiwei Zhang <zzyiwei@google.com> Thu Sep 10 09:39:45 2020 -0700
committer Yiwei Zhang <zzyiwei@google.com> Thu Sep 10 16:47:57 2020 -0700
tree 2b3a389d0cd1c02a9ecd85df37092a7ce1f2d88f
parent a4cfaa2dfc7f32d0bde13435d255299c9faaf57d

Fix the scope of counter_span_view

counter_span_view was meant to be applied only on global counter track
by reading the commit messages and codes. However, it currently would
also capture the other non-global tracks if the same counter name
appeared in those tracks as well. This change fixed the scope here.

Bug: 167416193
Test: tools/diff_test_trace_processor.py <trace_processor_shell> \
      --trace-filter='gpu_metric*'
Change-Id: I985af75d163cdf302a60e2050c61907a0b91460d

Android.bp

diff --git a/Android.bp b/Android.bp
index 6b00865..c88d771 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,10 +37,10 @@
     "src/trace_processor/metrics/android/android_task_names.sql",
     "src/trace_processor/metrics/android/android_task_state.sql",
     "src/trace_processor/metrics/android/android_thread_time_in_state.sql",
-    "src/trace_processor/metrics/android/counter_span_view.sql",
     "src/trace_processor/metrics/android/cpu_info.sql",
     "src/trace_processor/metrics/android/display_metrics.sql",
     "src/trace_processor/metrics/android/frame_missed.sql",
+    "src/trace_processor/metrics/android/global_counter_span_view.sql",
     "src/trace_processor/metrics/android/heap_profile_callsites.sql",
     "src/trace_processor/metrics/android/hsc_startups.sql",
     "src/trace_processor/metrics/android/java_heap_histogram.sql",

BUILD

diff --git a/BUILD b/BUILD
index 6efdde8..4fcde48 100644
--- a/BUILD
+++ b/BUILD
@@ -767,10 +767,10 @@
         "src/trace_processor/metrics/android/android_task_names.sql",
         "src/trace_processor/metrics/android/android_task_state.sql",
         "src/trace_processor/metrics/android/android_thread_time_in_state.sql",
-        "src/trace_processor/metrics/android/counter_span_view.sql",
         "src/trace_processor/metrics/android/cpu_info.sql",
         "src/trace_processor/metrics/android/display_metrics.sql",
         "src/trace_processor/metrics/android/frame_missed.sql",
+        "src/trace_processor/metrics/android/global_counter_span_view.sql",
         "src/trace_processor/metrics/android/heap_profile_callsites.sql",
         "src/trace_processor/metrics/android/hsc_startups.sql",
         "src/trace_processor/metrics/android/java_heap_histogram.sql",

src/trace_processor/metrics/BUILD.gn

diff --git a/src/trace_processor/metrics/BUILD.gn b/src/trace_processor/metrics/BUILD.gn
index 83ca4fd..6f468a2 100644
--- a/src/trace_processor/metrics/BUILD.gn
+++ b/src/trace_processor/metrics/BUILD.gn
@@ -51,7 +51,7 @@
   "android/mem_stats_priority_breakdown.sql",
   "android/span_view_stats.sql",
   "android/process_counter_span_view.sql",
-  "android/counter_span_view.sql",
+  "android/global_counter_span_view.sql",
   "android/unsymbolized_frames.sql",
   "chrome/chrome_processes.sql",
   "chrome/scroll_jank.sql",

src/trace_processor/metrics/android/android_batt.sql

diff --git a/src/trace_processor/metrics/android/android_batt.sql b/src/trace_processor/metrics/android/android_batt.sql
index 4c146a4..a5c38e4 100644
--- a/src/trace_processor/metrics/android/android_batt.sql
+++ b/src/trace_processor/metrics/android/android_batt.sql
@@ -126,7 +126,7 @@
   AND lead_start = 0
   AND lead_2_start = 0 AND lead_2_event = 1;
 
-SELECT RUN_METRIC('android/counter_span_view.sql',
+SELECT RUN_METRIC('android/global_counter_span_view.sql',
   'table_name', 'screen_state',
   'counter_name', 'ScreenState');
 

src/trace_processor/metrics/android/global_counter_span_view.sql

diff --git a/src/trace_processor/metrics/android/counter_span_view.sql b/src/trace_processor/metrics/android/global_counter_span_view.sql
similarity index 93%
rename from src/trace_processor/metrics/android/counter_span_view.sql
rename to src/trace_processor/metrics/android/global_counter_span_view.sql
index cdd953a..2d3364c 100644
--- a/src/trace_processor/metrics/android/counter_span_view.sql
+++ b/src/trace_processor/metrics/android/global_counter_span_view.sql
@@ -22,4 +22,5 @@
   value AS {{table_name}}_val
 FROM counter c JOIN counter_track t
   ON t.id = c.track_id
-WHERE name = '{{counter_name}}';
+WHERE t.type = 'counter_track'
+  AND name = '{{counter_name}}';