diff --git a/packages/react-native/Package.swift b/packages/react-native/Package.swift index d96a1f9c079..8c9765260c1 100644 --- a/packages/react-native/Package.swift +++ b/packages/react-native/Package.swift @@ -456,7 +456,7 @@ let reactFabric = RNTarget( "components/virtualview", "components/root/tests", ], - dependencies: [.reactNativeDependencies, .reactJsiExecutor, .rctTypesafety, .reactTurboModuleCore, .jsi, .logger, .reactDebug, .reactFeatureFlags, .reactUtils, .reactRuntimeScheduler, .reactCxxReact, .reactRendererDebug, .reactGraphics, .yoga, .reactJsInspectorTracing], + dependencies: [.reactNativeDependencies, .reactJsiExecutor, .rctTypesafety, .reactTurboModuleCore, .jsi, .logger, .reactDebug, .reactFeatureFlags, .reactUtils, .reactRuntimeScheduler, .reactCxxReact, .reactRendererDebug, .reactGraphics, .yoga], sources: ["animated", "animationbackend", "animations", "attributedstring", "core", "componentregistry", "componentregistry/native", "components/root", "components/view", "components/view/platform/cxx", "components/scrollview", "components/scrollview/platform/cxx", "components/scrollview/platform/ios", "components/legacyviewmanagerinterop", "components/legacyviewmanagerinterop/platform/ios", "dom", "scheduler", "mounting", "observers/events", "observers/intersection", "telemetry", "consistency", "leakchecker", "uimanager", "uimanager/consistency", "viewtransition"] ) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountItemDispatcher.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountItemDispatcher.kt index d2e8c37ca7b..95a5f17405f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountItemDispatcher.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountItemDispatcher.kt @@ -21,7 +21,6 @@ import com.facebook.react.fabric.FabricUIManager import com.facebook.react.fabric.mounting.mountitems.DispatchCommandMountItem import com.facebook.react.fabric.mounting.mountitems.MountItem import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags -import com.facebook.react.internal.tracing.PerformanceTracer import com.facebook.systrace.Systrace import java.util.Queue import java.util.concurrent.ConcurrentLinkedQueue @@ -202,16 +201,9 @@ internal class MountItemDispatcher( "MountItemDispatcher::mountViews viewCommandMountItems", ) - PerformanceTracer.trace( - "view commands", - "Renderer", - "⚛ Native", - { -> - for (command in commands) { - dispatchViewCommand(command) - } - }, - ) + for (command in commands) { + dispatchViewCommand(command) + } Systrace.endSection(Systrace.TRACE_TAG_REACT) } @@ -223,21 +215,12 @@ internal class MountItemDispatcher( Systrace.TRACE_TAG_REACT, "MountItemDispatcher::mountViews preMountItems", ) - - PerformanceTracer.trace( - "premount", - "Renderer", - "⚛ Native", - { -> - for (preMountItem in preMountItems) { - if (ReactNativeFeatureFlags.enableFabricLogs()) { - printMountItem(preMountItem, "dispatchMountItems: Executing preMountItem") - } - executeOrEnqueue(preMountItem) - } - }, - ) - + for (preMountItem in preMountItems) { + if (ReactNativeFeatureFlags.enableFabricLogs()) { + printMountItem(preMountItem, "dispatchMountItems: Executing preMountItem") + } + executeOrEnqueue(preMountItem) + } Systrace.endSection(Systrace.TRACE_TAG_REACT) } @@ -246,56 +229,44 @@ internal class MountItemDispatcher( Systrace.TRACE_TAG_REACT, "MountItemDispatcher::mountViews mountItems to execute", ) + val batchedExecutionStartTime = SystemClock.uptimeMillis() - PerformanceTracer.trace( - "mount", - "Renderer", - "⚛ Native", - { -> - val batchedExecutionStartTime = SystemClock.uptimeMillis() + for (mountItem in items) { + if (ReactNativeFeatureFlags.enableFabricLogs()) { + printMountItem(mountItem, "dispatchMountItems: Executing mountItem") + } - for (mountItem in items) { - if (ReactNativeFeatureFlags.enableFabricLogs()) { - printMountItem(mountItem, "dispatchMountItems: Executing mountItem") - } + val command = mountItem as? DispatchCommandMountItem + if (command != null) { + dispatchViewCommand(command) + continue + } - val command = mountItem as? DispatchCommandMountItem - if (command != null) { - dispatchViewCommand(command) - continue - } - - try { - executeOrEnqueue(mountItem) - } catch (e: Throwable) { - // If there's an exception, we want to log diagnostics in prod and rethrow. - FLog.e(TAG, "dispatchMountItems: caught exception, displaying mount state", e) - for (m in items) { - if (m === mountItem) { - // We want to mark the mount item that caused exception - FLog.e( - TAG, - "dispatchMountItems: mountItem: next mountItem triggered exception!", - ) - } - printMountItem(m, "dispatchMountItems: mountItem") - } - - if (mountItem.getSurfaceId() != View.NO_ID) { - mountingManager.getSurfaceManager(mountItem.getSurfaceId())?.printSurfaceState() - } - - if (ReactIgnorableMountingException.isIgnorable(e)) { - ReactSoftExceptionLogger.logSoftException(TAG, e) - } else { - throw e - } - } + try { + executeOrEnqueue(mountItem) + } catch (e: Throwable) { + // If there's an exception, we want to log diagnostics in prod and rethrow. + FLog.e(TAG, "dispatchMountItems: caught exception, displaying mount state", e) + for (m in items) { + if (m === mountItem) { + // We want to mark the mount item that caused exception + FLog.e(TAG, "dispatchMountItems: mountItem: next mountItem triggered exception!") } - batchedExecutionTime += SystemClock.uptimeMillis() - batchedExecutionStartTime - }, - ) + printMountItem(m, "dispatchMountItems: mountItem") + } + if (mountItem.getSurfaceId() != View.NO_ID) { + mountingManager.getSurfaceManager(mountItem.getSurfaceId())?.printSurfaceState() + } + + if (ReactIgnorableMountingException.isIgnorable(e)) { + ReactSoftExceptionLogger.logSoftException(TAG, e) + } else { + throw e + } + } + } + batchedExecutionTime += SystemClock.uptimeMillis() - batchedExecutionStartTime Systrace.endSection(Systrace.TRACE_TAG_REACT) } @@ -326,34 +297,26 @@ internal class MountItemDispatcher( private fun dispatchPreMountItemsImpl(deadline: Long) { Systrace.beginSection(Systrace.TRACE_TAG_REACT, "MountItemDispatcher::premountViews") - PerformanceTracer.trace( - "premount", - "Renderer", - "⚛ Native", - { -> - // dispatchPreMountItems cannot be reentrant, but we want to prevent dispatchMountItems - // from - // reentering during dispatchPreMountItems - inDispatch = true + // dispatchPreMountItems cannot be reentrant, but we want to prevent dispatchMountItems from + // reentering during dispatchPreMountItems + inDispatch = true - try { - while (true) { - if (System.nanoTime() > deadline) { - break - } + try { + while (true) { + if (System.nanoTime() > deadline) { + break + } - // If list is empty, `poll` will return null, or var will never be set - val preMountItemToDispatch = preMountItems.poll() ?: break - if (ReactNativeFeatureFlags.enableFabricLogs()) { - printMountItem(preMountItemToDispatch, "dispatchPreMountItems") - } - executeOrEnqueue(preMountItemToDispatch) - } - } finally { - inDispatch = false - } - }, - ) + // If list is empty, `poll` will return null, or var will never be set + val preMountItemToDispatch = preMountItems.poll() ?: break + if (ReactNativeFeatureFlags.enableFabricLogs()) { + printMountItem(preMountItemToDispatch, "dispatchPreMountItems") + } + executeOrEnqueue(preMountItemToDispatch) + } + } finally { + inDispatch = false + } Systrace.endSection(Systrace.TRACE_TAG_REACT) } diff --git a/packages/react-native/ReactCommon/React-Fabric.podspec b/packages/react-native/ReactCommon/React-Fabric.podspec index f32b8582f5d..56fc9d3dbc7 100644 --- a/packages/react-native/ReactCommon/React-Fabric.podspec +++ b/packages/react-native/ReactCommon/React-Fabric.podspec @@ -173,7 +173,6 @@ Pod::Spec.new do |s| end s.subspec "mounting" do |ss| - ss.dependency "React-jsinspectortracing" ss.source_files = podspec_sources("react/renderer/mounting/**/*.{m,mm,cpp,h}", "react/renderer/mounting/**/*.h") ss.exclude_files = "react/renderer/mounting/tests" ss.header_dir = "react/renderer/mounting" diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/mounting/CMakeLists.txt index 895801657e2..eefd67c9f21 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/mounting/CMakeLists.txt @@ -22,7 +22,6 @@ target_link_libraries(react_renderer_mounting glog glog_init jsi - jsinspector_tracing react_debug react_renderer_core react_renderer_debug diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp index 21349465d81..9dbeee58107 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp +++ b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp @@ -8,7 +8,6 @@ #include "ShadowTree.h" #include -#include #include #include #include @@ -25,19 +24,6 @@ namespace facebook::react { namespace { const int MAX_COMMIT_ATTEMPTS_BEFORE_LOCKING = 3; - -std::string getShadowTreeCommitSourceName(ShadowTreeCommitSource source) { - switch (source) { - case ShadowTreeCommitSource::Unknown: - return "Unknown"; - case ShadowTreeCommitSource::React: - return "React"; - case ShadowTreeCommitSource::AnimationEndSync: - return "AnimationEndSync"; - case ShadowTreeCommitSource::ReactRevisionMerge: - return "ReactRevisionMerge"; - } -} } // namespace using CommitStatus = ShadowTree::CommitStatus; @@ -330,13 +316,6 @@ CommitStatus ShadowTree::tryCommit( const ShadowTreeCommitTransaction& transaction, const CommitOptions& commitOptions) const { TraceSection s("ShadowTree::commit"); - jsinspector_modern::tracing::PerformanceTracerSection s1( - "commit", - "Renderer", - "⚛ Native", - nullptr, - "source", - getShadowTreeCommitSourceName(commitOptions.source)); auto isReactBranch = ReactNativeFeatureFlags::enableFabricCommitBranching() && commitOptions.source == CommitSource::React; @@ -403,11 +382,7 @@ CommitStatus ShadowTree::tryCommit( telemetry.willLayout(); telemetry.setAsThreadLocal(); - { - jsinspector_modern::tracing::PerformanceTracerSection s2( - "layout", "Renderer", "⚛ Native"); - newRootShadowNode->layoutIfNeeded(&affectedLayoutableNodes); - } + newRootShadowNode->layoutIfNeeded(&affectedLayoutableNodes); telemetry.unsetAsThreadLocal(); telemetry.didLayout(static_cast(affectedLayoutableNodes.size()));