From 3adcafe5fd6204958f1ffd46f2891fa551fd088d Mon Sep 17 00:00:00 2001 From: Steven Lee Date: Sat, 19 May 2018 10:45:38 +0800 Subject: [PATCH] mem[windows]: if no swap, just return 0 used percent default --- mem/mem_windows.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/mem/mem_windows.go b/mem/mem_windows.go index 6b64ed0..cfdf8bd 100644 --- a/mem/mem_windows.go +++ b/mem/mem_windows.go @@ -4,7 +4,6 @@ package mem import ( "context" - "errors" "unsafe" "github.com/shirou/gopsutil/internal/common" @@ -80,16 +79,18 @@ func SwapMemoryWithContext(ctx context.Context) (*SwapMemoryStat, error) { } tot := perfInfo.commitLimit * perfInfo.pageSize used := perfInfo.commitTotal * perfInfo.pageSize - if tot == 0 || used == 0 { - return nil, errors.New("total or used memory is 0") - } - free := tot - used + var usedPercent float64 + if tot == 0 { + usedPercent = 0 + } else { + usedPercent = float64(used) / float64(tot) + } ret := &SwapMemoryStat{ Total: tot, Used: used, Free: free, - UsedPercent: float64(used) / float64(tot), + UsedPercent: usedPercent, } return ret, nil