Make measure calls asynchronous

Summary:
Changelog: [internal]

Add an option to make all measure calls asynchronous.

Reviewed By: JoshuaGross

Differential Revision: D28934444

fbshipit-source-id: 57a320b03add0182b4646b13ed4b692b899ddea3

Author: sammy-SC

ReactCommon/react/renderer/scheduler/Scheduler.cpp

@@ -95,11 +95,23 @@ Scheduler::Scheduler(
   uiManager->setDelegate(this);
   uiManager->setComponentDescriptorRegistry(componentDescriptorRegistry_);
 
+#ifdef ANDROID
+  auto asyncMeasure =
+      reactNativeConfig_->getBool("react_fabric:enable_async_measure_android");
+#else
+  auto asyncMeasure =
+      reactNativeConfig_->getBool("react_fabric:enable_async_measure_ios");
+#endif
+
   runtimeExecutor_([uiManager,
+                    asyncMeasure,
+                    runtimeExecutor = runtimeExecutor_,
                     runtimeScheduler = schedulerToolbox.runtimeScheduler](
                        jsi::Runtime &runtime) {
-    auto uiManagerBinding = UIManagerBinding::createAndInstallIfNeeded(runtime);
+    auto uiManagerBinding =
+        UIManagerBinding::createAndInstallIfNeeded(runtime, runtimeExecutor);
     uiManagerBinding->attach(uiManager);
+    uiManagerBinding->setEnableAsyncMeasure(asyncMeasure);
     if (runtimeScheduler) {
       RuntimeSchedulerBinding::createAndInstallIfNeeded(
           runtime, runtimeScheduler);

ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp

@@ -58,15 +58,16 @@ static bool checkGetCallableModuleIsActive(jsi::Runtime &runtime) {
 }
 
 std::shared_ptr<UIManagerBinding> UIManagerBinding::createAndInstallIfNeeded(
-    jsi::Runtime &runtime) {
+    jsi::Runtime &runtime,
+    RuntimeExecutor const &runtimeExecutor) {
   auto uiManagerModuleName = "nativeFabricUIManager";
 
   auto uiManagerValue =
       runtime.global().getProperty(runtime, uiManagerModuleName);
   if (uiManagerValue.isUndefined()) {
     // The global namespace does not have an instance of the binding;
     // we need to create, install and return it.
-    auto uiManagerBinding = std::make_shared<UIManagerBinding>();
+    auto uiManagerBinding = std::make_shared<UIManagerBinding>(runtimeExecutor);
     auto object = jsi::Object::createFromHostObject(runtime, uiManagerBinding);
     runtime.global().setProperty(
         runtime, uiManagerModuleName, std::move(object));
@@ -93,6 +94,9 @@ std::shared_ptr<UIManagerBinding> UIManagerBinding::getBinding(
   return uiManagerObject.getHostObject<UIManagerBinding>(runtime);
 }
 
+UIManagerBinding::UIManagerBinding(RuntimeExecutor const &runtimeExecutor)
+    : runtimeExecutor_(runtimeExecutor) {}
+
 UIManagerBinding::~UIManagerBinding() {
   LOG(WARNING) << "UIManagerBinding::~UIManagerBinding() was called (address: "
                << this << ").";
@@ -102,6 +106,10 @@ void UIManagerBinding::attach(std::shared_ptr<UIManager> const &uiManager) {
   uiManager_ = uiManager;
 }
 
+void UIManagerBinding::setEnableAsyncMeasure(bool enable) {
+  enableAsyncMeasure_ = enable;
+}
+
 static jsi::Value callMethodOfModule(
     jsi::Runtime &runtime,
     std::string const &moduleName,
@@ -826,8 +834,12 @@ jsi::Value UIManagerBinding::get(
 
 void UIManagerBinding::executeMeasure(
     jsi::Runtime &runtime,
-    std::function<void(jsi::Runtime &)> callback) const noexcept {
-  callback(runtime);
+    std::function<void(jsi::Runtime &)> &&callback) const noexcept {
+  if (enableAsyncMeasure_) {
+    runtimeExecutor_(std::move(callback));
+  } else {
+    callback(runtime);
+  }
 }
 
 } // namespace facebook::react

ReactCommon/react/renderer/uimanager/UIManagerBinding.h

@@ -7,6 +7,7 @@
 
 #pragma once
 
+#import <ReactCommon/RuntimeExecutor.h>
 #include <folly/dynamic.h>
 #include <jsi/jsi.h>
 #include <react/renderer/core/RawValue.h>
@@ -28,14 +29,17 @@ class UIManagerBinding : public jsi::HostObject {
    * Thread synchronization must be enforced externally.
    */
   static std::shared_ptr<UIManagerBinding> createAndInstallIfNeeded(
-      jsi::Runtime &runtime);
+      jsi::Runtime &runtime,
+      RuntimeExecutor const &runtimeExecutor);
 
   /*
    * Returns a pointer to UIManagerBinding previously installed into a runtime.
    * Thread synchronization must be enforced externally.
    */
   static std::shared_ptr<UIManagerBinding> getBinding(jsi::Runtime &runtime);
 
+  UIManagerBinding(RuntimeExecutor const &runtimeExecutor);
+
   ~UIManagerBinding();
 
   /*
@@ -45,6 +49,8 @@ class UIManagerBinding : public jsi::HostObject {
    */
   void attach(std::shared_ptr<UIManager> const &uiManager);
 
+  void setEnableAsyncMeasure(bool enable);
+
   /*
    * Starts React Native Surface with given id, moduleName, and props.
    * Thread synchronization must be enforced externally.
@@ -102,11 +108,14 @@ class UIManagerBinding : public jsi::HostObject {
  private:
   void executeMeasure(
       jsi::Runtime &runtime,
-      std::function<void(jsi::Runtime &)> callback) const noexcept;
+      std::function<void(jsi::Runtime &)> &&callback) const noexcept;
 
   std::shared_ptr<UIManager> uiManager_;
   std::unique_ptr<EventHandler const> eventHandler_;
   mutable ReactEventPriority currentEventPriority_;
+
+  bool enableAsyncMeasure_;
+  RuntimeExecutor runtimeExecutor_;
 };
 
 } // namespace facebook::react