|
11 | 11 | #import <cassert>
|
12 | 12 | #import <condition_variable>
|
13 | 13 | #import <mutex>
|
14 |
| -#import <shared_mutex> |
15 | 14 |
|
16 | 15 | #import <objc/runtime.h>
|
17 | 16 |
|
@@ -173,7 +172,6 @@ @implementation RCTTurboModuleManager {
|
173 | 172 | std::mutex _turboModuleManagerDelegateMutex;
|
174 | 173 |
|
175 | 174 | // Enforce synchronous access to _invalidating and _turboModuleHolders
|
176 |
| - std::shared_timed_mutex _turboModuleHoldersSharedMutex; |
177 | 175 | std::mutex _turboModuleHoldersMutex;
|
178 | 176 | std::atomic<bool> _invalidating;
|
179 | 177 | }
|
@@ -317,23 +315,6 @@ - (void)notifyAboutTurboModuleSetup:(const char *)name
|
317 | 315 |
|
318 | 316 | - (TurboModuleHolder *)_getOrCreateTurboModuleHolder:(const char *)moduleName
|
319 | 317 | {
|
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 |
| - |
337 | 318 | std::lock_guard<std::mutex> guard(_turboModuleHoldersMutex);
|
338 | 319 | if (_invalidating) {
|
339 | 320 | return nullptr;
|
@@ -785,11 +766,6 @@ - (id)moduleForName:(const char *)moduleName warnOnLookupFailure:(BOOL)warnOnLoo
|
785 | 766 |
|
786 | 767 | - (BOOL)moduleIsInitialized:(const char *)moduleName
|
787 | 768 | {
|
788 |
| - if (RCTTurboModuleSharedMutexInitEnabled()) { |
789 |
| - std::shared_lock<std::shared_timed_mutex> guard(_turboModuleHoldersSharedMutex); |
790 |
| - return _turboModuleHolders.find(moduleName) != _turboModuleHolders.end(); |
791 |
| - } |
792 |
| - |
793 | 769 | std::unique_lock<std::mutex> guard(_turboModuleHoldersMutex);
|
794 | 770 | return _turboModuleHolders.find(moduleName) != _turboModuleHolders.end();
|
795 | 771 | }
|
@@ -843,13 +819,8 @@ - (void)invalidate
|
843 | 819 | - (void)_enterInvalidatingState
|
844 | 820 | {
|
845 | 821 | // 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; |
853 | 824 | }
|
854 | 825 |
|
855 | 826 | - (void)_invalidateModules
|
|
0 commit comments