Darwin: Snapshot nodeIDToDeviceMap correctly (#35476)

project-chip · Sep 9, 2024 · 607a4a8 · 607a4a8
1 parent 7249c56
commit 607a4a8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/src/darwin/Framework/CHIP/MTRDeviceController.mm b/src/darwin/Framework/CHIP/MTRDeviceController.mm
@@ -364,13 +364,10 @@ - (void)suspend
     @synchronized(self) {
         _suspended = YES;
 
-        NSMutableArray * devicesToSuspend = [NSMutableArray array];
+        NSArray * devicesToSuspend;
         {
             std::lock_guard lock(*self.deviceMapLock);
-            NSEnumerator * devices = [self.nodeIDToDeviceMap objectEnumerator];
-            for (MTRDevice * device in devices) {
-                [devicesToSuspend addObject:device];
-            }
+            devicesToSuspend = [self.nodeIDToDeviceMap objectEnumerator].allObjects;
         }
 
         for (MTRDevice * device in devicesToSuspend) {
@@ -392,13 +389,10 @@ - (void)resume
     @synchronized(self) {
         _suspended = NO;
 
-        NSMutableArray * devicesToResume = [NSMutableArray array];
+        NSArray * devicesToResume;
         {
             std::lock_guard lock(*self.deviceMapLock);
-            NSEnumerator * devices = [self.nodeIDToDeviceMap objectEnumerator];
-            for (MTRDevice * device in devices) {
-                [devicesToResume addObject:device];
-            }
+            devicesToResume = [self.nodeIDToDeviceMap objectEnumerator].allObjects;
         }
 
         for (MTRDevice * device in devicesToResume) {
@@ -490,7 +484,7 @@ - (void)cleanupAfterStartup
     // devices before we start invalidating.
     MTR_LOG("%s: %@", __PRETTY_FUNCTION__, self);
     os_unfair_lock_lock(self.deviceMapLock);
-    NSEnumerator * devices = [_nodeIDToDeviceMap objectEnumerator];
+    auto * devices = [self.nodeIDToDeviceMap objectEnumerator].allObjects;
     [_nodeIDToDeviceMap removeAllObjects];
     os_unfair_lock_unlock(self.deviceMapLock);
 

diff --git a/src/darwin/Framework/CHIP/MTRDeviceController_Concrete.mm b/src/darwin/Framework/CHIP/MTRDeviceController_Concrete.mm
@@ -426,7 +426,7 @@ - (void)cleanupAfterStartup
     // devices before we start invalidating.
     MTR_LOG("%s: %@", __PRETTY_FUNCTION__, self);
     os_unfair_lock_lock(self.deviceMapLock);
-    NSEnumerator * devices = [self.nodeIDToDeviceMap objectEnumerator];
+    auto * devices = [self.nodeIDToDeviceMap objectEnumerator].allObjects;
     [self.nodeIDToDeviceMap removeAllObjects];
     os_unfair_lock_unlock(self.deviceMapLock);