Skip to content

Commit 90310f2

Browse files
woody-applerestyled-commits
andauthoredJul 9, 2024
Disabling this darwin feature, doesn't seem to be of use, and is crashing (project-chip#34238)
* Disabling this * Restyled by clang-format --------- Co-authored-by: Restyled.io <commits@restyled.io>
1 parent 1ca9ac0 commit 90310f2

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed
 

‎src/darwin/Framework/CHIP/MTRDevice.mm

+7-2
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@
6060

6161
#define kSecondsToWaitBeforeMarkingUnreachableAfterSettingUpSubscription 10
6262

63+
// Disabling pending crashes
64+
#define ENABLE_CONNECTIVITY_MONITORING 0
65+
6366
// Consider moving utility classes to their own file
6467
#pragma mark - Utility Classes
6568

@@ -1381,15 +1384,15 @@ - (void)_handleResubscriptionNeededWithDelay:(NSNumber *)resubscriptionDelayMs
13811384
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, resubscriptionDelayNs), self.queue, resubscriptionBlock);
13821385
}
13831386

1384-
// Set up connectivity monitoring in case network routability changes for the positive, to accellerate resubscription
1387+
// Set up connectivity monitoring in case network routability changes for the positive, to accelerate resubscription
13851388
[self _setupConnectivityMonitoring];
13861389
}
13871390

13881391
- (void)_handleSubscriptionReset:(NSNumber * _Nullable)retryDelay
13891392
{
13901393
std::lock_guard lock(_lock);
13911394

1392-
// If we are here, then either we failed to establish initil CASE, or we
1395+
// If we are here, then either we failed to establish initial CASE, or we
13931396
// failed to send the initial SubscribeRequest message, or our ReadClient
13941397
// has given up completely. Those all count as "we have tried and failed to
13951398
// subscribe".
@@ -2253,6 +2256,7 @@ - (void)_createDataVersionFilterListFromDictionary:(NSDictionary<MTRClusterPath
22532256

22542257
- (void)_setupConnectivityMonitoring
22552258
{
2259+
#if ENABLE_CONNECTIVITY_MONITORING
22562260
// Dispatch to own queue first to avoid deadlock with syncGetCompressedFabricID
22572261
dispatch_async(self.queue, ^{
22582262
// Get the required info before setting up the connectivity monitor
@@ -2277,6 +2281,7 @@ - (void)_setupConnectivityMonitoring
22772281
errorHandler:nil];
22782282
} queue:self.queue];
22792283
});
2284+
#endif
22802285
}
22812286

22822287
- (void)_stopConnectivityMonitoring

0 commit comments

Comments
 (0)