diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java b/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java index fe0ec8b4192d62..e00588c20634b6 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java +++ b/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java @@ -26,6 +26,7 @@ public abstract class ReactNativeHost { private final Application mApplication; private @Nullable ReactInstanceManager mReactInstanceManager; + private @Nullable ReactPerformanceLogger mReactPerformanceLogger; protected ReactNativeHost(Application application) { mApplication = application; @@ -34,6 +35,8 @@ protected ReactNativeHost(Application application) { /** Get the current {@link ReactInstanceManager} instance, or create one. */ public ReactInstanceManager getReactInstanceManager() { if (mReactInstanceManager == null) { + // Ensure {@link ReactPerformanceLogger} exists before we create {@link ReactInstanceManager}. + getReactPerformanceLogger(); ReactMarker.logMarker(ReactMarkerConstants.GET_REACT_INSTANCE_MANAGER_START); mReactInstanceManager = createReactInstanceManager(); ReactMarker.logMarker(ReactMarkerConstants.GET_REACT_INSTANCE_MANAGER_END); @@ -41,6 +44,14 @@ public ReactInstanceManager getReactInstanceManager() { return mReactInstanceManager; } + /** Get the current {@link ReactPerformanceLogger} instance, or create one. */ + public ReactPerformanceLogger getReactPerformanceLogger() { + if (mReactPerformanceLogger == null) { + mReactPerformanceLogger = new ReactPerformanceLogger(); + } + return mReactPerformanceLogger; + } + /** * Get whether this holder contains a {@link ReactInstanceManager} instance, or not. I.e. if * {@link #getReactInstanceManager()} has been called at least once since this object was created @@ -58,6 +69,10 @@ public void clear() { mReactInstanceManager.destroy(); mReactInstanceManager = null; } + if (mReactPerformanceLogger != null) { + mReactPerformanceLogger.release(); + mReactPerformanceLogger = null; + } } protected ReactInstanceManager createReactInstanceManager() { diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactPerformanceLogger.java b/ReactAndroid/src/main/java/com/facebook/react/ReactPerformanceLogger.java new file mode 100644 index 00000000000000..1a1ab44e75c82f --- /dev/null +++ b/ReactAndroid/src/main/java/com/facebook/react/ReactPerformanceLogger.java @@ -0,0 +1,93 @@ +/** + * Copyright (c) Facebook, Inc. and its 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; + +import android.util.Log; + +import com.facebook.react.bridge.ReactMarker; +import com.facebook.react.bridge.ReactMarkerConstants; +import com.facebook.react.common.annotations.VisibleForTesting; + +import javax.annotation.Nullable; + +import static com.facebook.react.bridge.ReactMarkerConstants.RUN_JS_BUNDLE_END; + +public class ReactPerformanceLogger implements ReactMarker.MarkerListener { + + public enum Tag { + BRIDGE_STARTUP, + SCRIPT_EXECUTION, + } + + private static final String TAG = ReactPerformanceLogger.class.getSimpleName(); + + private long[][] mData = new long[Tag.values().length][2]; + + public ReactPerformanceLogger() { + ReactMarker.addListener(this); + } + + public long getDuration(Tag tag) { + return mData[tag.ordinal()][1] - mData[tag.ordinal()][0]; + } + + public void release() { + ReactMarker.removeListener(this); + } + + @Override + public void logMarker(ReactMarkerConstants name, @Nullable String tag, int instanceKey) { + switch (name) { + case GET_REACT_INSTANCE_MANAGER_START: + markStart(Tag.BRIDGE_STARTUP); + break; + + case RUN_JS_BUNDLE_END: + markStop(Tag.SCRIPT_EXECUTION); + break; + + case CHANGE_THREAD_PRIORITY: + // Due to a bug, RUN_JS_BUNDLE_END may not be triggered: + // https://github.com/facebook/react-native/issues/23771 + if (getDuration(Tag.SCRIPT_EXECUTION) < 0) { + logMarker(RUN_JS_BUNDLE_END, tag, instanceKey); + } + markStop(Tag.BRIDGE_STARTUP); + break; + + case PRE_RUN_JS_BUNDLE_START: + markStart(Tag.SCRIPT_EXECUTION); + break; + + default: + break; + } + } + + private void markStart(Tag tag) { + markStart(tag, System.currentTimeMillis()); + } + + private void markStop(Tag tag) { + markStop(tag, System.currentTimeMillis()); + } + + @VisibleForTesting + public void markStart(Tag tag, long timestamp) { + mData[tag.ordinal()][0] = timestamp; + mData[tag.ordinal()][1] = 0; + } + + @VisibleForTesting + public void markStop(Tag tag, long timestamp) { + if (mData[tag.ordinal()][0] == 0 || mData[tag.ordinal()][1] != 0) { + Log.i(TAG, "Unbalanced start/end calls for tag " + tag.name()); + } else { + mData[tag.ordinal()][1] = timestamp; + } + } +} diff --git a/ReactAndroid/src/test/java/com/facebook/react/ReactPerformanceLoggerTest.java b/ReactAndroid/src/test/java/com/facebook/react/ReactPerformanceLoggerTest.java new file mode 100644 index 00000000000000..c4c0d2e5939023 --- /dev/null +++ b/ReactAndroid/src/test/java/com/facebook/react/ReactPerformanceLoggerTest.java @@ -0,0 +1,109 @@ +package com.facebook.react; + +import android.util.Log; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; +import org.robolectric.annotation.Implements; + +import static com.facebook.react.bridge.ReactMarkerConstants.CHANGE_THREAD_PRIORITY; +import static com.facebook.react.bridge.ReactMarkerConstants.GET_REACT_INSTANCE_MANAGER_START; +import static com.facebook.react.bridge.ReactMarkerConstants.PRE_RUN_JS_BUNDLE_START; +import static com.facebook.react.bridge.ReactMarkerConstants.RUN_JS_BUNDLE_END; +import static org.fest.assertions.api.Assertions.assertThat; + +/** Test case for {@link ReactPerformanceLogger}. */ +@RunWith(RobolectricTestRunner.class) +@Config(manifest=Config.NONE, shadows={ReactPerformanceLoggerTest.ShadowLog.class}) +public final class ReactPerformanceLoggerTest { + + @Test + public void logsDuration() { + ReactPerformanceLogger logger = new ReactPerformanceLogger(); + assertThat(logger.getDuration(ReactPerformanceLogger.Tag.BRIDGE_STARTUP)).isEqualTo(0); + + logger.markStop(ReactPerformanceLogger.Tag.BRIDGE_STARTUP, 1); + assertThat(logger.getDuration(ReactPerformanceLogger.Tag.BRIDGE_STARTUP)).isEqualTo(0); + + logger.markStart(ReactPerformanceLogger.Tag.BRIDGE_STARTUP, 1000); + assertThat(logger.getDuration(ReactPerformanceLogger.Tag.BRIDGE_STARTUP)).isLessThan(0); + + logger.markStop(ReactPerformanceLogger.Tag.BRIDGE_STARTUP, 2500); + assertThat(logger.getDuration(ReactPerformanceLogger.Tag.BRIDGE_STARTUP)).isEqualTo(1500); + + logger.markStart(ReactPerformanceLogger.Tag.BRIDGE_STARTUP, 3000); + assertThat(logger.getDuration(ReactPerformanceLogger.Tag.BRIDGE_STARTUP)).isLessThan(0); + + logger.markStart(ReactPerformanceLogger.Tag.BRIDGE_STARTUP, 3500); + assertThat(logger.getDuration(ReactPerformanceLogger.Tag.BRIDGE_STARTUP)).isLessThan(0); + + logger.markStop(ReactPerformanceLogger.Tag.BRIDGE_STARTUP, 4500); + assertThat(logger.getDuration(ReactPerformanceLogger.Tag.BRIDGE_STARTUP)).isEqualTo(1000); + + logger.markStop(ReactPerformanceLogger.Tag.BRIDGE_STARTUP, 9000); + assertThat(logger.getDuration(ReactPerformanceLogger.Tag.BRIDGE_STARTUP)).isEqualTo(1000); + } + + @Test + public void handlesUnbalancedCalls() { + ReactPerformanceLogger logger = new ReactPerformanceLogger(); + assertThat(logger.getDuration(ReactPerformanceLogger.Tag.SCRIPT_EXECUTION)).isEqualTo(0); + + logger.logMarker(RUN_JS_BUNDLE_END, null, 0); + assertThat(logger.getDuration(ReactPerformanceLogger.Tag.SCRIPT_EXECUTION)).isEqualTo(0); + + logger.logMarker(PRE_RUN_JS_BUNDLE_START, null, 0); + assertThat(logger.getDuration(ReactPerformanceLogger.Tag.SCRIPT_EXECUTION)).isLessThan(0); + + logger.logMarker(PRE_RUN_JS_BUNDLE_START, null, 0); + assertThat(logger.getDuration(ReactPerformanceLogger.Tag.SCRIPT_EXECUTION)).isLessThan(0); + + logger.logMarker(RUN_JS_BUNDLE_END, null, 0); + final long duration = logger.getDuration(ReactPerformanceLogger.Tag.SCRIPT_EXECUTION); + assertThat(duration).isGreaterThanOrEqualTo(0); + + logger.logMarker(RUN_JS_BUNDLE_END, null, 0); + assertThat(logger.getDuration(ReactPerformanceLogger.Tag.SCRIPT_EXECUTION)).isEqualTo(duration); + + logger.logMarker(PRE_RUN_JS_BUNDLE_START, null, 0); + assertThat(logger.getDuration(ReactPerformanceLogger.Tag.SCRIPT_EXECUTION)).isLessThan(0); + } + + @Test + public void logsBridgeStartupDuration() { + ReactPerformanceLogger logger = new ReactPerformanceLogger(); + assertThat(logger.getDuration(ReactPerformanceLogger.Tag.BRIDGE_STARTUP)).isEqualTo(0); + + logger.logMarker(GET_REACT_INSTANCE_MANAGER_START, null, 0); + assertThat(logger.getDuration(ReactPerformanceLogger.Tag.BRIDGE_STARTUP)).isLessThan(0); + + logger.logMarker(CHANGE_THREAD_PRIORITY, null, 0); + assertThat(logger.getDuration(ReactPerformanceLogger.Tag.BRIDGE_STARTUP)).isGreaterThanOrEqualTo(0); + } + + @Test + public void logsScriptExecutionDuration() { + ReactPerformanceLogger logger = new ReactPerformanceLogger(); + assertThat(logger.getDuration(ReactPerformanceLogger.Tag.SCRIPT_EXECUTION)).isEqualTo(0); + + logger.logMarker(PRE_RUN_JS_BUNDLE_START, null, 0); + assertThat(logger.getDuration(ReactPerformanceLogger.Tag.SCRIPT_EXECUTION)).isLessThan(0); + + logger.logMarker(RUN_JS_BUNDLE_END, null, 0); + assertThat(logger.getDuration(ReactPerformanceLogger.Tag.SCRIPT_EXECUTION)).isGreaterThanOrEqualTo(0); + } + + @SuppressWarnings("unused") + @Implements(Log.class) + public static class ShadowLog { + public static int d(String tag, String msg) { + return 0; + } + + public static int i(String tag, String msg) { + return 0; + } + } +} diff --git a/ReactAndroid/src/test/java/com/facebook/react/views/text/ReactTextTest.java b/ReactAndroid/src/test/java/com/facebook/react/views/text/ReactTextTest.java index 9874b928d69c6f..b2a59cec6c32f2 100644 --- a/ReactAndroid/src/test/java/com/facebook/react/views/text/ReactTextTest.java +++ b/ReactAndroid/src/test/java/com/facebook/react/views/text/ReactTextTest.java @@ -11,9 +11,11 @@ import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; +import android.annotation.TargetApi; import android.graphics.Color; import android.graphics.Typeface; import android.graphics.drawable.Drawable; +import android.os.Build; import android.text.Layout; import android.text.Spanned; import android.text.TextUtils;