From 3d1d81cddccaad6784fc33655dfb822f3eac3e25 Mon Sep 17 00:00:00 2001 From: Alex Hunt Date: Thu, 21 Aug 2025 03:06:52 -0700 Subject: [PATCH] Remove Perf Monitor hooks from DevSupport API (#53349) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/53349 Follows feedback on D78904767, refactoring how we pass data to `PerfMonitorOverlayViewManager` to avoid API additions on `DevSupport`. New interfaces under `com.facebook.react.devsupport.perfmonitor`: - `PerfMonitorUpdateListener` is implemented by the view class to receive updates from the C++ `HostTargetDelegate`. - `PerfMonitorInspectorTargetBinding` exposes an API on `ReactHostInspectorTarget` to send CDP actions down to C++ (stub for now). - `PerfMonitorDevHelper` allows us to use the internal `ReactHostImplDevHelper` to expose the `ReactHostInspectorTarget` instance from the runtime. Changelog: [Internal] Reviewed By: cortinico, rshest Differential Revision: D80464093 fbshipit-source-id: b88e270c0211e4adf52c015ac700df7f44945a5a --- .../ReactAndroid/api/ReactAndroid.api | 3 +-- .../react/devsupport/DevSupportManagerBase.kt | 26 ++++++++---------- .../PerfMonitorOverlayViewManager.kt | 12 +++++---- .../interfaces/PerfMonitorOverlayManager.kt | 5 ---- .../interfaces/PerfMonitorV2Handler.kt | 23 ---------------- .../perfmonitor/PerfMonitorDevHelper.kt | 20 ++++++++++++++ .../perfmonitor/PerfMonitorEventDispatcher.kt | 12 +++++++++ .../perfmonitor/PerfMonitorInspectorTarget.kt | 11 ++++++++ .../PerfMonitorInspectorTargetBinding.kt | 16 +++++++++++ .../perfmonitor/PerfMonitorUpdateListener.kt | 20 ++++++++++++++ .../facebook/react/runtime/ReactHostImpl.kt | 14 +--------- .../react/runtime/ReactHostImplDevHelper.kt | 7 ++++- .../react/runtime/ReactHostInspectorTarget.kt | 27 ++++++++++++++++++- .../runtime/jni/JReactHostInspectorTarget.cpp | 22 ++++++++------- .../runtime/jni/JReactHostInspectorTarget.h | 14 +++------- 15 files changed, 147 insertions(+), 85 deletions(-) delete mode 100644 packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/PerfMonitorV2Handler.kt create mode 100644 packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/perfmonitor/PerfMonitorDevHelper.kt create mode 100644 packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/perfmonitor/PerfMonitorEventDispatcher.kt create mode 100644 packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/perfmonitor/PerfMonitorInspectorTarget.kt create mode 100644 packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/perfmonitor/PerfMonitorInspectorTargetBinding.kt create mode 100644 packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/perfmonitor/PerfMonitorUpdateListener.kt diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/packages/react-native/ReactAndroid/api/ReactAndroid.api index 1095f6a08af..935443a962f 100644 --- a/packages/react-native/ReactAndroid/api/ReactAndroid.api +++ b/packages/react-native/ReactAndroid/api/ReactAndroid.api @@ -1973,7 +1973,7 @@ public abstract interface class com/facebook/react/devsupport/DevServerHelper$Pa public abstract fun onPackagerReloadCommand ()V } -public abstract class com/facebook/react/devsupport/DevSupportManagerBase : com/facebook/react/devsupport/interfaces/DevSupportManager, com/facebook/react/devsupport/interfaces/PerfMonitorV2Handler { +public abstract class com/facebook/react/devsupport/DevSupportManagerBase : com/facebook/react/devsupport/interfaces/DevSupportManager { public static final field Companion Lcom/facebook/react/devsupport/DevSupportManagerBase$Companion; public fun (Landroid/content/Context;Lcom/facebook/react/devsupport/ReactInstanceDevHelper;Ljava/lang/String;ZLcom/facebook/react/devsupport/interfaces/RedBoxHandler;Lcom/facebook/react/devsupport/interfaces/DevBundleDownloadListener;ILjava/util/Map;Lcom/facebook/react/common/SurfaceDelegateFactory;Lcom/facebook/react/devsupport/interfaces/DevLoadingViewManager;Lcom/facebook/react/devsupport/interfaces/PausedInDebuggerOverlayManager;)V public fun addCustomDevOption (Ljava/lang/String;Lcom/facebook/react/devsupport/interfaces/DevOptionHandler;)V @@ -2031,7 +2031,6 @@ public abstract class com/facebook/react/devsupport/DevSupportManagerBase : com/ public fun startInspector ()V public fun stopInspector ()V public fun toggleElementInspector ()V - public fun unstable_updatePerfMonitor (III)V } public abstract interface class com/facebook/react/devsupport/DevSupportManagerBase$CallbackWithBundleLoader { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.kt index faa541cab90..6f718b79757 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.kt @@ -62,10 +62,9 @@ import com.facebook.react.devsupport.interfaces.ErrorCustomizer import com.facebook.react.devsupport.interfaces.ErrorType import com.facebook.react.devsupport.interfaces.PackagerStatusCallback import com.facebook.react.devsupport.interfaces.PausedInDebuggerOverlayManager -import com.facebook.react.devsupport.interfaces.PerfMonitorOverlayManager -import com.facebook.react.devsupport.interfaces.PerfMonitorV2Handler import com.facebook.react.devsupport.interfaces.RedBoxHandler import com.facebook.react.devsupport.interfaces.StackFrame +import com.facebook.react.devsupport.perfmonitor.PerfMonitorDevHelper import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags import com.facebook.react.internal.featureflags.ReactNativeNewArchitectureFeatureFlags import com.facebook.react.modules.core.RCTNativeAppEventEmitter @@ -92,7 +91,7 @@ public abstract class DevSupportManagerBase( private val surfaceDelegateFactory: SurfaceDelegateFactory?, public var devLoadingViewManager: DevLoadingViewManager?, private var pausedInDebuggerOverlayManager: PausedInDebuggerOverlayManager?, -) : DevSupportManager, PerfMonitorV2Handler { +) : DevSupportManager { public interface CallbackWithBundleLoader { public fun onSuccess(bundleLoader: JSBundleLoader) @@ -184,7 +183,7 @@ public abstract class DevSupportManagerBase( null } - private var perfMonitorOverlayManager: PerfMonitorOverlayManager? = null + private var perfMonitorOverlayManager: PerfMonitorOverlayViewManager? = null init { // We store JS bundle loaded from dev server in a single destination in app's data dir. @@ -216,6 +215,7 @@ public abstract class DevSupportManagerBase( if ( ReactNativeNewArchitectureFeatureFlags.enableBridgelessArchitecture() && ReactNativeFeatureFlags.perfMonitorV2Enabled() && + reactInstanceDevHelper is PerfMonitorDevHelper && perfMonitorOverlayManager == null ) { perfMonitorOverlayManager = @@ -227,7 +227,7 @@ public abstract class DevSupportManagerBase( } context }, - { openDebugger() }, + reactInstanceDevHelper.inspectorTarget, ) } } @@ -507,6 +507,12 @@ public abstract class DevSupportManagerBase( override fun onNewReactContextCreated(reactContext: ReactContext) { resetCurrentContext(reactContext) + + if (perfMonitorOverlayManager != null && reactInstanceDevHelper is PerfMonitorDevHelper) { + perfMonitorOverlayManager?.let { manager -> + reactInstanceDevHelper.inspectorTarget?.addPerfMonitorListener(manager) + } + } } override fun onReactInstanceDestroyed(reactContext: ReactContext) { @@ -936,16 +942,6 @@ public abstract class DevSupportManagerBase( pausedInDebuggerOverlayManager?.hidePausedInDebuggerOverlay() } - override fun unstable_updatePerfMonitor( - longTaskDuration: Int, - responsivenessScore: Int, - ttl: Int, - ) { - perfMonitorOverlayManager?.update( - PerfMonitorOverlayManager.PerfMonitorUpdateData(longTaskDuration, responsivenessScore, ttl) - ) - } - override fun setAdditionalOptionForPackager(name: String, value: String) { devSettings.packagerConnectionSettings.setAdditionalOptionForPackager(name, value) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/PerfMonitorOverlayViewManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/PerfMonitorOverlayViewManager.kt index 74f0a9c980c..98be8d98d6b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/PerfMonitorOverlayViewManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/PerfMonitorOverlayViewManager.kt @@ -26,14 +26,16 @@ import androidx.core.view.WindowInsetsCompat import com.facebook.react.R import com.facebook.react.bridge.UiThreadUtil import com.facebook.react.devsupport.interfaces.PerfMonitorOverlayManager +import com.facebook.react.devsupport.perfmonitor.PerfMonitorInspectorTargetBinding +import com.facebook.react.devsupport.perfmonitor.PerfMonitorUpdateListener import com.facebook.react.uimanager.DisplayMetricsHolder import com.facebook.react.uimanager.PixelUtil import java.util.Locale internal class PerfMonitorOverlayViewManager( private val contextSupplier: Supplier, - private val onRequestAnalyzeTrace: () -> Unit, -) : PerfMonitorOverlayManager { + private val inspectorTarget: PerfMonitorInspectorTargetBinding?, +) : PerfMonitorOverlayManager, PerfMonitorUpdateListener { private var initialized: Boolean = false private var enabled: Boolean = false private var hasInteractionData: Boolean = false @@ -66,13 +68,13 @@ internal class PerfMonitorOverlayViewManager( } } - override fun update(data: PerfMonitorOverlayManager.PerfMonitorUpdateData) { + override fun onNewFocusedEvent(data: PerfMonitorUpdateListener.LongTaskEventData) { UiThreadUtil.runOnUiThread { ensureInitialized() durationLabel?.text = String.format(Locale.US, "%d ms", data.durationMs) durationLabel?.setTextColor(getDurationHighlightColor(data.responsivenessScore)) hasInteractionData = true - this.ttl = data.ttl + ttl = data.ttl hideAfterTimeoutHandler?.removeCallbacksAndMessages(null) @@ -175,7 +177,7 @@ internal class PerfMonitorOverlayViewManager( dpToPx(8f).toInt(), ) addView(buttonInner) - setOnClickListener { onRequestAnalyzeTrace() } + setOnClickListener { inspectorTarget?.pauseAndAnalyzeTrace() } } val dialog = createAnchoredDialog(context, dpToPx(0f), dpToPx(0f)).apply { setContentView(buttonView) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/PerfMonitorOverlayManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/PerfMonitorOverlayManager.kt index ca5b5fc6d70..6cac09c6957 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/PerfMonitorOverlayManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/PerfMonitorOverlayManager.kt @@ -9,8 +9,6 @@ package com.facebook.react.devsupport.interfaces /** [Experimental] Interface to manage the V2 Perf Monitor overlay. */ internal interface PerfMonitorOverlayManager { - data class PerfMonitorUpdateData(val durationMs: Int, val responsivenessScore: Int, val ttl: Int) - /** Enable the Perf Monitor overlay. Will be shown when updates are received. */ public fun enable() @@ -19,7 +17,4 @@ internal interface PerfMonitorOverlayManager { /** Reset the Perf Monitor overlay, e.g. after a reload. */ public fun reset() - - /** Update the state of the Perf Monitor overlay. */ - public fun update(data: PerfMonitorUpdateData) } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/PerfMonitorV2Handler.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/PerfMonitorV2Handler.kt deleted file mode 100644 index 8905ecd5cdb..00000000000 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/PerfMonitorV2Handler.kt +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -package com.facebook.react.devsupport.interfaces - -/** - * [Experimental] Interface used by [com.facebook.react.devsupport.BridgeDevSupportManagerBase] - * implement the UI for the V2 Perf Monitor overlay. - */ -internal interface PerfMonitorV2Handler { - - /** [Experimental] Update the V2 Perf Monitor overlay with the given data. */ - // FIXME(T233950466): Refactor ReactHostImpl/DevSupport setup to avoid this public API addition - public fun unstable_updatePerfMonitor( - longTaskDuration: Int, - responsivenessScore: Int, - ttl: Int, - ) -} diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/perfmonitor/PerfMonitorDevHelper.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/perfmonitor/PerfMonitorDevHelper.kt new file mode 100644 index 00000000000..86e39ad3921 --- /dev/null +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/perfmonitor/PerfMonitorDevHelper.kt @@ -0,0 +1,20 @@ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +package com.facebook.react.devsupport.perfmonitor + +/** + * Interface implemented by [com.facebook.react.runtime.ReactHostImplDevHelper] exposing additional + * hooks used to implement the V2 Perf Monitor overlay (experimental). + */ +internal interface PerfMonitorDevHelper { + /** + * The inspector target object. Matches the lifetime of the ReactHost. May be null if modern JS + * debugging is disabled. + */ + public val inspectorTarget: PerfMonitorInspectorTarget? +} diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/perfmonitor/PerfMonitorEventDispatcher.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/perfmonitor/PerfMonitorEventDispatcher.kt new file mode 100644 index 00000000000..55107d023eb --- /dev/null +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/perfmonitor/PerfMonitorEventDispatcher.kt @@ -0,0 +1,12 @@ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +package com.facebook.react.devsupport.perfmonitor + +internal interface PerfMonitorEventDispatcher { + public fun addPerfMonitorListener(listener: PerfMonitorUpdateListener) +} diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/perfmonitor/PerfMonitorInspectorTarget.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/perfmonitor/PerfMonitorInspectorTarget.kt new file mode 100644 index 00000000000..0b6740d8651 --- /dev/null +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/perfmonitor/PerfMonitorInspectorTarget.kt @@ -0,0 +1,11 @@ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +package com.facebook.react.devsupport.perfmonitor + +internal interface PerfMonitorInspectorTarget : + PerfMonitorEventDispatcher, PerfMonitorInspectorTargetBinding {} diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/perfmonitor/PerfMonitorInspectorTargetBinding.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/perfmonitor/PerfMonitorInspectorTargetBinding.kt new file mode 100644 index 00000000000..5ca2e5f3aec --- /dev/null +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/perfmonitor/PerfMonitorInspectorTargetBinding.kt @@ -0,0 +1,16 @@ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +package com.facebook.react.devsupport.perfmonitor + +/** + * [Experimental] Interface implemented by [com.facebook.react.runtime.ReactHostInspectorTarget] + * exposing actions for the V2 Perf Monitor. + */ +internal interface PerfMonitorInspectorTargetBinding { + public fun pauseAndAnalyzeTrace() +} diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/perfmonitor/PerfMonitorUpdateListener.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/perfmonitor/PerfMonitorUpdateListener.kt new file mode 100644 index 00000000000..f09fd03c53f --- /dev/null +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/perfmonitor/PerfMonitorUpdateListener.kt @@ -0,0 +1,20 @@ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +package com.facebook.react.devsupport.perfmonitor + +/** [Experimental] An interface for subscribing to updates for the V2 Perf Monitor. */ +internal interface PerfMonitorUpdateListener { + data class LongTaskEventData( + val durationMs: Int, + val responsivenessScore: Int, + val ttl: Int, + ) + + /** Called when a new active performance event should be displayed. */ + fun onNewFocusedEvent(data: LongTaskEventData) +} diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.kt index 7e96b3e251d..7bcea525e3c 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.kt @@ -47,7 +47,6 @@ import com.facebook.react.devsupport.inspector.InspectorNetworkRequestListener import com.facebook.react.devsupport.interfaces.BundleLoadCallback import com.facebook.react.devsupport.interfaces.DevSupportManager import com.facebook.react.devsupport.interfaces.DevSupportManager.PausedInDebuggerOverlayCommandListener -import com.facebook.react.devsupport.interfaces.PerfMonitorV2Handler import com.facebook.react.fabric.ComponentFactory import com.facebook.react.fabric.FabricUIManager import com.facebook.react.interfaces.TaskInterface @@ -133,7 +132,7 @@ public class ReactHostImpl( CopyOnWriteArrayList() private val beforeDestroyListeners: MutableList<() -> Unit> = CopyOnWriteArrayList() - private var reactHostInspectorTarget: ReactHostInspectorTarget? = null + internal var reactHostInspectorTarget: ReactHostInspectorTarget? = null @Volatile private var hostInvalidated = false @@ -419,17 +418,6 @@ public class ReactHostImpl( } } - @DoNotStrip - private fun unstable_updatePerfMonitor( - longTaskDuration: Int, - responsivenessScore: Int, - ttl: Int, - ) { - if (devSupportManager is PerfMonitorV2Handler) { - devSupportManager.unstable_updatePerfMonitor(longTaskDuration, responsivenessScore, ttl) - } - } - @get:DoNotStrip private val hostMetadata: Map get() = AndroidInfoHelpers.getInspectorHostMetadata(context) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImplDevHelper.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImplDevHelper.kt index e18982a9a8f..d1a07cc137f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImplDevHelper.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImplDevHelper.kt @@ -16,6 +16,8 @@ import com.facebook.react.bridge.ReactContext import com.facebook.react.common.annotations.FrameworkAPI import com.facebook.react.common.annotations.UnstableReactNativeAPI import com.facebook.react.devsupport.ReactInstanceDevHelper +import com.facebook.react.devsupport.perfmonitor.PerfMonitorDevHelper +import com.facebook.react.devsupport.perfmonitor.PerfMonitorInspectorTarget import com.facebook.react.interfaces.TaskInterface import com.facebook.react.modules.core.DeviceEventManagerModule @@ -28,7 +30,7 @@ import com.facebook.react.modules.core.DeviceEventManagerModule @UnstableReactNativeAPI @OptIn(FrameworkAPI::class) internal class ReactHostImplDevHelper(private val delegate: ReactHostImpl) : - ReactInstanceDevHelper { + ReactInstanceDevHelper, PerfMonitorDevHelper { override val currentActivity: Activity? get() = delegate.lastUsedActivity @@ -39,6 +41,9 @@ internal class ReactHostImplDevHelper(private val delegate: ReactHostImpl) : override val currentReactContext: ReactContext? get() = delegate.currentReactContext + override val inspectorTarget: PerfMonitorInspectorTarget? + get() = delegate.reactHostInspectorTarget + override fun onJSBundleLoadedFromServer() { // Not implemented, only referenced by BridgeDevSupportManager } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostInspectorTarget.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostInspectorTarget.kt index 00d70dbd75e..5ce60e160fc 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostInspectorTarget.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostInspectorTarget.kt @@ -12,6 +12,8 @@ import com.facebook.proguard.annotations.DoNotStripAny import com.facebook.react.bridge.UiThreadUtil import com.facebook.react.common.annotations.FrameworkAPI import com.facebook.react.common.annotations.UnstableReactNativeAPI +import com.facebook.react.devsupport.perfmonitor.PerfMonitorInspectorTarget +import com.facebook.react.devsupport.perfmonitor.PerfMonitorUpdateListener import com.facebook.soloader.SoLoader import java.io.Closeable import java.util.concurrent.Executor @@ -19,16 +21,39 @@ import java.util.concurrent.Executor @DoNotStripAny @UnstableReactNativeAPI @OptIn(FrameworkAPI::class) -internal class ReactHostInspectorTarget(reactHostImpl: ReactHostImpl) : Closeable { +internal class ReactHostInspectorTarget(reactHostImpl: ReactHostImpl) : + PerfMonitorInspectorTarget, Closeable { // fbjni looks for the exact name "mHybridData": // https://github.com/facebookincubator/fbjni/blob/5587a7fd2b191656be9391a3832ce04c034009a5/cxx/fbjni/detail/Hybrid.h#L310 @Suppress("NoHungarianNotation") private val mHybridData: HybridData = initHybrid(reactHostImpl, UIThreadConditionalSyncExecutor()) + private val perfMonitorListeners = mutableSetOf() + private external fun initHybrid(reactHostImpl: ReactHostImpl, executor: Executor): HybridData external fun sendDebuggerResumeCommand() + override fun addPerfMonitorListener(listener: PerfMonitorUpdateListener) { + perfMonitorListeners.add(listener) + } + + override fun pauseAndAnalyzeTrace() { + // TODO(T233874551) + } + + fun handleNativePerfMonitorMetricUpdate( + longTaskDurationMs: Int, + responsivenessScore: Int, + ttl: Int, + ) { + perfMonitorListeners.forEach { listener -> + listener.onNewFocusedEvent( + PerfMonitorUpdateListener.LongTaskEventData(longTaskDurationMs, responsivenessScore, ttl) + ) + } + } + override fun close() { mHybridData.resetNative() } diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactHostInspectorTarget.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactHostInspectorTarget.cpp index fdc8258c1ba..8e06dc32272 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactHostInspectorTarget.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactHostInspectorTarget.cpp @@ -17,9 +17,11 @@ using namespace facebook::react::jsinspector_modern; namespace facebook::react { JReactHostInspectorTarget::JReactHostInspectorTarget( + alias_ref jobj, alias_ref reactHostImpl, alias_ref executor) - : javaReactHostImpl_(make_global(makeJWeakReference(reactHostImpl))), + : jobj_(make_global(jobj)), + javaReactHostImpl_(make_global(makeJWeakReference(reactHostImpl))), inspectorExecutor_([javaExecutor = // Use a SafeReleaseJniRef because this lambda may // be copied to arbitrary threads. @@ -62,10 +64,10 @@ JReactHostInspectorTarget::~JReactHostInspectorTarget() { local_ref JReactHostInspectorTarget::initHybrid( - alias_ref /*self*/, + alias_ref jobj, jni::alias_ref reactHostImpl, jni::alias_ref javaExecutor) { - return makeCxxInstance(reactHostImpl, javaExecutor); + return makeCxxInstance(jobj, reactHostImpl, javaExecutor); } void JReactHostInspectorTarget::sendDebuggerResumeCommand() { @@ -129,12 +131,13 @@ void JReactHostInspectorTarget::onSetPausedInDebuggerMessage( void JReactHostInspectorTarget::unstable_onPerfMonitorUpdate( const PerfMonitorUpdateRequest& request) { - if (auto javaReactHostImplStrong = javaReactHostImpl_->get()) { - javaReactHostImplStrong->unstable_updatePerfMonitor( - request.activeInteraction.duration, - request.activeInteraction.responsivenessScore, - request.activeInteraction.ttl); - } + static auto method = javaClassStatic()->getMethod( + "handleNativePerfMonitorMetricUpdate"); + method( + jobj_, + request.activeInteraction.duration, + static_cast(request.activeInteraction.responsivenessScore), + request.activeInteraction.ttl); } void JReactHostInspectorTarget::loadNetworkResource( @@ -153,4 +156,5 @@ void JReactHostInspectorTarget::loadNetworkResource( HostTarget* JReactHostInspectorTarget::getInspectorTarget() { return inspectorTarget_ ? inspectorTarget_.get() : nullptr; } + } // namespace facebook::react diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactHostInspectorTarget.h b/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactHostInspectorTarget.h index 2640bfca15f..fc151e33172 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactHostInspectorTarget.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactHostInspectorTarget.h @@ -38,16 +38,6 @@ struct JReactHostImpl : public jni::JavaClass { method(self(), message ? jni::make_jstring(*message) : nullptr); } - void unstable_updatePerfMonitor( - uint16_t longTaskDuration, - jsinspector_modern::InteractionResponsivenessScore responsivenessScore, - uint16_t ttl) { - static auto method = javaClassStatic()->getMethod( - "unstable_updatePerfMonitor"); - method( - self(), longTaskDuration, static_cast(responsivenessScore), ttl); - } - jni::local_ref> getHostMetadata() const { static auto method = javaClassStatic() @@ -80,7 +70,7 @@ class JReactHostInspectorTarget ~JReactHostInspectorTarget() override; static jni::local_ref initHybrid( - jni::alias_ref jThis, + jni::alias_ref jobj, jni::alias_ref reactHost, jni::alias_ref javaExecutor); @@ -103,8 +93,10 @@ class JReactHostInspectorTarget private: JReactHostInspectorTarget( + jni::alias_ref jobj, jni::alias_ref reactHostImpl, jni::alias_ref javaExecutor); + jni::global_ref jobj_; // This weak reference breaks the cycle between the C++ HostTarget and the // Java ReactHostImpl, preventing memory leaks in apps that create multiple // ReactHostImpls over time.