status-im/react-native
2
0
Fork 0
mirror of https://github.com/status-im/react-native.git synced 2025-02-10 16:36:25 +00:00
Code Issues Projects Releases Wiki Activity

Move CREATE_CATALYST_INSTANCE_END marker inside JSCExecutor

Browse Source 
Reviewed By: AaaChiuuu

Differential Revision: D3096157

fb-gh-sync-id: 6bcca134e5e7a426719816047ffc98a5178e9596
shipit-source-id: 6bcca134e5e7a426719816047ffc98a5178e9596
This commit is contained in:
Marc Horowitz 2016-03-24 19:41:27 -07:00 committed by Facebook Github Bot 5
parent 62e80a600e
commit 18badf1c3e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerImpl.java
View File

@ -77,7 +77,6 @@ import static com.facebook.react.bridge.ReactMarkerConstants.BUILD_NATIVE_MODULE
import static com.facebook.react.bridge.ReactMarkerConstants.BUILD_NATIVE_MODULE_REGISTRY_START; import static com.facebook.react.bridge.ReactMarkerConstants.BUILD_NATIVE_MODULE_REGISTRY_START;
import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_CATALYST_INSTANCE_END; import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_CATALYST_INSTANCE_END;
import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_CATALYST_INSTANCE_START; import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_CATALYST_INSTANCE_START;
import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_REACT_CONTEXT_END;
import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_REACT_CONTEXT_START; import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_REACT_CONTEXT_START;
import static com.facebook.react.bridge.ReactMarkerConstants.PROCESS_PACKAGES_END; import static com.facebook.react.bridge.ReactMarkerConstants.PROCESS_PACKAGES_END;
import static com.facebook.react.bridge.ReactMarkerConstants.PROCESS_PACKAGES_START; import static com.facebook.react.bridge.ReactMarkerConstants.PROCESS_PACKAGES_START;
@ -858,6 +857,7 @@ import static com.facebook.react.bridge.ReactMarkerConstants.RUN_JS_BUNDLE_START
.setNativeModuleCallExceptionHandler(exceptionHandler); .setNativeModuleCallExceptionHandler(exceptionHandler);
ReactMarker.logMarker(CREATE_CATALYST_INSTANCE_START); ReactMarker.logMarker(CREATE_CATALYST_INSTANCE_START);
// CREATE_CATALYST_INSTANCE_END is in JSCExecutor.cpp
Systrace.beginSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "createCatalystInstance"); Systrace.beginSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "createCatalystInstance");
CatalystInstance catalystInstance; CatalystInstance catalystInstance;
try { try {
@ -882,7 +882,6 @@ import static com.facebook.react.bridge.ReactMarkerConstants.RUN_JS_BUNDLE_START
ReactMarker.logMarker(RUN_JS_BUNDLE_END); ReactMarker.logMarker(RUN_JS_BUNDLE_END);
} }
ReactMarker.logMarker(CREATE_REACT_CONTEXT_END);
return reactContext; return reactContext;
} }

1
ReactAndroid/src/main/jni/react/JSCExecutor.cpp
View File

@ -243,6 +243,7 @@ void JSCExecutor::loadApplicationScript(
evaluateScript(m_context, jsScript, jsSourceURL, m_deviceCacheDir.c_str()); evaluateScript(m_context, jsScript, jsSourceURL, m_deviceCacheDir.c_str());
} }
flush(); flush();
ReactMarker::logMarker("CREATE_REACT_CONTEXT_END");
} }
void JSCExecutor::loadApplicationUnbundle( void JSCExecutor::loadApplicationUnbundle(