mirror of
https://github.com/facebook/react-native.git
synced 2026-11-18 20:19:07 +00:00
Remove RCTTurboModuleSyncVoidMethodsEnabled feature flag and related code (#54684)
Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/54684 This diff removes the `RCTTurboModuleSyncVoidMethodsEnabled` feature flag and all related code that allowed TurboModule void methods to execute synchronously. Changelog: [Internal] Reviewed By: philIip Differential Revision: D87865883 fbshipit-source-id: fa64e8105e8329a0b20bb1718dbc01b17464cd06
This commit is contained in:
1 parent
d6c57725b7
commit
a540b903f9
7 files changed
+10
-54
No files matched your search
@@ -62,10 +62,6 @@ void RCTEnableTurboModuleInteropBridgeProxy(BOOL enabled);
|
||||
BOOL RCTFabricInteropLayerEnabled(void);
|
||||
void RCTEnableFabricInteropLayer(BOOL enabled);
|
||||
|
||||
// Turn on TurboModule sync execution of void methods
|
||||
BOOL RCTTurboModuleSyncVoidMethodsEnabled(void);
|
||||
void RCTEnableTurboModuleSyncVoidMethods(BOOL enabled);
|
||||
|
||||
BOOL RCTUIManagerDispatchAccessibilityManagerInitOntoMain(void);
|
||||
void RCTUIManagerSetDispatchAccessibilityManagerInitOntoMain(BOOL enabled);
|
||||
|
||||
|
||||
@@ -242,17 +242,6 @@ void RCTSetTurboModuleInteropBridgeProxyLogLevel(RCTBridgeProxyLoggingLevel logL
|
||||
bridgeProxyLoggingLevel = logLevel;
|
||||
}
|
||||
|
||||
// Turn on TurboModule sync execution of void methods
|
||||
static BOOL gTurboModuleEnableSyncVoidMethods = NO;
|
||||
BOOL RCTTurboModuleSyncVoidMethodsEnabled(void)
|
||||
{
|
||||
return gTurboModuleEnableSyncVoidMethods;
|
||||
}
|
||||
void RCTEnableTurboModuleSyncVoidMethods(BOOL enabled)
|
||||
{
|
||||
gTurboModuleEnableSyncVoidMethods = enabled;
|
||||
}
|
||||
|
||||
BOOL kDispatchAccessibilityManagerInitOntoMain = NO;
|
||||
BOOL RCTUIManagerDispatchAccessibilityManagerInitOntoMain(void)
|
||||
{
|
||||
|
||||
-1
@@ -58,7 +58,6 @@ class StubNativeMethodCallInvoker : public NativeMethodCallInvoker {
|
||||
.jsInvoker = nullptr,
|
||||
.nativeMethodCallInvoker = std::make_shared<StubNativeMethodCallInvoker>(),
|
||||
.isSyncModule = false,
|
||||
.shouldVoidMethodsExecuteSync = true,
|
||||
};
|
||||
module_ = std::make_unique<ObjCTurboModule>(params);
|
||||
}
|
||||
|
||||
-4
@@ -58,7 +58,6 @@ class JSI_EXPORT ObjCTurboModule : public TurboModule {
|
||||
std::shared_ptr<CallInvoker> jsInvoker;
|
||||
std::shared_ptr<NativeMethodCallInvoker> nativeMethodCallInvoker;
|
||||
bool isSyncModule;
|
||||
bool shouldVoidMethodsExecuteSync;
|
||||
};
|
||||
|
||||
ObjCTurboModule(const InitParams ¶ms);
|
||||
@@ -128,9 +127,6 @@ class JSI_EXPORT ObjCTurboModule : public TurboModule {
|
||||
// Does the NativeModule dispatch async methods to the JS thread?
|
||||
const bool isSyncModule_;
|
||||
|
||||
// Should void methods execute synchronously?
|
||||
const bool shouldVoidMethodsExecuteSync_;
|
||||
|
||||
/**
|
||||
* TODO(ramanpreet):
|
||||
* Investigate an optimization that'll let us get rid of this NSMutableDictionary.
|
||||
|
||||
+10
-27
@@ -461,11 +461,7 @@ void ObjCTurboModule::performVoidMethodInvocation(
|
||||
return;
|
||||
}
|
||||
|
||||
if (shouldVoidMethodsExecuteSync_) {
|
||||
TurboModulePerfLogger::syncMethodCallExecutionStart(moduleName, methodName);
|
||||
} else {
|
||||
TurboModulePerfLogger::asyncMethodCallExecutionStart(moduleName, methodName, asyncCallCounter);
|
||||
}
|
||||
TurboModulePerfLogger::asyncMethodCallExecutionStart(moduleName, methodName, asyncCallCounter);
|
||||
|
||||
@try {
|
||||
[inv invokeWithTarget:strongModule];
|
||||
@@ -475,26 +471,18 @@ void ObjCTurboModule::performVoidMethodInvocation(
|
||||
[retainedObjectsForInvocation removeAllObjects];
|
||||
}
|
||||
|
||||
if (shouldVoidMethodsExecuteSync_) {
|
||||
TurboModulePerfLogger::syncMethodCallExecutionEnd(moduleName, methodName);
|
||||
} else {
|
||||
TurboModulePerfLogger::asyncMethodCallExecutionEnd(moduleName, methodName, asyncCallCounter);
|
||||
}
|
||||
TurboModulePerfLogger::asyncMethodCallExecutionEnd(moduleName, methodName, asyncCallCounter);
|
||||
|
||||
return;
|
||||
};
|
||||
|
||||
if (shouldVoidMethodsExecuteSync_) {
|
||||
nativeMethodCallInvoker_->invokeSync(methodNameStr, [&]() -> void { block(); });
|
||||
} else {
|
||||
asyncCallCounter = getUniqueId();
|
||||
TurboModulePerfLogger::asyncMethodCallDispatch(moduleName, methodName);
|
||||
nativeMethodCallInvoker_->invokeAsync(methodNameStr, [moduleName, methodNameStr, block]() -> void {
|
||||
TraceSection s(
|
||||
"RCTTurboModuleAsyncMethodInvocation", "module", moduleName, "method", methodNameStr, "returnType", "void");
|
||||
block();
|
||||
});
|
||||
}
|
||||
asyncCallCounter = getUniqueId();
|
||||
TurboModulePerfLogger::asyncMethodCallDispatch(moduleName, methodName);
|
||||
nativeMethodCallInvoker_->invokeAsync(methodNameStr, [moduleName, methodNameStr, block]() -> void {
|
||||
TraceSection s(
|
||||
"RCTTurboModuleAsyncMethodInvocation", "module", moduleName, "method", methodNameStr, "returnType", "void");
|
||||
block();
|
||||
});
|
||||
}
|
||||
|
||||
jsi::Value ObjCTurboModule::convertReturnIdToJSIValue(
|
||||
@@ -763,10 +751,6 @@ bool ObjCTurboModule::isMethodSync(TurboModuleMethodValueKind returnType)
|
||||
return true;
|
||||
}
|
||||
|
||||
if (returnType == VoidKind && shouldVoidMethodsExecuteSync_) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return !(returnType == VoidKind || returnType == PromiseKind);
|
||||
}
|
||||
|
||||
@@ -774,8 +758,7 @@ ObjCTurboModule::ObjCTurboModule(const InitParams ¶ms)
|
||||
: TurboModule(params.moduleName, params.jsInvoker),
|
||||
instance_(params.instance),
|
||||
nativeMethodCallInvoker_(params.nativeMethodCallInvoker),
|
||||
isSyncModule_(params.isSyncModule),
|
||||
shouldVoidMethodsExecuteSync_(params.shouldVoidMethodsExecuteSync)
|
||||
isSyncModule_(params.isSyncModule)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
-2
@@ -397,7 +397,6 @@ typedef struct {
|
||||
.jsInvoker = _jsInvoker,
|
||||
.nativeMethodCallInvoker = nativeMethodCallInvoker,
|
||||
.isSyncModule = methodQueue == RCTJSThread,
|
||||
.shouldVoidMethodsExecuteSync = (bool)RCTTurboModuleSyncVoidMethodsEnabled(),
|
||||
};
|
||||
|
||||
auto turboModule = [(id<RCTTurboModule>)module getTurboModule:params];
|
||||
@@ -459,7 +458,6 @@ typedef struct {
|
||||
.jsInvoker = _jsInvoker,
|
||||
.nativeMethodCallInvoker = std::move(nativeMethodCallInvoker),
|
||||
.isSyncModule = methodQueue == RCTJSThread,
|
||||
.shouldVoidMethodsExecuteSync = (bool)RCTTurboModuleSyncVoidMethodsEnabled(),
|
||||
};
|
||||
|
||||
auto turboModule = std::make_shared<ObjCInteropTurboModule>(params);
|
||||
|
||||
@@ -2177,8 +2177,6 @@ BOOL RCTTurboModuleInteropBridgeProxyEnabled(void);
|
||||
void RCTEnableTurboModuleInteropBridgeProxy(BOOL enabled);
|
||||
BOOL RCTFabricInteropLayerEnabled(void);
|
||||
void RCTEnableFabricInteropLayer(BOOL enabled);
|
||||
BOOL RCTTurboModuleSyncVoidMethodsEnabled(void);
|
||||
void RCTEnableTurboModuleSyncVoidMethods(BOOL enabled);
|
||||
BOOL RCTUIManagerDispatchAccessibilityManagerInitOntoMain(void);
|
||||
void RCTUIManagerSetDispatchAccessibilityManagerInitOntoMain(BOOL enabled);
|
||||
typedef enum {
|
||||
@@ -16571,7 +16569,6 @@ class JSI_EXPORT ObjCTurboModule : public TurboModule {
|
||||
std::shared_ptr<CallInvoker> jsInvoker;
|
||||
std::shared_ptr<NativeMethodCallInvoker> nativeMethodCallInvoker;
|
||||
bool isSyncModule;
|
||||
bool shouldVoidMethodsExecuteSync;
|
||||
};
|
||||
ObjCTurboModule(const InitParams ¶ms);
|
||||
jsi::Value invokeObjCMethod(
|
||||
@@ -16648,7 +16645,6 @@ class JSI_EXPORT ObjCTurboModule : public TurboModule {
|
||||
std::shared_ptr<CallInvoker> jsInvoker;
|
||||
std::shared_ptr<NativeMethodCallInvoker> nativeMethodCallInvoker;
|
||||
bool isSyncModule;
|
||||
bool shouldVoidMethodsExecuteSync;
|
||||
};
|
||||
ObjCTurboModule(const InitParams ¶ms);
|
||||
jsi::Value invokeObjCMethod(
|
||||
@@ -16681,7 +16677,6 @@ class JSI_EXPORT ObjCTurboModule : public TurboModule {
|
||||
|
||||
private:
|
||||
const bool isSyncModule_;
|
||||
const bool shouldVoidMethodsExecuteSync_;
|
||||
NSMutableDictionary<NSString *, NSMutableArray *> *methodArgConversionSelectors_;
|
||||
NSDictionary<NSString *, NSArray<NSString *> *> *methodArgumentTypeNames_;
|
||||
bool isMethodSync(TurboModuleMethodValueKind returnType);
|
||||
|
||||
Reference in new issue
Block a user