@@ -1522,23 +1522,23 @@ static BOOL AttributeHasChangesOmittedQuality(MTRAttributePath * attributePath)
1522
1522
while (readRequestsNext.count ) {
1523
1523
// Can only read up to 9 paths at a time, per spec
1524
1524
if (readRequestsCurrent.count >= 9 ) {
1525
- MTR_LOG_INFO (" Batching read attribute work item [%llu]: cannot add more work, item is full [%@ :%@:%@:%@ ]" , workItemID, nodeID, endpointID, clusterID, attributeID);
1525
+ MTR_LOG_INFO (" Batching read attribute work item [%llu]: cannot add more work, item is full [0x%016llX :%@:0x%llx:0x%llx ]" , workItemID, nodeID. unsignedLongLongValue , endpointID, clusterID. unsignedLongLongValue , attributeID. unsignedLongLongValue );
1526
1526
return outcome;
1527
1527
}
1528
1528
1529
1529
// if params don't match then they cannot be merged
1530
1530
if (![readRequestsNext[0 ][MTRDeviceReadRequestFieldParamsIndex]
1531
1531
isEqual: readRequestsCurrent[0 ][MTRDeviceReadRequestFieldParamsIndex]]) {
1532
- MTR_LOG_INFO (" Batching read attribute work item [%llu]: cannot add more work, parameter mismatch [%@ :%@:%@:%@ ]" , workItemID, nodeID, endpointID, clusterID, attributeID);
1532
+ MTR_LOG_INFO (" Batching read attribute work item [%llu]: cannot add more work, parameter mismatch [0x%016llX :%@:0x%llx:0x%llx ]" , workItemID, nodeID. unsignedLongLongValue , endpointID, clusterID. unsignedLongLongValue , attributeID. unsignedLongLongValue );
1533
1533
return outcome;
1534
1534
}
1535
1535
1536
1536
// merge the next item's first request into the current item's list
1537
1537
auto readItem = readRequestsNext.firstObject ;
1538
1538
[readRequestsNext removeObjectAtIndex: 0 ];
1539
1539
[readRequestsCurrent addObject: readItem];
1540
- MTR_LOG_INFO (" Batching read attribute work item [%llu]: added %@ (now %tu requests total) [%@ :%@:%@:%@ ]" ,
1541
- workItemID, readItem, readRequestsCurrent.count , nodeID, endpointID, clusterID, attributeID);
1540
+ MTR_LOG_INFO (" Batching read attribute work item [%llu]: added %@ (now %tu requests total) [0x%016llX :%@:0x%llx:0x%llx ]" ,
1541
+ workItemID, readItem, readRequestsCurrent.count , nodeID. unsignedLongLongValue , endpointID, clusterID. unsignedLongLongValue , attributeID. unsignedLongLongValue );
1542
1542
outcome = MTRBatchedPartially;
1543
1543
}
1544
1544
NSCAssert (readRequestsNext.count == 0 , @" should have batched everything or returned early" );
@@ -1548,7 +1548,7 @@ static BOOL AttributeHasChangesOmittedQuality(MTRAttributePath * attributePath)
1548
1548
mtr_hide (self); // don't capture self accidentally
1549
1549
for (NSArray * readItem in readRequests) {
1550
1550
if ([readItem isEqual: opaqueItemData]) {
1551
- MTR_LOG_DEFAULT (" Read attribute work item [%llu] report duplicate %@ [%@ :%@:%@:%@ ]" , workItemID, readItem, nodeID, endpointID, clusterID, attributeID);
1551
+ MTR_LOG_DEFAULT (" Read attribute work item [%llu] report duplicate %@ [0x%016llX :%@:0x%llx:0x%llx ]" , workItemID, readItem, nodeID. unsignedLongLongValue , endpointID, clusterID. unsignedLongLongValue , attributeID. unsignedLongLongValue );
1552
1552
*isDuplicate = YES ;
1553
1553
*stop = YES ;
1554
1554
return ;
@@ -1585,23 +1585,23 @@ static BOOL AttributeHasChangesOmittedQuality(MTRAttributePath * attributePath)
1585
1585
if (values) {
1586
1586
// Since the format is the same data-value dictionary, this looks like an
1587
1587
// attribute report
1588
- MTR_LOG_INFO (" Read attribute work item [%llu] result: %@ [%@ :%@:%@:%@ ]" , workItemID, values, nodeID, endpointID, clusterID, attributeID);
1588
+ MTR_LOG_INFO (" Read attribute work item [%llu] result: %@ [0x%016llX :%@:0x%llX:0x%llX ]" , workItemID, values, nodeID. unsignedLongLongValue , endpointID, clusterID. unsignedLongLongValue , attributeID. unsignedLongLongValue );
1589
1589
[self _handleAttributeReport: values];
1590
1590
}
1591
1591
1592
1592
// TODO: better retry logic
1593
1593
if (error && (retryCount < 2 )) {
1594
- MTR_LOG_ERROR (" Read attribute work item [%llu] failed (will retry): %@ [%@ :%@:%@:%@ ]" , workItemID, error, nodeID, endpointID, clusterID, attributeID);
1594
+ MTR_LOG_ERROR (" Read attribute work item [%llu] failed (will retry): %@ [0x%016llX :%@:0x%llx:0x%llx ]" , workItemID, error, nodeID. unsignedLongLongValue , endpointID, clusterID. unsignedLongLongValue , attributeID. unsignedLongLongValue );
1595
1595
completion (MTRAsyncWorkNeedsRetry);
1596
1596
} else {
1597
1597
if (error) {
1598
- MTR_LOG_DEFAULT (" Read attribute work item [%llu] failed (giving up): %@ [%@ :%@:%@:%@ ]" , workItemID, error, nodeID, endpointID, clusterID, attributeID);
1598
+ MTR_LOG_DEFAULT (" Read attribute work item [%llu] failed (giving up): %@ [0x%016llX :%@:0x%llx:0x%llx ]" , workItemID, error, nodeID. unsignedLongLongValue , endpointID, clusterID. unsignedLongLongValue , attributeID. unsignedLongLongValue );
1599
1599
}
1600
1600
completion (MTRAsyncWorkComplete);
1601
1601
}
1602
1602
}];
1603
1603
}];
1604
- [_asyncWorkQueue enqueueWorkItem: workItem descriptionWithFormat: @" read %@ %@ %@ %@ " , self .nodeID, endpointID, clusterID, attributeID];
1604
+ [_asyncWorkQueue enqueueWorkItem: workItem descriptionWithFormat: @" read %@ 0x %llx 0x %llx " , endpointID, clusterID.unsignedLongLongValue , attributeID.unsignedLongLongValue ];
1605
1605
}
1606
1606
1607
1607
return attributeValueToReturn;
@@ -1669,7 +1669,7 @@ - (void)writeAttributeWithEndpointID:(NSNumber *)endpointID
1669
1669
completion (MTRAsyncWorkComplete);
1670
1670
}];
1671
1671
}];
1672
- [_asyncWorkQueue enqueueWorkItem: workItem descriptionWithFormat: @" write %@ %@ %@ %@ " , self .nodeID, endpointID, clusterID, attributeID];
1672
+ [_asyncWorkQueue enqueueWorkItem: workItem descriptionWithFormat: @" write %@ 0x %llx 0x %llx " , endpointID, clusterID.unsignedLongLongValue , attributeID.unsignedLongLongValue ];
1673
1673
}
1674
1674
1675
1675
- (void )invokeCommandWithEndpointID : (NSNumber *)endpointID
@@ -1819,7 +1819,7 @@ - (void)_invokeCommandWithEndpointID:(NSNumber *)endpointID
1819
1819
workDone (values, error);
1820
1820
}];
1821
1821
}];
1822
- [_asyncWorkQueue enqueueWorkItem: workItem descriptionWithFormat: @" invoke %@ %@ %@ " , endpointID, clusterID, commandID];
1822
+ [_asyncWorkQueue enqueueWorkItem: workItem descriptionWithFormat: @" invoke %@ 0x %llx 0x %llx " , endpointID, clusterID.unsignedLongLongValue , commandID.unsignedLongLongValue ];
1823
1823
}
1824
1824
1825
1825
- (void )_invokeKnownCommandWithEndpointID : (NSNumber *)endpointID
0 commit comments