simplify - pull attributes from cache without intermediate object, should be fast enough

Author: kiel-apple

src/darwin/Framework/CHIP/MTRDevice.mm

@@ -93,39 +93,6 @@ - (id)strongObject
 }
 @end
 
-// convenience object for commonly-logged device attributes
-@interface MTRDeviceInformationalAttributes : NSObject
-@property (readonly) UInt16 vendorID;
-@property (readonly) UInt16 productID;
-@property (readonly) BOOL usesThread;
-
-- (void)addInformationalAttributesToCurrentMetricScope;
-
-@end
-
-@implementation MTRDeviceInformationalAttributes
-
-- (instancetype)initWithVendorID:(UInt16)vendorID productID:(UInt16)productID usesThread:(BOOL)usesThread {
-    self = [super init];
-    
-    if (self) {
-        _vendorID = vendorID;
-        _productID = productID;
-        _usesThread = usesThread;
-    }
-    
-    return self;
-}
-
-- (void)addInformationalAttributesToCurrentMetricScope {
-    using namespace chip::Tracing::DarwinFramework;
-    MATTER_LOG_METRIC(kMetricDeviceVendorID, _vendorID);
-    MATTER_LOG_METRIC(kMetricDeviceProductID, _productID);
-    MATTER_LOG_METRIC(kMetricDeviceUsesThread, _usesThread);
-}
-
-@end
-
 NSNumber * MTRClampedNumber(NSNumber * aNumber, NSNumber * min, NSNumber * max)
 {
     if ([aNumber compare:min] == NSOrderedAscending) {
@@ -1896,7 +1863,7 @@ - (void)_setCachedAttributeValue:(MTRDeviceDataValueDictionary _Nullable)value f
     }
 
     [clusterData storeValue:value forAttribute:path.attribute];
-
+    
     if (value != nil
         && isFromSubscription
         && !_receivingPrimingReport
@@ -1906,11 +1873,9 @@ - (void)_setCachedAttributeValue:(MTRDeviceDataValueDictionary _Nullable)value f
         // (removals are OK)
 
         // log when a device violates expectations for Changes Omitted Quality attributes.
-        MTRDeviceInformationalAttributes * attributes = [self _informationalAttributesForCurrentState];
-        
         using namespace chip::Tracing::DarwinFramework;
         MATTER_LOG_METRIC_BEGIN(kMetricUnexpectedCQualityUpdate);
-        [attributes addInformationalAttributesToCurrentMetricScope];
+        [self _addInformationalAttributesToCurrentMetricScope];
         MATTER_LOG_METRIC_END(kMetricUnexpectedCQualityUpdate);
 
         return;
@@ -3567,18 +3532,40 @@ - (void)removeClientDataForKey:(NSString *)key endpointID:(NSNumber *)endpointID
 
 #pragma mark Log Help
 
-- (MTRDeviceInformationalAttributes *)_informationalAttributesForCurrentState {
-    MTRClusterPath * basicInfoClusterPath = [MTRClusterPath clusterPathWithEndpointID:@(kRootEndpointId) clusterID:@(MTRClusterIDTypeBasicInformationID)];
-    MTRDeviceClusterData * basicInfoClusterData = [self _clusterDataForPath:basicInfoClusterPath];
+- (NSNumber *)_informationalNumberAtAttributePath:(MTRAttributePath *)attributePath {
+    auto * cachedData = [self _cachedAttributeValueForPath:attributePath];
 
-    NSNumber * vidObj = basicInfoClusterData.attributes[@(MTRAttributeIDTypeClusterBasicInformationAttributeVendorIDID)][MTRValueKey];
-    UInt16 vendorID = vidObj.unsignedShortValue;
-    NSNumber * pidObj = basicInfoClusterData.attributes[@(MTRAttributeIDTypeClusterBasicInformationAttributeProductIDID)][MTRValueKey];
-    UInt16 productID = pidObj.unsignedShortValue;
+    auto * attrReport = [[MTRAttributeReport alloc] initWithResponseValue:@{
+        MTRAttributePathKey : attributePath,
+        MTRDataKey : cachedData,
+    } error:nil];
+    // REVIEWERS:  is it worth logging the `error` above?
 
-    BOOL usesThread = [self _deviceUsesThread];
+    return attrReport.value;
+}
+
+- (NSNumber *)_informationalVendorID {
+    auto * vendorIDPath = [MTRAttributePath attributePathWithEndpointID:@(kRootEndpointId)
+                                                                          clusterID:@(MTRClusterIDTypeBasicInformationID)
+                                                                        attributeID:@(MTRClusterBasicAttributeVendorIDID)];
 
-    return [[MTRDeviceInformationalAttributes alloc] initWithVendorID:vendorID productID:productID usesThread:usesThread];
+    return [self _informationalNumberAtAttributePath:vendorIDPath];
+}
+
+- (NSNumber *)_informationalProductID {
+    auto * productIDPath = [MTRAttributePath attributePathWithEndpointID:@(kRootEndpointId)
+                                                                          clusterID:@(MTRClusterIDTypeBasicInformationID)
+                                                                        attributeID:@(MTRClusterBasicAttributeProductIDID)];
+    
+    return [self _informationalNumberAtAttributePath:productIDPath];
+}
+
+- (void)_addInformationalAttributesToCurrentMetricScope {
+    using namespace chip::Tracing::DarwinFramework;
+    MATTER_LOG_METRIC(kMetricDeviceVendorID, [self _informationalVendorID].unsignedShortValue);
+    MATTER_LOG_METRIC(kMetricDeviceProductID, [self _informationalProductID].unsignedShortValue);
+    BOOL usesThread = [self _deviceUsesThread];
+    MATTER_LOG_METRIC(kMetricDeviceUsesThread, usesThread);
 }
 
 @end