Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disabling this darwin feature, doesn't seem to be of use, and is crashing #34238

Merged
merged 2 commits into from
Jul 9, 2024
Merged

Disabling this darwin feature, doesn't seem to be of use, and is crashing #34238

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d386a72
Disabling this
woody-apple Jul 8, 2024
0af571e
Restyled by clang-format
restyled-commits Jul 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/darwin/Framework/CHIP/MTRDevice.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@

#define kSecondsToWaitBeforeMarkingUnreachableAfterSettingUpSubscription 10

// Disabling pending crashes
#define ENABLE_CONNECTIVITY_MONITORING 0

// Consider moving utility classes to their own file
#pragma mark - Utility Classes

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

// Set up connectivity monitoring in case network routability changes for the positive, to accellerate resubscription
// Set up connectivity monitoring in case network routability changes for the positive, to accelerate resubscription
[self _setupConnectivityMonitoring];
}

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

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

- (void)_setupConnectivityMonitoring
{
#if ENABLE_CONNECTIVITY_MONITORING
// Dispatch to own queue first to avoid deadlock with syncGetCompressedFabricID
dispatch_async(self.queue, ^{
// Get the required info before setting up the connectivity monitor
Expand All @@ -2277,6 +2281,7 @@ - (void)_setupConnectivityMonitoring
errorHandler:nil];
} queue:self.queue];
});
#endif
}

- (void)_stopConnectivityMonitoring
Expand Down
Loading