OrgGo/shirou_gopsutil
1
0
Fork 0
mirror of https://github.com/shirou/gopsutil.git synced 2025-04-26 13:48:59 +08:00
Code Issues Projects Releases Wiki Activity

refactoring.

Browse Source
This commit is contained in:
WAKAYAMA Shirou 2014-09-20 00:21:26 +09:00
parent 90b8a2160b
commit b2dc569885
2 changed files with 17 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
disk_linux.go
View File

@ -78,13 +78,13 @@ func DiskIOCounters() (map[string]DiskIOCountersStat, error) {
return ret, err return ret, err
} }
d := DiskIOCountersStat{ d := DiskIOCountersStat{
ReadBytes: uint64(rbytes) * SectorSize, ReadBytes: rbytes * SectorSize,
WriteBytes: uint64(wbytes) * SectorSize, WriteBytes: wbytes * SectorSize,
ReadCount: uint64(reads), ReadCount: reads,
WriteCount: uint64(writes), WriteCount: writes,
ReadTime: uint64(rtime), ReadTime: rtime,
WriteTime: uint64(wtime), WriteTime: wtime,
IoTime: uint64(iotime), IoTime: iotime,
} }
if d == empty { if d == empty {
continue continue

42
mem_linux.go
View File

@ -22,45 +22,23 @@ func VirtualMemory() (*VirtualMemoryStat, error) {
value := strings.TrimSpace(fields[1]) value := strings.TrimSpace(fields[1])
value = strings.Replace(value, " kB", "", -1) value = strings.Replace(value, " kB", "", -1)
t, err := strconv.ParseUint(value, 10, 64)
if err != nil {
return ret, err
}
switch key { switch key {
case "MemTotal": case "MemTotal":
ret.Total = mustParseUint64(value) * 1000 ret.Total = t * 1000
t, err := strconv.ParseInt(value, 10, 64)
if err != nil {
return ret, err
}
ret.Total = uint64(t) * 1000
case "MemFree": case "MemFree":
ret.Free = mustParseUint64(value) * 1000 ret.Free = t * 1000
t, err := strconv.ParseInt(value, 10, 64)
if err != nil {
return ret, err
}
ret.Free = uint64(t) * 1000
case "Buffers": case "Buffers":
t, err := strconv.ParseInt(value, 10, 64) ret.Buffers = t * 1000
if err != nil {
return ret, err
}
ret.Buffers = uint64(t) * 1000
case "Cached": case "Cached":
t, err := strconv.ParseInt(value, 10, 64) ret.Cached = t * 1000
if err != nil {
return ret, err
}
ret.Cached = uint64(t) * 1000
case "Active": case "Active":
t, err := strconv.ParseInt(value, 10, 64) ret.Active = t * 1000
if err != nil {
return ret, err
}
ret.Active = uint64(t) * 1000
case "Inactive": case "Inactive":
t, err := strconv.ParseInt(value, 10, 64) ret.Inactive = t * 1000
if err != nil {
return ret, err
}
ret.Inactive = uint64(t) * 1000
} }
} }
ret.Available = ret.Free + ret.Buffers + ret.Cached ret.Available = ret.Free + ret.Buffers + ret.Cached