bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #106216 - ChrisDenton:ps-go-faster, r=jyn514

Browse source 
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``
This commit is contained in:
Matthias Krüger 2022-12-29 13:16:02 +01:00 • committed by GitHub
commit e7823145f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
x.ps1
View file

@ -14,6 +14,12 @@ function Get-Application($app) {
return Get-Command $app -ErrorAction SilentlyContinue -CommandType Application 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") { foreach ($python in "py", "python3", "python", "python2") {
# NOTE: this only tests that the command exists in PATH, not that it's actually # 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 # executable. The latter is not possible in a portable way, see
@ -23,16 +29,14 @@ foreach ($python in "py", "python3", "python", "python2") {
# Use python3, not python2 # Use python3, not python2
$xpy_args = @("-3") + $xpy_args $xpy_args = @("-3") + $xpy_args
} }
$process = Start-Process -NoNewWindow -Wait -PassThru $python $xpy_args Invoke-Application $python $xpy_args
Exit $process.ExitCode
} }
} }
$found = (Get-Application "python*" | Where-Object {$_.name -match '^python[2-3]\.[0-9]+(\.exe)?$'}) $found = (Get-Application "python*" | Where-Object {$_.name -match '^python[2-3]\.[0-9]+(\.exe)?$'})
if (($null -ne $found) -and ($found.Length -ge 1)) { if (($null -ne $found) -and ($found.Length -ge 1)) {
$python = $found[0] $python = $found[0]
$process = Start-Process -NoNewWindow -Wait -PassThru $python $xpy_args Invoke-Application $python $xpy_args
Exit $process.ExitCode
} }
Write-Error "${PSCommandPath}: error: did not find python installed" Write-Error "${PSCommandPath}: error: did not find python installed"