follow-up

Signed-off-by: Alex Aizman <[email protected]>
NVIDIA · Dec 18, 2024 · 576ce3c · 576ce3c
1 parent e8662f3
commit 576ce3c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/fs/throttle.go b/fs/throttle.go
@@ -35,8 +35,7 @@ func ThrottlePct() (int, int64, float64) {
 	var (
 		load     = sys.MaxLoad()
 		util     = GetMaxUtil()
-		ncpu     = sys.NumCPU()
-		highLoad = sys.HighLoadWM(ncpu)
+		highLoad = sys.HighLoadWM()
 	)
 	if load >= float64(highLoad) {
 		return 100, util, load

diff --git a/memsys/gc.go b/memsys/gc.go
@@ -32,8 +32,7 @@ func (r *MMSA) freeMemToOS(mingc int64, p int, forces ...bool) {
 
 	var (
 		load     = sys.MaxLoad()
-		ncpu     = sys.NumCPU()
-		highLoad = sys.HighLoadWM(ncpu)
+		highLoad = sys.HighLoadWM()
 	)
 	if !force {
 		// too busy and not too "pressured"

diff --git a/sys/cpu.go b/sys/cpu.go
@@ -13,7 +13,7 @@ import (
 )
 
 // used with MaxLoad()
-// floating point; compare with HighLoadWM() below
+// floating point; HighLoad < HighLoadWM() < ExtremeLoad
 const (
 	ExtremeLoad = 92
 	HighLoad    = 82
@@ -61,7 +61,10 @@ func GoEnvMaxprocs() {
 
 // "high-load watermark", to maybe throttle when MaxLoad() is above
 // see also (ExtremeLoad, HighLoad) defaults
-func HighLoadWM(ncpu int) int { return max(ncpu-ncpu>>3, 1) }
+func HighLoadWM() int {
+	ncpu := NumCPU()
+	return max(ncpu-ncpu>>3, 1)
+}
 
 // return max(1 minute, 5 minute) load average
 func MaxLoad() (load float64) {