mirror of
https://github.com/facebook/react-native.git
synced 2026-11-18 20:19:07 +00:00
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
This commit is contained in:
1 parent
7722eae226
commit
53d8a98ee3
6 files changed
+15
-36
No files matched your search
@@ -39,17 +39,6 @@ std::optional<folly::dynamic> ConsoleTaskContext::getSerializedStackTrace()
|
||||
return maybeValue;
|
||||
}
|
||||
|
||||
std::function<std::optional<folly::dynamic>()>
|
||||
ConsoleTaskContext::getSerializedStackTraceProvider() const {
|
||||
return [selfWeak = weak_from_this()]() -> std::optional<folly::dynamic> {
|
||||
if (auto self = selfWeak.lock()) {
|
||||
return self->getSerializedStackTrace();
|
||||
}
|
||||
|
||||
return std::nullopt;
|
||||
};
|
||||
}
|
||||
|
||||
void ConsoleTaskContext::schedule() {
|
||||
orchestrator_.scheduleTask(id(), weak_from_this());
|
||||
}
|
||||
|
||||
@@ -80,11 +80,6 @@ class ConsoleTaskContext : public std::enable_shared_from_this<ConsoleTaskContex
|
||||
*/
|
||||
std::optional<folly::dynamic> getSerializedStackTrace() const;
|
||||
|
||||
/**
|
||||
* Returns a function that returns the serialized stack trace, if available.
|
||||
*/
|
||||
std::function<std::optional<folly::dynamic>()> getSerializedStackTraceProvider() const;
|
||||
|
||||
void schedule();
|
||||
|
||||
private:
|
||||
|
||||
@@ -491,7 +491,7 @@ void consoleTimeStamp(
|
||||
trackGroup,
|
||||
color,
|
||||
std::move(detail),
|
||||
taskContext ? taskContext->getSerializedStackTraceProvider() : nullptr);
|
||||
taskContext ? taskContext->getSerializedStackTrace() : nullptr);
|
||||
}
|
||||
|
||||
if (ReactPerfettoLogger::isTracing()) {
|
||||
|
||||
@@ -188,7 +188,7 @@ void PerformanceTracer::reportMeasure(
|
||||
HighResTimeStamp start,
|
||||
HighResDuration duration,
|
||||
folly::dynamic&& detail,
|
||||
std::function<std::optional<folly::dynamic>()>&& stackTraceProvider) {
|
||||
std::optional<folly::dynamic> 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<std::string> trackGroup,
|
||||
std::optional<ConsoleTimeStampColor> color,
|
||||
std::optional<folly::dynamic> detail,
|
||||
std::function<std::optional<folly::dynamic>()>&& stackTraceProvider) {
|
||||
std::optional<folly::dynamic> 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(
|
||||
|
||||
@@ -82,7 +82,7 @@ class PerformanceTracer {
|
||||
HighResTimeStamp start,
|
||||
HighResDuration duration,
|
||||
folly::dynamic &&detail = nullptr,
|
||||
std::function<std::optional<folly::dynamic>()> &&stackTraceProvider = nullptr);
|
||||
std::optional<folly::dynamic> stackTrace = nullptr);
|
||||
|
||||
/**
|
||||
* Record a "TimeStamp" Trace Event - a labelled entry on Performance
|
||||
@@ -99,7 +99,7 @@ class PerformanceTracer {
|
||||
std::optional<std::string> trackGroup = std::nullopt,
|
||||
std::optional<ConsoleTimeStampColor> color = std::nullopt,
|
||||
std::optional<folly::dynamic> detail = std::nullopt,
|
||||
std::function<std::optional<folly::dynamic>()> &&stackTraceProvider = nullptr);
|
||||
std::optional<folly::dynamic> 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<std::optional<folly::dynamic>()> stackTraceProvider;
|
||||
std::optional<folly::dynamic> stackTrace;
|
||||
HighResTimeStamp createdAt = HighResTimeStamp::now();
|
||||
};
|
||||
|
||||
@@ -270,7 +270,7 @@ class PerformanceTracer {
|
||||
std::optional<std::string> trackGroup;
|
||||
std::optional<ConsoleTimeStampColor> color;
|
||||
std::optional<folly::dynamic> detail;
|
||||
std::function<std::optional<folly::dynamic>()> stackTraceProvider;
|
||||
std::optional<folly::dynamic> stackTrace;
|
||||
ThreadId threadId;
|
||||
HighResTimeStamp createdAt = HighResTimeStamp::now();
|
||||
};
|
||||
|
||||
+1
-2
@@ -390,8 +390,7 @@ void PerformanceEntryReporter::traceMeasure(
|
||||
entry.startTime,
|
||||
entry.duration,
|
||||
std::move(detail),
|
||||
taskContext ? taskContext->getSerializedStackTraceProvider()
|
||||
: nullptr);
|
||||
taskContext ? taskContext->getSerializedStackTrace() : nullptr);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user