commit f9f548af967bda0e3311002f2fb8f6f0ca407fb8
author Treehugger Robot <treehugger-gerrit@google.com> Wed Apr 20 06:22:19 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 20 06:22:19 2022 +0000
tree 9db7e6f80a6603187ecec98c574c99f051486081
parent 8a66f2a3416c644f3a5f83084e25bbe400d39875
parent eab7411a793bda838068e3d1e2b42415657655c0

Merge "Raise ipc_hash arg up for any mojom or toplevel category." am: 759a52fa99 am: 70040520fb am: eab7411a79

Original change: https://android-review.googlesource.com/c/platform/external/perfetto/+/2059829

Change-Id: I9382c0f24efe550c4c790096b0b7eebd28d4b354
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/trace_processor/metrics/sql/chrome/scroll_jank_cause_queuing_delay.sql

diff --git a/src/trace_processor/metrics/sql/chrome/scroll_jank_cause_queuing_delay.sql b/src/trace_processor/metrics/sql/chrome/scroll_jank_cause_queuing_delay.sql
index dad1cf3..9b45876 100644
--- a/src/trace_processor/metrics/sql/chrome/scroll_jank_cause_queuing_delay.sql
+++ b/src/trace_processor/metrics/sql/chrome/scroll_jank_cause_queuing_delay.sql
@@ -135,6 +135,8 @@
               "chrome_mojo_event_info.mojo_interface_tag"),
           NULL),
       descendant.name) AS descendant_name,
+    EXTRACT_ARG(descendant.arg_set_id,
+        "chrome_mojo_event_info.ipc_hash") AS descendant_ipc_hash,
     descendant.parent_id As descendant_parent_id,
     descendant.depth AS descendant_depth,
     descendant.category AS descendant_category,
@@ -293,6 +295,8 @@
         NULL
       END
     , "-") AS mojom_name,
+    -- All ipc_hashes should be equal so just select the first non-null one.
+    MIN(descendant_ipc_hash) AS mojom_ipc_hash,
     GROUP_CONCAT(
       CASE WHEN
         descendant_category = "toplevel" AND
@@ -443,8 +447,10 @@
     TopLevelName(name, function, file) || COALESCE(
       "-" || descendant_name, "") AS location,
     TopLevelName(name, function, file) || COALESCE(
-      "-" || GetFirstSliceNameOrNull(mojom_name),
-      "-" || GetFirstSliceNameOrNull(toplevel_name),
+      "-" || GetFirstSliceNameOrNull(mojom_name)
+          || COALESCE("(ipc=" || mojom_ipc_hash || ")", ""),
+      "-" || GetFirstSliceNameOrNull(toplevel_name)
+          || COALESCE("(ipc=" || mojom_ipc_hash || ")", ""),
       "-" || GetJavaSliceSummaryOrNull(java_name),
       UnknownEventOrEmptyString(name, category, descendant_name)
     ) AS restricted_location,