@@ -126,9 +126,9 @@ - (void)callReadyHandlerWithContext:(id)context completion:(MTRAsyncWorkCompleti
126
126
auto readyHandler = _readyHandler;
127
127
dispatch_async (_queue, ^{
128
128
if (!retryCount) {
129
- MTR_LOG_DEFAULT (" MTRAsyncWorkQueue<%@> executing work item [%llu]" , context, uniqueID);
129
+ MTR_LOG (" MTRAsyncWorkQueue<%@> executing work item [%llu]" , context, uniqueID);
130
130
} else {
131
- MTR_LOG_DEFAULT (" MTRAsyncWorkQueue<%@> executing work item [%llu] (retry %zd)" , context, uniqueID, retryCount);
131
+ MTR_LOG (" MTRAsyncWorkQueue<%@> executing work item [%llu] (retry %zd)" , context, uniqueID, retryCount);
132
132
}
133
133
if (readyHandler) {
134
134
readyHandler (context, retryCount, completion);
@@ -268,9 +268,9 @@ - (void)enqueueWorkItem:(MTRAsyncWorkItem *)item
268
268
// Logging the description once is enough because other log messages
269
269
// related to the work item (execution, completion etc) can easily be
270
270
// correlated using the unique id.
271
- MTR_LOG_DEFAULT (" MTRAsyncWorkQueue<%@, items count: %tu> enqueued work item [%llu]: %@" , context.description , _items.count , item.uniqueID , description);
271
+ MTR_LOG (" MTRAsyncWorkQueue<%@, items count: %tu> enqueued work item [%llu]: %@" , context.description , _items.count , item.uniqueID , description);
272
272
} else {
273
- MTR_LOG_DEFAULT (" MTRAsyncWorkQueue<%@, items count: %tu> enqueued work item [%llu]" , context.description , _items.count , item.uniqueID );
273
+ MTR_LOG (" MTRAsyncWorkQueue<%@, items count: %tu> enqueued work item [%llu]" , context.description , _items.count , item.uniqueID );
274
274
}
275
275
276
276
[self _callNextReadyWorkItemWithContext: context];
@@ -280,7 +280,7 @@ - (void)invalidate
280
280
{
281
281
ContextSnapshot context (self); // outside of lock
282
282
std::lock_guard lock (_lock);
283
- MTR_LOG_INFO (" MTRAsyncWorkQueue<%@> invalidate %tu items" , context.description , _items.count );
283
+ MTR_LOG (" MTRAsyncWorkQueue<%@> invalidate %tu items" , context.description , _items.count );
284
284
for (MTRAsyncWorkItem * item in _items) {
285
285
[item cancel ];
286
286
}
@@ -309,14 +309,14 @@ - (void)_postProcessWorkItem:(MTRAsyncWorkItem *)workItem
309
309
310
310
// already part of the running work items allowed by width - retry directly
311
311
if (retry) {
312
- MTR_LOG_DEFAULT (" MTRAsyncWorkQueue<%@> retry needed for work item [%llu]" , context.description , workItem.uniqueID );
312
+ MTR_LOG (" MTRAsyncWorkQueue<%@> retry needed for work item [%llu]" , context.description , workItem.uniqueID );
313
313
[self _callWorkItem: workItem withContext: context];
314
314
return ;
315
315
}
316
316
317
317
[workItem markComplete ];
318
318
[_items removeObjectAtIndex: indexOfWorkItem];
319
- MTR_LOG_DEFAULT (" MTRAsyncWorkQueue<%@, items count: %tu> completed work item [%llu]" , context.description , _items.count , workItem.uniqueID );
319
+ MTR_LOG (" MTRAsyncWorkQueue<%@, items count: %tu> completed work item [%llu]" , context.description , _items.count , workItem.uniqueID );
320
320
321
321
// sanity check running work item count is positive
322
322
if (_runningWorkItemCount == 0 ) {
@@ -398,11 +398,11 @@ - (void)_callNextReadyWorkItemWithContext:(ContextSnapshot const &)context
398
398
case MTRNotBatched:
399
399
goto done; // can't merge anything else
400
400
case MTRBatchedPartially:
401
- MTR_LOG_DEFAULT (" MTRAsyncWorkQueue<%@> partially merged work item [%llu] into %llu" ,
401
+ MTR_LOG (" MTRAsyncWorkQueue<%@> partially merged work item [%llu] into %llu" ,
402
402
context.description , nextWorkItem.uniqueID , workItem.uniqueID );
403
403
goto done; // can't merge anything else
404
404
case MTRBatchedFully:
405
- MTR_LOG_DEFAULT (" MTRAsyncWorkQueue<%@> fully merged work item [%llu] into %llu" ,
405
+ MTR_LOG (" MTRAsyncWorkQueue<%@> fully merged work item [%llu] into %llu" ,
406
406
context.description , nextWorkItem.uniqueID , workItem.uniqueID );
407
407
[_items removeObjectAtIndex: 1 ];
408
408
continue ; // try to batch the next item (if any)
0 commit comments