kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-02-09 17:13:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Load JS bundle after CatalystInstance has been attached to the ReactContext

Browse Source 
Reviewed By: andreicoman11

Differential Revision: D2550062

fb-gh-sync-id: 05790e8c092c7dd28669ffd48f7d7d2dffd6546e
This commit is contained in:
Andy Street
2015-10-20 06:22:30 -07:00
committed by facebook-github-bot-6
parent 1d6d1189f0
commit 1b55e4657c
3 changed files with 94 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
View File

@@ -533,6 +533,7 @@ public class ReactInstanceManager {
}
reactContext.initializeWithInstance(catalystInstance);
catalystInstance.runJSBundle();
return reactContext;
}

130
ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java
View File

@@ -42,6 +42,7 @@ import com.fasterxml.jackson.core.JsonGenerator;
public class CatalystInstance {
private static final int BRIDGE_SETUP_TIMEOUT_MS = 15000;
private static final int LOAD_JS_BUNDLE_TIMEOUT_MS = 15000;
private static final AtomicInteger sNextInstanceIdForTrace = new AtomicInteger(1);
@@ -52,6 +53,9 @@ public class CatalystInstance {
private final String mJsPendingCallsTitleForTrace =
"pending_js_calls_instance" + sNextInstanceIdForTrace.getAndIncrement();
private volatile boolean mDestroyed = false;
private final TraceListener mTraceListener;
private final JavaScriptModuleRegistry mJSModuleRegistry;
private final JSBundleLoader mJSBundleLoader;
// Access from native modules thread
private final NativeModuleRegistry mJavaRegistry;
@@ -60,8 +64,7 @@ public class CatalystInstance {
// Access from JS thread
private @Nullable ReactBridge mBridge;
private @Nullable JavaScriptModuleRegistry mJSModuleRegistry;
private @Nullable TraceListener mTraceListener;
private boolean mJSBundleHasLoaded;
private CatalystInstance(
final CatalystQueueConfigurationSpec catalystQueueConfigurationSpec,
@@ -73,19 +76,20 @@ public class CatalystInstance {
mCatalystQueueConfiguration = CatalystQueueConfiguration.create(
catalystQueueConfigurationSpec,
new NativeExceptionHandler());
mBridgeIdleListeners = new CopyOnWriteArrayList<NotThreadSafeBridgeIdleDebugListener>();
mBridgeIdleListeners = new CopyOnWriteArrayList<>();
mJavaRegistry = registry;
mJSModuleRegistry = new JavaScriptModuleRegistry(CatalystInstance.this, jsModulesConfig);
mJSBundleLoader = jsBundleLoader;
mNativeModuleCallExceptionHandler = nativeModuleCallExceptionHandler;
mTraceListener = new JSProfilerTraceListener();
Systrace.registerListener(mTraceListener);
final CountDownLatch initLatch = new CountDownLatch(1);
mCatalystQueueConfiguration.getJSQueueThread().runOnQueue(
new Runnable() {
@Override
public void run() {
initializeBridge(jsExecutor, registry, jsModulesConfig, jsBundleLoader);
mJSModuleRegistry =
new JavaScriptModuleRegistry(CatalystInstance.this, jsModulesConfig);
initializeBridge(jsExecutor, jsModulesConfig);
initLatch.countDown();
}
});
@@ -101,65 +105,48 @@ public class CatalystInstance {
private void initializeBridge(
JavaScriptExecutor jsExecutor,
NativeModuleRegistry registry,
JavaScriptModulesConfig jsModulesConfig,
JSBundleLoader jsBundleLoader) {
JavaScriptModulesConfig jsModulesConfig) {
mCatalystQueueConfiguration.getJSQueueThread().assertIsOnThread();
Assertions.assertCondition(mBridge == null, "initializeBridge should be called once");
mBridge = new ReactBridge(
jsExecutor,
new NativeModulesReactCallback(),
mCatalystQueueConfiguration.getNativeModulesQueueThread());
mBridge.setGlobalVariable(
"__fbBatchedBridgeConfig",
buildModulesConfigJSONProperty(registry, jsModulesConfig));
buildModulesConfigJSONProperty(mJavaRegistry, jsModulesConfig));
}
public void runJSBundle() {
Systrace.beginSection(
Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,
"CatalystInstance_initializeBridge");
"CatalystInstance_runJSBundle");
try {
jsBundleLoader.loadScript(mBridge);
final CountDownLatch initLatch = new CountDownLatch(1);
mCatalystQueueConfiguration.getJSQueueThread().runOnQueue(
new Runnable() {
@Override
public void run() {
Assertions.assertCondition(!mJSBundleHasLoaded, "JS bundle was already loaded!");
mJSBundleHasLoaded = true;
incrementPendingJSCalls();
mJSBundleLoader.loadScript(mBridge);
initLatch.countDown();
}
});
Assertions.assertCondition(
initLatch.await(LOAD_JS_BUNDLE_TIMEOUT_MS, TimeUnit.MILLISECONDS),
"Timed out loading JS!");
} catch (InterruptedException e) {
throw new RuntimeException(e);
} finally {
Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
}
mTraceListener = new TraceListener() {
@Override
public void onTraceStarted() {
mCatalystQueueConfiguration.getJSQueueThread().runOnQueue(
new Runnable() {
@Override
public void run() {
mCatalystQueueConfiguration.getJSQueueThread().assertIsOnThread();
if (mDestroyed) {
return;
}
Assertions.assertNotNull(mBridge).setGlobalVariable(
"__BridgeProfilingIsProfiling",
"true");
}
});
}
@Override
public void onTraceStopped() {
mCatalystQueueConfiguration.getJSQueueThread().runOnQueue(
new Runnable() {
@Override
public void run() {
mCatalystQueueConfiguration.getJSQueueThread().assertIsOnThread();
if (mDestroyed) {
return;
}
Assertions.assertNotNull(mBridge).setGlobalVariable(
"__BridgeProfilingIsProfiling",
"false");
}
});
}
};
Systrace.registerListener(mTraceListener);
}
/* package */ void callFunction(
@@ -351,6 +338,7 @@ public class CatalystInstance {
private void decrementPendingJSCalls() {
int newPendingCalls = mPendingJSCalls.decrementAndGet();
Assertions.assertCondition(newPendingCalls >= 0);
boolean isNowIdle = newPendingCalls == 0;
Systrace.traceCounter(
Systrace.TRACE_TAG_REACT_JAVA_BRIDGE,
@@ -417,6 +405,44 @@ public class CatalystInstance {
}
}
private class JSProfilerTraceListener implements TraceListener {
@Override
public void onTraceStarted() {
mCatalystQueueConfiguration.getJSQueueThread().runOnQueue(
new Runnable() {
@Override
public void run() {
mCatalystQueueConfiguration.getJSQueueThread().assertIsOnThread();
if (mDestroyed) {
return;
}
Assertions.assertNotNull(mBridge).setGlobalVariable(
"__BridgeProfilingIsProfiling",
"true");
}
});
}
@Override
public void onTraceStopped() {
mCatalystQueueConfiguration.getJSQueueThread().runOnQueue(
new Runnable() {
@Override
public void run() {
mCatalystQueueConfiguration.getJSQueueThread().assertIsOnThread();
if (mDestroyed) {
return;
}
Assertions.assertNotNull(mBridge).setGlobalVariable(
"__BridgeProfilingIsProfiling",
"false");
}
});
}
}
public static class Builder {
private @Nullable CatalystQueueConfigurationSpec mCatalystQueueConfigurationSpec;