Remove synchronization queue

firebase · Oct 4, 2024 · 3e0de8c · 3e0de8c
1 parent 41bbf35
commit 3e0de8c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 41 deletions.
diff --git a/FirebaseCore/Sources/FIRConfiguration.m b/FirebaseCore/Sources/FIRConfiguration.m
@@ -19,10 +19,6 @@
 extern void FIRSetLoggerLevel(FIRLoggerLevel loggerLevel);
 extern FIRLoggerLevel FIRGetLoggerLevel(void);
 
-@interface FIRConfiguration ()
-@property(nonatomic, readonly) dispatch_queue_t queue;
-@end
-
 @implementation FIRConfiguration
 
 + (instancetype)sharedInstance {
@@ -37,7 +33,6 @@ + (instancetype)sharedInstance {
 - (instancetype)init {
   self = [super init];
   if (self) {
-    _queue = dispatch_queue_create("com.firebase.FIRConfiguration", DISPATCH_QUEUE_SERIAL);
     _analyticsConfiguration = [FIRAnalyticsConfiguration sharedInstance];
   }
   return self;
@@ -46,17 +41,15 @@ - (instancetype)init {
 - (void)setLoggerLevel:(FIRLoggerLevel)loggerLevel {
   NSAssert(loggerLevel <= FIRLoggerLevelMax && loggerLevel >= FIRLoggerLevelMin,
            @"Invalid logger level, %ld", (long)loggerLevel);
-  dispatch_sync(self.queue, ^{
+  @synchronized(self) {
     FIRSetLoggerLevel(loggerLevel);
-  });
+  }
 }
 
 - (FIRLoggerLevel)loggerLevel {
-  __block FIRLoggerLevel level;
-  dispatch_sync(self.queue, ^{
-    level = FIRGetLoggerLevel();
-  });
-  return level;
+  @synchronized(self) {
+    return FIRGetLoggerLevel();
+  }
 }
 
 @end
diff --git a/FirebaseCore/Tests/Unit/FIRConfigurationTest.m b/FirebaseCore/Tests/Unit/FIRConfigurationTest.m
@@ -42,33 +42,4 @@ - (void)testSetAndGet {
   }
 }
 
-- (void)testSynchronizedAccess {
-  FIRConfiguration *config = [FIRConfiguration sharedInstance];
-
-  __block BOOL raceConditionExists = NO;
-
-  // Dispatch to a concurrent queue to simulate concurrent access.
-  dispatch_queue_t queue = dispatch_get_global_queue(QOS_CLASS_UTILITY, 0);
-  for (int i = 0; i < 1000000; i++) {
-    dispatch_async(queue, ^{
-      // Get the current logging level.
-      FIRLoggerLevel currentLevel = [config loggerLevel];
-
-      // Set a new logging level.
-      FIRLoggerLevel nextLevel =
-          (currentLevel + 1 > FIRLoggerLevelMax) ? FIRLoggerLevelMin : currentLevel + 1;
-      [config setLoggerLevel:nextLevel];
-
-      // Confirm that the new logging level is retrieved.
-      if (nextLevel != [config loggerLevel]) {
-        raceConditionExists = YES;
-      }
-    });
-  }
-
-  dispatch_sync(queue, ^{/* Drain queue before proceeding. */});
-
-  XCTAssertEqual(raceConditionExists, NO);
-}
-
 @end