Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: ReactHost: Make getOrCreateStartTask confined to the ReactHost thread (#42167)

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/42167

Changelog: [Internal]

Reviewed By: mdvacca

Differential Revision: D52495534

fbshipit-source-id: bab3158dfdcf642efd5afed05ced27fb0d2594f7
This commit is contained in:
Ramanpreet Nara
2024-01-09 19:07:01 -08:00
committed by Facebook GitHub Bot
parent 6b79c14e33
commit 2e6afdc550
1 changed files with 45 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.java
+45 -54
View File
@@ -202,10 +202,11 @@ public class ReactHostImpl implements ReactHost {
@Override
public TaskInterface<Void> start() {
if (ReactFeatureFlags.enableBridgelessArchitectureNewCreateReloadDestroy) {
return newGetOrCreateStartTask();
return Task.call(this::newGetOrCreateStartTask, mBGExecutor)
.continueWithTask(Task::getResult);
}
return oldGetOrCreateStartTask();
return Task.call(this::oldGetOrCreateStartTask, mBGExecutor).continueWithTask(Task::getResult);
}
/** Initialize and run a React Native surface in a background without mounting real views. */
@@ -719,63 +720,53 @@ public class ReactHostImpl implements ReactHost {
@ThreadConfined("ReactHost")
private @Nullable Task<Void> mStartTask = null;
@ThreadConfined("ReactHost")
private Task<Void> oldGetOrCreateStartTask() {
final String method = "oldGetOrCreateStartTask()";
return Task.call(
() -> {
if (mStartTask == null) {
log(method, "Schedule");
mStartTask =
getOrCreateReactInstance()
.continueWithTask(
task -> {
if (task.isFaulted()) {
destroy(
"oldGetOrCreateStartTask() failure: "
+ task.getError().getMessage(),
task.getError());
mReactHostDelegate.handleInstanceException(task.getError());
}
if (mStartTask == null) {
final String method = "oldGetOrCreateStartTask()";
log(method, "Schedule");
mStartTask =
getOrCreateReactInstance()
.continueWithTask(
task -> {
if (task.isFaulted()) {
destroy(
"oldGetOrCreateStartTask() failure: " + task.getError().getMessage(),
task.getError());
mReactHostDelegate.handleInstanceException(task.getError());
}
return task;
},
mBGExecutor)
.makeVoid();
}
return mStartTask;
},
mBGExecutor)
.continueWithTask(Task::getResult);
return task;
},
mBGExecutor)
.makeVoid();
}
return mStartTask;
}
@ThreadConfined("ReactHost")
private Task<Void> newGetOrCreateStartTask() {
final String method = "newGetOrCreateStartTask()";
return Task.call(
() -> {
if (mStartTask == null) {
log(method, "Schedule");
mStartTask =
waitThenCallNewGetOrCreateReactInstanceTask()
.continueWithTask(
(task) -> {
if (task.isFaulted()) {
mReactHostDelegate.handleInstanceException(task.getError());
// Wait for destroy to finish
return newGetOrCreateDestroyTask(
"newGetOrCreateStartTask() failure: "
+ task.getError().getMessage(),
task.getError())
.continueWithTask(destroyTask -> Task.forError(task.getError()))
.makeVoid();
}
return task.makeVoid();
},
mBGExecutor);
}
return mStartTask;
},
mBGExecutor)
.continueWithTask(Task::getResult);
if (mStartTask == null) {
final String method = "newGetOrCreateStartTask()";
log(method, "Schedule");
mStartTask =
waitThenCallNewGetOrCreateReactInstanceTask()
.continueWithTask(
(task) -> {
if (task.isFaulted()) {
mReactHostDelegate.handleInstanceException(task.getError());
// Wait for destroy to finish
return newGetOrCreateDestroyTask(
"newGetOrCreateStartTask() failure: " + task.getError().getMessage(),
task.getError())
.continueWithTask(destroyTask -> Task.forError(task.getError()))
.makeVoid();
}
return task.makeVoid();
},
mBGExecutor);
}
return mStartTask;
}
@ThreadConfined(UI)