Skip to content

[WIP] Experiment with adding a operation queue #9243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[WIP] Experiment with adding a operation queue #9243

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 24 additions & 20 deletions Sources/_InternalTestSupport/SwiftPMProduct.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ import struct Basics.AsyncProcessResult

import enum TSCBasic.ProcessEnv

private let swiftPMExecutionQueue = AsyncOperationQueue(concurrentTasks: 6)

/// Defines the executables used by SwiftPM.
/// Contains path to the currently built executable and
/// helper method to execute them.
Expand Down Expand Up @@ -82,28 +84,30 @@ extension SwiftPM {
env: Environment? = nil,
throwIfCommandFails: Bool = true
) async throws -> (stdout: String, stderr: String) {
let result = try await executeProcess(
args,
packagePath: packagePath,
env: env
)
//Remove /r from stdout/stderr so that tests do not have to deal with them
let stdout = try String(decoding: result.output.get().filter( { $0 != 13 }), as: Unicode.UTF8.self)
let stderr = try String(decoding: result.stderrOutput.get().filter( { $0 != 13 }), as: Unicode.UTF8.self)

let returnValue = (stdout: stdout, stderr: stderr)
if (!throwIfCommandFails) { return returnValue }

if result.exitStatus == .terminated(code: 0) {
return returnValue
try await swiftPMExecutionQueue.withOperation {
let result = try await executeProcess(
args,
packagePath: packagePath,
env: env
)
// Remove /r from stdout/stderr so that tests do not have to deal with them
let stdout = try String(decoding: result.output.get().filter { $0 != 13 }, as: Unicode.UTF8.self)
let stderr = try String(decoding: result.stderrOutput.get().filter { $0 != 13 }, as: Unicode.UTF8.self)

let returnValue = (stdout: stdout, stderr: stderr)
if !throwIfCommandFails { return returnValue }

if result.exitStatus == .terminated(code: 0) {
return returnValue
}
throw SwiftPMError.executionFailure(
underlying: AsyncProcessResult.Error.nonZeroExit(result),
stdout: stdout,
stderr: stderr
)
}
throw SwiftPMError.executionFailure(
underlying: AsyncProcessResult.Error.nonZeroExit(result),
stdout: stdout,
stderr: stderr
)
}

private func executeProcess(
_ args: [String],
packagePath: AbsolutePath? = nil,
Expand Down