From 15242446427a941d7d7e646e005eaae85b7b2876 Mon Sep 17 00:00:00 2001 From: Jeff Tung <100387939+jtung-apple@users.noreply.github.com> Date: Wed, 30 Nov 2022 17:31:31 -0800 Subject: [PATCH] [Darwin] Add fabric index to MTRDevice/MTRClusters logging (#23818) * [Darwin] Add fabric index to MTRDevice/MTRClusters logging * Update src/darwin/Framework/CHIP/templates/MTRClusters-src.zapt Co-authored-by: Boris Zbarsky * regenerate MTRClusters.mm * rebased to master and use the new zap acronym names Co-authored-by: Boris Zbarsky --- src/darwin/Framework/CHIP/MTRDevice.mm | 9 +- .../CHIP/templates/MTRClusters-src.zapt | 19 +- .../CHIP/zap-generated/MTRClusters.mm | 1700 +++++++++++------ 3 files changed, 1159 insertions(+), 569 deletions(-) diff --git a/src/darwin/Framework/CHIP/MTRDevice.mm b/src/darwin/Framework/CHIP/MTRDevice.mm index 9c81aa46c33a1d..16537378ff82d4 100644 --- a/src/darwin/Framework/CHIP/MTRDevice.mm +++ b/src/darwin/Framework/CHIP/MTRDevice.mm @@ -409,7 +409,8 @@ - (void)setupSubscription attributeID:(NSNumber *)attributeID params:(MTRReadParams *)params { - NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice read %@ %@ %@", endpointID, clusterID, attributeID]; + NSString * logPrefix = [NSString + stringWithFormat:@"MTRDevice read %u %@ %@ %@", _deviceController.fabricIndex, endpointID, clusterID, attributeID]; // Create work item, set ready handler to perform task, then enqueue the work MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:_queue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { @@ -460,7 +461,8 @@ - (void)writeAttributeWithEndpointID:(NSNumber *)endpointID expectedValueInterval:(NSNumber *)expectedValueInterval timedWriteTimeout:(NSNumber * _Nullable)timeout { - NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice write %@ %@ %@", endpointID, clusterID, attributeID]; + NSString * logPrefix = [NSString + stringWithFormat:@"MTRDevice write %u %@ %@ %@", _deviceController.fabricIndex, endpointID, clusterID, attributeID]; if (timeout) { timeout = MTRClampedNumber(timeout, @(1), @(UINT16_MAX)); } @@ -504,7 +506,8 @@ - (void)invokeCommandWithEndpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue completion:(MTRDeviceResponseHandler)completion { - NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %@ %@ %@", endpointID, clusterID, commandID]; + NSString * logPrefix = [NSString + stringWithFormat:@"MTRDevice command %u %@ %@ %@", _deviceController.fabricIndex, endpointID, clusterID, commandID]; if (timeout) { timeout = MTRClampedNumber(timeout, @(1), @(UINT16_MAX)); } diff --git a/src/darwin/Framework/CHIP/templates/MTRClusters-src.zapt b/src/darwin/Framework/CHIP/templates/MTRClusters-src.zapt index a2f09935535ded..b37dd1674d7bf1 100644 --- a/src/darwin/Framework/CHIP/templates/MTRClusters-src.zapt +++ b/src/darwin/Framework/CHIP/templates/MTRClusters-src.zapt @@ -24,6 +24,18 @@ using namespace chip::app::Clusters; using chip::Messaging::ExchangeManager; using chip::SessionHandle; +static void MTRClustersLogEnqueue(NSString *logPrefix, MTRAsyncCallbackWorkQueue *workQueue) { + MTR_LOG_INFO("%@ enqueueWorkItem %@", logPrefix, workQueue); +} + +static void MTRClustersLogDequeue(NSString *logPrefix, MTRAsyncCallbackWorkQueue *workQueue) { + MTR_LOG_INFO("%@ dequeueWorkItem %@", logPrefix, workQueue); +} + +static void MTRClustersLogCompletion(NSString *logPrefix, id value, NSError *error) { + MTR_LOG_INFO("%@ completion value %@ error %@ endWork", logPrefix, value, error); +} + // NOLINTBEGIN(clang-analyzer-cplusplus.NewDeleteLeaks): Linter is unable to locate the delete on these objects. {{#chip_client_clusters includeAll=true}} @implementation MTRCluster{{asUpperCamelCase name preserveAcronyms=true}} @@ -54,6 +66,7 @@ using chip::SessionHandle; {{/unless}} - (void){{asLowerCamelCase name}}WithParams: (MTR{{>cluster}}Cluster{{asUpperCamelCase name preserveAcronyms=true}}Params * {{#unless (commandHasRequiredField .)}}_Nullable{{/unless}})params expectedValues:(NSArray *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:({{>command_completion_type command=.}})completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, (unsigned int)MTRClusterIDType{{>cluster}}ID, (unsigned int)MTRCommandIDTypeCluster{{>cluster}}Command{{asUpperCamelCase name preserveAcronyms=true}}ID]; // Make a copy of params before we go async. params = [params copy]; NSNumber *timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -62,7 +75,7 @@ using chip::SessionHandle; } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("{{asUpperCamelCase parent.name}} {{asUpperCamelCase name}} dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice *baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTR{{>callbackName}}CallbackBridge(self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { @@ -76,7 +89,7 @@ using chip::SessionHandle; type-safety perspective, of course. }} completion(error); {{/if}} - MTR_LOG_INFO("{{asUpperCamelCase parent.name}} {{asUpperCamelCase name}} completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, {{>callbackName}}CallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) { @@ -111,7 +124,7 @@ using chip::SessionHandle; std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("{{asUpperCamelCase parent.name}} {{asUpperCamelCase name}} enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm index f98b6455c8a889..f0d5060132cdd7 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm @@ -39,6 +39,21 @@ using chip::Messaging::ExchangeManager; using chip::SessionHandle; +static void MTRClustersLogEnqueue(NSString * logPrefix, MTRAsyncCallbackWorkQueue * workQueue) +{ + MTR_LOG_INFO("%@ enqueueWorkItem %@", logPrefix, workQueue); +} + +static void MTRClustersLogDequeue(NSString * logPrefix, MTRAsyncCallbackWorkQueue * workQueue) +{ + MTR_LOG_INFO("%@ dequeueWorkItem %@", logPrefix, workQueue); +} + +static void MTRClustersLogCompletion(NSString * logPrefix, id value, NSError * error) +{ + MTR_LOG_INFO("%@ completion value %@ error %@ endWork", logPrefix, value, error); +} + // NOLINTBEGIN(clang-analyzer-cplusplus.NewDeleteLeaks): Linter is unable to locate the delete on these objects. @implementation MTRClusterIdentify @@ -60,6 +75,9 @@ - (void)identifyWithParams:(MTRIdentifyClusterIdentifyParams *)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeIdentifyID, (unsigned int) MTRCommandIDTypeClusterIdentifyCommandIdentifyID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -68,14 +86,14 @@ - (void)identifyWithParams:(MTRIdentifyClusterIdentifyParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Identify Identify dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("Identify Identify completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -94,7 +112,7 @@ - (void)identifyWithParams:(MTRIdentifyClusterIdentifyParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Identify Identify enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -112,6 +130,9 @@ - (void)triggerEffectWithParams:(MTRIdentifyClusterTriggerEffectParams *)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeIdentifyID, (unsigned int) MTRCommandIDTypeClusterIdentifyCommandTriggerEffectID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -120,14 +141,14 @@ - (void)triggerEffectWithParams:(MTRIdentifyClusterTriggerEffectParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Identify TriggerEffect dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("Identify TriggerEffect completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -149,7 +170,7 @@ - (void)triggerEffectWithParams:(MTRIdentifyClusterTriggerEffectParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Identify TriggerEffect enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -288,6 +309,9 @@ - (void)addGroupWithParams:(MTRGroupsClusterAddGroupParams *)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(void (^)(MTRGroupsClusterAddGroupResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeGroupsID, (unsigned int) MTRCommandIDTypeClusterGroupsCommandAddGroupID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -296,14 +320,14 @@ - (void)addGroupWithParams:(MTRGroupsClusterAddGroupParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Groups AddGroup dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRGroupsClusterAddGroupResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("Groups AddGroup completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, GroupsClusterAddGroupResponseCallbackType successCb, @@ -323,7 +347,7 @@ - (void)addGroupWithParams:(MTRGroupsClusterAddGroupParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Groups AddGroup enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -342,6 +366,9 @@ - (void)viewGroupWithParams:(MTRGroupsClusterViewGroupParams *)params completion: (void (^)(MTRGroupsClusterViewGroupResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeGroupsID, (unsigned int) MTRCommandIDTypeClusterGroupsCommandViewGroupID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -350,14 +377,14 @@ - (void)viewGroupWithParams:(MTRGroupsClusterViewGroupParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Groups ViewGroup dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRGroupsClusterViewGroupResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("Groups ViewGroup completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -376,7 +403,7 @@ - (void)viewGroupWithParams:(MTRGroupsClusterViewGroupParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Groups ViewGroup enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -395,6 +422,9 @@ - (void)getGroupMembershipWithParams:(MTRGroupsClusterGetGroupMembershipParams * completion:(void (^)(MTRGroupsClusterGetGroupMembershipResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeGroupsID, (unsigned int) MTRCommandIDTypeClusterGroupsCommandGetGroupMembershipID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -403,14 +433,14 @@ - (void)getGroupMembershipWithParams:(MTRGroupsClusterGetGroupMembershipParams * } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Groups GetGroupMembership dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRGroupsClusterGetGroupMembershipResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("Groups GetGroupMembership completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -451,7 +481,7 @@ - (void)getGroupMembershipWithParams:(MTRGroupsClusterGetGroupMembershipParams * std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Groups GetGroupMembership enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -470,6 +500,9 @@ - (void)removeGroupWithParams:(MTRGroupsClusterRemoveGroupParams *)params completion: (void (^)(MTRGroupsClusterRemoveGroupResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeGroupsID, (unsigned int) MTRCommandIDTypeClusterGroupsCommandRemoveGroupID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -478,14 +511,14 @@ - (void)removeGroupWithParams:(MTRGroupsClusterRemoveGroupParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Groups RemoveGroup dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRGroupsClusterRemoveGroupResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("Groups RemoveGroup completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -505,7 +538,7 @@ - (void)removeGroupWithParams:(MTRGroupsClusterRemoveGroupParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Groups RemoveGroup enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -532,6 +565,9 @@ - (void)removeAllGroupsWithParams:(MTRGroupsClusterRemoveAllGroupsParams * _Null expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeGroupsID, (unsigned int) MTRCommandIDTypeClusterGroupsCommandRemoveAllGroupsID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -540,14 +576,14 @@ - (void)removeAllGroupsWithParams:(MTRGroupsClusterRemoveAllGroupsParams * _Null } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Groups RemoveAllGroups dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("Groups RemoveAllGroups completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -565,7 +601,7 @@ - (void)removeAllGroupsWithParams:(MTRGroupsClusterRemoveAllGroupsParams * _Null std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Groups RemoveAllGroups enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -583,6 +619,9 @@ - (void)addGroupIfIdentifyingWithParams:(MTRGroupsClusterAddGroupIfIdentifyingPa expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeGroupsID, + (unsigned int) MTRCommandIDTypeClusterGroupsCommandAddGroupIfIdentifyingID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -591,14 +630,14 @@ - (void)addGroupIfIdentifyingWithParams:(MTRGroupsClusterAddGroupIfIdentifyingPa } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Groups AddGroupIfIdentifying dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("Groups AddGroupIfIdentifying completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -618,7 +657,7 @@ - (void)addGroupIfIdentifyingWithParams:(MTRGroupsClusterAddGroupIfIdentifyingPa std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Groups AddGroupIfIdentifying enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -796,6 +835,9 @@ - (void)addSceneWithParams:(MTRScenesClusterAddSceneParams *)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(void (^)(MTRScenesClusterAddSceneResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeScenesID, (unsigned int) MTRCommandIDTypeClusterScenesCommandAddSceneID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -804,14 +846,14 @@ - (void)addSceneWithParams:(MTRScenesClusterAddSceneParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Scenes AddScene dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRScenesClusterAddSceneResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("Scenes AddScene completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, ScenesClusterAddSceneResponseCallbackType successCb, @@ -907,7 +949,7 @@ - (void)addSceneWithParams:(MTRScenesClusterAddSceneParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Scenes AddScene enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -926,6 +968,9 @@ - (void)viewSceneWithParams:(MTRScenesClusterViewSceneParams *)params completion: (void (^)(MTRScenesClusterViewSceneResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeScenesID, (unsigned int) MTRCommandIDTypeClusterScenesCommandViewSceneID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -934,14 +979,14 @@ - (void)viewSceneWithParams:(MTRScenesClusterViewSceneParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Scenes ViewScene dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRScenesClusterViewSceneResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("Scenes ViewScene completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -961,7 +1006,7 @@ - (void)viewSceneWithParams:(MTRScenesClusterViewSceneParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Scenes ViewScene enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -980,6 +1025,9 @@ - (void)removeSceneWithParams:(MTRScenesClusterRemoveSceneParams *)params completion: (void (^)(MTRScenesClusterRemoveSceneResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeScenesID, (unsigned int) MTRCommandIDTypeClusterScenesCommandRemoveSceneID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -988,14 +1036,14 @@ - (void)removeSceneWithParams:(MTRScenesClusterRemoveSceneParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Scenes RemoveScene dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRScenesClusterRemoveSceneResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("Scenes RemoveScene completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -1016,7 +1064,7 @@ - (void)removeSceneWithParams:(MTRScenesClusterRemoveSceneParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Scenes RemoveScene enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -1035,6 +1083,9 @@ - (void)removeAllScenesWithParams:(MTRScenesClusterRemoveAllScenesParams *)param completion:(void (^)(MTRScenesClusterRemoveAllScenesResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeScenesID, (unsigned int) MTRCommandIDTypeClusterScenesCommandRemoveAllScenesID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -1043,14 +1094,14 @@ - (void)removeAllScenesWithParams:(MTRScenesClusterRemoveAllScenesParams *)param } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Scenes RemoveAllScenes dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRScenesClusterRemoveAllScenesResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("Scenes RemoveAllScenes completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -1070,7 +1121,7 @@ - (void)removeAllScenesWithParams:(MTRScenesClusterRemoveAllScenesParams *)param std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Scenes RemoveAllScenes enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -1089,6 +1140,9 @@ - (void)storeSceneWithParams:(MTRScenesClusterStoreSceneParams *)params completion: (void (^)(MTRScenesClusterStoreSceneResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeScenesID, (unsigned int) MTRCommandIDTypeClusterScenesCommandStoreSceneID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -1097,14 +1151,14 @@ - (void)storeSceneWithParams:(MTRScenesClusterStoreSceneParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Scenes StoreScene dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRScenesClusterStoreSceneResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("Scenes StoreScene completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -1124,7 +1178,7 @@ - (void)storeSceneWithParams:(MTRScenesClusterStoreSceneParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Scenes StoreScene enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -1142,6 +1196,9 @@ - (void)recallSceneWithParams:(MTRScenesClusterRecallSceneParams *)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeScenesID, (unsigned int) MTRCommandIDTypeClusterScenesCommandRecallSceneID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -1150,14 +1207,14 @@ - (void)recallSceneWithParams:(MTRScenesClusterRecallSceneParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Scenes RecallScene dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("Scenes RecallScene completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -1186,7 +1243,7 @@ - (void)recallSceneWithParams:(MTRScenesClusterRecallSceneParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Scenes RecallScene enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -1205,6 +1262,9 @@ - (void)getSceneMembershipWithParams:(MTRScenesClusterGetSceneMembershipParams * completion:(void (^)(MTRScenesClusterGetSceneMembershipResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeScenesID, (unsigned int) MTRCommandIDTypeClusterScenesCommandGetSceneMembershipID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -1213,14 +1273,14 @@ - (void)getSceneMembershipWithParams:(MTRScenesClusterGetSceneMembershipParams * } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Scenes GetSceneMembership dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRScenesClusterGetSceneMembershipResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("Scenes GetSceneMembership completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -1240,7 +1300,7 @@ - (void)getSceneMembershipWithParams:(MTRScenesClusterGetSceneMembershipParams * std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Scenes GetSceneMembership enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -1259,6 +1319,9 @@ - (void)enhancedAddSceneWithParams:(MTRScenesClusterEnhancedAddSceneParams *)par completion:(void (^)(MTRScenesClusterEnhancedAddSceneResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeScenesID, (unsigned int) MTRCommandIDTypeClusterScenesCommandEnhancedAddSceneID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -1267,14 +1330,14 @@ - (void)enhancedAddSceneWithParams:(MTRScenesClusterEnhancedAddSceneParams *)par } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Scenes EnhancedAddScene dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRScenesClusterEnhancedAddSceneResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("Scenes EnhancedAddScene completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -1371,7 +1434,7 @@ - (void)enhancedAddSceneWithParams:(MTRScenesClusterEnhancedAddSceneParams *)par std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Scenes EnhancedAddScene enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -1390,6 +1453,9 @@ - (void)enhancedViewSceneWithParams:(MTRScenesClusterEnhancedViewSceneParams *)p completion:(void (^)(MTRScenesClusterEnhancedViewSceneResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeScenesID, (unsigned int) MTRCommandIDTypeClusterScenesCommandEnhancedViewSceneID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -1398,14 +1464,14 @@ - (void)enhancedViewSceneWithParams:(MTRScenesClusterEnhancedViewSceneParams *)p } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Scenes EnhancedViewScene dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRScenesClusterEnhancedViewSceneResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("Scenes EnhancedViewScene completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -1426,7 +1492,7 @@ - (void)enhancedViewSceneWithParams:(MTRScenesClusterEnhancedViewSceneParams *)p std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Scenes EnhancedViewScene enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -1445,6 +1511,9 @@ - (void)copySceneWithParams:(MTRScenesClusterCopySceneParams *)params completion: (void (^)(MTRScenesClusterCopySceneResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeScenesID, (unsigned int) MTRCommandIDTypeClusterScenesCommandCopySceneID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -1453,14 +1522,14 @@ - (void)copySceneWithParams:(MTRScenesClusterCopySceneParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Scenes CopyScene dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRScenesClusterCopySceneResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("Scenes CopyScene completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -1483,7 +1552,7 @@ - (void)copySceneWithParams:(MTRScenesClusterCopySceneParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Scenes CopyScene enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -1759,6 +1828,9 @@ - (void)offWithParams:(MTROnOffClusterOffParams * _Nullable)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeOnOffID, (unsigned int) MTRCommandIDTypeClusterOnOffCommandOffID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -1767,14 +1839,14 @@ - (void)offWithParams:(MTROnOffClusterOffParams * _Nullable)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("OnOff Off dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("OnOff Off completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -1792,7 +1864,7 @@ - (void)offWithParams:(MTROnOffClusterOffParams * _Nullable)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("OnOff Off enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -1816,6 +1888,9 @@ - (void)onWithParams:(MTROnOffClusterOnParams * _Nullable)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeOnOffID, (unsigned int) MTRCommandIDTypeClusterOnOffCommandOnID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -1824,14 +1899,14 @@ - (void)onWithParams:(MTROnOffClusterOnParams * _Nullable)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("OnOff On dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("OnOff On completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -1849,7 +1924,7 @@ - (void)onWithParams:(MTROnOffClusterOnParams * _Nullable)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("OnOff On enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -1873,6 +1948,9 @@ - (void)toggleWithParams:(MTROnOffClusterToggleParams * _Nullable)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeOnOffID, (unsigned int) MTRCommandIDTypeClusterOnOffCommandToggleID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -1881,14 +1959,14 @@ - (void)toggleWithParams:(MTROnOffClusterToggleParams * _Nullable)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("OnOff Toggle dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("OnOff Toggle completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -1906,7 +1984,7 @@ - (void)toggleWithParams:(MTROnOffClusterToggleParams * _Nullable)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("OnOff Toggle enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -1924,6 +2002,9 @@ - (void)offWithEffectWithParams:(MTROnOffClusterOffWithEffectParams *)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeOnOffID, (unsigned int) MTRCommandIDTypeClusterOnOffCommandOffWithEffectID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -1932,14 +2013,14 @@ - (void)offWithEffectWithParams:(MTROnOffClusterOffWithEffectParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("OnOff OffWithEffect dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("OnOff OffWithEffect completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -1961,7 +2042,7 @@ - (void)offWithEffectWithParams:(MTROnOffClusterOffWithEffectParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("OnOff OffWithEffect enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -1988,6 +2069,9 @@ - (void)onWithRecallGlobalSceneWithParams:(MTROnOffClusterOnWithRecallGlobalScen expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeOnOffID, + (unsigned int) MTRCommandIDTypeClusterOnOffCommandOnWithRecallGlobalSceneID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -1996,14 +2080,14 @@ - (void)onWithRecallGlobalSceneWithParams:(MTROnOffClusterOnWithRecallGlobalScen } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("OnOff OnWithRecallGlobalScene dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("OnOff OnWithRecallGlobalScene completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -2021,7 +2105,7 @@ - (void)onWithRecallGlobalSceneWithParams:(MTROnOffClusterOnWithRecallGlobalScen std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("OnOff OnWithRecallGlobalScene enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -2039,6 +2123,9 @@ - (void)onWithTimedOffWithParams:(MTROnOffClusterOnWithTimedOffParams *)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeOnOffID, (unsigned int) MTRCommandIDTypeClusterOnOffCommandOnWithTimedOffID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -2047,14 +2134,14 @@ - (void)onWithTimedOffWithParams:(MTROnOffClusterOnWithTimedOffParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("OnOff OnWithTimedOff dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("OnOff OnWithTimedOff completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -2076,7 +2163,7 @@ - (void)onWithTimedOffWithParams:(MTROnOffClusterOnWithTimedOffParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("OnOff OnWithTimedOff enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -2456,6 +2543,9 @@ - (void)moveToLevelWithParams:(MTRLevelControlClusterMoveToLevelParams *)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeLevelControlID, + (unsigned int) MTRCommandIDTypeClusterLevelControlCommandMoveToLevelID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -2464,14 +2554,14 @@ - (void)moveToLevelWithParams:(MTRLevelControlClusterMoveToLevelParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("LevelControl MoveToLevel dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("LevelControl MoveToLevel completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -2500,7 +2590,7 @@ - (void)moveToLevelWithParams:(MTRLevelControlClusterMoveToLevelParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("LevelControl MoveToLevel enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -2518,6 +2608,9 @@ - (void)moveWithParams:(MTRLevelControlClusterMoveParams *)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeLevelControlID, (unsigned int) MTRCommandIDTypeClusterLevelControlCommandMoveID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -2526,14 +2619,14 @@ - (void)moveWithParams:(MTRLevelControlClusterMoveParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("LevelControl Move dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("LevelControl Move completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -2563,7 +2656,7 @@ - (void)moveWithParams:(MTRLevelControlClusterMoveParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("LevelControl Move enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -2581,6 +2674,9 @@ - (void)stepWithParams:(MTRLevelControlClusterStepParams *)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeLevelControlID, (unsigned int) MTRCommandIDTypeClusterLevelControlCommandStepID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -2589,14 +2685,14 @@ - (void)stepWithParams:(MTRLevelControlClusterStepParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("LevelControl Step dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("LevelControl Step completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -2627,7 +2723,7 @@ - (void)stepWithParams:(MTRLevelControlClusterStepParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("LevelControl Step enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -2645,6 +2741,9 @@ - (void)stopWithParams:(MTRLevelControlClusterStopParams *)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeLevelControlID, (unsigned int) MTRCommandIDTypeClusterLevelControlCommandStopID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -2653,14 +2752,14 @@ - (void)stopWithParams:(MTRLevelControlClusterStopParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("LevelControl Stop dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("LevelControl Stop completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -2682,7 +2781,7 @@ - (void)stopWithParams:(MTRLevelControlClusterStopParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("LevelControl Stop enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -2700,6 +2799,9 @@ - (void)moveToLevelWithOnOffWithParams:(MTRLevelControlClusterMoveToLevelWithOnO expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeLevelControlID, + (unsigned int) MTRCommandIDTypeClusterLevelControlCommandMoveToLevelWithOnOffID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -2708,14 +2810,14 @@ - (void)moveToLevelWithOnOffWithParams:(MTRLevelControlClusterMoveToLevelWithOnO } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("LevelControl MoveToLevelWithOnOff dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("LevelControl MoveToLevelWithOnOff completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -2744,7 +2846,7 @@ - (void)moveToLevelWithOnOffWithParams:(MTRLevelControlClusterMoveToLevelWithOnO std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("LevelControl MoveToLevelWithOnOff enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -2762,6 +2864,9 @@ - (void)moveWithOnOffWithParams:(MTRLevelControlClusterMoveWithOnOffParams *)par expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeLevelControlID, + (unsigned int) MTRCommandIDTypeClusterLevelControlCommandMoveWithOnOffID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -2770,14 +2875,14 @@ - (void)moveWithOnOffWithParams:(MTRLevelControlClusterMoveWithOnOffParams *)par } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("LevelControl MoveWithOnOff dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("LevelControl MoveWithOnOff completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -2807,7 +2912,7 @@ - (void)moveWithOnOffWithParams:(MTRLevelControlClusterMoveWithOnOffParams *)par std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("LevelControl MoveWithOnOff enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -2825,6 +2930,9 @@ - (void)stepWithOnOffWithParams:(MTRLevelControlClusterStepWithOnOffParams *)par expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeLevelControlID, + (unsigned int) MTRCommandIDTypeClusterLevelControlCommandStepWithOnOffID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -2833,14 +2941,14 @@ - (void)stepWithOnOffWithParams:(MTRLevelControlClusterStepWithOnOffParams *)par } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("LevelControl StepWithOnOff dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("LevelControl StepWithOnOff completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -2871,7 +2979,7 @@ - (void)stepWithOnOffWithParams:(MTRLevelControlClusterStepWithOnOffParams *)par std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("LevelControl StepWithOnOff enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -2889,6 +2997,9 @@ - (void)stopWithOnOffWithParams:(MTRLevelControlClusterStopWithOnOffParams *)par expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeLevelControlID, + (unsigned int) MTRCommandIDTypeClusterLevelControlCommandStopWithOnOffID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -2897,14 +3008,14 @@ - (void)stopWithOnOffWithParams:(MTRLevelControlClusterStopWithOnOffParams *)par } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("LevelControl StopWithOnOff dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("LevelControl StopWithOnOff completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -2926,7 +3037,7 @@ - (void)stopWithOnOffWithParams:(MTRLevelControlClusterStopWithOnOffParams *)par std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("LevelControl StopWithOnOff enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -2944,6 +3055,9 @@ - (void)moveToClosestFrequencyWithParams:(MTRLevelControlClusterMoveToClosestFre expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeLevelControlID, + (unsigned int) MTRCommandIDTypeClusterLevelControlCommandMoveToClosestFrequencyID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -2952,14 +3066,14 @@ - (void)moveToClosestFrequencyWithParams:(MTRLevelControlClusterMoveToClosestFre } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("LevelControl MoveToClosestFrequency dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("LevelControl MoveToClosestFrequency completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -2978,7 +3092,7 @@ - (void)moveToClosestFrequencyWithParams:(MTRLevelControlClusterMoveToClosestFre std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("LevelControl MoveToClosestFrequency enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -4005,6 +4119,9 @@ - (void)instantActionWithParams:(MTRActionsClusterInstantActionParams *)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeActionsID, (unsigned int) MTRCommandIDTypeClusterActionsCommandInstantActionID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -4013,14 +4130,14 @@ - (void)instantActionWithParams:(MTRActionsClusterInstantActionParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Actions InstantAction dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("Actions InstantAction completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -4043,7 +4160,7 @@ - (void)instantActionWithParams:(MTRActionsClusterInstantActionParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Actions InstantAction enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -4061,6 +4178,9 @@ - (void)instantActionWithTransitionWithParams:(MTRActionsClusterInstantActionWit expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeActionsID, + (unsigned int) MTRCommandIDTypeClusterActionsCommandInstantActionWithTransitionID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -4069,14 +4189,14 @@ - (void)instantActionWithTransitionWithParams:(MTRActionsClusterInstantActionWit } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Actions InstantActionWithTransition dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("Actions InstantActionWithTransition completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -4100,7 +4220,7 @@ - (void)instantActionWithTransitionWithParams:(MTRActionsClusterInstantActionWit std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Actions InstantActionWithTransition enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -4118,6 +4238,9 @@ - (void)startActionWithParams:(MTRActionsClusterStartActionParams *)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeActionsID, (unsigned int) MTRCommandIDTypeClusterActionsCommandStartActionID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -4126,14 +4249,14 @@ - (void)startActionWithParams:(MTRActionsClusterStartActionParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Actions StartAction dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("Actions StartAction completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -4156,7 +4279,7 @@ - (void)startActionWithParams:(MTRActionsClusterStartActionParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Actions StartAction enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -4174,6 +4297,9 @@ - (void)startActionWithDurationWithParams:(MTRActionsClusterStartActionWithDurat expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeActionsID, + (unsigned int) MTRCommandIDTypeClusterActionsCommandStartActionWithDurationID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -4182,14 +4308,14 @@ - (void)startActionWithDurationWithParams:(MTRActionsClusterStartActionWithDurat } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Actions StartActionWithDuration dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("Actions StartActionWithDuration completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -4213,7 +4339,7 @@ - (void)startActionWithDurationWithParams:(MTRActionsClusterStartActionWithDurat std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Actions StartActionWithDuration enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -4231,6 +4357,9 @@ - (void)stopActionWithParams:(MTRActionsClusterStopActionParams *)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeActionsID, (unsigned int) MTRCommandIDTypeClusterActionsCommandStopActionID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -4239,14 +4368,14 @@ - (void)stopActionWithParams:(MTRActionsClusterStopActionParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Actions StopAction dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("Actions StopAction completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -4269,7 +4398,7 @@ - (void)stopActionWithParams:(MTRActionsClusterStopActionParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Actions StopAction enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -4287,6 +4416,9 @@ - (void)pauseActionWithParams:(MTRActionsClusterPauseActionParams *)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeActionsID, (unsigned int) MTRCommandIDTypeClusterActionsCommandPauseActionID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -4295,14 +4427,14 @@ - (void)pauseActionWithParams:(MTRActionsClusterPauseActionParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Actions PauseAction dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("Actions PauseAction completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -4325,7 +4457,7 @@ - (void)pauseActionWithParams:(MTRActionsClusterPauseActionParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Actions PauseAction enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -4343,6 +4475,9 @@ - (void)pauseActionWithDurationWithParams:(MTRActionsClusterPauseActionWithDurat expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeActionsID, + (unsigned int) MTRCommandIDTypeClusterActionsCommandPauseActionWithDurationID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -4351,14 +4486,14 @@ - (void)pauseActionWithDurationWithParams:(MTRActionsClusterPauseActionWithDurat } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Actions PauseActionWithDuration dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("Actions PauseActionWithDuration completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -4382,7 +4517,7 @@ - (void)pauseActionWithDurationWithParams:(MTRActionsClusterPauseActionWithDurat std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Actions PauseActionWithDuration enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -4400,6 +4535,9 @@ - (void)resumeActionWithParams:(MTRActionsClusterResumeActionParams *)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeActionsID, (unsigned int) MTRCommandIDTypeClusterActionsCommandResumeActionID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -4408,14 +4546,14 @@ - (void)resumeActionWithParams:(MTRActionsClusterResumeActionParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Actions ResumeAction dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("Actions ResumeAction completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -4438,7 +4576,7 @@ - (void)resumeActionWithParams:(MTRActionsClusterResumeActionParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Actions ResumeAction enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -4456,6 +4594,9 @@ - (void)enableActionWithParams:(MTRActionsClusterEnableActionParams *)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeActionsID, (unsigned int) MTRCommandIDTypeClusterActionsCommandEnableActionID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -4464,14 +4605,14 @@ - (void)enableActionWithParams:(MTRActionsClusterEnableActionParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Actions EnableAction dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("Actions EnableAction completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -4494,7 +4635,7 @@ - (void)enableActionWithParams:(MTRActionsClusterEnableActionParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Actions EnableAction enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -4512,6 +4653,9 @@ - (void)enableActionWithDurationWithParams:(MTRActionsClusterEnableActionWithDur expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeActionsID, + (unsigned int) MTRCommandIDTypeClusterActionsCommandEnableActionWithDurationID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -4520,14 +4664,14 @@ - (void)enableActionWithDurationWithParams:(MTRActionsClusterEnableActionWithDur } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Actions EnableActionWithDuration dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("Actions EnableActionWithDuration completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -4551,7 +4695,7 @@ - (void)enableActionWithDurationWithParams:(MTRActionsClusterEnableActionWithDur std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Actions EnableActionWithDuration enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -4569,6 +4713,9 @@ - (void)disableActionWithParams:(MTRActionsClusterDisableActionParams *)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeActionsID, (unsigned int) MTRCommandIDTypeClusterActionsCommandDisableActionID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -4577,14 +4724,14 @@ - (void)disableActionWithParams:(MTRActionsClusterDisableActionParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Actions DisableAction dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("Actions DisableAction completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -4607,7 +4754,7 @@ - (void)disableActionWithParams:(MTRActionsClusterDisableActionParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Actions DisableAction enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -4625,6 +4772,9 @@ - (void)disableActionWithDurationWithParams:(MTRActionsClusterDisableActionWithD expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeActionsID, + (unsigned int) MTRCommandIDTypeClusterActionsCommandDisableActionWithDurationID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -4633,14 +4783,14 @@ - (void)disableActionWithDurationWithParams:(MTRActionsClusterDisableActionWithD } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Actions DisableActionWithDuration dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("Actions DisableActionWithDuration completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -4664,7 +4814,7 @@ - (void)disableActionWithDurationWithParams:(MTRActionsClusterDisableActionWithD std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Actions DisableActionWithDuration enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -4901,6 +5051,9 @@ - (void)mfgSpecificPingWithParams:(MTRBasicClusterMfgSpecificPingParams * _Nulla expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeBasicID, (unsigned int) MTRCommandIDTypeClusterBasicCommandMfgSpecificPingID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -4909,14 +5062,14 @@ - (void)mfgSpecificPingWithParams:(MTRBasicClusterMfgSpecificPingParams * _Nulla } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Basic MfgSpecificPing dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("Basic MfgSpecificPing completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -4934,7 +5087,7 @@ - (void)mfgSpecificPingWithParams:(MTRBasicClusterMfgSpecificPingParams * _Nulla std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Basic MfgSpecificPing enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -5255,6 +5408,9 @@ - (void)queryImageWithParams:(MTROTASoftwareUpdateProviderClusterQueryImageParam completion:(void (^)(MTROTASoftwareUpdateProviderClusterQueryImageResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeOTASoftwareUpdateProviderID, + (unsigned int) MTRCommandIDTypeClusterOTASoftwareUpdateProviderCommandQueryImageID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -5263,14 +5419,14 @@ - (void)queryImageWithParams:(MTROTASoftwareUpdateProviderClusterQueryImageParam } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("OtaSoftwareUpdateProvider QueryImage dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTROTASoftwareUpdateProviderClusterQueryImageResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("OtaSoftwareUpdateProvider QueryImage completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -5332,7 +5488,7 @@ - (void)queryImageWithParams:(MTROTASoftwareUpdateProviderClusterQueryImageParam std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("OtaSoftwareUpdateProvider QueryImage enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -5351,6 +5507,9 @@ - (void)applyUpdateRequestWithParams:(MTROTASoftwareUpdateProviderClusterApplyUp completion:(void (^)(MTROTASoftwareUpdateProviderClusterApplyUpdateResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeOTASoftwareUpdateProviderID, + (unsigned int) MTRCommandIDTypeClusterOTASoftwareUpdateProviderCommandApplyUpdateRequestID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -5359,14 +5518,14 @@ - (void)applyUpdateRequestWithParams:(MTROTASoftwareUpdateProviderClusterApplyUp } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("OtaSoftwareUpdateProvider ApplyUpdateRequest dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTROTASoftwareUpdateProviderClusterApplyUpdateResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("OtaSoftwareUpdateProvider ApplyUpdateRequest completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -5387,7 +5546,7 @@ - (void)applyUpdateRequestWithParams:(MTROTASoftwareUpdateProviderClusterApplyUp std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("OtaSoftwareUpdateProvider ApplyUpdateRequest enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -5405,6 +5564,9 @@ - (void)notifyUpdateAppliedWithParams:(MTROTASoftwareUpdateProviderClusterNotify expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeOTASoftwareUpdateProviderID, + (unsigned int) MTRCommandIDTypeClusterOTASoftwareUpdateProviderCommandNotifyUpdateAppliedID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -5413,14 +5575,14 @@ - (void)notifyUpdateAppliedWithParams:(MTROTASoftwareUpdateProviderClusterNotify } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("OtaSoftwareUpdateProvider NotifyUpdateApplied dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("OtaSoftwareUpdateProvider NotifyUpdateApplied completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -5440,7 +5602,7 @@ - (void)notifyUpdateAppliedWithParams:(MTROTASoftwareUpdateProviderClusterNotify std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("OtaSoftwareUpdateProvider NotifyUpdateApplied enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -5570,6 +5732,9 @@ - (void)announceOtaProviderWithParams:(MTROTASoftwareUpdateRequestorClusterAnnou expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeOTASoftwareUpdateRequestorID, + (unsigned int) MTRCommandIDTypeClusterOTASoftwareUpdateRequestorCommandAnnounceOtaProviderID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -5578,14 +5743,14 @@ - (void)announceOtaProviderWithParams:(MTROTASoftwareUpdateRequestorClusterAnnou } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("OtaSoftwareUpdateRequestor AnnounceOtaProvider dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("OtaSoftwareUpdateRequestor AnnounceOtaProvider completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -5613,7 +5778,7 @@ - (void)announceOtaProviderWithParams:(MTROTASoftwareUpdateRequestorClusterAnnou std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("OtaSoftwareUpdateRequestor AnnounceOtaProvider enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -6482,6 +6647,9 @@ - (void)armFailSafeWithParams:(MTRGeneralCommissioningClusterArmFailSafeParams * completion:(void (^)(MTRGeneralCommissioningClusterArmFailSafeResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeGeneralCommissioningID, + (unsigned int) MTRCommandIDTypeClusterGeneralCommissioningCommandArmFailSafeID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -6490,14 +6658,14 @@ - (void)armFailSafeWithParams:(MTRGeneralCommissioningClusterArmFailSafeParams * } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("GeneralCommissioning ArmFailSafe dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRGeneralCommissioningClusterArmFailSafeResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("GeneralCommissioning ArmFailSafe completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -6518,7 +6686,7 @@ - (void)armFailSafeWithParams:(MTRGeneralCommissioningClusterArmFailSafeParams * std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("GeneralCommissioning ArmFailSafe enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -6537,6 +6705,9 @@ - (void)setRegulatoryConfigWithParams:(MTRGeneralCommissioningClusterSetRegulato completion:(void (^)(MTRGeneralCommissioningClusterSetRegulatoryConfigResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeGeneralCommissioningID, + (unsigned int) MTRCommandIDTypeClusterGeneralCommissioningCommandSetRegulatoryConfigID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -6545,14 +6716,14 @@ - (void)setRegulatoryConfigWithParams:(MTRGeneralCommissioningClusterSetRegulato } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("GeneralCommissioning SetRegulatoryConfig dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRGeneralCommissioningClusterSetRegulatoryConfigResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("GeneralCommissioning SetRegulatoryConfig completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -6575,7 +6746,7 @@ - (void)setRegulatoryConfigWithParams:(MTRGeneralCommissioningClusterSetRegulato std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("GeneralCommissioning SetRegulatoryConfig enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -6607,6 +6778,9 @@ - (void)commissioningCompleteWithParams:(MTRGeneralCommissioningClusterCommissio (void (^)(MTRGeneralCommissioningClusterCommissioningCompleteResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeGeneralCommissioningID, + (unsigned int) MTRCommandIDTypeClusterGeneralCommissioningCommandCommissioningCompleteID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -6615,14 +6789,14 @@ - (void)commissioningCompleteWithParams:(MTRGeneralCommissioningClusterCommissio } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("GeneralCommissioning CommissioningComplete dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRGeneralCommissioningClusterCommissioningCompleteResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("GeneralCommissioning CommissioningComplete completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -6641,7 +6815,7 @@ - (void)commissioningCompleteWithParams:(MTRGeneralCommissioningClusterCommissio std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("GeneralCommissioning CommissioningComplete enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -6847,6 +7021,9 @@ - (void)scanNetworksWithParams:(MTRNetworkCommissioningClusterScanNetworksParams completion:(void (^)(MTRNetworkCommissioningClusterScanNetworksResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeNetworkCommissioningID, + (unsigned int) MTRCommandIDTypeClusterNetworkCommissioningCommandScanNetworksID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -6855,14 +7032,14 @@ - (void)scanNetworksWithParams:(MTRNetworkCommissioningClusterScanNetworksParams } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("NetworkCommissioning ScanNetworks dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRNetworkCommissioningClusterScanNetworksResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("NetworkCommissioning ScanNetworks completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -6896,7 +7073,7 @@ - (void)scanNetworksWithParams:(MTRNetworkCommissioningClusterScanNetworksParams std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("NetworkCommissioning ScanNetworks enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -6915,6 +7092,9 @@ - (void)addOrUpdateWiFiNetworkWithParams:(MTRNetworkCommissioningClusterAddOrUpd completion:(void (^)(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeNetworkCommissioningID, + (unsigned int) MTRCommandIDTypeClusterNetworkCommissioningCommandAddOrUpdateWiFiNetworkID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -6923,14 +7103,14 @@ - (void)addOrUpdateWiFiNetworkWithParams:(MTRNetworkCommissioningClusterAddOrUpd } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("NetworkCommissioning AddOrUpdateWiFiNetwork dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRNetworkCommissioningClusterNetworkConfigResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("NetworkCommissioning AddOrUpdateWiFiNetwork completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -6955,7 +7135,7 @@ - (void)addOrUpdateWiFiNetworkWithParams:(MTRNetworkCommissioningClusterAddOrUpd std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("NetworkCommissioning AddOrUpdateWiFiNetwork enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -6974,6 +7154,9 @@ - (void)addOrUpdateThreadNetworkWithParams:(MTRNetworkCommissioningClusterAddOrU completion:(void (^)(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeNetworkCommissioningID, + (unsigned int) MTRCommandIDTypeClusterNetworkCommissioningCommandAddOrUpdateThreadNetworkID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -6982,14 +7165,14 @@ - (void)addOrUpdateThreadNetworkWithParams:(MTRNetworkCommissioningClusterAddOrU } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("NetworkCommissioning AddOrUpdateThreadNetwork dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRNetworkCommissioningClusterNetworkConfigResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("NetworkCommissioning AddOrUpdateThreadNetwork completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -7013,7 +7196,7 @@ - (void)addOrUpdateThreadNetworkWithParams:(MTRNetworkCommissioningClusterAddOrU std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("NetworkCommissioning AddOrUpdateThreadNetwork enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -7032,6 +7215,9 @@ - (void)removeNetworkWithParams:(MTRNetworkCommissioningClusterRemoveNetworkPara completion:(void (^)(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeNetworkCommissioningID, + (unsigned int) MTRCommandIDTypeClusterNetworkCommissioningCommandRemoveNetworkID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -7040,14 +7226,14 @@ - (void)removeNetworkWithParams:(MTRNetworkCommissioningClusterRemoveNetworkPara } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("NetworkCommissioning RemoveNetwork dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRNetworkCommissioningClusterNetworkConfigResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("NetworkCommissioning RemoveNetwork completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -7071,7 +7257,7 @@ - (void)removeNetworkWithParams:(MTRNetworkCommissioningClusterRemoveNetworkPara std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("NetworkCommissioning RemoveNetwork enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -7090,6 +7276,9 @@ - (void)connectNetworkWithParams:(MTRNetworkCommissioningClusterConnectNetworkPa completion:(void (^)(MTRNetworkCommissioningClusterConnectNetworkResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeNetworkCommissioningID, + (unsigned int) MTRCommandIDTypeClusterNetworkCommissioningCommandConnectNetworkID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -7098,14 +7287,14 @@ - (void)connectNetworkWithParams:(MTRNetworkCommissioningClusterConnectNetworkPa } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("NetworkCommissioning ConnectNetwork dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRNetworkCommissioningClusterConnectNetworkResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("NetworkCommissioning ConnectNetwork completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -7129,7 +7318,7 @@ - (void)connectNetworkWithParams:(MTRNetworkCommissioningClusterConnectNetworkPa std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("NetworkCommissioning ConnectNetwork enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -7148,6 +7337,9 @@ - (void)reorderNetworkWithParams:(MTRNetworkCommissioningClusterReorderNetworkPa completion:(void (^)(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeNetworkCommissioningID, + (unsigned int) MTRCommandIDTypeClusterNetworkCommissioningCommandReorderNetworkID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -7156,14 +7348,14 @@ - (void)reorderNetworkWithParams:(MTRNetworkCommissioningClusterReorderNetworkPa } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("NetworkCommissioning ReorderNetwork dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRNetworkCommissioningClusterNetworkConfigResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("NetworkCommissioning ReorderNetwork completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -7188,7 +7380,7 @@ - (void)reorderNetworkWithParams:(MTRNetworkCommissioningClusterReorderNetworkPa std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("NetworkCommissioning ReorderNetwork enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -7450,6 +7642,9 @@ - (void)retrieveLogsRequestWithParams:(MTRDiagnosticLogsClusterRetrieveLogsReque completion:(void (^)(MTRDiagnosticLogsClusterRetrieveLogsResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeDiagnosticLogsID, + (unsigned int) MTRCommandIDTypeClusterDiagnosticLogsCommandRetrieveLogsRequestID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -7458,14 +7653,14 @@ - (void)retrieveLogsRequestWithParams:(MTRDiagnosticLogsClusterRetrieveLogsReque } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("DiagnosticLogs RetrieveLogsRequest dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRDiagnosticLogsClusterRetrieveLogsResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("DiagnosticLogs RetrieveLogsRequest completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -7488,7 +7683,7 @@ - (void)retrieveLogsRequestWithParams:(MTRDiagnosticLogsClusterRetrieveLogsReque std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("DiagnosticLogs RetrieveLogsRequest enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -7587,6 +7782,9 @@ - (void)testEventTriggerWithParams:(MTRGeneralDiagnosticsClusterTestEventTrigger expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeGeneralDiagnosticsID, + (unsigned int) MTRCommandIDTypeClusterGeneralDiagnosticsCommandTestEventTriggerID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -7595,14 +7793,14 @@ - (void)testEventTriggerWithParams:(MTRGeneralDiagnosticsClusterTestEventTrigger } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("GeneralDiagnostics TestEventTrigger dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("GeneralDiagnostics TestEventTrigger completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -7622,7 +7820,7 @@ - (void)testEventTriggerWithParams:(MTRGeneralDiagnosticsClusterTestEventTrigger std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("GeneralDiagnostics TestEventTrigger enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -7798,6 +7996,9 @@ - (void)resetWatermarksWithParams:(MTRSoftwareDiagnosticsClusterResetWatermarksP expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeSoftwareDiagnosticsID, + (unsigned int) MTRCommandIDTypeClusterSoftwareDiagnosticsCommandResetWatermarksID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -7806,14 +8007,14 @@ - (void)resetWatermarksWithParams:(MTRSoftwareDiagnosticsClusterResetWatermarksP } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("SoftwareDiagnostics ResetWatermarks dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("SoftwareDiagnostics ResetWatermarks completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -7831,7 +8032,7 @@ - (void)resetWatermarksWithParams:(MTRSoftwareDiagnosticsClusterResetWatermarksP std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("SoftwareDiagnostics ResetWatermarks enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -7976,6 +8177,9 @@ - (void)resetCountsWithParams:(MTRThreadNetworkDiagnosticsClusterResetCountsPara expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeThreadNetworkDiagnosticsID, + (unsigned int) MTRCommandIDTypeClusterThreadNetworkDiagnosticsCommandResetCountsID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -7984,14 +8188,14 @@ - (void)resetCountsWithParams:(MTRThreadNetworkDiagnosticsClusterResetCountsPara } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("ThreadNetworkDiagnostics ResetCounts dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("ThreadNetworkDiagnostics ResetCounts completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -8009,7 +8213,7 @@ - (void)resetCountsWithParams:(MTRThreadNetworkDiagnosticsClusterResetCountsPara std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("ThreadNetworkDiagnostics ResetCounts enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -8643,6 +8847,9 @@ - (void)resetCountsWithParams:(MTRWiFiNetworkDiagnosticsClusterResetCountsParams expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeWiFiNetworkDiagnosticsID, + (unsigned int) MTRCommandIDTypeClusterWiFiNetworkDiagnosticsCommandResetCountsID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -8651,14 +8858,14 @@ - (void)resetCountsWithParams:(MTRWiFiNetworkDiagnosticsClusterResetCountsParams } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("WiFiNetworkDiagnostics ResetCounts dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("WiFiNetworkDiagnostics ResetCounts completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -8676,7 +8883,7 @@ - (void)resetCountsWithParams:(MTRWiFiNetworkDiagnosticsClusterResetCountsParams std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("WiFiNetworkDiagnostics ResetCounts enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -8897,6 +9104,9 @@ - (void)resetCountsWithParams:(MTREthernetNetworkDiagnosticsClusterResetCountsPa expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeEthernetNetworkDiagnosticsID, + (unsigned int) MTRCommandIDTypeClusterEthernetNetworkDiagnosticsCommandResetCountsID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -8905,14 +9115,14 @@ - (void)resetCountsWithParams:(MTREthernetNetworkDiagnosticsClusterResetCountsPa } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("EthernetNetworkDiagnostics ResetCounts dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("EthernetNetworkDiagnostics ResetCounts completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -8930,7 +9140,7 @@ - (void)resetCountsWithParams:(MTREthernetNetworkDiagnosticsClusterResetCountsPa std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("EthernetNetworkDiagnostics ResetCounts enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -9402,6 +9612,10 @@ - (void)openCommissioningWindowWithParams:(MTRAdministratorCommissioningClusterO expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeAdministratorCommissioningID, + (unsigned int) MTRCommandIDTypeClusterAdministratorCommissioningCommandOpenCommissioningWindowID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -9410,15 +9624,14 @@ - (void)openCommissioningWindowWithParams:(MTRAdministratorCommissioningClusterO } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("AdministratorCommissioning OpenCommissioningWindow dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO( - "AdministratorCommissioning OpenCommissioningWindow completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -9444,7 +9657,7 @@ - (void)openCommissioningWindowWithParams:(MTRAdministratorCommissioningClusterO std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("AdministratorCommissioning OpenCommissioningWindow enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -9462,6 +9675,10 @@ - (void)openBasicCommissioningWindowWithParams:(MTRAdministratorCommissioningClu expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeAdministratorCommissioningID, + (unsigned int) MTRCommandIDTypeClusterAdministratorCommissioningCommandOpenBasicCommissioningWindowID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -9470,16 +9687,14 @@ - (void)openBasicCommissioningWindowWithParams:(MTRAdministratorCommissioningClu } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO( - "AdministratorCommissioning OpenBasicCommissioningWindow dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO( - "AdministratorCommissioning OpenBasicCommissioningWindow completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -9501,7 +9716,7 @@ - (void)openBasicCommissioningWindowWithParams:(MTRAdministratorCommissioningClu std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("AdministratorCommissioning OpenBasicCommissioningWindow enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -9528,6 +9743,9 @@ - (void)revokeCommissioningWithParams:(MTRAdministratorCommissioningClusterRevok expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeAdministratorCommissioningID, + (unsigned int) MTRCommandIDTypeClusterAdministratorCommissioningCommandRevokeCommissioningID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -9536,14 +9754,14 @@ - (void)revokeCommissioningWithParams:(MTRAdministratorCommissioningClusterRevok } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("AdministratorCommissioning RevokeCommissioning dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("AdministratorCommissioning RevokeCommissioning completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -9564,7 +9782,7 @@ - (void)revokeCommissioningWithParams:(MTRAdministratorCommissioningClusterRevok std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("AdministratorCommissioning RevokeCommissioning enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -9715,6 +9933,9 @@ - (void)attestationRequestWithParams:(MTROperationalCredentialsClusterAttestatio completion:(void (^)(MTROperationalCredentialsClusterAttestationResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeOperationalCredentialsID, + (unsigned int) MTRCommandIDTypeClusterOperationalCredentialsCommandAttestationRequestID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -9723,14 +9944,14 @@ - (void)attestationRequestWithParams:(MTROperationalCredentialsClusterAttestatio } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("OperationalCredentials AttestationRequest dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTROperationalCredentialsClusterAttestationResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("OperationalCredentials AttestationRequest completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -9750,7 +9971,7 @@ - (void)attestationRequestWithParams:(MTROperationalCredentialsClusterAttestatio std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("OperationalCredentials AttestationRequest enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -9769,6 +9990,9 @@ - (void)certificateChainRequestWithParams:(MTROperationalCredentialsClusterCerti completion:(void (^)(MTROperationalCredentialsClusterCertificateChainResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeOperationalCredentialsID, + (unsigned int) MTRCommandIDTypeClusterOperationalCredentialsCommandCertificateChainRequestID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -9777,14 +10001,14 @@ - (void)certificateChainRequestWithParams:(MTROperationalCredentialsClusterCerti } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("OperationalCredentials CertificateChainRequest dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTROperationalCredentialsClusterCertificateChainResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("OperationalCredentials CertificateChainRequest completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -9804,7 +10028,7 @@ - (void)certificateChainRequestWithParams:(MTROperationalCredentialsClusterCerti std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("OperationalCredentials CertificateChainRequest enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -9823,6 +10047,9 @@ - (void)CSRRequestWithParams:(MTROperationalCredentialsClusterCSRRequestParams * completion:(void (^)(MTROperationalCredentialsClusterCSRResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeOperationalCredentialsID, + (unsigned int) MTRCommandIDTypeClusterOperationalCredentialsCommandCSRRequestID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -9831,14 +10058,14 @@ - (void)CSRRequestWithParams:(MTROperationalCredentialsClusterCSRRequestParams * } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("OperationalCredentials CSRRequest dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTROperationalCredentialsClusterCSRResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("OperationalCredentials CSRRequest completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -9862,7 +10089,7 @@ - (void)CSRRequestWithParams:(MTROperationalCredentialsClusterCSRRequestParams * std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("OperationalCredentials CSRRequest enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -9881,6 +10108,9 @@ - (void)addNOCWithParams:(MTROperationalCredentialsClusterAddNOCParams *)params completion:(void (^)(MTROperationalCredentialsClusterNOCResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeOperationalCredentialsID, + (unsigned int) MTRCommandIDTypeClusterOperationalCredentialsCommandAddNOCID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -9889,14 +10119,14 @@ - (void)addNOCWithParams:(MTROperationalCredentialsClusterAddNOCParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("OperationalCredentials AddNOC dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTROperationalCredentialsClusterNOCResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("OperationalCredentials AddNOC completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -9924,7 +10154,7 @@ - (void)addNOCWithParams:(MTROperationalCredentialsClusterAddNOCParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("OperationalCredentials AddNOC enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -9943,6 +10173,9 @@ - (void)updateNOCWithParams:(MTROperationalCredentialsClusterUpdateNOCParams *)p completion:(void (^)(MTROperationalCredentialsClusterNOCResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeOperationalCredentialsID, + (unsigned int) MTRCommandIDTypeClusterOperationalCredentialsCommandUpdateNOCID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -9951,14 +10184,14 @@ - (void)updateNOCWithParams:(MTROperationalCredentialsClusterUpdateNOCParams *)p } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("OperationalCredentials UpdateNOC dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTROperationalCredentialsClusterNOCResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("OperationalCredentials UpdateNOC completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -9982,7 +10215,7 @@ - (void)updateNOCWithParams:(MTROperationalCredentialsClusterUpdateNOCParams *)p std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("OperationalCredentials UpdateNOC enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -10001,6 +10234,9 @@ - (void)updateFabricLabelWithParams:(MTROperationalCredentialsClusterUpdateFabri completion:(void (^)(MTROperationalCredentialsClusterNOCResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeOperationalCredentialsID, + (unsigned int) MTRCommandIDTypeClusterOperationalCredentialsCommandUpdateFabricLabelID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -10009,14 +10245,14 @@ - (void)updateFabricLabelWithParams:(MTROperationalCredentialsClusterUpdateFabri } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("OperationalCredentials UpdateFabricLabel dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTROperationalCredentialsClusterNOCResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("OperationalCredentials UpdateFabricLabel completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -10036,7 +10272,7 @@ - (void)updateFabricLabelWithParams:(MTROperationalCredentialsClusterUpdateFabri std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("OperationalCredentials UpdateFabricLabel enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -10055,6 +10291,9 @@ - (void)removeFabricWithParams:(MTROperationalCredentialsClusterRemoveFabricPara completion:(void (^)(MTROperationalCredentialsClusterNOCResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeOperationalCredentialsID, + (unsigned int) MTRCommandIDTypeClusterOperationalCredentialsCommandRemoveFabricID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -10063,14 +10302,14 @@ - (void)removeFabricWithParams:(MTROperationalCredentialsClusterRemoveFabricPara } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("OperationalCredentials RemoveFabric dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTROperationalCredentialsClusterNOCResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("OperationalCredentials RemoveFabric completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -10090,7 +10329,7 @@ - (void)removeFabricWithParams:(MTROperationalCredentialsClusterRemoveFabricPara std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("OperationalCredentials RemoveFabric enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -10108,6 +10347,10 @@ - (void)addTrustedRootCertificateWithParams:(MTROperationalCredentialsClusterAdd expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeOperationalCredentialsID, + (unsigned int) MTRCommandIDTypeClusterOperationalCredentialsCommandAddTrustedRootCertificateID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -10116,14 +10359,14 @@ - (void)addTrustedRootCertificateWithParams:(MTROperationalCredentialsClusterAdd } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("OperationalCredentials AddTrustedRootCertificate dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("OperationalCredentials AddTrustedRootCertificate completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -10142,7 +10385,7 @@ - (void)addTrustedRootCertificateWithParams:(MTROperationalCredentialsClusterAdd std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("OperationalCredentials AddTrustedRootCertificate enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -10390,6 +10633,9 @@ - (void)keySetWriteWithParams:(MTRGroupKeyManagementClusterKeySetWriteParams *)p expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeGroupKeyManagementID, + (unsigned int) MTRCommandIDTypeClusterGroupKeyManagementCommandKeySetWriteID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -10398,14 +10644,14 @@ - (void)keySetWriteWithParams:(MTRGroupKeyManagementClusterKeySetWriteParams *)p } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("GroupKeyManagement KeySetWrite dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("GroupKeyManagement KeySetWrite completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -10463,7 +10709,7 @@ - (void)keySetWriteWithParams:(MTRGroupKeyManagementClusterKeySetWriteParams *)p std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("GroupKeyManagement KeySetWrite enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -10482,6 +10728,9 @@ - (void)keySetReadWithParams:(MTRGroupKeyManagementClusterKeySetReadParams *)par completion:(void (^)(MTRGroupKeyManagementClusterKeySetReadResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeGroupKeyManagementID, + (unsigned int) MTRCommandIDTypeClusterGroupKeyManagementCommandKeySetReadID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -10490,14 +10739,14 @@ - (void)keySetReadWithParams:(MTRGroupKeyManagementClusterKeySetReadParams *)par } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("GroupKeyManagement KeySetRead dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRGroupKeyManagementClusterKeySetReadResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("GroupKeyManagement KeySetRead completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -10517,7 +10766,7 @@ - (void)keySetReadWithParams:(MTRGroupKeyManagementClusterKeySetReadParams *)par std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("GroupKeyManagement KeySetRead enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -10535,6 +10784,9 @@ - (void)keySetRemoveWithParams:(MTRGroupKeyManagementClusterKeySetRemoveParams * expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeGroupKeyManagementID, + (unsigned int) MTRCommandIDTypeClusterGroupKeyManagementCommandKeySetRemoveID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -10543,14 +10795,14 @@ - (void)keySetRemoveWithParams:(MTRGroupKeyManagementClusterKeySetRemoveParams * } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("GroupKeyManagement KeySetRemove dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("GroupKeyManagement KeySetRemove completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -10569,7 +10821,7 @@ - (void)keySetRemoveWithParams:(MTRGroupKeyManagementClusterKeySetRemoveParams * std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("GroupKeyManagement KeySetRemove enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -10588,6 +10840,9 @@ - (void)keySetReadAllIndicesWithParams:(MTRGroupKeyManagementClusterKeySetReadAl completion:(void (^)(MTRGroupKeyManagementClusterKeySetReadAllIndicesResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeGroupKeyManagementID, + (unsigned int) MTRCommandIDTypeClusterGroupKeyManagementCommandKeySetReadAllIndicesID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -10596,14 +10851,14 @@ - (void)keySetReadAllIndicesWithParams:(MTRGroupKeyManagementClusterKeySetReadAl } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("GroupKeyManagement KeySetReadAllIndices dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRGroupKeyManagementClusterKeySetReadAllIndicesResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("GroupKeyManagement KeySetReadAllIndices completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -10644,7 +10899,7 @@ - (void)keySetReadAllIndicesWithParams:(MTRGroupKeyManagementClusterKeySetReadAl std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("GroupKeyManagement KeySetReadAllIndices enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -11070,6 +11325,9 @@ - (void)changeToModeWithParams:(MTRModeSelectClusterChangeToModeParams *)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeModeSelectID, + (unsigned int) MTRCommandIDTypeClusterModeSelectCommandChangeToModeID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -11078,14 +11336,14 @@ - (void)changeToModeWithParams:(MTRModeSelectClusterChangeToModeParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("ModeSelect ChangeToMode dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("ModeSelect ChangeToMode completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -11104,7 +11362,7 @@ - (void)changeToModeWithParams:(MTRModeSelectClusterChangeToModeParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("ModeSelect ChangeToMode enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -11284,6 +11542,9 @@ - (void)lockDoorWithParams:(MTRDoorLockClusterLockDoorParams * _Nullable)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeDoorLockID, (unsigned int) MTRCommandIDTypeClusterDoorLockCommandLockDoorID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -11292,14 +11553,14 @@ - (void)lockDoorWithParams:(MTRDoorLockClusterLockDoorParams * _Nullable)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("DoorLock LockDoor dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("DoorLock LockDoor completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -11326,7 +11587,7 @@ - (void)lockDoorWithParams:(MTRDoorLockClusterLockDoorParams * _Nullable)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("DoorLock LockDoor enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -11344,6 +11605,9 @@ - (void)unlockDoorWithParams:(MTRDoorLockClusterUnlockDoorParams * _Nullable)par expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeDoorLockID, (unsigned int) MTRCommandIDTypeClusterDoorLockCommandUnlockDoorID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -11352,14 +11616,14 @@ - (void)unlockDoorWithParams:(MTRDoorLockClusterUnlockDoorParams * _Nullable)par } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("DoorLock UnlockDoor dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("DoorLock UnlockDoor completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -11386,7 +11650,7 @@ - (void)unlockDoorWithParams:(MTRDoorLockClusterUnlockDoorParams * _Nullable)par std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("DoorLock UnlockDoor enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -11404,6 +11668,9 @@ - (void)unlockWithTimeoutWithParams:(MTRDoorLockClusterUnlockWithTimeoutParams * expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeDoorLockID, + (unsigned int) MTRCommandIDTypeClusterDoorLockCommandUnlockWithTimeoutID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -11412,14 +11679,14 @@ - (void)unlockWithTimeoutWithParams:(MTRDoorLockClusterUnlockWithTimeoutParams * } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("DoorLock UnlockWithTimeout dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("DoorLock UnlockWithTimeout completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -11445,7 +11712,7 @@ - (void)unlockWithTimeoutWithParams:(MTRDoorLockClusterUnlockWithTimeoutParams * std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("DoorLock UnlockWithTimeout enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -11463,6 +11730,9 @@ - (void)setWeekDayScheduleWithParams:(MTRDoorLockClusterSetWeekDayScheduleParams expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeDoorLockID, + (unsigned int) MTRCommandIDTypeClusterDoorLockCommandSetWeekDayScheduleID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -11471,14 +11741,14 @@ - (void)setWeekDayScheduleWithParams:(MTRDoorLockClusterSetWeekDayScheduleParams } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("DoorLock SetWeekDaySchedule dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("DoorLock SetWeekDaySchedule completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -11504,7 +11774,7 @@ - (void)setWeekDayScheduleWithParams:(MTRDoorLockClusterSetWeekDayScheduleParams std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("DoorLock SetWeekDaySchedule enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -11523,6 +11793,9 @@ - (void)getWeekDayScheduleWithParams:(MTRDoorLockClusterGetWeekDayScheduleParams completion:(void (^)(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeDoorLockID, + (unsigned int) MTRCommandIDTypeClusterDoorLockCommandGetWeekDayScheduleID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -11531,14 +11804,14 @@ - (void)getWeekDayScheduleWithParams:(MTRDoorLockClusterGetWeekDayScheduleParams } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("DoorLock GetWeekDaySchedule dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRDoorLockClusterGetWeekDayScheduleResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("DoorLock GetWeekDaySchedule completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -11559,7 +11832,7 @@ - (void)getWeekDayScheduleWithParams:(MTRDoorLockClusterGetWeekDayScheduleParams std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("DoorLock GetWeekDaySchedule enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -11577,6 +11850,9 @@ - (void)clearWeekDayScheduleWithParams:(MTRDoorLockClusterClearWeekDaySchedulePa expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeDoorLockID, + (unsigned int) MTRCommandIDTypeClusterDoorLockCommandClearWeekDayScheduleID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -11585,14 +11861,14 @@ - (void)clearWeekDayScheduleWithParams:(MTRDoorLockClusterClearWeekDaySchedulePa } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("DoorLock ClearWeekDaySchedule dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("DoorLock ClearWeekDaySchedule completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -11612,7 +11888,7 @@ - (void)clearWeekDayScheduleWithParams:(MTRDoorLockClusterClearWeekDaySchedulePa std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("DoorLock ClearWeekDaySchedule enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -11630,6 +11906,9 @@ - (void)setYearDayScheduleWithParams:(MTRDoorLockClusterSetYearDayScheduleParams expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeDoorLockID, + (unsigned int) MTRCommandIDTypeClusterDoorLockCommandSetYearDayScheduleID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -11638,14 +11917,14 @@ - (void)setYearDayScheduleWithParams:(MTRDoorLockClusterSetYearDayScheduleParams } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("DoorLock SetYearDaySchedule dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("DoorLock SetYearDaySchedule completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -11667,7 +11946,7 @@ - (void)setYearDayScheduleWithParams:(MTRDoorLockClusterSetYearDayScheduleParams std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("DoorLock SetYearDaySchedule enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -11686,6 +11965,9 @@ - (void)getYearDayScheduleWithParams:(MTRDoorLockClusterGetYearDayScheduleParams completion:(void (^)(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeDoorLockID, + (unsigned int) MTRCommandIDTypeClusterDoorLockCommandGetYearDayScheduleID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -11694,14 +11976,14 @@ - (void)getYearDayScheduleWithParams:(MTRDoorLockClusterGetYearDayScheduleParams } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("DoorLock GetYearDaySchedule dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRDoorLockClusterGetYearDayScheduleResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("DoorLock GetYearDaySchedule completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -11722,7 +12004,7 @@ - (void)getYearDayScheduleWithParams:(MTRDoorLockClusterGetYearDayScheduleParams std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("DoorLock GetYearDaySchedule enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -11740,6 +12022,9 @@ - (void)clearYearDayScheduleWithParams:(MTRDoorLockClusterClearYearDaySchedulePa expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeDoorLockID, + (unsigned int) MTRCommandIDTypeClusterDoorLockCommandClearYearDayScheduleID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -11748,14 +12033,14 @@ - (void)clearYearDayScheduleWithParams:(MTRDoorLockClusterClearYearDaySchedulePa } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("DoorLock ClearYearDaySchedule dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("DoorLock ClearYearDaySchedule completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -11775,7 +12060,7 @@ - (void)clearYearDayScheduleWithParams:(MTRDoorLockClusterClearYearDaySchedulePa std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("DoorLock ClearYearDaySchedule enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -11793,6 +12078,9 @@ - (void)setHolidayScheduleWithParams:(MTRDoorLockClusterSetHolidayScheduleParams expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeDoorLockID, + (unsigned int) MTRCommandIDTypeClusterDoorLockCommandSetHolidayScheduleID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -11801,14 +12089,14 @@ - (void)setHolidayScheduleWithParams:(MTRDoorLockClusterSetHolidayScheduleParams } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("DoorLock SetHolidaySchedule dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("DoorLock SetHolidaySchedule completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -11831,7 +12119,7 @@ - (void)setHolidayScheduleWithParams:(MTRDoorLockClusterSetHolidayScheduleParams std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("DoorLock SetHolidaySchedule enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -11850,6 +12138,9 @@ - (void)getHolidayScheduleWithParams:(MTRDoorLockClusterGetHolidayScheduleParams completion:(void (^)(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeDoorLockID, + (unsigned int) MTRCommandIDTypeClusterDoorLockCommandGetHolidayScheduleID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -11858,14 +12149,14 @@ - (void)getHolidayScheduleWithParams:(MTRDoorLockClusterGetHolidayScheduleParams } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("DoorLock GetHolidaySchedule dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRDoorLockClusterGetHolidayScheduleResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("DoorLock GetHolidaySchedule completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -11885,7 +12176,7 @@ - (void)getHolidayScheduleWithParams:(MTRDoorLockClusterGetHolidayScheduleParams std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("DoorLock GetHolidaySchedule enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -11903,6 +12194,9 @@ - (void)clearHolidayScheduleWithParams:(MTRDoorLockClusterClearHolidaySchedulePa expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeDoorLockID, + (unsigned int) MTRCommandIDTypeClusterDoorLockCommandClearHolidayScheduleID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -11911,14 +12205,14 @@ - (void)clearHolidayScheduleWithParams:(MTRDoorLockClusterClearHolidaySchedulePa } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("DoorLock ClearHolidaySchedule dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("DoorLock ClearHolidaySchedule completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -11937,7 +12231,7 @@ - (void)clearHolidayScheduleWithParams:(MTRDoorLockClusterClearHolidaySchedulePa std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("DoorLock ClearHolidaySchedule enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -11955,6 +12249,9 @@ - (void)setUserWithParams:(MTRDoorLockClusterSetUserParams *)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeDoorLockID, (unsigned int) MTRCommandIDTypeClusterDoorLockCommandSetUserID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -11963,14 +12260,14 @@ - (void)setUserWithParams:(MTRDoorLockClusterSetUserParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("DoorLock SetUser dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("DoorLock SetUser completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -12027,7 +12324,7 @@ - (void)setUserWithParams:(MTRDoorLockClusterSetUserParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("DoorLock SetUser enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -12045,6 +12342,9 @@ - (void)getUserWithParams:(MTRDoorLockClusterGetUserParams *)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(void (^)(MTRDoorLockClusterGetUserResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeDoorLockID, (unsigned int) MTRCommandIDTypeClusterDoorLockCommandGetUserID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -12053,14 +12353,14 @@ - (void)getUserWithParams:(MTRDoorLockClusterGetUserParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("DoorLock GetUser dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRDoorLockClusterGetUserResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("DoorLock GetUser completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -12079,7 +12379,7 @@ - (void)getUserWithParams:(MTRDoorLockClusterGetUserParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("DoorLock GetUser enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -12097,6 +12397,9 @@ - (void)clearUserWithParams:(MTRDoorLockClusterClearUserParams *)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeDoorLockID, (unsigned int) MTRCommandIDTypeClusterDoorLockCommandClearUserID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -12105,14 +12408,14 @@ - (void)clearUserWithParams:(MTRDoorLockClusterClearUserParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("DoorLock ClearUser dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("DoorLock ClearUser completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -12134,7 +12437,7 @@ - (void)clearUserWithParams:(MTRDoorLockClusterClearUserParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("DoorLock ClearUser enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -12153,6 +12456,9 @@ - (void)setCredentialWithParams:(MTRDoorLockClusterSetCredentialParams *)params completion:(void (^)(MTRDoorLockClusterSetCredentialResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeDoorLockID, (unsigned int) MTRCommandIDTypeClusterDoorLockCommandSetCredentialID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -12161,14 +12467,14 @@ - (void)setCredentialWithParams:(MTRDoorLockClusterSetCredentialParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("DoorLock SetCredential dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRDoorLockClusterSetCredentialResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("DoorLock SetCredential completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -12217,7 +12523,7 @@ - (void)setCredentialWithParams:(MTRDoorLockClusterSetCredentialParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("DoorLock SetCredential enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -12236,6 +12542,9 @@ - (void)getCredentialStatusWithParams:(MTRDoorLockClusterGetCredentialStatusPara completion:(void (^)(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeDoorLockID, + (unsigned int) MTRCommandIDTypeClusterDoorLockCommandGetCredentialStatusID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -12244,14 +12553,14 @@ - (void)getCredentialStatusWithParams:(MTRDoorLockClusterGetCredentialStatusPara } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("DoorLock GetCredentialStatus dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRDoorLockClusterGetCredentialStatusResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("DoorLock GetCredentialStatus completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -12274,7 +12583,7 @@ - (void)getCredentialStatusWithParams:(MTRDoorLockClusterGetCredentialStatusPara std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("DoorLock GetCredentialStatus enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -12292,6 +12601,9 @@ - (void)clearCredentialWithParams:(MTRDoorLockClusterClearCredentialParams *)par expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeDoorLockID, + (unsigned int) MTRCommandIDTypeClusterDoorLockCommandClearCredentialID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -12300,14 +12612,14 @@ - (void)clearCredentialWithParams:(MTRDoorLockClusterClearCredentialParams *)par } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("DoorLock ClearCredential dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("DoorLock ClearCredential completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -12336,7 +12648,7 @@ - (void)clearCredentialWithParams:(MTRDoorLockClusterClearCredentialParams *)par std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("DoorLock ClearCredential enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -13281,6 +13593,9 @@ - (void)upOrOpenWithParams:(MTRWindowCoveringClusterUpOrOpenParams * _Nullable)p expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeWindowCoveringID, + (unsigned int) MTRCommandIDTypeClusterWindowCoveringCommandUpOrOpenID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -13289,14 +13604,14 @@ - (void)upOrOpenWithParams:(MTRWindowCoveringClusterUpOrOpenParams * _Nullable)p } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("WindowCovering UpOrOpen dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("WindowCovering UpOrOpen completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -13314,7 +13629,7 @@ - (void)upOrOpenWithParams:(MTRWindowCoveringClusterUpOrOpenParams * _Nullable)p std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("WindowCovering UpOrOpen enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -13341,6 +13656,9 @@ - (void)downOrCloseWithParams:(MTRWindowCoveringClusterDownOrCloseParams * _Null expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeWindowCoveringID, + (unsigned int) MTRCommandIDTypeClusterWindowCoveringCommandDownOrCloseID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -13349,14 +13667,14 @@ - (void)downOrCloseWithParams:(MTRWindowCoveringClusterDownOrCloseParams * _Null } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("WindowCovering DownOrClose dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("WindowCovering DownOrClose completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -13374,7 +13692,7 @@ - (void)downOrCloseWithParams:(MTRWindowCoveringClusterDownOrCloseParams * _Null std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("WindowCovering DownOrClose enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -13401,6 +13719,9 @@ - (void)stopMotionWithParams:(MTRWindowCoveringClusterStopMotionParams * _Nullab expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeWindowCoveringID, + (unsigned int) MTRCommandIDTypeClusterWindowCoveringCommandStopMotionID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -13409,14 +13730,14 @@ - (void)stopMotionWithParams:(MTRWindowCoveringClusterStopMotionParams * _Nullab } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("WindowCovering StopMotion dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("WindowCovering StopMotion completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -13434,7 +13755,7 @@ - (void)stopMotionWithParams:(MTRWindowCoveringClusterStopMotionParams * _Nullab std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("WindowCovering StopMotion enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -13452,6 +13773,9 @@ - (void)goToLiftValueWithParams:(MTRWindowCoveringClusterGoToLiftValueParams *)p expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeWindowCoveringID, + (unsigned int) MTRCommandIDTypeClusterWindowCoveringCommandGoToLiftValueID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -13460,14 +13784,14 @@ - (void)goToLiftValueWithParams:(MTRWindowCoveringClusterGoToLiftValueParams *)p } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("WindowCovering GoToLiftValue dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("WindowCovering GoToLiftValue completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -13486,7 +13810,7 @@ - (void)goToLiftValueWithParams:(MTRWindowCoveringClusterGoToLiftValueParams *)p std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("WindowCovering GoToLiftValue enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -13504,6 +13828,9 @@ - (void)goToLiftPercentageWithParams:(MTRWindowCoveringClusterGoToLiftPercentage expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeWindowCoveringID, + (unsigned int) MTRCommandIDTypeClusterWindowCoveringCommandGoToLiftPercentageID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -13512,14 +13839,14 @@ - (void)goToLiftPercentageWithParams:(MTRWindowCoveringClusterGoToLiftPercentage } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("WindowCovering GoToLiftPercentage dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("WindowCovering GoToLiftPercentage completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -13538,7 +13865,7 @@ - (void)goToLiftPercentageWithParams:(MTRWindowCoveringClusterGoToLiftPercentage std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("WindowCovering GoToLiftPercentage enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -13556,6 +13883,9 @@ - (void)goToTiltValueWithParams:(MTRWindowCoveringClusterGoToTiltValueParams *)p expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeWindowCoveringID, + (unsigned int) MTRCommandIDTypeClusterWindowCoveringCommandGoToTiltValueID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -13564,14 +13894,14 @@ - (void)goToTiltValueWithParams:(MTRWindowCoveringClusterGoToTiltValueParams *)p } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("WindowCovering GoToTiltValue dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("WindowCovering GoToTiltValue completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -13590,7 +13920,7 @@ - (void)goToTiltValueWithParams:(MTRWindowCoveringClusterGoToTiltValueParams *)p std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("WindowCovering GoToTiltValue enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -13608,6 +13938,9 @@ - (void)goToTiltPercentageWithParams:(MTRWindowCoveringClusterGoToTiltPercentage expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeWindowCoveringID, + (unsigned int) MTRCommandIDTypeClusterWindowCoveringCommandGoToTiltPercentageID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -13616,14 +13949,14 @@ - (void)goToTiltPercentageWithParams:(MTRWindowCoveringClusterGoToTiltPercentage } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("WindowCovering GoToTiltPercentage dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("WindowCovering GoToTiltPercentage completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -13642,7 +13975,7 @@ - (void)goToTiltPercentageWithParams:(MTRWindowCoveringClusterGoToTiltPercentage std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("WindowCovering GoToTiltPercentage enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -14024,6 +14357,9 @@ - (void)barrierControlGoToPercentWithParams:(MTRBarrierControlClusterBarrierCont expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeBarrierControlID, + (unsigned int) MTRCommandIDTypeClusterBarrierControlCommandBarrierControlGoToPercentID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -14032,14 +14368,14 @@ - (void)barrierControlGoToPercentWithParams:(MTRBarrierControlClusterBarrierCont } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("BarrierControl BarrierControlGoToPercent dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("BarrierControl BarrierControlGoToPercent completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -14058,7 +14394,7 @@ - (void)barrierControlGoToPercentWithParams:(MTRBarrierControlClusterBarrierCont std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("BarrierControl BarrierControlGoToPercent enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -14085,6 +14421,9 @@ - (void)barrierControlStopWithParams:(MTRBarrierControlClusterBarrierControlStop expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeBarrierControlID, + (unsigned int) MTRCommandIDTypeClusterBarrierControlCommandBarrierControlStopID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -14093,14 +14432,14 @@ - (void)barrierControlStopWithParams:(MTRBarrierControlClusterBarrierControlStop } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("BarrierControl BarrierControlStop dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("BarrierControl BarrierControlStop completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -14118,7 +14457,7 @@ - (void)barrierControlStopWithParams:(MTRBarrierControlClusterBarrierControlStop std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("BarrierControl BarrierControlStop enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -14769,6 +15108,9 @@ - (void)setpointRaiseLowerWithParams:(MTRThermostatClusterSetpointRaiseLowerPara expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeThermostatID, + (unsigned int) MTRCommandIDTypeClusterThermostatCommandSetpointRaiseLowerID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -14777,14 +15119,14 @@ - (void)setpointRaiseLowerWithParams:(MTRThermostatClusterSetpointRaiseLowerPara } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Thermostat SetpointRaiseLower dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("Thermostat SetpointRaiseLower completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -14804,7 +15146,7 @@ - (void)setpointRaiseLowerWithParams:(MTRThermostatClusterSetpointRaiseLowerPara std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Thermostat SetpointRaiseLower enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -14822,6 +15164,9 @@ - (void)setWeeklyScheduleWithParams:(MTRThermostatClusterSetWeeklyScheduleParams expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeThermostatID, + (unsigned int) MTRCommandIDTypeClusterThermostatCommandSetWeeklyScheduleID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -14830,14 +15175,14 @@ - (void)setWeeklyScheduleWithParams:(MTRThermostatClusterSetWeeklyScheduleParams } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Thermostat SetWeeklySchedule dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("Thermostat SetWeeklySchedule completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -14894,7 +15239,7 @@ - (void)setWeeklyScheduleWithParams:(MTRThermostatClusterSetWeeklyScheduleParams std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Thermostat SetWeeklySchedule enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -14913,6 +15258,9 @@ - (void)getWeeklyScheduleWithParams:(MTRThermostatClusterGetWeeklyScheduleParams completion:(void (^)(MTRThermostatClusterGetWeeklyScheduleResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeThermostatID, + (unsigned int) MTRCommandIDTypeClusterThermostatCommandGetWeeklyScheduleID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -14921,14 +15269,14 @@ - (void)getWeeklyScheduleWithParams:(MTRThermostatClusterGetWeeklyScheduleParams } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Thermostat GetWeeklySchedule dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRThermostatClusterGetWeeklyScheduleResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("Thermostat GetWeeklySchedule completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -14951,7 +15299,7 @@ - (void)getWeeklyScheduleWithParams:(MTRThermostatClusterGetWeeklyScheduleParams std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Thermostat GetWeeklySchedule enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -14978,6 +15326,9 @@ - (void)clearWeeklyScheduleWithParams:(MTRThermostatClusterClearWeeklySchedulePa expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeThermostatID, + (unsigned int) MTRCommandIDTypeClusterThermostatCommandClearWeeklyScheduleID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -14986,14 +15337,14 @@ - (void)clearWeeklyScheduleWithParams:(MTRThermostatClusterClearWeeklySchedulePa } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Thermostat ClearWeeklySchedule dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("Thermostat ClearWeeklySchedule completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -15011,7 +15362,7 @@ - (void)clearWeeklyScheduleWithParams:(MTRThermostatClusterClearWeeklySchedulePa std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Thermostat ClearWeeklySchedule enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -16509,6 +16860,9 @@ - (void)moveToHueWithParams:(MTRColorControlClusterMoveToHueParams *)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeColorControlID, + (unsigned int) MTRCommandIDTypeClusterColorControlCommandMoveToHueID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -16517,14 +16871,14 @@ - (void)moveToHueWithParams:(MTRColorControlClusterMoveToHueParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("ColorControl MoveToHue dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("ColorControl MoveToHue completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -16548,7 +16902,7 @@ - (void)moveToHueWithParams:(MTRColorControlClusterMoveToHueParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("ColorControl MoveToHue enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -16566,6 +16920,9 @@ - (void)moveHueWithParams:(MTRColorControlClusterMoveHueParams *)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeColorControlID, + (unsigned int) MTRCommandIDTypeClusterColorControlCommandMoveHueID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -16574,14 +16931,14 @@ - (void)moveHueWithParams:(MTRColorControlClusterMoveHueParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("ColorControl MoveHue dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("ColorControl MoveHue completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -16604,7 +16961,7 @@ - (void)moveHueWithParams:(MTRColorControlClusterMoveHueParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("ColorControl MoveHue enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -16622,6 +16979,9 @@ - (void)stepHueWithParams:(MTRColorControlClusterStepHueParams *)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeColorControlID, + (unsigned int) MTRCommandIDTypeClusterColorControlCommandStepHueID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -16630,14 +16990,14 @@ - (void)stepHueWithParams:(MTRColorControlClusterStepHueParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("ColorControl StepHue dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("ColorControl StepHue completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -16661,7 +17021,7 @@ - (void)stepHueWithParams:(MTRColorControlClusterStepHueParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("ColorControl StepHue enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -16679,6 +17039,9 @@ - (void)moveToSaturationWithParams:(MTRColorControlClusterMoveToSaturationParams expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeColorControlID, + (unsigned int) MTRCommandIDTypeClusterColorControlCommandMoveToSaturationID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -16687,14 +17050,14 @@ - (void)moveToSaturationWithParams:(MTRColorControlClusterMoveToSaturationParams } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("ColorControl MoveToSaturation dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("ColorControl MoveToSaturation completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -16716,7 +17079,7 @@ - (void)moveToSaturationWithParams:(MTRColorControlClusterMoveToSaturationParams std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("ColorControl MoveToSaturation enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -16734,6 +17097,9 @@ - (void)moveSaturationWithParams:(MTRColorControlClusterMoveSaturationParams *)p expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeColorControlID, + (unsigned int) MTRCommandIDTypeClusterColorControlCommandMoveSaturationID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -16742,14 +17108,14 @@ - (void)moveSaturationWithParams:(MTRColorControlClusterMoveSaturationParams *)p } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("ColorControl MoveSaturation dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("ColorControl MoveSaturation completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -16772,7 +17138,7 @@ - (void)moveSaturationWithParams:(MTRColorControlClusterMoveSaturationParams *)p std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("ColorControl MoveSaturation enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -16790,6 +17156,9 @@ - (void)stepSaturationWithParams:(MTRColorControlClusterStepSaturationParams *)p expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeColorControlID, + (unsigned int) MTRCommandIDTypeClusterColorControlCommandStepSaturationID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -16798,14 +17167,14 @@ - (void)stepSaturationWithParams:(MTRColorControlClusterStepSaturationParams *)p } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("ColorControl StepSaturation dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("ColorControl StepSaturation completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -16829,7 +17198,7 @@ - (void)stepSaturationWithParams:(MTRColorControlClusterStepSaturationParams *)p std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("ColorControl StepSaturation enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -16847,6 +17216,9 @@ - (void)moveToHueAndSaturationWithParams:(MTRColorControlClusterMoveToHueAndSatu expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeColorControlID, + (unsigned int) MTRCommandIDTypeClusterColorControlCommandMoveToHueAndSaturationID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -16855,14 +17227,14 @@ - (void)moveToHueAndSaturationWithParams:(MTRColorControlClusterMoveToHueAndSatu } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("ColorControl MoveToHueAndSaturation dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("ColorControl MoveToHueAndSaturation completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -16885,7 +17257,7 @@ - (void)moveToHueAndSaturationWithParams:(MTRColorControlClusterMoveToHueAndSatu std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("ColorControl MoveToHueAndSaturation enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -16903,6 +17275,9 @@ - (void)moveToColorWithParams:(MTRColorControlClusterMoveToColorParams *)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeColorControlID, + (unsigned int) MTRCommandIDTypeClusterColorControlCommandMoveToColorID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -16911,14 +17286,14 @@ - (void)moveToColorWithParams:(MTRColorControlClusterMoveToColorParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("ColorControl MoveToColor dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("ColorControl MoveToColor completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -16941,7 +17316,7 @@ - (void)moveToColorWithParams:(MTRColorControlClusterMoveToColorParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("ColorControl MoveToColor enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -16959,6 +17334,9 @@ - (void)moveColorWithParams:(MTRColorControlClusterMoveColorParams *)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeColorControlID, + (unsigned int) MTRCommandIDTypeClusterColorControlCommandMoveColorID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -16967,14 +17345,14 @@ - (void)moveColorWithParams:(MTRColorControlClusterMoveColorParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("ColorControl MoveColor dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("ColorControl MoveColor completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -16996,7 +17374,7 @@ - (void)moveColorWithParams:(MTRColorControlClusterMoveColorParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("ColorControl MoveColor enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -17014,6 +17392,9 @@ - (void)stepColorWithParams:(MTRColorControlClusterStepColorParams *)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeColorControlID, + (unsigned int) MTRCommandIDTypeClusterColorControlCommandStepColorID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -17022,14 +17403,14 @@ - (void)stepColorWithParams:(MTRColorControlClusterStepColorParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("ColorControl StepColor dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("ColorControl StepColor completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -17052,7 +17433,7 @@ - (void)stepColorWithParams:(MTRColorControlClusterStepColorParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("ColorControl StepColor enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -17070,6 +17451,9 @@ - (void)moveToColorTemperatureWithParams:(MTRColorControlClusterMoveToColorTempe expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeColorControlID, + (unsigned int) MTRCommandIDTypeClusterColorControlCommandMoveToColorTemperatureID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -17078,14 +17462,14 @@ - (void)moveToColorTemperatureWithParams:(MTRColorControlClusterMoveToColorTempe } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("ColorControl MoveToColorTemperature dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("ColorControl MoveToColorTemperature completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -17107,7 +17491,7 @@ - (void)moveToColorTemperatureWithParams:(MTRColorControlClusterMoveToColorTempe std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("ColorControl MoveToColorTemperature enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -17125,6 +17509,9 @@ - (void)enhancedMoveToHueWithParams:(MTRColorControlClusterEnhancedMoveToHuePara expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeColorControlID, + (unsigned int) MTRCommandIDTypeClusterColorControlCommandEnhancedMoveToHueID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -17133,14 +17520,14 @@ - (void)enhancedMoveToHueWithParams:(MTRColorControlClusterEnhancedMoveToHuePara } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("ColorControl EnhancedMoveToHue dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("ColorControl EnhancedMoveToHue completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -17164,7 +17551,7 @@ - (void)enhancedMoveToHueWithParams:(MTRColorControlClusterEnhancedMoveToHuePara std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("ColorControl EnhancedMoveToHue enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -17182,6 +17569,9 @@ - (void)enhancedMoveHueWithParams:(MTRColorControlClusterEnhancedMoveHueParams * expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeColorControlID, + (unsigned int) MTRCommandIDTypeClusterColorControlCommandEnhancedMoveHueID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -17190,14 +17580,14 @@ - (void)enhancedMoveHueWithParams:(MTRColorControlClusterEnhancedMoveHueParams * } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("ColorControl EnhancedMoveHue dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("ColorControl EnhancedMoveHue completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -17220,7 +17610,7 @@ - (void)enhancedMoveHueWithParams:(MTRColorControlClusterEnhancedMoveHueParams * std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("ColorControl EnhancedMoveHue enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -17238,6 +17628,9 @@ - (void)enhancedStepHueWithParams:(MTRColorControlClusterEnhancedStepHueParams * expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeColorControlID, + (unsigned int) MTRCommandIDTypeClusterColorControlCommandEnhancedStepHueID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -17246,14 +17639,14 @@ - (void)enhancedStepHueWithParams:(MTRColorControlClusterEnhancedStepHueParams * } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("ColorControl EnhancedStepHue dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("ColorControl EnhancedStepHue completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -17277,7 +17670,7 @@ - (void)enhancedStepHueWithParams:(MTRColorControlClusterEnhancedStepHueParams * std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("ColorControl EnhancedStepHue enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -17295,6 +17688,9 @@ - (void)enhancedMoveToHueAndSaturationWithParams:(MTRColorControlClusterEnhanced expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeColorControlID, + (unsigned int) MTRCommandIDTypeClusterColorControlCommandEnhancedMoveToHueAndSaturationID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -17303,14 +17699,14 @@ - (void)enhancedMoveToHueAndSaturationWithParams:(MTRColorControlClusterEnhanced } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("ColorControl EnhancedMoveToHueAndSaturation dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("ColorControl EnhancedMoveToHueAndSaturation completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -17333,7 +17729,7 @@ - (void)enhancedMoveToHueAndSaturationWithParams:(MTRColorControlClusterEnhanced std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("ColorControl EnhancedMoveToHueAndSaturation enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -17351,6 +17747,9 @@ - (void)colorLoopSetWithParams:(MTRColorControlClusterColorLoopSetParams *)param expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeColorControlID, + (unsigned int) MTRCommandIDTypeClusterColorControlCommandColorLoopSetID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -17359,14 +17758,14 @@ - (void)colorLoopSetWithParams:(MTRColorControlClusterColorLoopSetParams *)param } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("ColorControl ColorLoopSet dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("ColorControl ColorLoopSet completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -17393,7 +17792,7 @@ - (void)colorLoopSetWithParams:(MTRColorControlClusterColorLoopSetParams *)param std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("ColorControl ColorLoopSet enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -17411,6 +17810,9 @@ - (void)stopMoveStepWithParams:(MTRColorControlClusterStopMoveStepParams *)param expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeColorControlID, + (unsigned int) MTRCommandIDTypeClusterColorControlCommandStopMoveStepID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -17419,14 +17821,14 @@ - (void)stopMoveStepWithParams:(MTRColorControlClusterStopMoveStepParams *)param } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("ColorControl StopMoveStep dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("ColorControl StopMoveStep completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -17446,7 +17848,7 @@ - (void)stopMoveStepWithParams:(MTRColorControlClusterStopMoveStepParams *)param std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("ColorControl StopMoveStep enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -17464,6 +17866,9 @@ - (void)moveColorTemperatureWithParams:(MTRColorControlClusterMoveColorTemperatu expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeColorControlID, + (unsigned int) MTRCommandIDTypeClusterColorControlCommandMoveColorTemperatureID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -17472,14 +17877,14 @@ - (void)moveColorTemperatureWithParams:(MTRColorControlClusterMoveColorTemperatu } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("ColorControl MoveColorTemperature dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("ColorControl MoveColorTemperature completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -17504,7 +17909,7 @@ - (void)moveColorTemperatureWithParams:(MTRColorControlClusterMoveColorTemperatu std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("ColorControl MoveColorTemperature enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -17522,6 +17927,9 @@ - (void)stepColorTemperatureWithParams:(MTRColorControlClusterStepColorTemperatu expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeColorControlID, + (unsigned int) MTRCommandIDTypeClusterColorControlCommandStepColorTemperatureID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -17530,14 +17938,14 @@ - (void)stepColorTemperatureWithParams:(MTRColorControlClusterStepColorTemperatu } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("ColorControl StepColorTemperature dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("ColorControl StepColorTemperature completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -17563,7 +17971,7 @@ - (void)stepColorTemperatureWithParams:(MTRColorControlClusterStepColorTemperatu std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("ColorControl StepColorTemperature enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -19925,6 +20333,9 @@ - (void)changeChannelWithParams:(MTRChannelClusterChangeChannelParams *)params completion:(void (^)(MTRChannelClusterChangeChannelResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeChannelID, (unsigned int) MTRCommandIDTypeClusterChannelCommandChangeChannelID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -19933,14 +20344,14 @@ - (void)changeChannelWithParams:(MTRChannelClusterChangeChannelParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Channel ChangeChannel dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRChannelClusterChangeChannelResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("Channel ChangeChannel completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -19960,7 +20371,7 @@ - (void)changeChannelWithParams:(MTRChannelClusterChangeChannelParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Channel ChangeChannel enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -19978,6 +20389,9 @@ - (void)changeChannelByNumberWithParams:(MTRChannelClusterChangeChannelByNumberP expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeChannelID, + (unsigned int) MTRCommandIDTypeClusterChannelCommandChangeChannelByNumberID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -19986,14 +20400,14 @@ - (void)changeChannelByNumberWithParams:(MTRChannelClusterChangeChannelByNumberP } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Channel ChangeChannelByNumber dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("Channel ChangeChannelByNumber completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -20013,7 +20427,7 @@ - (void)changeChannelByNumberWithParams:(MTRChannelClusterChangeChannelByNumberP std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Channel ChangeChannelByNumber enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -20031,6 +20445,9 @@ - (void)skipChannelWithParams:(MTRChannelClusterSkipChannelParams *)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeChannelID, (unsigned int) MTRCommandIDTypeClusterChannelCommandSkipChannelID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -20039,14 +20456,14 @@ - (void)skipChannelWithParams:(MTRChannelClusterSkipChannelParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("Channel SkipChannel dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("Channel SkipChannel completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -20065,7 +20482,7 @@ - (void)skipChannelWithParams:(MTRChannelClusterSkipChannelParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("Channel SkipChannel enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -20208,6 +20625,9 @@ - (void)navigateTargetWithParams:(MTRTargetNavigatorClusterNavigateTargetParams completion:(void (^)(MTRTargetNavigatorClusterNavigateTargetResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeTargetNavigatorID, + (unsigned int) MTRCommandIDTypeClusterTargetNavigatorCommandNavigateTargetID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -20216,14 +20636,14 @@ - (void)navigateTargetWithParams:(MTRTargetNavigatorClusterNavigateTargetParams } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("TargetNavigator NavigateTarget dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRTargetNavigatorClusterNavigateTargetResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("TargetNavigator NavigateTarget completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -20247,7 +20667,7 @@ - (void)navigateTargetWithParams:(MTRTargetNavigatorClusterNavigateTargetParams std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("TargetNavigator NavigateTarget enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -20370,6 +20790,9 @@ - (void)playWithParams:(MTRMediaPlaybackClusterPlayParams * _Nullable)params completion: (void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeMediaPlaybackID, (unsigned int) MTRCommandIDTypeClusterMediaPlaybackCommandPlayID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -20378,14 +20801,14 @@ - (void)playWithParams:(MTRMediaPlaybackClusterPlayParams * _Nullable)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("MediaPlayback Play dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRMediaPlaybackClusterPlaybackResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("MediaPlayback Play completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -20404,7 +20827,7 @@ - (void)playWithParams:(MTRMediaPlaybackClusterPlayParams * _Nullable)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("MediaPlayback Play enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -20430,6 +20853,9 @@ - (void)pauseWithParams:(MTRMediaPlaybackClusterPauseParams * _Nullable)params completion: (void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeMediaPlaybackID, + (unsigned int) MTRCommandIDTypeClusterMediaPlaybackCommandPauseID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -20438,14 +20864,14 @@ - (void)pauseWithParams:(MTRMediaPlaybackClusterPauseParams * _Nullable)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("MediaPlayback Pause dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRMediaPlaybackClusterPlaybackResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("MediaPlayback Pause completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -20464,7 +20890,7 @@ - (void)pauseWithParams:(MTRMediaPlaybackClusterPauseParams * _Nullable)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("MediaPlayback Pause enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -20493,6 +20919,9 @@ - (void)stopPlaybackWithParams:(MTRMediaPlaybackClusterStopPlaybackParams * _Nul completion:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeMediaPlaybackID, + (unsigned int) MTRCommandIDTypeClusterMediaPlaybackCommandStopPlaybackID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -20501,14 +20930,14 @@ - (void)stopPlaybackWithParams:(MTRMediaPlaybackClusterStopPlaybackParams * _Nul } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("MediaPlayback StopPlayback dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRMediaPlaybackClusterPlaybackResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("MediaPlayback StopPlayback completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -20527,7 +20956,7 @@ - (void)stopPlaybackWithParams:(MTRMediaPlaybackClusterStopPlaybackParams * _Nul std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("MediaPlayback StopPlayback enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -20556,6 +20985,9 @@ - (void)startOverWithParams:(MTRMediaPlaybackClusterStartOverParams * _Nullable) completion: (void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeMediaPlaybackID, + (unsigned int) MTRCommandIDTypeClusterMediaPlaybackCommandStartOverID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -20564,14 +20996,14 @@ - (void)startOverWithParams:(MTRMediaPlaybackClusterStartOverParams * _Nullable) } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("MediaPlayback StartOver dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRMediaPlaybackClusterPlaybackResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("MediaPlayback StartOver completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -20590,7 +21022,7 @@ - (void)startOverWithParams:(MTRMediaPlaybackClusterStartOverParams * _Nullable) std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("MediaPlayback StartOver enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -20616,6 +21048,9 @@ - (void)previousWithParams:(MTRMediaPlaybackClusterPreviousParams * _Nullable)pa completion: (void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeMediaPlaybackID, + (unsigned int) MTRCommandIDTypeClusterMediaPlaybackCommandPreviousID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -20624,14 +21059,14 @@ - (void)previousWithParams:(MTRMediaPlaybackClusterPreviousParams * _Nullable)pa } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("MediaPlayback Previous dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRMediaPlaybackClusterPlaybackResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("MediaPlayback Previous completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -20650,7 +21085,7 @@ - (void)previousWithParams:(MTRMediaPlaybackClusterPreviousParams * _Nullable)pa std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("MediaPlayback Previous enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -20676,6 +21111,9 @@ - (void)nextWithParams:(MTRMediaPlaybackClusterNextParams * _Nullable)params completion: (void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeMediaPlaybackID, (unsigned int) MTRCommandIDTypeClusterMediaPlaybackCommandNextID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -20684,14 +21122,14 @@ - (void)nextWithParams:(MTRMediaPlaybackClusterNextParams * _Nullable)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("MediaPlayback Next dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRMediaPlaybackClusterPlaybackResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("MediaPlayback Next completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -20710,7 +21148,7 @@ - (void)nextWithParams:(MTRMediaPlaybackClusterNextParams * _Nullable)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("MediaPlayback Next enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -20736,6 +21174,9 @@ - (void)rewindWithParams:(MTRMediaPlaybackClusterRewindParams * _Nullable)params completion: (void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeMediaPlaybackID, + (unsigned int) MTRCommandIDTypeClusterMediaPlaybackCommandRewindID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -20744,14 +21185,14 @@ - (void)rewindWithParams:(MTRMediaPlaybackClusterRewindParams * _Nullable)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("MediaPlayback Rewind dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRMediaPlaybackClusterPlaybackResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("MediaPlayback Rewind completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -20770,7 +21211,7 @@ - (void)rewindWithParams:(MTRMediaPlaybackClusterRewindParams * _Nullable)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("MediaPlayback Rewind enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -20799,6 +21240,9 @@ - (void)fastForwardWithParams:(MTRMediaPlaybackClusterFastForwardParams * _Nulla completion:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeMediaPlaybackID, + (unsigned int) MTRCommandIDTypeClusterMediaPlaybackCommandFastForwardID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -20807,14 +21251,14 @@ - (void)fastForwardWithParams:(MTRMediaPlaybackClusterFastForwardParams * _Nulla } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("MediaPlayback FastForward dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRMediaPlaybackClusterPlaybackResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("MediaPlayback FastForward completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -20833,7 +21277,7 @@ - (void)fastForwardWithParams:(MTRMediaPlaybackClusterFastForwardParams * _Nulla std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("MediaPlayback FastForward enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -20852,6 +21296,9 @@ - (void)skipForwardWithParams:(MTRMediaPlaybackClusterSkipForwardParams *)params completion:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeMediaPlaybackID, + (unsigned int) MTRCommandIDTypeClusterMediaPlaybackCommandSkipForwardID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -20860,14 +21307,14 @@ - (void)skipForwardWithParams:(MTRMediaPlaybackClusterSkipForwardParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("MediaPlayback SkipForward dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRMediaPlaybackClusterPlaybackResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("MediaPlayback SkipForward completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -20887,7 +21334,7 @@ - (void)skipForwardWithParams:(MTRMediaPlaybackClusterSkipForwardParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("MediaPlayback SkipForward enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -20906,6 +21353,9 @@ - (void)skipBackwardWithParams:(MTRMediaPlaybackClusterSkipBackwardParams *)para completion:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeMediaPlaybackID, + (unsigned int) MTRCommandIDTypeClusterMediaPlaybackCommandSkipBackwardID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -20914,14 +21364,14 @@ - (void)skipBackwardWithParams:(MTRMediaPlaybackClusterSkipBackwardParams *)para } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("MediaPlayback SkipBackward dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRMediaPlaybackClusterPlaybackResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("MediaPlayback SkipBackward completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -20941,7 +21391,7 @@ - (void)skipBackwardWithParams:(MTRMediaPlaybackClusterSkipBackwardParams *)para std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("MediaPlayback SkipBackward enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -20960,6 +21410,9 @@ - (void)seekWithParams:(MTRMediaPlaybackClusterSeekParams *)params completion: (void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeMediaPlaybackID, (unsigned int) MTRCommandIDTypeClusterMediaPlaybackCommandSeekID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -20968,14 +21421,14 @@ - (void)seekWithParams:(MTRMediaPlaybackClusterSeekParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("MediaPlayback Seek dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRMediaPlaybackClusterPlaybackResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("MediaPlayback Seek completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -20995,7 +21448,7 @@ - (void)seekWithParams:(MTRMediaPlaybackClusterSeekParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("MediaPlayback Seek enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -21369,6 +21822,9 @@ - (void)selectInputWithParams:(MTRMediaInputClusterSelectInputParams *)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeMediaInputID, + (unsigned int) MTRCommandIDTypeClusterMediaInputCommandSelectInputID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -21377,14 +21833,14 @@ - (void)selectInputWithParams:(MTRMediaInputClusterSelectInputParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("MediaInput SelectInput dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("MediaInput SelectInput completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -21403,7 +21859,7 @@ - (void)selectInputWithParams:(MTRMediaInputClusterSelectInputParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("MediaInput SelectInput enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -21430,6 +21886,9 @@ - (void)showInputStatusWithParams:(MTRMediaInputClusterShowInputStatusParams * _ expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeMediaInputID, + (unsigned int) MTRCommandIDTypeClusterMediaInputCommandShowInputStatusID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -21438,14 +21897,14 @@ - (void)showInputStatusWithParams:(MTRMediaInputClusterShowInputStatusParams * _ } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("MediaInput ShowInputStatus dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("MediaInput ShowInputStatus completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -21463,7 +21922,7 @@ - (void)showInputStatusWithParams:(MTRMediaInputClusterShowInputStatusParams * _ std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("MediaInput ShowInputStatus enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -21490,6 +21949,9 @@ - (void)hideInputStatusWithParams:(MTRMediaInputClusterHideInputStatusParams * _ expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeMediaInputID, + (unsigned int) MTRCommandIDTypeClusterMediaInputCommandHideInputStatusID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -21498,14 +21960,14 @@ - (void)hideInputStatusWithParams:(MTRMediaInputClusterHideInputStatusParams * _ } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("MediaInput HideInputStatus dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("MediaInput HideInputStatus completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -21523,7 +21985,7 @@ - (void)hideInputStatusWithParams:(MTRMediaInputClusterHideInputStatusParams * _ std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("MediaInput HideInputStatus enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -21541,6 +22003,9 @@ - (void)renameInputWithParams:(MTRMediaInputClusterRenameInputParams *)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeMediaInputID, + (unsigned int) MTRCommandIDTypeClusterMediaInputCommandRenameInputID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -21549,14 +22014,14 @@ - (void)renameInputWithParams:(MTRMediaInputClusterRenameInputParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("MediaInput RenameInput dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("MediaInput RenameInput completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -21576,7 +22041,7 @@ - (void)renameInputWithParams:(MTRMediaInputClusterRenameInputParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("MediaInput RenameInput enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -21740,6 +22205,9 @@ - (void)sleepWithParams:(MTRLowPowerClusterSleepParams * _Nullable)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeLowPowerID, (unsigned int) MTRCommandIDTypeClusterLowPowerCommandSleepID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -21748,14 +22216,14 @@ - (void)sleepWithParams:(MTRLowPowerClusterSleepParams * _Nullable)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("LowPower Sleep dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("LowPower Sleep completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -21773,7 +22241,7 @@ - (void)sleepWithParams:(MTRLowPowerClusterSleepParams * _Nullable)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("LowPower Sleep enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -21877,6 +22345,9 @@ - (void)sendKeyWithParams:(MTRKeypadInputClusterSendKeyParams *)params completion: (void (^)(MTRKeypadInputClusterSendKeyResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeKeypadInputID, (unsigned int) MTRCommandIDTypeClusterKeypadInputCommandSendKeyID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -21885,14 +22356,14 @@ - (void)sendKeyWithParams:(MTRKeypadInputClusterSendKeyParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("KeypadInput SendKey dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRKeypadInputClusterSendKeyResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("KeypadInput SendKey completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -21912,7 +22383,7 @@ - (void)sendKeyWithParams:(MTRKeypadInputClusterSendKeyParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("KeypadInput SendKey enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -22011,6 +22482,9 @@ - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *) completion:(void (^)(MTRContentLauncherClusterLaunchResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeContentLauncherID, + (unsigned int) MTRCommandIDTypeClusterContentLauncherCommandLaunchContentID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -22019,14 +22493,14 @@ - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *) } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("ContentLauncher LaunchContent dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRContentLauncherClusterLaunchResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("ContentLauncher LaunchContent completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -22103,7 +22577,7 @@ - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *) std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("ContentLauncher LaunchContent enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -22122,6 +22596,9 @@ - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params completion: (void (^)(MTRContentLauncherClusterLaunchResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeContentLauncherID, + (unsigned int) MTRCommandIDTypeClusterContentLauncherCommandLaunchURLID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -22130,14 +22607,14 @@ - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("ContentLauncher LaunchURL dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRContentLauncherClusterLaunchResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("ContentLauncher LaunchURL completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -22255,7 +22732,7 @@ - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("ContentLauncher LaunchURL enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -22405,6 +22882,9 @@ - (void)selectOutputWithParams:(MTRAudioOutputClusterSelectOutputParams *)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeAudioOutputID, + (unsigned int) MTRCommandIDTypeClusterAudioOutputCommandSelectOutputID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -22413,14 +22893,14 @@ - (void)selectOutputWithParams:(MTRAudioOutputClusterSelectOutputParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("AudioOutput SelectOutput dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("AudioOutput SelectOutput completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -22439,7 +22919,7 @@ - (void)selectOutputWithParams:(MTRAudioOutputClusterSelectOutputParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("AudioOutput SelectOutput enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -22457,6 +22937,9 @@ - (void)renameOutputWithParams:(MTRAudioOutputClusterRenameOutputParams *)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeAudioOutputID, + (unsigned int) MTRCommandIDTypeClusterAudioOutputCommandRenameOutputID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -22465,14 +22948,14 @@ - (void)renameOutputWithParams:(MTRAudioOutputClusterRenameOutputParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("AudioOutput RenameOutput dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("AudioOutput RenameOutput completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -22492,7 +22975,7 @@ - (void)renameOutputWithParams:(MTRAudioOutputClusterRenameOutputParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("AudioOutput RenameOutput enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -22613,6 +23096,9 @@ - (void)launchAppWithParams:(MTRApplicationLauncherClusterLaunchAppParams *)para completion:(void (^)(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeApplicationLauncherID, + (unsigned int) MTRCommandIDTypeClusterApplicationLauncherCommandLaunchAppID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -22621,14 +23107,14 @@ - (void)launchAppWithParams:(MTRApplicationLauncherClusterLaunchAppParams *)para } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("ApplicationLauncher LaunchApp dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRApplicationLauncherClusterLauncherResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("ApplicationLauncher LaunchApp completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -22653,7 +23139,7 @@ - (void)launchAppWithParams:(MTRApplicationLauncherClusterLaunchAppParams *)para std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("ApplicationLauncher LaunchApp enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -22672,6 +23158,9 @@ - (void)stopAppWithParams:(MTRApplicationLauncherClusterStopAppParams *)params completion:(void (^)(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeApplicationLauncherID, + (unsigned int) MTRCommandIDTypeClusterApplicationLauncherCommandStopAppID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -22680,14 +23169,14 @@ - (void)stopAppWithParams:(MTRApplicationLauncherClusterStopAppParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("ApplicationLauncher StopApp dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRApplicationLauncherClusterLauncherResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("ApplicationLauncher StopApp completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -22708,7 +23197,7 @@ - (void)stopAppWithParams:(MTRApplicationLauncherClusterStopAppParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("ApplicationLauncher StopApp enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -22727,6 +23216,9 @@ - (void)hideAppWithParams:(MTRApplicationLauncherClusterHideAppParams *)params completion:(void (^)(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeApplicationLauncherID, + (unsigned int) MTRCommandIDTypeClusterApplicationLauncherCommandHideAppID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -22735,14 +23227,14 @@ - (void)hideAppWithParams:(MTRApplicationLauncherClusterHideAppParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("ApplicationLauncher HideApp dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRApplicationLauncherClusterLauncherResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("ApplicationLauncher HideApp completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -22763,7 +23255,7 @@ - (void)hideAppWithParams:(MTRApplicationLauncherClusterHideAppParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("ApplicationLauncher HideApp enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -23055,6 +23547,9 @@ - (void)getSetupPINWithParams:(MTRAccountLoginClusterGetSetupPINParams *)params completion:(void (^)(MTRAccountLoginClusterGetSetupPINResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeAccountLoginID, + (unsigned int) MTRCommandIDTypeClusterAccountLoginCommandGetSetupPINID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -23063,14 +23558,14 @@ - (void)getSetupPINWithParams:(MTRAccountLoginClusterGetSetupPINParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("AccountLogin GetSetupPIN dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRAccountLoginClusterGetSetupPINResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("AccountLogin GetSetupPIN completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -23093,7 +23588,7 @@ - (void)getSetupPINWithParams:(MTRAccountLoginClusterGetSetupPINParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("AccountLogin GetSetupPIN enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -23111,6 +23606,9 @@ - (void)loginWithParams:(MTRAccountLoginClusterLoginParams *)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeAccountLoginID, (unsigned int) MTRCommandIDTypeClusterAccountLoginCommandLoginID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -23119,14 +23617,14 @@ - (void)loginWithParams:(MTRAccountLoginClusterLoginParams *)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("AccountLogin Login dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("AccountLogin Login completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -23149,7 +23647,7 @@ - (void)loginWithParams:(MTRAccountLoginClusterLoginParams *)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("AccountLogin Login enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -23173,6 +23671,9 @@ - (void)logoutWithParams:(MTRAccountLoginClusterLogoutParams * _Nullable)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeAccountLoginID, (unsigned int) MTRCommandIDTypeClusterAccountLoginCommandLogoutID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -23181,14 +23682,14 @@ - (void)logoutWithParams:(MTRAccountLoginClusterLogoutParams * _Nullable)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("AccountLogin Logout dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("AccountLogin Logout completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -23209,7 +23710,7 @@ - (void)logoutWithParams:(MTRAccountLoginClusterLogoutParams * _Nullable)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("AccountLogin Logout enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -23345,6 +23846,9 @@ - (void)getProfileInfoCommandWithParams:(MTRElectricalMeasurementClusterGetProfi expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeElectricalMeasurementID, + (unsigned int) MTRCommandIDTypeClusterElectricalMeasurementCommandGetProfileInfoCommandID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -23353,14 +23857,14 @@ - (void)getProfileInfoCommandWithParams:(MTRElectricalMeasurementClusterGetProfi } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("ElectricalMeasurement GetProfileInfoCommand dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("ElectricalMeasurement GetProfileInfoCommand completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -23378,7 +23882,7 @@ - (void)getProfileInfoCommandWithParams:(MTRElectricalMeasurementClusterGetProfi std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("ElectricalMeasurement GetProfileInfoCommand enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -23396,6 +23900,10 @@ - (void)getMeasurementProfileCommandWithParams:(MTRElectricalMeasurementClusterG expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeElectricalMeasurementID, + (unsigned int) MTRCommandIDTypeClusterElectricalMeasurementCommandGetMeasurementProfileCommandID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -23404,15 +23912,14 @@ - (void)getMeasurementProfileCommandWithParams:(MTRElectricalMeasurementClusterG } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("ElectricalMeasurement GetMeasurementProfileCommand dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO( - "ElectricalMeasurement GetMeasurementProfileCommand completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -23433,7 +23940,7 @@ - (void)getMeasurementProfileCommandWithParams:(MTRElectricalMeasurementClusterG std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("ElectricalMeasurement GetMeasurementProfileCommand enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -24789,6 +25296,9 @@ - (void)testWithParams:(MTRUnitTestingClusterTestParams * _Nullable)params expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeUnitTestingID, (unsigned int) MTRCommandIDTypeClusterUnitTestingCommandTestID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -24797,14 +25307,14 @@ - (void)testWithParams:(MTRUnitTestingClusterTestParams * _Nullable)params } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("UnitTesting Test dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("UnitTesting Test completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -24822,7 +25332,7 @@ - (void)testWithParams:(MTRUnitTestingClusterTestParams * _Nullable)params std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("UnitTesting Test enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -24849,6 +25359,9 @@ - (void)testNotHandledWithParams:(MTRUnitTestingClusterTestNotHandledParams * _N expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeUnitTestingID, + (unsigned int) MTRCommandIDTypeClusterUnitTestingCommandTestNotHandledID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -24857,14 +25370,14 @@ - (void)testNotHandledWithParams:(MTRUnitTestingClusterTestNotHandledParams * _N } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("UnitTesting TestNotHandled dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("UnitTesting TestNotHandled completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -24882,7 +25395,7 @@ - (void)testNotHandledWithParams:(MTRUnitTestingClusterTestNotHandledParams * _N std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("UnitTesting TestNotHandled enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -24911,6 +25424,9 @@ - (void)testSpecificWithParams:(MTRUnitTestingClusterTestSpecificParams * _Nulla completion:(void (^)(MTRUnitTestingClusterTestSpecificResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeUnitTestingID, + (unsigned int) MTRCommandIDTypeClusterUnitTestingCommandTestSpecificID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -24919,14 +25435,14 @@ - (void)testSpecificWithParams:(MTRUnitTestingClusterTestSpecificParams * _Nulla } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("UnitTesting TestSpecific dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRUnitTestingClusterTestSpecificResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("UnitTesting TestSpecific completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -24945,7 +25461,7 @@ - (void)testSpecificWithParams:(MTRUnitTestingClusterTestSpecificParams * _Nulla std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("UnitTesting TestSpecific enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -24972,6 +25488,9 @@ - (void)testUnknownCommandWithParams:(MTRUnitTestingClusterTestUnknownCommandPar expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeUnitTestingID, + (unsigned int) MTRCommandIDTypeClusterUnitTestingCommandTestUnknownCommandID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -24980,14 +25499,14 @@ - (void)testUnknownCommandWithParams:(MTRUnitTestingClusterTestUnknownCommandPar } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("UnitTesting TestUnknownCommand dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("UnitTesting TestUnknownCommand completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -25005,7 +25524,7 @@ - (void)testUnknownCommandWithParams:(MTRUnitTestingClusterTestUnknownCommandPar std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("UnitTesting TestUnknownCommand enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -25024,6 +25543,9 @@ - (void)testAddArgumentsWithParams:(MTRUnitTestingClusterTestAddArgumentsParams completion:(void (^)(MTRUnitTestingClusterTestAddArgumentsResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeUnitTestingID, + (unsigned int) MTRCommandIDTypeClusterUnitTestingCommandTestAddArgumentsID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -25032,14 +25554,14 @@ - (void)testAddArgumentsWithParams:(MTRUnitTestingClusterTestAddArgumentsParams } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("UnitTesting TestAddArguments dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRUnitTestingClusterTestAddArgumentsResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("UnitTesting TestAddArguments completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -25060,7 +25582,7 @@ - (void)testAddArgumentsWithParams:(MTRUnitTestingClusterTestAddArgumentsParams std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("UnitTesting TestAddArguments enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -25079,6 +25601,9 @@ - (void)testSimpleArgumentRequestWithParams:(MTRUnitTestingClusterTestSimpleArgu completion:(void (^)(MTRUnitTestingClusterTestSimpleArgumentResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeUnitTestingID, + (unsigned int) MTRCommandIDTypeClusterUnitTestingCommandTestSimpleArgumentRequestID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -25087,14 +25612,14 @@ - (void)testSimpleArgumentRequestWithParams:(MTRUnitTestingClusterTestSimpleArgu } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("UnitTesting TestSimpleArgumentRequest dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRUnitTestingClusterTestSimpleArgumentResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("UnitTesting TestSimpleArgumentRequest completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -25114,7 +25639,7 @@ - (void)testSimpleArgumentRequestWithParams:(MTRUnitTestingClusterTestSimpleArgu std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("UnitTesting TestSimpleArgumentRequest enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -25134,6 +25659,9 @@ - (void)testStructArrayArgumentRequestWithParams:(MTRUnitTestingClusterTestStruc (void (^)(MTRUnitTestingClusterTestStructArrayArgumentResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeUnitTestingID, + (unsigned int) MTRCommandIDTypeClusterUnitTestingCommandTestStructArrayArgumentRequestID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -25142,14 +25670,14 @@ - (void)testStructArrayArgumentRequestWithParams:(MTRUnitTestingClusterTestStruc } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("UnitTesting TestStructArrayArgumentRequest dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRUnitTestingClusterTestStructArrayArgumentResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("UnitTesting TestStructArrayArgumentRequest completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -25380,7 +25908,7 @@ - (void)testStructArrayArgumentRequestWithParams:(MTRUnitTestingClusterTestStruc std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("UnitTesting TestStructArrayArgumentRequest enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -25399,6 +25927,9 @@ - (void)testStructArgumentRequestWithParams:(MTRUnitTestingClusterTestStructArgu completion:(void (^)(MTRUnitTestingClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeUnitTestingID, + (unsigned int) MTRCommandIDTypeClusterUnitTestingCommandTestStructArgumentRequestID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -25407,14 +25938,14 @@ - (void)testStructArgumentRequestWithParams:(MTRUnitTestingClusterTestStructArgu } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("UnitTesting TestStructArgumentRequest dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRUnitTestingClusterBooleanResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("UnitTesting TestStructArgumentRequest completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -25441,7 +25972,7 @@ - (void)testStructArgumentRequestWithParams:(MTRUnitTestingClusterTestStructArgu std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("UnitTesting TestStructArgumentRequest enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -25460,6 +25991,9 @@ - (void)testNestedStructArgumentRequestWithParams:(MTRUnitTestingClusterTestNest completion:(void (^)(MTRUnitTestingClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeUnitTestingID, + (unsigned int) MTRCommandIDTypeClusterUnitTestingCommandTestNestedStructArgumentRequestID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -25468,14 +26002,14 @@ - (void)testNestedStructArgumentRequestWithParams:(MTRUnitTestingClusterTestNest } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("UnitTesting TestNestedStructArgumentRequest dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRUnitTestingClusterBooleanResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("UnitTesting TestNestedStructArgumentRequest completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -25506,7 +26040,7 @@ - (void)testNestedStructArgumentRequestWithParams:(MTRUnitTestingClusterTestNest std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("UnitTesting TestNestedStructArgumentRequest enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -25525,6 +26059,9 @@ - (void)testListStructArgumentRequestWithParams:(MTRUnitTestingClusterTestListSt completion:(void (^)(MTRUnitTestingClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeUnitTestingID, + (unsigned int) MTRCommandIDTypeClusterUnitTestingCommandTestListStructArgumentRequestID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -25533,14 +26070,14 @@ - (void)testListStructArgumentRequestWithParams:(MTRUnitTestingClusterTestListSt } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("UnitTesting TestListStructArgumentRequest dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRUnitTestingClusterBooleanResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("UnitTesting TestListStructArgumentRequest completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -25590,7 +26127,7 @@ - (void)testListStructArgumentRequestWithParams:(MTRUnitTestingClusterTestListSt std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("UnitTesting TestListStructArgumentRequest enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -25609,6 +26146,9 @@ - (void)testListInt8UArgumentRequestWithParams:(MTRUnitTestingClusterTestListInt completion:(void (^)(MTRUnitTestingClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeUnitTestingID, + (unsigned int) MTRCommandIDTypeClusterUnitTestingCommandTestListInt8UArgumentRequestID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -25617,14 +26157,14 @@ - (void)testListInt8UArgumentRequestWithParams:(MTRUnitTestingClusterTestListInt } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("UnitTesting TestListInt8UArgumentRequest dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRUnitTestingClusterBooleanResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("UnitTesting TestListInt8UArgumentRequest completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -25665,7 +26205,7 @@ - (void)testListInt8UArgumentRequestWithParams:(MTRUnitTestingClusterTestListInt std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("UnitTesting TestListInt8UArgumentRequest enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -25684,6 +26224,9 @@ - (void)testNestedStructListArgumentRequestWithParams:(MTRUnitTestingClusterTest completion:(void (^)(MTRUnitTestingClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeUnitTestingID, + (unsigned int) MTRCommandIDTypeClusterUnitTestingCommandTestNestedStructListArgumentRequestID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -25692,14 +26235,14 @@ - (void)testNestedStructListArgumentRequestWithParams:(MTRUnitTestingClusterTest } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("UnitTesting TestNestedStructListArgumentRequest dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRUnitTestingClusterBooleanResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("UnitTesting TestNestedStructListArgumentRequest completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -25827,7 +26370,7 @@ - (void)testNestedStructListArgumentRequestWithParams:(MTRUnitTestingClusterTest std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("UnitTesting TestNestedStructListArgumentRequest enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -25847,6 +26390,10 @@ - (void)testListNestedStructListArgumentRequestWithParams: completion:(void (^)(MTRUnitTestingClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeUnitTestingID, + (unsigned int) MTRCommandIDTypeClusterUnitTestingCommandTestListNestedStructListArgumentRequestID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -25855,15 +26402,14 @@ - (void)testListNestedStructListArgumentRequestWithParams: } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("UnitTesting TestListNestedStructListArgumentRequest dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRUnitTestingClusterBooleanResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO( - "UnitTesting TestListNestedStructListArgumentRequest completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -26016,7 +26562,7 @@ - (void)testListNestedStructListArgumentRequestWithParams: std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("UnitTesting TestListNestedStructListArgumentRequest enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -26035,6 +26581,9 @@ - (void)testListInt8UReverseRequestWithParams:(MTRUnitTestingClusterTestListInt8 completion:(void (^)(MTRUnitTestingClusterTestListInt8UReverseResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeUnitTestingID, + (unsigned int) MTRCommandIDTypeClusterUnitTestingCommandTestListInt8UReverseRequestID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -26043,14 +26592,14 @@ - (void)testListInt8UReverseRequestWithParams:(MTRUnitTestingClusterTestListInt8 } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("UnitTesting TestListInt8UReverseRequest dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRUnitTestingClusterTestListInt8UReverseResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("UnitTesting TestListInt8UReverseRequest completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -26091,7 +26640,7 @@ - (void)testListInt8UReverseRequestWithParams:(MTRUnitTestingClusterTestListInt8 std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("UnitTesting TestListInt8UReverseRequest enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -26110,6 +26659,9 @@ - (void)testEnumsRequestWithParams:(MTRUnitTestingClusterTestEnumsRequestParams completion:(void (^)(MTRUnitTestingClusterTestEnumsResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeUnitTestingID, + (unsigned int) MTRCommandIDTypeClusterUnitTestingCommandTestEnumsRequestID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -26118,14 +26670,14 @@ - (void)testEnumsRequestWithParams:(MTRUnitTestingClusterTestEnumsRequestParams } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("UnitTesting TestEnumsRequest dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRUnitTestingClusterTestEnumsResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("UnitTesting TestEnumsRequest completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -26146,7 +26698,7 @@ - (void)testEnumsRequestWithParams:(MTRUnitTestingClusterTestEnumsRequestParams std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("UnitTesting TestEnumsRequest enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -26165,6 +26717,9 @@ - (void)testNullableOptionalRequestWithParams:(MTRUnitTestingClusterTestNullable completion:(void (^)(MTRUnitTestingClusterTestNullableOptionalResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeUnitTestingID, + (unsigned int) MTRCommandIDTypeClusterUnitTestingCommandTestNullableOptionalRequestID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -26173,14 +26728,14 @@ - (void)testNullableOptionalRequestWithParams:(MTRUnitTestingClusterTestNullable } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("UnitTesting TestNullableOptionalRequest dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRUnitTestingClusterTestNullableOptionalResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("UnitTesting TestNullableOptionalRequest completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -26210,7 +26765,7 @@ - (void)testNullableOptionalRequestWithParams:(MTRUnitTestingClusterTestNullable std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("UnitTesting TestNullableOptionalRequest enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -26231,6 +26786,9 @@ - (void)testComplexNullableOptionalRequestWithParams:(MTRUnitTestingClusterTestC MTRUnitTestingClusterTestComplexNullableOptionalResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeUnitTestingID, + (unsigned int) MTRCommandIDTypeClusterUnitTestingCommandTestComplexNullableOptionalRequestID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -26239,14 +26797,14 @@ - (void)testComplexNullableOptionalRequestWithParams:(MTRUnitTestingClusterTestC } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("UnitTesting TestComplexNullableOptionalRequest dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRUnitTestingClusterTestComplexNullableOptionalResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("UnitTesting TestComplexNullableOptionalRequest completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -26435,7 +26993,7 @@ - (void)testComplexNullableOptionalRequestWithParams:(MTRUnitTestingClusterTestC std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("UnitTesting TestComplexNullableOptionalRequest enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -26454,6 +27012,9 @@ - (void)simpleStructEchoRequestWithParams:(MTRUnitTestingClusterSimpleStructEcho completion:(void (^)(MTRUnitTestingClusterSimpleStructResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeUnitTestingID, + (unsigned int) MTRCommandIDTypeClusterUnitTestingCommandSimpleStructEchoRequestID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -26462,14 +27023,14 @@ - (void)simpleStructEchoRequestWithParams:(MTRUnitTestingClusterSimpleStructEcho } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("UnitTesting SimpleStructEchoRequest dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRUnitTestingClusterSimpleStructResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("UnitTesting SimpleStructEchoRequest completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -26496,7 +27057,7 @@ - (void)simpleStructEchoRequestWithParams:(MTRUnitTestingClusterSimpleStructEcho std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("UnitTesting SimpleStructEchoRequest enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -26523,6 +27084,9 @@ - (void)timedInvokeRequestWithParams:(MTRUnitTestingClusterTimedInvokeRequestPar expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeUnitTestingID, + (unsigned int) MTRCommandIDTypeClusterUnitTestingCommandTimedInvokeRequestID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -26531,14 +27095,14 @@ - (void)timedInvokeRequestWithParams:(MTRUnitTestingClusterTimedInvokeRequestPar } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("UnitTesting TimedInvokeRequest dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("UnitTesting TimedInvokeRequest completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -26559,7 +27123,7 @@ - (void)timedInvokeRequestWithParams:(MTRUnitTestingClusterTimedInvokeRequestPar std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("UnitTesting TimedInvokeRequest enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -26577,6 +27141,9 @@ - (void)testSimpleOptionalArgumentRequestWithParams:(MTRUnitTestingClusterTestSi expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeUnitTestingID, + (unsigned int) MTRCommandIDTypeClusterUnitTestingCommandTestSimpleOptionalArgumentRequestID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -26585,14 +27152,14 @@ - (void)testSimpleOptionalArgumentRequestWithParams:(MTRUnitTestingClusterTestSi } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("UnitTesting TestSimpleOptionalArgumentRequest dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRCommandSuccessCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(error); - MTR_LOG_INFO("UnitTesting TestSimpleOptionalArgumentRequest completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, CommandSuccessCallbackType successCb, @@ -26616,7 +27183,7 @@ - (void)testSimpleOptionalArgumentRequestWithParams:(MTRUnitTestingClusterTestSi std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("UnitTesting TestSimpleOptionalArgumentRequest enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -26635,6 +27202,9 @@ - (void)testEmitTestEventRequestWithParams:(MTRUnitTestingClusterTestEmitTestEve completion:(void (^)(MTRUnitTestingClusterTestEmitTestEventResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeUnitTestingID, + (unsigned int) MTRCommandIDTypeClusterUnitTestingCommandTestEmitTestEventRequestID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -26643,14 +27213,14 @@ - (void)testEmitTestEventRequestWithParams:(MTRUnitTestingClusterTestEmitTestEve } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("UnitTesting TestEmitTestEventRequest dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRUnitTestingClusterTestEmitTestEventResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("UnitTesting TestEmitTestEventRequest completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -26672,7 +27242,7 @@ - (void)testEmitTestEventRequestWithParams:(MTRUnitTestingClusterTestEmitTestEve std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("UnitTesting TestEmitTestEventRequest enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) { @@ -26694,6 +27264,10 @@ - (void)testEmitTestEventRequestWithParams:(MTRUnitTestingClusterTestEmitTestEve MTRUnitTestingClusterTestEmitTestFabricScopedEventResponseParams * _Nullable data, NSError * _Nullable error))completion { + NSString * logPrefix = + [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeUnitTestingID, + (unsigned int) MTRCommandIDTypeClusterUnitTestingCommandTestEmitTestFabricScopedEventRequestID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -26702,14 +27276,14 @@ - (void)testEmitTestEventRequestWithParams:(MTRUnitTestingClusterTestEmitTestEve } MTRAsyncCallbackQueueWorkItem * workItem = [[MTRAsyncCallbackQueueWorkItem alloc] initWithQueue:self.callbackQueue]; MTRAsyncCallbackReadyHandler readyHandler = ^(MTRDevice * device, NSUInteger retryCount) { - MTR_LOG_INFO("UnitTesting TestEmitTestFabricScopedEventRequest dequeueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; auto * bridge = new MTRUnitTestingClusterTestEmitTestFabricScopedEventResponseCallbackBridge( self.callbackQueue, ^(id _Nullable value, NSError * _Nullable error) { completion(value, error); - MTR_LOG_INFO("UnitTesting TestEmitTestFabricScopedEventRequest completion value %@ error %@ endWork", value, error); + MTRClustersLogCompletion(logPrefix, value, error); [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, @@ -26729,7 +27303,7 @@ - (void)testEmitTestEventRequestWithParams:(MTRUnitTestingClusterTestEmitTestEve std::move(*bridge).DispatchAction(baseDevice); }; workItem.readyHandler = readyHandler; - MTR_LOG_INFO("UnitTesting TestEmitTestFabricScopedEventRequest enqueueWorkItem %@", self.device.asyncCallbackWorkQueue); + MTRClustersLogEnqueue(logPrefix, self.device.asyncCallbackWorkQueue); [self.device.asyncCallbackWorkQueue enqueueWorkItem:workItem]; if (!expectedValueIntervalMs || ([expectedValueIntervalMs compare:@(0)] == NSOrderedAscending)) {