From 9ffec9efd0c5c2bed2eaa2ab1f1e7da8a883649b Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Wed, 8 Jan 2025 16:30:25 +0000 Subject: [PATCH] [cr134] Override for prefetto categories simplified This override had to be update as the category declaration has been updated for all those listed. Chromium change: https://chromium.googlesource.com/chromium/src/+/32b001c89dc2f186bfebe1d19a85fc74c61750eb commit 32b001c89dc2f186bfebe1d19a85fc74c61750eb Author: Etienne Pierre-doray Date: Tue Jan 7 07:44:42 2025 -0800 [tracing] Update builtin categories to use perfetto API This CL simplifies builtin categories definition, and uses SetDescription to declare existing category descriptions. Drive-by: remove some (non-exhaustive) unused categories. Bug: 343404899 --- build/BUILD.gn | 2 +- .../base/trace_event/builtin_categories.h | 9 +++++---- ...base-trace_event-builtin_categories.h.patch | 18 +++++++++--------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/build/BUILD.gn b/build/BUILD.gn index ffdf782baad..b24f0eb8a72 100644 --- a/build/BUILD.gn +++ b/build/BUILD.gn @@ -28,7 +28,7 @@ if (is_redirect_cc_build) { "BRAVE_GET_TARGET_FOR_DEFAULT_APP_SETTINGS=", "BRAVE_HISTOGRAM_FUNCTIONS_UMA_HISTOGRAM_ENUMERATION=", "BRAVE_SCOPED_ALLOW_BASE_SYNC_PRIMITIVES_H=", - "BRAVE_INTERNAL_TRACE_LIST_BUILTIN_CATEGORIES(X)=", + "BRAVE_INTERNAL_TRACE_LIST_BUILTIN_CATEGORIES=", ] } } diff --git a/chromium_src/base/trace_event/builtin_categories.h b/chromium_src/base/trace_event/builtin_categories.h index 7634c451147..7c8e883627b 100644 --- a/chromium_src/base/trace_event/builtin_categories.h +++ b/chromium_src/base/trace_event/builtin_categories.h @@ -15,11 +15,12 @@ // // Note: There is no #undef for this macros because it is used in exported // macros of the chromium builtin_categories.h. -#define BRAVE_INTERNAL_TRACE_LIST_BUILTIN_CATEGORIES(X) \ - X("brave") \ - X("brave.adblock") \ - X("brave.ads") +#define BRAVE_INTERNAL_TRACE_LIST_BUILTIN_CATEGORIES \ + perfetto::Category("brave"), perfetto::Category("brave.adblock"), \ + perfetto::Category("brave.ads"), #include "src/base/trace_event/builtin_categories.h" // IWYU pragma: export +#undef BRAVE_INTERNAL_TRACE_LIST_BUILTIN_CATEGORIES + #endif // BRAVE_CHROMIUM_SRC_BASE_TRACE_EVENT_BUILTIN_CATEGORIES_H_ diff --git a/patches/base-trace_event-builtin_categories.h.patch b/patches/base-trace_event-builtin_categories.h.patch index a80447add18..d065e2182d8 100644 --- a/patches/base-trace_event-builtin_categories.h.patch +++ b/patches/base-trace_event-builtin_categories.h.patch @@ -1,12 +1,12 @@ diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h -index d10d536f1266a3979bb8d76862cf8c2d8b2cfef3..f8511db6032b63d75ed1ca477095c136f9dab4fb 100644 +index dfa4928b628aa37634d8adcb23b44b9a859a30ef..807dee67894b58e74e915ae83181efc48e4d1568 100644 --- a/base/trace_event/builtin_categories.h +++ b/base/trace_event/builtin_categories.h -@@ -205,6 +205,7 @@ - X("webrtc") \ - X("webrtc_stats") \ - X("xr") \ -+ BRAVE_INTERNAL_TRACE_LIST_BUILTIN_CATEGORIES(X) /*see chromium_src*/ \ - X(TRACE_DISABLED_BY_DEFAULT("android_view_hierarchy")) \ - X(TRACE_DISABLED_BY_DEFAULT("animation-worklet")) \ - X(TRACE_DISABLED_BY_DEFAULT("audio")) \ +@@ -203,6 +203,7 @@ PERFETTO_DEFINE_CATEGORIES_IN_NAMESPACE_WITH_ATTRS( + perfetto::Category("webrtc"), + perfetto::Category("webrtc_stats"), + perfetto::Category("xr"), ++ BRAVE_INTERNAL_TRACE_LIST_BUILTIN_CATEGORIES + perfetto::Category(TRACE_DISABLED_BY_DEFAULT("android_view_hierarchy")), + perfetto::Category(TRACE_DISABLED_BY_DEFAULT("animation-worklet")), + perfetto::Category(TRACE_DISABLED_BY_DEFAULT("audio")),