@@ -322,7 +322,12 @@ final class LLBuildProgressTracker: LLBuildBuildSystemDelegate, SwiftCompilerOut
322
322
self . observabilityScope. emit ( . multipleProducers( output: output, commands: commands) )
323
323
}
324
324
325
- func commandProcessStarted( _ command: SPMLLBuild . Command , process: ProcessHandle ) { }
325
+ func commandProcessStarted( _ command: SPMLLBuild . Command , process: ProcessHandle ) {
326
+ self . queue. async {
327
+ self . outputStream. send ( " EXTRA VERBOSE COMMAND STARTED \( process. hashValue) for \( command. verboseDescription) \n " )
328
+ self . outputStream. flush ( )
329
+ }
330
+ }
326
331
327
332
func commandProcessHadError( _ command: SPMLLBuild . Command , process: ProcessHandle , message: String ) {
328
333
self . observabilityScope. emit ( . commandError( command: command, message: message) )
@@ -345,18 +350,17 @@ final class LLBuildProgressTracker: LLBuildBuildSystemDelegate, SwiftCompilerOut
345
350
process: ProcessHandle ,
346
351
result: CommandExtendedResult
347
352
) {
348
- // FIXME: This should really happen at the command-level and is just a stopgap measure.
349
- let shouldFilterOutput = !self . logLevel. isVerbose && command. verboseDescription. hasPrefix ( " codesign " ) && result
350
- . result != . failed
351
-
352
353
let commandName = command. name
353
354
354
355
self . queue. async {
355
- if let buffer = self . nonSwiftMessageBuffers [ commandName] , !shouldFilterOutput {
356
+ if let buffer = self . nonSwiftMessageBuffers [ commandName] {
356
357
self . progressAnimation. clear ( )
357
- self . outputStream. send ( buffer)
358
+ self . outputStream. send ( " EXTRA VERBOSE COMMAND FINISHED \( process . hashValue ) EXIT \( result . exitStatus ) for \( command . verboseDescription ) with \( buffer) \n " )
358
359
self . outputStream. flush ( )
359
360
self . nonSwiftMessageBuffers [ commandName] = nil
361
+ } else {
362
+ self . outputStream. send ( " EXTRA VERBOSE COMMAND FINISHED \( process. hashValue) EXIT \( result. exitStatus) for \( command. verboseDescription) \n " )
363
+ self . outputStream. flush ( )
360
364
}
361
365
}
362
366
@@ -634,8 +638,15 @@ extension SwiftCompilerMessage {
634
638
fileprivate var verboseProgressText : String ? {
635
639
switch kind {
636
640
case . began( let info) :
637
- ( [ info. commandExecutable] + info. commandArguments) . joined ( separator: " " )
638
- case . skipped, . finished, . abnormal, . signalled, . unparsableOutput:
641
+ " EXTRA VERBOSE STARTED \( info. pid) for \( ( [ info. commandExecutable] + info. commandArguments) . joined ( separator: " " ) ) "
642
+ case . finished( let info) :
643
+ " EXTRA VERBOSE FINISHED \( info. pid) with \( info. output ?? " no output " ) "
644
+ case . abnormal( let info) ,
645
+ . signalled( let info) :
646
+ " EXTRA VERBOSE FAILED \( info. pid) with \( info. output ?? " no output " ) "
647
+ case . unparsableOutput( let output) :
648
+ " EXTRA VERBOSE UNPARSABLE with \( output) "
649
+ case . skipped:
639
650
nil
640
651
}
641
652
}
0 commit comments