fix(clistat): do not include buffers/cache for host memory used (#8095)

johnstcn · web-flow · commit 0f754f0bb943 · 2023-06-20T13:29:27.000+01:00
diff --git a/cli/clistat/stat.go b/cli/clistat/stat.go
@@ -186,6 +186,10 @@ func (s *Statter) HostMemory() (*Result, error) {
 		return nil, xerrors.Errorf("get memory info: %w", err)
 	}
 	r.Total = ptr.To(float64(hm.Total))
-	r.Used = float64(hm.Used)
+	// On Linux, hm.Used equates to MemTotal - MemFree in /proc/stat.
+	// This includes buffers and cache.
+	// So use MemAvailable instead, which only equates to physical memory.
+	// On Windows, this is also calculated as Total - Available.
+	r.Used = float64(hm.Total - hm.Available)
 	return r, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -186,6 +186,10 @@ func (s Statter) HostMemory() (Result, error) {`
`186`	`186`	`return nil, xerrors.Errorf("get memory info: %w", err)`
`187`	`187`	`}`
`188`	`188`	`r.Total = ptr.To(float64(hm.Total))`
`189`		`- r.Used = float64(hm.Used)`
	`189`	`+ // On Linux, hm.Used equates to MemTotal - MemFree in /proc/stat.`
	`190`	`+ // This includes buffers and cache.`
	`191`	`+ // So use MemAvailable instead, which only equates to physical memory.`
	`192`	`+ // On Windows, this is also calculated as Total - Available.`
	`193`	`+ r.Used = float64(hm.Total - hm.Available)`
`190`	`194`	`return r, nil`
`191`	`195`	`}`