From 53d8a98ee3b031919fa0f77dae91be5e0153dc72 Mon Sep 17 00:00:00 2001 From: Ruslan Lesiutin Date: Thu, 6 Nov 2025 04:25:36 -0800 Subject: [PATCH] Serialize stack trace eagerly (#54418) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/54418 # Changelog: [Internal] Previosuly, we were serializing only at the end of tracing. We were creating a weak pointer to encapsulating `ConsoleTaskContext`. Initially I've decided to do it this way for performance reasons, but this resulted in missing a significant portion of stack traces, if the corresponding task was already gc-ed. Unfortunately, we have to serialize them at the time of reporting to `PerformanceTracer`. Reviewed By: huntie Differential Revision: D86207507 fbshipit-source-id: 58b15145ef081a02f2d79d75e05380968eb43a06 --- .../jsinspector-modern/ConsoleTaskContext.cpp | 11 ---------- .../jsinspector-modern/ConsoleTaskContext.h | 5 ----- .../RuntimeTargetConsole.cpp | 2 +- .../tracing/PerformanceTracer.cpp | 22 ++++++++----------- .../tracing/PerformanceTracer.h | 8 +++---- .../timeline/PerformanceEntryReporter.cpp | 3 +-- 6 files changed, 15 insertions(+), 36 deletions(-) diff --git a/packages/react-native/ReactCommon/jsinspector-modern/ConsoleTaskContext.cpp b/packages/react-native/ReactCommon/jsinspector-modern/ConsoleTaskContext.cpp index 53ba2929783..e3a67760442 100644 --- a/packages/react-native/ReactCommon/jsinspector-modern/ConsoleTaskContext.cpp +++ b/packages/react-native/ReactCommon/jsinspector-modern/ConsoleTaskContext.cpp @@ -39,17 +39,6 @@ std::optional ConsoleTaskContext::getSerializedStackTrace() return maybeValue; } -std::function()> -ConsoleTaskContext::getSerializedStackTraceProvider() const { - return [selfWeak = weak_from_this()]() -> std::optional { - if (auto self = selfWeak.lock()) { - return self->getSerializedStackTrace(); - } - - return std::nullopt; - }; -} - void ConsoleTaskContext::schedule() { orchestrator_.scheduleTask(id(), weak_from_this()); } diff --git a/packages/react-native/ReactCommon/jsinspector-modern/ConsoleTaskContext.h b/packages/react-native/ReactCommon/jsinspector-modern/ConsoleTaskContext.h index e651168661b..86fa68a571b 100644 --- a/packages/react-native/ReactCommon/jsinspector-modern/ConsoleTaskContext.h +++ b/packages/react-native/ReactCommon/jsinspector-modern/ConsoleTaskContext.h @@ -80,11 +80,6 @@ class ConsoleTaskContext : public std::enable_shared_from_this getSerializedStackTrace() const; - /** - * Returns a function that returns the serialized stack trace, if available. - */ - std::function()> getSerializedStackTraceProvider() const; - void schedule(); private: diff --git a/packages/react-native/ReactCommon/jsinspector-modern/RuntimeTargetConsole.cpp b/packages/react-native/ReactCommon/jsinspector-modern/RuntimeTargetConsole.cpp index 5cf5e443827..5bf6c544fc8 100644 --- a/packages/react-native/ReactCommon/jsinspector-modern/RuntimeTargetConsole.cpp +++ b/packages/react-native/ReactCommon/jsinspector-modern/RuntimeTargetConsole.cpp @@ -491,7 +491,7 @@ void consoleTimeStamp( trackGroup, color, std::move(detail), - taskContext ? taskContext->getSerializedStackTraceProvider() : nullptr); + taskContext ? taskContext->getSerializedStackTrace() : nullptr); } if (ReactPerfettoLogger::isTracing()) { diff --git a/packages/react-native/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.cpp b/packages/react-native/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.cpp index cf4b443df9b..12d5051686f 100644 --- a/packages/react-native/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.cpp +++ b/packages/react-native/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.cpp @@ -188,7 +188,7 @@ void PerformanceTracer::reportMeasure( HighResTimeStamp start, HighResDuration duration, folly::dynamic&& detail, - std::function()>&& stackTraceProvider) { + std::optional stackTrace) { if (!tracingAtomic_) { return; } @@ -205,7 +205,7 @@ void PerformanceTracer::reportMeasure( .duration = duration, .detail = std::move(detail), .threadId = getCurrentThreadId(), - .stackTraceProvider = std::move(stackTraceProvider), + .stackTrace = std::move(stackTrace), }); } @@ -217,7 +217,7 @@ void PerformanceTracer::reportTimeStamp( std::optional trackGroup, std::optional color, std::optional detail, - std::function()>&& stackTraceProvider) { + std::optional stackTrace) { if (!tracingAtomic_) { return; } @@ -236,7 +236,7 @@ void PerformanceTracer::reportTimeStamp( .trackGroup = std::move(trackGroup), .color = std::move(color), .detail = std::move(detail), - .stackTraceProvider = std::move(stackTraceProvider), + .stackTrace = std::move(stackTrace), .threadId = getCurrentThreadId(), }); } @@ -610,11 +610,9 @@ void PerformanceTracer::enqueueTraceEventsFromPerformanceTracerEvent( beginEventArgs = folly::dynamic::object("detail", folly::toJson(event.detail)); } - if (event.stackTraceProvider) { - if (auto maybeStackTrace = event.stackTraceProvider()) { - beginEventArgs["data"] = folly::dynamic::object( - "rnStackTrace", std::move(*maybeStackTrace)); - } + if (event.stackTrace) { + beginEventArgs["data"] = folly::dynamic::object( + "rnStackTrace", std::move(*event.stackTrace)); } auto eventId = ++performanceMeasureCount_; @@ -705,10 +703,8 @@ void PerformanceTracer::enqueueTraceEventsFromPerformanceTracerEvent( } data["devtools"] = folly::toJson(devtoolsDetail); } - if (event.stackTraceProvider) { - if (auto maybeStackTrace = event.stackTraceProvider()) { - data["rnStackTrace"] = std::move(*maybeStackTrace); - } + if (event.stackTrace) { + data["rnStackTrace"] = std::move(*event.stackTrace); } events.emplace_back( diff --git a/packages/react-native/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.h b/packages/react-native/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.h index 96bf715ab3f..fcab366784a 100644 --- a/packages/react-native/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.h +++ b/packages/react-native/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.h @@ -82,7 +82,7 @@ class PerformanceTracer { HighResTimeStamp start, HighResDuration duration, folly::dynamic &&detail = nullptr, - std::function()> &&stackTraceProvider = nullptr); + std::optional stackTrace = nullptr); /** * Record a "TimeStamp" Trace Event - a labelled entry on Performance @@ -99,7 +99,7 @@ class PerformanceTracer { std::optional trackGroup = std::nullopt, std::optional color = std::nullopt, std::optional detail = std::nullopt, - std::function()> &&stackTraceProvider = nullptr); + std::optional stackTrace = std::nullopt); /** * Record an Event Loop tick, which will be represented as an Event Loop task @@ -258,7 +258,7 @@ class PerformanceTracer { HighResDuration duration; folly::dynamic detail; ThreadId threadId; - std::function()> stackTraceProvider; + std::optional stackTrace; HighResTimeStamp createdAt = HighResTimeStamp::now(); }; @@ -270,7 +270,7 @@ class PerformanceTracer { std::optional trackGroup; std::optional color; std::optional detail; - std::function()> stackTraceProvider; + std::optional stackTrace; ThreadId threadId; HighResTimeStamp createdAt = HighResTimeStamp::now(); }; diff --git a/packages/react-native/ReactCommon/react/performance/timeline/PerformanceEntryReporter.cpp b/packages/react-native/ReactCommon/react/performance/timeline/PerformanceEntryReporter.cpp index ed33d46d69d..8e42bbfc924 100644 --- a/packages/react-native/ReactCommon/react/performance/timeline/PerformanceEntryReporter.cpp +++ b/packages/react-native/ReactCommon/react/performance/timeline/PerformanceEntryReporter.cpp @@ -390,8 +390,7 @@ void PerformanceEntryReporter::traceMeasure( entry.startTime, entry.duration, std::move(detail), - taskContext ? taskContext->getSerializedStackTraceProvider() - : nullptr); + taskContext ? taskContext->getSerializedStackTrace() : nullptr); } } }