From d8e6a985a30fd4e060b0ebcb12d147edc28a776e Mon Sep 17 00:00:00 2001 From: Zeya Peng Date: Sat, 1 Nov 2025 14:10:55 -0700 Subject: [PATCH] Avoid acquiring multiple locks in async node creation (#54359) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/54359 ## Changelog: [Internal] [Changed] [react-native][cxx animated] Avoid acquiring multiple locks in async node creation Reviewed By: christophpurrer Differential Revision: D85969336 fbshipit-source-id: bfc05d5b8b36318aec21e1ad966e21108978afd0 --- .../animated/NativeAnimatedNodesManager.cpp | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/packages/react-native/ReactCommon/react/renderer/animated/NativeAnimatedNodesManager.cpp b/packages/react-native/ReactCommon/react/renderer/animated/NativeAnimatedNodesManager.cpp index 52872e40e82..bf56e2fee4d 100644 --- a/packages/react-native/ReactCommon/react/renderer/animated/NativeAnimatedNodesManager.cpp +++ b/packages/react-native/ReactCommon/react/renderer/animated/NativeAnimatedNodesManager.cpp @@ -1044,13 +1044,20 @@ void NativeAnimatedNodesManager::onRender() { { // Flush async created animated nodes - std::lock_guard lock(animatedNodesCreatedAsyncMutex_); - std::lock_guard lockCreateAsync(connectedAnimatedNodesMutex_); - for (auto& [tag, node] : animatedNodesCreatedAsync_) { - animatedNodes_.insert({tag, std::move(node)}); - updatedNodeTags_.insert(tag); + std::unordered_map> + animatedNodesCreatedAsync; + { + std::lock_guard lock(animatedNodesCreatedAsyncMutex_); + std::swap(animatedNodesCreatedAsync, animatedNodesCreatedAsync_); + } + + if (!animatedNodesCreatedAsync.empty()) { + std::lock_guard lock(connectedAnimatedNodesMutex_); + for (auto& [tag, node] : animatedNodesCreatedAsync) { + animatedNodes_.insert({tag, std::move(node)}); + updatedNodeTags_.insert(tag); + } } - animatedNodesCreatedAsync_.clear(); } // Run operations scheduled from AnimatedModule