Skip to content

Commit 70bb644

Browse files
javachefacebook-github-bot
authored andcommitted
Remove iOS TurboModuleManager experiment with shared mutex
Summary: Changelog: [Internal] Reviewed By: mdvacca Differential Revision: D41551085 fbshipit-source-id: f4d1d8126529d5f384ada941f6fb140abcfd9716
1 parent 229a1de commit 70bb644

File tree

3 files changed

+2
-46
lines changed

3 files changed

+2
-46
lines changed

React/Base/RCTBridge.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@ RCT_EXTERN void RCTEnableTurboModule(BOOL enabled);
5252
RCT_EXTERN BOOL RCTTurboModuleEagerInitEnabled(void);
5353
RCT_EXTERN void RCTEnableTurboModuleEagerInit(BOOL enabled);
5454

55-
// Turn on TurboModule shared mutex initialization
56-
RCT_EXTERN BOOL RCTTurboModuleSharedMutexInitEnabled(void);
57-
RCT_EXTERN void RCTEnableTurboModuleSharedMutexInit(BOOL enabled);
58-
5955
// Turn off TurboModule delegate locking
6056
RCT_EXTERN BOOL RCTTurboModuleManagerDelegateLockingDisabled(void);
6157
RCT_EXTERN void RCTDisableTurboModuleManagerDelegateLocking(BOOL enabled);

React/Base/RCTBridge.m

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -108,17 +108,6 @@ void RCTEnableTurboModuleEagerInit(BOOL enabled)
108108
turboModuleEagerInitEnabled = enabled;
109109
}
110110

111-
static BOOL turboModuleSharedMutexInitEnabled = NO;
112-
BOOL RCTTurboModuleSharedMutexInitEnabled(void)
113-
{
114-
return turboModuleSharedMutexInitEnabled;
115-
}
116-
117-
void RCTEnableTurboModuleSharedMutexInit(BOOL enabled)
118-
{
119-
turboModuleSharedMutexInitEnabled = enabled;
120-
}
121-
122111
// Turn off TurboModule delegate locking
123112
static BOOL turboModuleManagerDelegateLockingDisabled = YES;
124113
BOOL RCTTurboModuleManagerDelegateLockingDisabled(void)

ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.mm

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#import <cassert>
1212
#import <condition_variable>
1313
#import <mutex>
14-
#import <shared_mutex>
1514

1615
#import <objc/runtime.h>
1716

@@ -173,7 +172,6 @@ @implementation RCTTurboModuleManager {
173172
std::mutex _turboModuleManagerDelegateMutex;
174173

175174
// Enforce synchronous access to _invalidating and _turboModuleHolders
176-
std::shared_timed_mutex _turboModuleHoldersSharedMutex;
177175
std::mutex _turboModuleHoldersMutex;
178176
std::atomic<bool> _invalidating;
179177
}
@@ -317,23 +315,6 @@ - (void)notifyAboutTurboModuleSetup:(const char *)name
317315

318316
- (TurboModuleHolder *)_getOrCreateTurboModuleHolder:(const char *)moduleName
319317
{
320-
if (RCTTurboModuleSharedMutexInitEnabled()) {
321-
{
322-
std::shared_lock<std::shared_timed_mutex> guard(_turboModuleHoldersSharedMutex);
323-
if (_invalidating) {
324-
return nullptr;
325-
}
326-
327-
auto it = _turboModuleHolders.find(moduleName);
328-
if (it != _turboModuleHolders.end()) {
329-
return &it->second;
330-
}
331-
}
332-
333-
std::unique_lock<std::shared_timed_mutex> guard(_turboModuleHoldersSharedMutex);
334-
return &_turboModuleHolders[moduleName];
335-
}
336-
337318
std::lock_guard<std::mutex> guard(_turboModuleHoldersMutex);
338319
if (_invalidating) {
339320
return nullptr;
@@ -785,11 +766,6 @@ - (id)moduleForName:(const char *)moduleName warnOnLookupFailure:(BOOL)warnOnLoo
785766

786767
- (BOOL)moduleIsInitialized:(const char *)moduleName
787768
{
788-
if (RCTTurboModuleSharedMutexInitEnabled()) {
789-
std::shared_lock<std::shared_timed_mutex> guard(_turboModuleHoldersSharedMutex);
790-
return _turboModuleHolders.find(moduleName) != _turboModuleHolders.end();
791-
}
792-
793769
std::unique_lock<std::mutex> guard(_turboModuleHoldersMutex);
794770
return _turboModuleHolders.find(moduleName) != _turboModuleHolders.end();
795771
}
@@ -843,13 +819,8 @@ - (void)invalidate
843819
- (void)_enterInvalidatingState
844820
{
845821
// This should halt all insertions into _turboModuleHolders
846-
if (RCTTurboModuleSharedMutexInitEnabled()) {
847-
std::unique_lock<std::shared_timed_mutex> guard(_turboModuleHoldersSharedMutex);
848-
_invalidating = true;
849-
} else {
850-
std::lock_guard<std::mutex> guard(_turboModuleHoldersMutex);
851-
_invalidating = true;
852-
}
822+
std::lock_guard<std::mutex> guard(_turboModuleHoldersMutex);
823+
_invalidating = true;
853824
}
854825

855826
- (void)_invalidateModules

0 commit comments

Comments
 (0)