From 5998320887ec7179bb0f112f00aa162012353b4d Mon Sep 17 00:00:00 2001 From: Xin Chen Date: Tue, 12 Sep 2023 15:07:39 -0700 Subject: [PATCH] Refactor and separate layout affected nodes react marker (#39249) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/39249 Changelog: [Internal] - Code refactor on affected nodes in react marker. Reviewed By: rshest Differential Revision: D48884903 fbshipit-source-id: d09ec8ad398818589c4fdfa8d64bf8a7e5627e43 --- .../java/com/facebook/react/bridge/ReactMarkerConstants.java | 1 + .../com/facebook/react/fabric/DevToolsReactPerfLogger.java | 5 +++-- .../main/java/com/facebook/react/fabric/FabricUIManager.java | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java index f67168d76db..318c71a597d 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java @@ -115,6 +115,7 @@ public enum ReactMarkerConstants { FABRIC_DIFF_END, FABRIC_LAYOUT_START, FABRIC_LAYOUT_END, + FABRIC_LAYOUT_AFFECTED_NODES, FABRIC_BATCH_EXECUTION_START, FABRIC_BATCH_EXECUTION_END, FABRIC_UPDATE_UI_MAIN_THREAD_START, diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/DevToolsReactPerfLogger.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/DevToolsReactPerfLogger.java index b7dd6c58999..1158ae27406 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/DevToolsReactPerfLogger.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/DevToolsReactPerfLogger.java @@ -188,7 +188,7 @@ public class DevToolsReactPerfLogger implements ReactMarker.FabricMarkerListener } public int getAffectedLayoutNodesCount() { - return getCounter(FABRIC_LAYOUT_END); + return getCounter(FABRIC_LAYOUT_AFFECTED_NODES); } public long getBatchExecutionStart() { @@ -292,6 +292,7 @@ public class DevToolsReactPerfLogger implements ReactMarker.FabricMarkerListener || name == FABRIC_BATCH_EXECUTION_START || name == FABRIC_BATCH_EXECUTION_END || name == FABRIC_UPDATE_UI_MAIN_THREAD_START - || name == FABRIC_UPDATE_UI_MAIN_THREAD_END; + || name == FABRIC_UPDATE_UI_MAIN_THREAD_END + || name == FABRIC_LAYOUT_AFFECTED_NODES; } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java index 943e6ec08a4..755af41dc20 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java @@ -838,7 +838,9 @@ public class FabricUIManager implements UIManager, LifecycleEventListener { ReactMarker.logFabricMarker( ReactMarkerConstants.FABRIC_LAYOUT_START, null, commitNumber, layoutStartTime); ReactMarker.logFabricMarker( - ReactMarkerConstants.FABRIC_LAYOUT_END, + ReactMarkerConstants.FABRIC_LAYOUT_END, null, commitNumber, layoutEndTime); + ReactMarker.logFabricMarker( + ReactMarkerConstants.FABRIC_LAYOUT_AFFECTED_NODES, null, commitNumber, layoutEndTime,