@@ -1152,9 +1152,8 @@ void AccumulatingTaskGroup::offer(AsyncTask *completedTask, AsyncContext *contex
1152
1152
// will need to release in the other path.
1153
1153
lock (); // TODO: remove fragment lock, and use status for synchronization
1154
1154
1155
- SWIFT_TASK_GROUP_DEBUG_LOG (this , " offer, completedTask:%p (count:%d) , status:%s" ,
1155
+ SWIFT_TASK_GROUP_DEBUG_LOG (this , " offer, completedTask:%p, status:%s" ,
1156
1156
completedTask,
1157
- swift_retainCount (completedTask),
1158
1157
statusString ().c_str ());
1159
1158
1160
1159
// Immediately increment ready count and acquire the status
@@ -1251,7 +1250,6 @@ void DiscardingTaskGroup::offer(AsyncTask *completedTask, AsyncContext *context)
1251
1250
break ;
1252
1251
case ReadyStatus::Error:
1253
1252
SWIFT_TASK_GROUP_DEBUG_LOG (this , " offer, complete, resume with errorItem.task:%p" , readyErrorItem.getTask ());
1254
- SWIFT_TASK_GROUP_DEBUG_LOG (this , " offer, complete, expect that it was extra retained %p" , readyErrorItem.getTask ());
1255
1253
resumeWaitingTask (readyErrorItem.getTask (), assumed,
1256
1254
/* hadErrorResult=*/ true ,
1257
1255
alreadyDecrementedStatus,
@@ -1374,11 +1372,7 @@ void TaskGroupBase::resumeWaitingTask(
1374
1372
auto waitingContext =
1375
1373
static_cast <TaskFutureWaitAsyncContext *>(
1376
1374
waitingTask->ResumeContext );
1377
- SWIFT_TASK_GROUP_DEBUG_LOG (this , " completed task %p" , completedTask);
1378
-
1379
-
1380
1375
fillGroupNextResult (waitingContext, result);
1381
- SWIFT_TASK_GROUP_DEBUG_LOG (this , " completed task %p; AFTER FILL" , completedTask);
1382
1376
1383
1377
// Remove the child from the task group's running tasks list.
1384
1378
// The parent task isn't currently running (we're about to wake
@@ -1388,16 +1382,10 @@ void TaskGroupBase::resumeWaitingTask(
1388
1382
// does a parent -> child traversal while recursively holding
1389
1383
// locks) because we know that the child task is completed and
1390
1384
// we can't be holding its locks ourselves.
1391
- auto before = completedTask;
1392
1385
_swift_taskGroup_detachChild (asAbstract (this ), completedTask);
1393
- SWIFT_TASK_GROUP_DEBUG_LOG (this , " completedTask %p; AFTER DETACH (count:%d)" , completedTask, swift_retainCount (completedTask));
1394
1386
if (isDiscardingResults () && hadErrorResult && taskWasRetained) {
1395
- SWIFT_TASK_GROUP_DEBUG_LOG (this , " BEFORE RELEASE error task=%p (count:%d)\n " ,
1396
- completedTask,
1397
- swift_retainCount (completedTask));
1398
1387
// We only used the task to keep the error in the future fragment around
1399
1388
// so now that we emitted the error and detached the task, we are free to release the task immediately.
1400
- auto error = completedTask->futureFragment ()->getError ();
1401
1389
swift_release (completedTask);
1402
1390
}
1403
1391
0 commit comments