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

[Darwin] apply changes from PR #34797 to to concrete class #34856

Merged
merged 1 commit into from
Aug 7, 2024
Merged

[Darwin] apply changes from PR #34797 to to concrete class #34856

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 22 additions & 11 deletions src/darwin/Framework/CHIP/MTRDevice_Concrete.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1101,23 +1101,21 @@ - (void)_handleSubscriptionEstablished
{
os_unfair_lock_lock(&self->_lock);

// We have completed the subscription work - remove from the subscription pool.
[self _clearSubscriptionPoolWork];

// reset subscription attempt wait time when subscription succeeds
_lastSubscriptionAttemptWait = 0;
if (HadSubscriptionEstablishedOnce(_internalDeviceState)) {
[self _changeInternalState:MTRInternalDeviceStateLaterSubscriptionEstablished];
} else {
MATTER_LOG_METRIC_END(kMetricMTRDeviceInitialSubscriptionSetup, CHIP_NO_ERROR);
[self _changeInternalState:MTRInternalDeviceStateInitialSubscriptionEstablished];
// If subscription had reset since this handler was scheduled, do not execute "established" logic below
if (!HaveSubscriptionEstablishedRightNow(_internalDeviceState)) {
MTR_LOG("%@ _handleSubscriptionEstablished run with internal state %lu - skipping subscription establishment logic", self, static_cast<unsigned long>(_internalDeviceState));
return;
}

[self _changeState:MTRDeviceStateReachable];
// We have completed the subscription work - remove from the subscription pool.
[self _clearSubscriptionPoolWork];

// No need to monitor connectivity after subscription establishment
[self _stopConnectivityMonitoring];

// reset subscription attempt wait time when subscription succeeds
_lastSubscriptionAttemptWait = 0;

auto initialSubscribeStart = _initialSubscribeStart;
// We no longer need to track subscribe latency for this device.
_initialSubscribeStart = nil;
Expand Down Expand Up @@ -2384,6 +2382,19 @@ - (void)_setupSubscriptionWithReason:(NSString *)reason
},
^(void) {
MTR_LOG("%@ got subscription established", self);
std::lock_guard lock(self->_lock);

// First synchronously change state
if (HadSubscriptionEstablishedOnce(self->_internalDeviceState)) {
[self _changeInternalState:MTRInternalDeviceStateLaterSubscriptionEstablished];
} else {
MATTER_LOG_METRIC_END(kMetricMTRDeviceInitialSubscriptionSetup, CHIP_NO_ERROR);
[self _changeInternalState:MTRInternalDeviceStateInitialSubscriptionEstablished];
}

[self _changeState:MTRDeviceStateReachable];

// Then async work that shouldn't be performed on the matter queue
dispatch_async(self.queue, ^{
// OnSubscriptionEstablished
[self _handleSubscriptionEstablished];
Expand Down
Loading