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

Improve logging around network technology detection in MTRDevice. #37878

Merged
merged 1 commit into from
Mar 5, 2025
+18 −2
Merged

Improve logging around network technology detection in MTRDevice. #37878

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
20 changes: 18 additions & 2 deletions src/darwin/Framework/CHIP/MTRDevice_Concrete.mm
View file
Original file line number Diff line number Diff line change
@@ -4195,9 +4195,9 @@ - (NSArray *)_getAttributesToReportWithReportedValues:(NSArray<NSDictionary<NSSt
// When the expected value interval expires, the correct value will be reported,
// if needed.
if (expectedValue) {
MTR_LOG("%@ report %@ value filtered - expected value still present", self, attributePath);
MTR_LOG("%@ report %@ value %@ filtered - expected value still present", self, attributePath, attributeDataValue);
} else {
MTR_LOG("%@ report %@ value filtered - same as read cache", self, attributePath);
MTR_LOG("%@ report %@ value %@ filtered - same as read cache", self, attributePath, attributeDataValue);
}
}

@@ -4310,6 +4310,22 @@ - (void)_doSetPersistedClusterData:(NSDictionary<MTRClusterPath *, MTRDeviceClus

[self _updateAttributeDependentDescriptionData];

NSNumber * networkFeatures = nil;
{
std::lock_guard descriptionLock(_descriptionLock);
networkFeatures = _allNetworkFeatures;
}

if ((networkFeatures.unsignedLongLongValue & MTRNetworkCommissioningFeatureWiFiNetworkInterface) == 0 && (networkFeatures.unsignedLongLongValue & MTRNetworkCommissioningFeatureThreadNetworkInterface) == 0) {
// We had persisted data, but apparently this device does not have any
// known network technologies? Log some more information about what's
// going on.
auto * rootNetworkCommissioningPath = [MTRClusterPath clusterPathWithEndpointID:@(kRootEndpointId) clusterID:@(MTRClusterIDTypeNetworkCommissioningID)];
auto * networkCommisioningData = clusterData[rootNetworkCommissioningPath];
MTR_LOG("%@ after setting persisted data, network features: %@, root network commissioning featureMap: %@", self, networkFeatures,
networkCommisioningData.attributes[@(MTRClusterGlobalAttributeFeatureMapID)]);
}

// We have some stored data. Since we don't store data until the end of the
// initial priming report, our device cache must be primed.
_deviceCachePrimed = YES;