Skip to content

Commit

Permalink
cmd/podman/pods: omit superfluous runtime.NumCPU call
Browse files Browse the repository at this point in the history
sysinfo.NumCPU already falls back to runtime.NumCPU in case the
platform-specific sysinfo.numCPU returns 0, see
https://github.com/containers/common/blob/554799639fc82afeddb9e39ec27a7b85382a6db3/pkg/sysinfo/numcpu.go#L8-L13

Also omit a second call to sysinfo.NumCPU and use the result from the
earlier call.

[NO NEW TESTS NEEDED]

Signed-off-by: Tobias Klauser <[email protected]>
  • Loading branch information
tklauser committed Apr 21, 2023
1 parent e9c1335 commit 70bd096
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions cmd/podman/pods/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"errors"
"fmt"
"os"
"runtime"
"sort"
"strconv"
"strings"
Expand Down Expand Up @@ -207,16 +206,13 @@ func create(cmd *cobra.Command, args []string) error {
}

numCPU := sysinfo.NumCPU()
if numCPU == 0 {
numCPU = runtime.NumCPU()
}
if createOptions.Cpus > float64(numCPU) {
createOptions.Cpus = float64(numCPU)
}
copy := infraOptions.CPUSetCPUs
cpuSet := infraOptions.CPUS
if cpuSet == 0 {
cpuSet = float64(sysinfo.NumCPU())
cpuSet = float64(numCPU)
}
ret, err := parsers.ParseUintList(copy)
copy = ""
Expand Down

0 comments on commit 70bd096

Please sign in to comment.