Skip to content

Fix data race in updateRendering #51948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
michalkielan wants to merge 1 commit into from
Closed

Fix data race in updateRendering #51948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ...ages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Modern.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,8 +354,9 @@ void RuntimeScheduler_Modern::updateRendering() {

// This is the integration of the Event Timing API in the Event Loop.
// See https://w3c.github.io/event-timing/#sec-modifications-HTML
if (eventTimingDelegate_ != nullptr) {
eventTimingDelegate_->dispatchPendingEventTimingEntries(
const auto eventTimingDelegate = eventTimingDelegate_.load();
if (eventTimingDelegate != nullptr) {
eventTimingDelegate->dispatchPendingEventTimingEntries(
surfaceIdsWithPendingRenderingUpdates_);
}

Expand Down
6 changes: 5 additions & 1 deletion packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler_Modern.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,11 +228,15 @@ class RuntimeScheduler_Modern final : public RuntimeSchedulerBase {
std::queue<RuntimeSchedulerRenderingUpdate> pendingRenderingUpdates_;
std::unordered_set<SurfaceId> surfaceIdsWithPendingRenderingUpdates_;

// TODO(T227212654) eventTimingDelegate_ is only set once during startup, so
// the real fix here would be to delay runEventLoop until
// setEventTimingDelegate.
std::atomic<ShadowTreeRevisionConsistencyManager*>
shadowTreeRevisionConsistencyManager_{nullptr};
std::atomic<RuntimeSchedulerEventTimingDelegate*> eventTimingDelegate_{
nullptr};

PerformanceEntryReporter* performanceEntryReporter_{nullptr};
RuntimeSchedulerEventTimingDelegate* eventTimingDelegate_{nullptr};
RuntimeSchedulerIntersectionObserverDelegate* intersectionObserverDelegate_{
nullptr};

Expand Down