From 15f11f3e5905a5bab66dc061851e6e8facd8a81f Mon Sep 17 00:00:00 2001 From: David Vacca Date: Mon, 15 Jul 2019 12:26:00 -0700 Subject: [PATCH] Make Binding.commitMutex_ recursive Summary: This diff makes the Binding.commitMutex_ recursive, for more context see: D15995971 Reviewed By: shergin Differential Revision: D16187220 fbshipit-source-id: 559d06e1e4a83d7beee13f41b4549db2b91983e5 --- .../src/main/java/com/facebook/react/fabric/jni/Binding.cpp | 2 +- .../src/main/java/com/facebook/react/fabric/jni/Binding.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp index 4139523ed71..2ce223e1c6f 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp @@ -450,7 +450,7 @@ local_ref createCreateMountItem( void Binding::schedulerDidFinishTransaction( MountingCoordinator::Shared const &mountingCoordinator) { - std::lock_guard lock(commitMutex_); + std::lock_guard lock(commitMutex_); SystraceSection s("FabricUIManagerBinding::schedulerDidFinishTransaction"); long finishTransactionStartTime = getTime(); diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h index 7987afc92b3..de1822989df 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h @@ -32,7 +32,7 @@ class Binding : public jni::HybridClass, public SchedulerDelegate { std::shared_ptr scheduler_; std::mutex schedulerMutex_; - std::mutex commitMutex_; + std::recursive_mutex commitMutex_; float pointScaleFactor_ = 1;