Skip to content

Commit

Permalink
Rollup merge of rust-lang#106216 - ChrisDenton:ps-go-faster, r=jyn514
Browse files Browse the repository at this point in the history
Powershell: Use `WaitForExit` instead of `-Wait`

Using the method `WaitForExit` instead of the parameter `-Wait` results in a notable speed up of the `x.ps1` script (~350ms, fairly consistently).

Results:
```
milliseconds before: 1127.7576
milliseconds after:   779.0467
```

I think there are opportunities for further speed up by calling `Get-Command` only once with the pattern `py*` then filtering the returned list.

But I'll leave that for another time (or someone else).

r? `@jyn514`
  • Loading branch information
matthiaskrgr authored Dec 29, 2022
2 parents f9fab1f + 96501bd commit 801093f
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions x.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ function Get-Application($app) {
return Get-Command $app -ErrorAction SilentlyContinue -CommandType Application
}

function Invoke-Application($application, $arguments) {
$process = Start-Process -NoNewWindow -PassThru $application $arguments
$process.WaitForExit()
Exit $process.ExitCode
}

foreach ($python in "py", "python3", "python", "python2") {
# NOTE: this only tests that the command exists in PATH, not that it's actually
# executable. The latter is not possible in a portable way, see
Expand All @@ -23,16 +29,14 @@ foreach ($python in "py", "python3", "python", "python2") {
# Use python3, not python2
$xpy_args = @("-3") + $xpy_args
}
$process = Start-Process -NoNewWindow -Wait -PassThru $python $xpy_args
Exit $process.ExitCode
Invoke-Application $python $xpy_args
}
}

$found = (Get-Application "python*" | Where-Object {$_.name -match '^python[2-3]\.[0-9]+(\.exe)?$'})
if (($null -ne $found) -and ($found.Length -ge 1)) {
$python = $found[0]
$process = Start-Process -NoNewWindow -Wait -PassThru $python $xpy_args
Exit $process.ExitCode
Invoke-Application $python $xpy_args
}

Write-Error "${PSCommandPath}: error: did not find python installed"
Expand Down

0 comments on commit 801093f

Please sign in to comment.