Merge pull request #238 from kthommandra/add_linux_mem_fields

Added fields to VirtualMemoryStat
pull/239/head
shirou 9 years ago committed by GitHub
commit e997d2e3db

@ -48,8 +48,12 @@ type VirtualMemoryStat struct {
// Linux specific numbers // Linux specific numbers
// https://www.centos.org/docs/5/html/5.1/Deployment_Guide/s2-proc-meminfo.html // https://www.centos.org/docs/5/html/5.1/Deployment_Guide/s2-proc-meminfo.html
// https://www.kernel.org/doc/Documentation/filesystems/proc.txt
Buffers uint64 `json:"buffers"` Buffers uint64 `json:"buffers"`
Cached uint64 `json:"cached"` Cached uint64 `json:"cached"`
Writeback uint64 `json:"writeback"`
Dirty uint64 `json:"dirty"`
WritebackTmp uint64 `json:"writebacktmp"`
} }
type SwapMemoryStat struct { type SwapMemoryStat struct {

@ -46,6 +46,12 @@ func VirtualMemory() (*VirtualMemoryStat, error) {
ret.Active = t * 1024 ret.Active = t * 1024
case "Inactive": case "Inactive":
ret.Inactive = t * 1024 ret.Inactive = t * 1024
case "Writeback":
ret.Writeback = t * 1024
case "WritebackTmp":
ret.WritebackTmp = t * 1024
case "Dirty":
ret.Dirty = t * 1024
} }
} }
if !memavail { if !memavail {

@ -52,7 +52,7 @@ func TestVirtualMemoryStat_String(t *testing.T) {
UsedPercent: 30.1, UsedPercent: 30.1,
Free: 40, Free: 40,
} }
e := `{"total":10,"available":20,"used":30,"usedPercent":30.1,"free":40,"active":0,"inactive":0,"wired":0,"buffers":0,"cached":0}` e := `{"total":10,"available":20,"used":30,"usedPercent":30.1,"free":40,"active":0,"inactive":0,"wired":0,"buffers":0,"cached":0,"writeback":0,"dirty":0,"writebacktmp":0}`
if e != fmt.Sprintf("%v", v) { if e != fmt.Sprintf("%v", v) {
t.Errorf("VirtualMemoryStat string is invalid: %v", v) t.Errorf("VirtualMemoryStat string is invalid: %v", v)
} }

Loading…
Cancel
Save