Skip to content

Fix race condition in native module invalidation #44048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dmytrorykun wants to merge 1 commit into from
Closed

Fix race condition in native module invalidation #44048

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 28 additions & 14 deletions ...ive/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,11 @@ static Class getFallbackClassFromName(const char *name)
return moduleClass;
}

typedef struct {
id<RCTBridgeModule> module;
dispatch_queue_t methodQueue;
} ModuleQueuePair;

@implementation RCTTurboModuleManager {
std::shared_ptr<CallInvoker> _jsInvoker;
__weak id<RCTTurboModuleManagerDelegate> _delegate;
Expand Down Expand Up @@ -1033,7 +1038,7 @@ - (void)_invalidateModules
{
// Backward-compatibility: RCTInvalidating handling.
dispatch_group_t moduleInvalidationGroup = dispatch_group_create();

std::vector<ModuleQueuePair> modulesToInvalidate;
for (auto &pair : _moduleHolders) {
std::string moduleName = pair.first;
ModuleHolder *moduleHolder = &pair.second;
Expand All @@ -1056,22 +1061,31 @@ - (void)_invalidateModules
[module class]);
continue;
}
modulesToInvalidate.push_back({module, methodQueue});
}
}

dispatch_group_enter(moduleInvalidationGroup);
dispatch_block_t invalidateModule = ^{
[((id<RCTInvalidating>)module) invalidate];
dispatch_group_leave(moduleInvalidationGroup);
};
for (auto unused : modulesToInvalidate) {
dispatch_group_enter(moduleInvalidationGroup);
}

if (_bridge) {
[_bridge dispatchBlock:invalidateModule queue:methodQueue];
for (auto &moduleQueuePair : modulesToInvalidate) {
id<RCTBridgeModule> module = moduleQueuePair.module;
dispatch_queue_t methodQueue = moduleQueuePair.methodQueue;

dispatch_block_t invalidateModule = ^{
[((id<RCTInvalidating>)module) invalidate];
dispatch_group_leave(moduleInvalidationGroup);
};

if (_bridge) {
[_bridge dispatchBlock:invalidateModule queue:methodQueue];
} else {
// Bridgeless mode
if (methodQueue == RCTJSThread) {
invalidateModule();
} else {
// Bridgeless mode
if (methodQueue == RCTJSThread) {
invalidateModule();
} else {
dispatch_async(methodQueue, invalidateModule);
}
dispatch_async(methodQueue, invalidateModule);
}
}
}
Expand Down