Move feature flags for the event loop to ReactNativeFeatureFlags (re-…

…land) (facebook#42677) Summary: Pull Request resolved: facebook#42677 Changelog: [internal] This is a re-application of facebook#42434 which had to be reverted after a problem in a previous PR. See details in the original PR. Reviewed By: huntie Differential Revision: D53122991 fbshipit-source-id: 56a762f450b6ccd5a9a3bd364954ef9698d062c4
rubennorte · Jan 26, 2024 · 98ff595 · 98ff595
1 parent 521daaf
commit 98ff595
Show file tree

Hide file tree

Showing 46 changed files with 388 additions and 150 deletions.
diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/packages/react-native/ReactAndroid/api/ReactAndroid.api
@@ -1917,7 +1917,6 @@ public class com/facebook/react/config/ReactFeatureFlags {
 	public static field unstable_useFabricInterop Z
 	public static field unstable_useTurboModuleInterop Z
 	public static field unstable_useTurboModuleInteropForAllTurboModules Z
-	public static field useModernRuntimeScheduler Z
 	public static field useNativeViewConfigsInBridgelessMode Z
 	public static field useTurboModules Z
 	public fun <init> ()V

diff --git a/.../react-native/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java b/.../react-native/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java
@@ -127,12 +127,6 @@ public class ReactFeatureFlags {
   /** When enabled, rawProps in Props will not include Yoga specific props. */
   public static boolean excludeYogaFromRawProps = false;
 
-  /**
-   * When enabled, it uses the modern fork of RuntimeScheduler that allows scheduling tasks with
-   * priorities from any thread.
-   */
-  public static boolean useModernRuntimeScheduler = false;
-
   /**
    * Enables storing js caller stack when creating promise in native module. This is useful in case
    * of Promise rejection and tracing the cause.

diff --git a/...Android/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt b/...Android/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt
@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<c201b2b577ab4aa4bf6071d6b99b43c9>>
+ * @generated SignedSource<<52367278b4d0fdf7f436bd8c511d4ffe>>
  */
 
 /**
@@ -33,6 +33,21 @@ object ReactNativeFeatureFlags {
    */
   fun commonTestFlag() = accessor.commonTestFlag()
 
+  /**
+   * When enabled, it uses the modern fork of RuntimeScheduler that allows scheduling tasks with priorities from any thread.
+   */
+  fun useModernRuntimeScheduler() = accessor.useModernRuntimeScheduler()
+
+  /**
+   * Enables the use of microtasks in Hermes (scheduling) and RuntimeScheduler (execution).
+   */
+  fun enableMicrotasks() = accessor.enableMicrotasks()
+
+  /**
+   * When enabled, the RuntimeScheduler processing the event loop will batch all rendering updates and dispatch them together at the end of each iteration of the loop.
+   */
+  fun batchRenderingUpdatesInEventLoop() = accessor.batchRenderingUpdatesInEventLoop()
+
   /**
    * Overrides the feature flags with the ones provided by the given provider
    * (generally one that extends `ReactNativeFeatureFlagsDefaults`).

diff --git a/.../main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt b/.../main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt
@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<961f1fb0a7ad802a492437f15b1f2dcb>>
+ * @generated SignedSource<<920bb26d238f935f63a77943df7ef6e2>>
  */
 
 /**
@@ -21,6 +21,9 @@ package com.facebook.react.internal.featureflags
 
 class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAccessor {
   private var commonTestFlagCache: Boolean? = null
+  private var useModernRuntimeSchedulerCache: Boolean? = null
+  private var enableMicrotasksCache: Boolean? = null
+  private var batchRenderingUpdatesInEventLoopCache: Boolean? = null
 
   override fun commonTestFlag(): Boolean {
     var cached = commonTestFlagCache
@@ -31,6 +34,33 @@ class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAccessor {
     return cached
   }
 
+  override fun useModernRuntimeScheduler(): Boolean {
+    var cached = useModernRuntimeSchedulerCache
+    if (cached == null) {
+      cached = ReactNativeFeatureFlagsCxxInterop.useModernRuntimeScheduler()
+      useModernRuntimeSchedulerCache = cached
+    }
+    return cached
+  }
+
+  override fun enableMicrotasks(): Boolean {
+    var cached = enableMicrotasksCache
+    if (cached == null) {
+      cached = ReactNativeFeatureFlagsCxxInterop.enableMicrotasks()
+      enableMicrotasksCache = cached
+    }
+    return cached
+  }
+
+  override fun batchRenderingUpdatesInEventLoop(): Boolean {
+    var cached = batchRenderingUpdatesInEventLoopCache
+    if (cached == null) {
+      cached = ReactNativeFeatureFlagsCxxInterop.batchRenderingUpdatesInEventLoop()
+      batchRenderingUpdatesInEventLoopCache = cached
+    }
+    return cached
+  }
+
   override fun override(provider: ReactNativeFeatureFlagsProvider) =
       ReactNativeFeatureFlagsCxxInterop.override(provider as Any)
 

diff --git a/...c/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxInterop.kt b/...c/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxInterop.kt
@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<c2e41ac8c3d9471b4cb79f6147cc2bf2>>
+ * @generated SignedSource<<19d0606854e3e34efe67acf9dc1d26b4>>
  */
 
 /**
@@ -30,6 +30,12 @@ object ReactNativeFeatureFlagsCxxInterop {
 
   @DoNotStrip @JvmStatic external fun commonTestFlag(): Boolean
 
+  @DoNotStrip @JvmStatic external fun useModernRuntimeScheduler(): Boolean
+
+  @DoNotStrip @JvmStatic external fun enableMicrotasks(): Boolean
+
+  @DoNotStrip @JvmStatic external fun batchRenderingUpdatesInEventLoop(): Boolean
+
   @DoNotStrip @JvmStatic external fun override(provider: Any)
 
   @DoNotStrip @JvmStatic external fun dangerouslyReset()

diff --git a/...src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt b/...src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt
@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<aa1eaeee7b715e5b1d3cbcf9b7a7062e>>
+ * @generated SignedSource<<932fd2768c81d5a5f49929c89d6659ff>>
  */
 
 /**
@@ -24,4 +24,10 @@ open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvider {
   // but that is more expensive than just duplicating the defaults here.
 
   override fun commonTestFlag(): Boolean = false
+
+  override fun useModernRuntimeScheduler(): Boolean = false
+
+  override fun enableMicrotasks(): Boolean = false
+
+  override fun batchRenderingUpdatesInEventLoop(): Boolean = false
 }
diff --git a/...ain/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsLocalAccessor.kt b/...ain/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsLocalAccessor.kt
@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<8bbd7e8cc2c50cfbf44ba6671d095f23>>
+ * @generated SignedSource<<6254686d99a8bfd0531ed629655cf673>>
  */
 
 /**
@@ -25,6 +25,9 @@ class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAccessor {
   private val accessedFeatureFlags = mutableSetOf<String>()
 
   private var commonTestFlagCache: Boolean? = null
+  private var useModernRuntimeSchedulerCache: Boolean? = null
+  private var enableMicrotasksCache: Boolean? = null
+  private var batchRenderingUpdatesInEventLoopCache: Boolean? = null
 
   override fun commonTestFlag(): Boolean {
     var cached = commonTestFlagCache
@@ -36,6 +39,36 @@ class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAccessor {
     return cached
   }
 
+  override fun useModernRuntimeScheduler(): Boolean {
+    var cached = useModernRuntimeSchedulerCache
+    if (cached == null) {
+      cached = currentProvider.useModernRuntimeScheduler()
+      accessedFeatureFlags.add("useModernRuntimeScheduler")
+      useModernRuntimeSchedulerCache = cached
+    }
+    return cached
+  }
+
+  override fun enableMicrotasks(): Boolean {
+    var cached = enableMicrotasksCache
+    if (cached == null) {
+      cached = currentProvider.enableMicrotasks()
+      accessedFeatureFlags.add("enableMicrotasks")
+      enableMicrotasksCache = cached
+    }
+    return cached
+  }
+
+  override fun batchRenderingUpdatesInEventLoop(): Boolean {
+    var cached = batchRenderingUpdatesInEventLoopCache
+    if (cached == null) {
+      cached = currentProvider.batchRenderingUpdatesInEventLoop()
+      accessedFeatureFlags.add("batchRenderingUpdatesInEventLoop")
+      batchRenderingUpdatesInEventLoopCache = cached
+    }
+    return cached
+  }
+
   override fun override(provider: ReactNativeFeatureFlagsProvider) {
     if (accessedFeatureFlags.isNotEmpty()) {
       val accessedFeatureFlagsStr = accessedFeatureFlags.joinToString(separator = ", ") { it }

diff --git a/...src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsProvider.kt b/...src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsProvider.kt
@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<8fae1537ff23fbd7dacd81cc2521cd3c>>
+ * @generated SignedSource<<c5c87368aae4df966b4b7971aadb79f2>>
  */
 
 /**
@@ -24,4 +24,10 @@ import com.facebook.proguard.annotations.DoNotStrip
 @DoNotStrip
 interface ReactNativeFeatureFlagsProvider {
   @DoNotStrip fun commonTestFlag(): Boolean
+
+  @DoNotStrip fun useModernRuntimeScheduler(): Boolean
+
+  @DoNotStrip fun enableMicrotasks(): Boolean
+
+  @DoNotStrip fun batchRenderingUpdatesInEventLoop(): Boolean
 }
diff --git a/...ges/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactInstance.java b/...ges/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactInstance.java
@@ -170,9 +170,6 @@ public void onHostDestroy() {
     // Notify JS if profiling is enabled
     boolean isProfiling =
         Systrace.isTracing(Systrace.TRACE_TAG_REACT_APPS | Systrace.TRACE_TAG_REACT_JS_VM_CALLS);
-    // TODO(T166383606): Remove this parameter when we remove the legacy runtime scheduler or we
-    // have access to ReactNativeConfig before we initialize it.
-    boolean useModernRuntimeScheduler = ReactFeatureFlags.useModernRuntimeScheduler;
     mHybridData =
         initHybrid(
             jsRuntimeFactory,
@@ -182,8 +179,7 @@ public void onHostDestroy() {
             jsTimerExecutor,
             reactExceptionManager,
             bindingsInstaller,
-            isProfiling,
-            useModernRuntimeScheduler);
+            isProfiling);
 
     // Set up TurboModules
     Systrace.beginSection(
@@ -457,8 +453,7 @@ private native HybridData initHybrid(
       JSTimerExecutor jsTimerExecutor,
       ReactJsExceptionHandler jReactExceptionsManager,
       @Nullable BindingsInstaller jBindingsInstaller,
-      boolean isProfiling,
-      boolean useModernRuntimeScheduler);
+      boolean isProfiling);
 
   @DoNotStrip
   private static native JSTimerExecutor createJSTimerExecutor();

diff --git a/...ative/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.cpp b/...ative/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.cpp
@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<ad6d2d1c24334995ba197c7cc0a74dc9>>
+ * @generated SignedSource<<bd4482119f1c4963aa4ad1e354f9107d>>
  */
 
 /**
@@ -28,6 +28,21 @@ bool JReactNativeFeatureFlagsCxxInterop::commonTestFlag(
   return ReactNativeFeatureFlags::commonTestFlag();
 }
 
+bool JReactNativeFeatureFlagsCxxInterop::useModernRuntimeScheduler(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
+  return ReactNativeFeatureFlags::useModernRuntimeScheduler();
+}
+
+bool JReactNativeFeatureFlagsCxxInterop::enableMicrotasks(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
+  return ReactNativeFeatureFlags::enableMicrotasks();
+}
+
+bool JReactNativeFeatureFlagsCxxInterop::batchRenderingUpdatesInEventLoop(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
+  return ReactNativeFeatureFlags::batchRenderingUpdatesInEventLoop();
+}
+
 void JReactNativeFeatureFlagsCxxInterop::override(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/,
     jni::alias_ref<jobject> provider) {
@@ -48,6 +63,15 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() {
       makeNativeMethod(
         "commonTestFlag",
         JReactNativeFeatureFlagsCxxInterop::commonTestFlag),
+      makeNativeMethod(
+        "useModernRuntimeScheduler",
+        JReactNativeFeatureFlagsCxxInterop::useModernRuntimeScheduler),
+      makeNativeMethod(
+        "enableMicrotasks",
+        JReactNativeFeatureFlagsCxxInterop::enableMicrotasks),
+      makeNativeMethod(
+        "batchRenderingUpdatesInEventLoop",
+        JReactNativeFeatureFlagsCxxInterop::batchRenderingUpdatesInEventLoop),
   });
 }
 

diff --git a/...-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.h b/...-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.h
@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<c759720f6c5f9b884f3eee8f3c104526>>
+ * @generated SignedSource<<b7304c29a002ce5a8a612d7a08d798ff>>
  */
 
 /**
@@ -33,6 +33,15 @@ class JReactNativeFeatureFlagsCxxInterop
   static bool commonTestFlag(
     facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
 
+  static bool useModernRuntimeScheduler(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
+
+  static bool enableMicrotasks(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
+
+  static bool batchRenderingUpdatesInEventLoop(
+    facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
+
   static void override(
       facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>,
       jni::alias_ref<jobject> provider);

diff --git a/...ve/ReactAndroid/src/main/jni/react/featureflags/ReactNativeFeatureFlagsProviderHolder.cpp b/...ve/ReactAndroid/src/main/jni/react/featureflags/ReactNativeFeatureFlagsProviderHolder.cpp
@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<6481de9ccf29dce1f9759c72cbaeb13d>>
+ * @generated SignedSource<<91f988022fbff7eba632f2ba46056025>>
  */
 
 /**
@@ -33,4 +33,22 @@ bool ReactNativeFeatureFlagsProviderHolder::commonTestFlag() {
   return method(javaProvider_);
 }
 
+bool ReactNativeFeatureFlagsProviderHolder::useModernRuntimeScheduler() {
+  static const auto method =
+      getJClass()->getMethod<jboolean()>("useModernRuntimeScheduler");
+  return method(javaProvider_);
+}
+
+bool ReactNativeFeatureFlagsProviderHolder::enableMicrotasks() {
+  static const auto method =
+      getJClass()->getMethod<jboolean()>("enableMicrotasks");
+  return method(javaProvider_);
+}
+
+bool ReactNativeFeatureFlagsProviderHolder::batchRenderingUpdatesInEventLoop() {
+  static const auto method =
+      getJClass()->getMethod<jboolean()>("batchRenderingUpdatesInEventLoop");
+  return method(javaProvider_);
+}
+
 } // namespace facebook::react
diff --git a/...tive/ReactAndroid/src/main/jni/react/featureflags/ReactNativeFeatureFlagsProviderHolder.h b/...tive/ReactAndroid/src/main/jni/react/featureflags/ReactNativeFeatureFlagsProviderHolder.h
@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<9a2d162cbd83f3b5122d0eb86f6f9177>>
+ * @generated SignedSource<<3550f7ee28a53a4024a48301ee38ce7e>>
  */
 
 /**
@@ -36,6 +36,9 @@ class ReactNativeFeatureFlagsProviderHolder
       : javaProvider_(make_global(javaProvider)){};
 
   bool commonTestFlag() override;
+  bool useModernRuntimeScheduler() override;
+  bool enableMicrotasks() override;
+  bool batchRenderingUpdatesInEventLoop() override;
 
  private:
   jni::global_ref<jobject> javaProvider_;