From eda59488f1981a84d397668f25300649aed68e59 Mon Sep 17 00:00:00 2001 From: Pablo Gamito Date: Tue, 28 Feb 2023 09:51:43 +0000 Subject: [PATCH] Dump jank tag to event log Allows us to detect specificities of different scenarios better in FaaS Bug: 271071509 Test: atest FlickerLibTest Change-Id: Ida39a42ca4003092583b154c4ed3287c929f66b4 --- core/java/com/android/internal/jank/EventLogTags.logtags | 2 +- core/java/com/android/internal/jank/InteractionJankMonitor.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/java/com/android/internal/jank/EventLogTags.logtags b/core/java/com/android/internal/jank/EventLogTags.logtags index ad47b810aa504..66ee131badaca 100644 --- a/core/java/com/android/internal/jank/EventLogTags.logtags +++ b/core/java/com/android/internal/jank/EventLogTags.logtags @@ -3,7 +3,7 @@ option java_package com.android.internal.jank; # Marks a request to start tracing a CUJ. Doesn't mean the request was executed. -37001 jank_cuj_events_begin_request (CUJ Type|1|5),(Unix Time Ns|2|3),(Elapsed Time Ns|2|3),(Uptime Ns|2|3) +37001 jank_cuj_events_begin_request (CUJ Type|1|5),(Unix Time Ns|2|3),(Elapsed Time Ns|2|3),(Uptime Ns|2|3),(Tag|3) # Marks a request to end tracing a CUJ. Doesn't mean the request was executed. 37002 jank_cuj_events_end_request (CUJ Type|1|5),(Unix Time Ns|2|3),(Elapsed Time Ns|2|3),(Uptime Time Ns|2|3) # Marks a request to cancel tracing a CUJ. Doesn't mean the request was executed. diff --git a/core/java/com/android/internal/jank/InteractionJankMonitor.java b/core/java/com/android/internal/jank/InteractionJankMonitor.java index 7ae63b1ac4500..d71d5e0bc0229 100644 --- a/core/java/com/android/internal/jank/InteractionJankMonitor.java +++ b/core/java/com/android/internal/jank/InteractionJankMonitor.java @@ -581,7 +581,7 @@ public class InteractionJankMonitor { final Configuration config = builder.build(); postEventLogToWorkerThread((unixNanos, elapsedNanos, realtimeNanos) -> { EventLogTags.writeJankCujEventsBeginRequest( - config.mCujType, unixNanos, elapsedNanos, realtimeNanos); + config.mCujType, unixNanos, elapsedNanos, realtimeNanos, config.mTag); }); final TrackerResult result = new TrackerResult(); final boolean success = config.getHandler().runWithScissors(