memory: expose virtual totals / avail values on windows

There are 2 more memory values i'd like to use. They are there already, just not exposed by the module. - https://learn.microsoft.com/en-us/windows/win32/api/sysinfoapi/ns-sysinfoapi-memorystatusex Signed-off-by: Sven Nierlein <[email protected]>
shirou · Jan 26, 2024 · 202353d · 202353d
1 parent 65b5fa3
commit 202353d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/mem/mem.go b/mem/mem.go
@@ -80,6 +80,11 @@ type VirtualMemoryStat struct {
 	HugePagesSurp  uint64 `json:"hugePagesSurp"`
 	HugePageSize   uint64 `json:"hugePageSize"`
 	AnonHugePages  uint64 `json:"anonHugePages"`
+
+	// Windows specific numbers
+	// https://learn.microsoft.com/en-us/windows/win32/api/sysinfoapi/ns-sysinfoapi-memorystatusex
+	VirtualTotal uint64 `json:"virtualTotal"`
+	VirtualAvail uint64 `json:"virtualAvail"`
 }
 
 type SwapMemoryStat struct {

diff --git a/mem/mem_windows.go b/mem/mem_windows.go
@@ -45,10 +45,12 @@ func VirtualMemoryWithContext(ctx context.Context) (*VirtualMemoryStat, error) {
 	}
 
 	ret := &VirtualMemoryStat{
-		Total:       memInfo.ullTotalPhys,
-		Available:   memInfo.ullAvailPhys,
-		Free:        memInfo.ullAvailPhys,
-		UsedPercent: float64(memInfo.dwMemoryLoad),
+		Total:        memInfo.ullTotalPhys,
+		Available:    memInfo.ullAvailPhys,
+		Free:         memInfo.ullAvailPhys,
+		UsedPercent:  float64(memInfo.dwMemoryLoad),
+		VirtualTotal: memInfo.ullAvailVirtual,
+		VirtualAvail: memInfo.ullAvailExtendedVirtual,
 	}
 
 	ret.Used = ret.Total - ret.Available