From 870836ff848725ca5b666938066ccdde82bb4ca5 Mon Sep 17 00:00:00 2001 From: Pieter De Baets Date: Mon, 25 Aug 2025 11:16:51 -0700 Subject: [PATCH] Namespace Perfetto usage (#53424) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/53424 Use the namespaced version of these macros to avoid symbol conflicts when multiple instances of `PERFETTO_DEFINE_CATEGORIES` are in the same binary. The current macro is effectively deprecated: https://github.com/a6f/perfetto_protos/blob/master/CHANGELOG#L691-L696 Changelog: [Internal] Reviewed By: rshest Differential Revision: D80697205 fbshipit-source-id: 713fec4d41137ddd2f025c7e7130dc44c5a3a656 --- .../reactperflogger/FuseboxPerfettoDataSource.cpp | 2 -- .../reactperflogger/HermesPerfettoDataSource.cpp | 4 +--- .../reactperflogger/reactperflogger/ReactPerfetto.cpp | 4 ++-- .../reactperflogger/ReactPerfettoCategories.cpp | 3 ++- .../reactperflogger/reactperflogger/ReactPerfettoCategories.h | 3 ++- .../ReactCxxPlatform/react/profiling/perfetto.cpp | 2 +- .../react-native/ReactCxxPlatform/react/profiling/perfetto.h | 3 ++- 7 files changed, 10 insertions(+), 11 deletions(-) diff --git a/packages/react-native/ReactCommon/reactperflogger/reactperflogger/FuseboxPerfettoDataSource.cpp b/packages/react-native/ReactCommon/reactperflogger/reactperflogger/FuseboxPerfettoDataSource.cpp index 516a703b2b0..885d1a53f5d 100644 --- a/packages/react-native/ReactCommon/reactperflogger/reactperflogger/FuseboxPerfettoDataSource.cpp +++ b/packages/react-native/ReactCommon/reactperflogger/reactperflogger/FuseboxPerfettoDataSource.cpp @@ -27,8 +27,6 @@ const std::string JS_SAMPLING_TRACK = "JS Sampling"; const int SAMPLING_HZ = 1000; -using perfetto::TrackEvent; - #if defined(__ANDROID__) std::string getApplicationId() { pid_t pid = getpid(); diff --git a/packages/react-native/ReactCommon/reactperflogger/reactperflogger/HermesPerfettoDataSource.cpp b/packages/react-native/ReactCommon/reactperflogger/reactperflogger/HermesPerfettoDataSource.cpp index 1ae283d7f50..899141bfc3d 100644 --- a/packages/react-native/ReactCommon/reactperflogger/reactperflogger/HermesPerfettoDataSource.cpp +++ b/packages/react-native/ReactCommon/reactperflogger/reactperflogger/HermesPerfettoDataSource.cpp @@ -23,8 +23,6 @@ const int SAMPLING_HZ = 100; int64_t hermesDeltaTime = 0; -using perfetto::TrackEvent; - uint64_t hermesToPerfettoTime(int64_t hermesTs) { if (hermesDeltaTime == 0) { hermesDeltaTime = TrackEvent::GetTraceTimeNs() - @@ -113,7 +111,7 @@ void HermesPerfettoDataSource::OnStart(const StartArgs&) { "react-native", perfetto::DynamicString{"Profiling Started"}, getPerfettoWebPerfTrackSync("JS Sampling"), - perfetto::TrackEvent::GetTraceTimeNs()); + TrackEvent::GetTraceTimeNs()); } void HermesPerfettoDataSource::OnFlush(const FlushArgs&) { diff --git a/packages/react-native/ReactCommon/reactperflogger/reactperflogger/ReactPerfetto.cpp b/packages/react-native/ReactCommon/reactperflogger/reactperflogger/ReactPerfetto.cpp index c8635e5e0fa..deeab6b22c4 100644 --- a/packages/react-native/ReactCommon/reactperflogger/reactperflogger/ReactPerfetto.cpp +++ b/packages/react-native/ReactCommon/reactperflogger/reactperflogger/ReactPerfetto.cpp @@ -29,7 +29,7 @@ void initializePerfetto() { args.backends |= perfetto::kSystemBackend; args.use_monotonic_clock = true; perfetto::Tracing::Initialize(args); - perfetto::TrackEvent::Register(); + TrackEvent::Register(); }); HermesPerfettoDataSource::RegisterDataSource(); @@ -42,7 +42,7 @@ static perfetto::Track createTrack(const std::string& trackName) { auto track = perfetto::Track(trackId++); auto desc = track.Serialize(); desc.set_name(trackName); - perfetto::TrackEvent::SetTrackDescriptor(track, desc); + TrackEvent::SetTrackDescriptor(track, desc); return track; } diff --git a/packages/react-native/ReactCommon/reactperflogger/reactperflogger/ReactPerfettoCategories.cpp b/packages/react-native/ReactCommon/reactperflogger/reactperflogger/ReactPerfettoCategories.cpp index 5941754d163..fa638bd6559 100644 --- a/packages/react-native/ReactCommon/reactperflogger/reactperflogger/ReactPerfettoCategories.cpp +++ b/packages/react-native/ReactCommon/reactperflogger/reactperflogger/ReactPerfettoCategories.cpp @@ -9,6 +9,7 @@ #include "ReactPerfettoCategories.h" -PERFETTO_TRACK_EVENT_STATIC_STORAGE(); +PERFETTO_TRACK_EVENT_STATIC_STORAGE_IN_NAMESPACE(facebook::react); +PERFETTO_USE_CATEGORIES_FROM_NAMESPACE(facebook::react); #endif diff --git a/packages/react-native/ReactCommon/reactperflogger/reactperflogger/ReactPerfettoCategories.h b/packages/react-native/ReactCommon/reactperflogger/reactperflogger/ReactPerfettoCategories.h index ab22c2c2f72..133f95a0bc7 100644 --- a/packages/react-native/ReactCommon/reactperflogger/reactperflogger/ReactPerfettoCategories.h +++ b/packages/react-native/ReactCommon/reactperflogger/reactperflogger/ReactPerfettoCategories.h @@ -11,7 +11,8 @@ #include -PERFETTO_DEFINE_CATEGORIES( +PERFETTO_DEFINE_CATEGORIES_IN_NAMESPACE( + facebook::react, perfetto::Category("react-native") .SetDescription("User timing events from React Native")); diff --git a/packages/react-native/ReactCxxPlatform/react/profiling/perfetto.cpp b/packages/react-native/ReactCxxPlatform/react/profiling/perfetto.cpp index b8d5e69eb6f..c15a1179ae7 100644 --- a/packages/react-native/ReactCxxPlatform/react/profiling/perfetto.cpp +++ b/packages/react-native/ReactCxxPlatform/react/profiling/perfetto.cpp @@ -23,7 +23,7 @@ void initializePerfetto() { #endif args.use_monotonic_clock = true; perfetto::Tracing::Initialize(args); - perfetto::TrackEvent::Register(); + facebook::react::TrackEvent::Register(); }); } diff --git a/packages/react-native/ReactCxxPlatform/react/profiling/perfetto.h b/packages/react-native/ReactCxxPlatform/react/profiling/perfetto.h index a88aab3b7f7..f1b1ca9aa14 100644 --- a/packages/react-native/ReactCxxPlatform/react/profiling/perfetto.h +++ b/packages/react-native/ReactCxxPlatform/react/profiling/perfetto.h @@ -18,7 +18,8 @@ #if WITH_PERFETTO #include -PERFETTO_DEFINE_CATEGORIES( +PERFETTO_DEFINE_CATEGORIES_IN_NAMESPACE( + facebook::react, perfetto::Category("rncxx").SetDescription("Events from RN/Granite")); void initializePerfetto();