From 50de41d5d68bc2c28c4cc777ff9f3d041f960df3 Mon Sep 17 00:00:00 2001 From: Aaron Chiu Date: Mon, 13 Feb 2017 14:42:35 -0800 Subject: [PATCH] log getConstants for Java modules Reviewed By: fkgozali Differential Revision: D4548706 fbshipit-source-id: ffcb6acd15e517ee13da88ef9a901f15e96a87c8 --- .../java/com/facebook/react/bridge/ReactMarkerConstants.java | 2 ++ .../java/com/facebook/react/cxxbridge/JavaModuleWrapper.java | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java index ca3649eee..0edb08d8e 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java @@ -58,4 +58,6 @@ public class ReactMarkerConstants { "CREATE_I18N_ASSETS_MODULE_START"; public static final String CREATE_I18N_ASSETS_MODULE_END = "CREATE_I18N_ASSETS_MODULE_END"; + public static final String GET_CONSTANTS_START = "GET_CONSTANTS_START"; + public static final String GET_CONSTANTS_END = "GET_CONSTANTS_END"; } diff --git a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/JavaModuleWrapper.java b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/JavaModuleWrapper.java index 0c549ba66..ff4765a64 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/JavaModuleWrapper.java +++ b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/JavaModuleWrapper.java @@ -21,12 +21,15 @@ import com.facebook.react.bridge.ExecutorToken; import com.facebook.react.bridge.NativeArray; import com.facebook.react.bridge.NativeModuleLogger; import com.facebook.react.bridge.NativeModule; +import com.facebook.react.bridge.ReactMarker; import com.facebook.react.bridge.ReadableNativeArray; import com.facebook.react.bridge.WritableNativeArray; import com.facebook.react.bridge.WritableNativeMap; import com.facebook.systrace.Systrace; import com.facebook.systrace.SystraceMessage; +import static com.facebook.react.bridge.ReactMarkerConstants.GET_CONSTANTS_END; +import static com.facebook.react.bridge.ReactMarkerConstants.GET_CONSTANTS_START; import static com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE; /** @@ -95,6 +98,7 @@ import static com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE; // NativeMap out of OnLoad. @DoNotStrip public NativeArray getConstants() { + ReactMarker.logMarker(GET_CONSTANTS_START, getName()); SystraceMessage.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "Map constants") .arg("moduleName", getName()) .flush(); @@ -119,6 +123,7 @@ import static com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE; if (baseJavaModule instanceof NativeModuleLogger) { ((NativeModuleLogger) baseJavaModule).endConstantsMapConversion(); } + ReactMarker.logMarker(GET_CONSTANTS_END); return array; }