From 799501d172f03b2d0a89491214fe22891bf56c81 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 31 Dec 2024 15:10:55 +0100 Subject: [PATCH] pkg/sysinfo: rename vars/arguments for clarity Signed-off-by: Sebastiaan van Stijn --- pkg/sysinfo/sysinfo.go | 8 ++++---- pkg/sysinfo/sysinfo_linux.go | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/sysinfo/sysinfo.go b/pkg/sysinfo/sysinfo.go index 7fcc66f54b..124f2c5c4f 100644 --- a/pkg/sysinfo/sysinfo.go +++ b/pkg/sysinfo/sysinfo.go @@ -135,13 +135,13 @@ type cgroupPids struct { // IsCpusetCpusAvailable returns `true` if the provided string set is contained // in cgroup's cpuset.cpus set, `false` otherwise. // If error is not nil a parsing error occurred. -func (c cgroupCpusetInfo) IsCpusetCpusAvailable(provided string) (bool, error) { - return isCpusetListAvailable(provided, c.Cpus) +func (c cgroupCpusetInfo) IsCpusetCpusAvailable(requested string) (bool, error) { + return isCpusetListAvailable(requested, c.Cpus) } // IsCpusetMemsAvailable returns `true` if the provided string set is contained // in cgroup's cpuset.mems set, `false` otherwise. // If error is not nil a parsing error occurred. -func (c cgroupCpusetInfo) IsCpusetMemsAvailable(provided string) (bool, error) { - return isCpusetListAvailable(provided, c.Mems) +func (c cgroupCpusetInfo) IsCpusetMemsAvailable(requested string) (bool, error) { + return isCpusetListAvailable(requested, c.Mems) } diff --git a/pkg/sysinfo/sysinfo_linux.go b/pkg/sysinfo/sysinfo_linux.go index 8b7f20f848..f09025a71c 100644 --- a/pkg/sysinfo/sysinfo_linux.go +++ b/pkg/sysinfo/sysinfo_linux.go @@ -316,7 +316,7 @@ func readProcBool(path string) bool { return strings.TrimSpace(string(val)) == "1" } -func isCpusetListAvailable(provided, available string) (bool, error) { +func isCpusetListAvailable(requested, available string) (bool, error) { parsedAvailable, err := parsers.ParseUintList(available) if err != nil { return false, err @@ -329,11 +329,11 @@ func isCpusetListAvailable(provided, available string) (bool, error) { maxCPUs = m } } - parsedProvided, err := parsers.ParseUintListMaximum(provided, maxCPUs) + parsedRequested, err := parsers.ParseUintListMaximum(requested, maxCPUs) if err != nil { return false, err } - for k := range parsedProvided { + for k := range parsedRequested { if !parsedAvailable[k] { return false, nil }