OrgGo/shirou_gopsutil
1
0
Fork 0
mirror of https://github.com/shirou/gopsutil.git synced 2025-05-04 22:17:34 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #351 from danielnelson/io-counters-for-names

Browse Source 
Make IOCounters a variadic function
This commit is contained in:
shirou 2017-04-14 12:53:08 +09:00 committed by GitHub
commit 70693b6a3d
8 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
disk/disk.go
View File

@ -62,7 +62,3 @@ func (d IOCountersStat) String() string {
s, _ := json.Marshal(d) s, _ := json.Marshal(d)
return string(s) return string(s)
} }
func IOCounters() (map[string]IOCountersStat, error) {
return IOCountersForNames([]string{})
}

2
disk/disk_darwin_cgo.go
View File

@ -34,7 +34,7 @@ import (
"github.com/shirou/gopsutil/internal/common" "github.com/shirou/gopsutil/internal/common"
) )
func IOCountersForNames(names []string) (map[string]IOCountersStat, error) { func IOCounters(names ...string) (map[string]IOCountersStat, error) {
if C.StartIOCounterFetch() == 0 { if C.StartIOCounterFetch() == 0 {
return nil, errors.New("Unable to fetch disk list") return nil, errors.New("Unable to fetch disk list")
} }

2
disk/disk_darwin_nocgo.go
View File

@ -5,6 +5,6 @@ package disk
import "github.com/shirou/gopsutil/internal/common" import "github.com/shirou/gopsutil/internal/common"
func IOCountersForNames(names []string) (map[string]IOCountersStat, error) { func IOCounters(names ...string) (map[string]IOCountersStat, error) {
return nil, common.ErrNotImplementedError return nil, common.ErrNotImplementedError
} }

2
disk/disk_fallback.go
View File

@ -4,7 +4,7 @@ package disk
import "github.com/shirou/gopsutil/internal/common" import "github.com/shirou/gopsutil/internal/common"
func IOCountersForNames(names []string) (map[string]IOCountersStat, error) { func IOCounters(names ...string) (map[string]IOCountersStat, error) {
return nil, common.ErrNotImplementedError return nil, common.ErrNotImplementedError
} }

2
disk/disk_freebsd.go
View File

@ -94,7 +94,7 @@ func Partitions(all bool) ([]PartitionStat, error) {
return ret, nil return ret, nil
} }
func IOCountersForNames(names []string) (map[string]IOCountersStat, error) { func IOCounters(names ...string) (map[string]IOCountersStat, error) {
// statinfo->devinfo->devstat // statinfo->devinfo->devstat
// /usr/include/devinfo.h // /usr/include/devinfo.h
ret := make(map[string]IOCountersStat) ret := make(map[string]IOCountersStat)

2
disk/disk_linux.go
View File

@ -272,7 +272,7 @@ func getFileSystems() ([]string, error) {
return ret, nil return ret, nil
} }
func IOCountersForNames(names []string) (map[string]IOCountersStat, error) { func IOCounters(names ...string) (map[string]IOCountersStat, error) {
filename := common.HostProc("diskstats") filename := common.HostProc("diskstats")
lines, err := common.ReadLines(filename) lines, err := common.ReadLines(filename)
if err != nil { if err != nil {

2
disk/disk_openbsd.go
View File

@ -63,7 +63,7 @@ func Partitions(all bool) ([]PartitionStat, error) {
return ret, nil return ret, nil
} }
func IOCountersForNames(names []string) (map[string]IOCountersStat, error) { func IOCounters(names ...string) (map[string]IOCountersStat, error) {
ret := make(map[string]IOCountersStat) ret := make(map[string]IOCountersStat)
r, err := syscall.Sysctl("hw.diskstats") r, err := syscall.Sysctl("hw.diskstats")

2
disk/disk_windows.go
View File

@ -129,7 +129,7 @@ func Partitions(all bool) ([]PartitionStat, error) {
return ret, nil return ret, nil
} }
func IOCountersForNames(names []string) (map[string]IOCountersStat, error) { func IOCounters(names ...string) (map[string]IOCountersStat, error) {
ret := make(map[string]IOCountersStat, 0) ret := make(map[string]IOCountersStat, 0)
var dst []Win32_PerfFormattedData var dst []Win32_PerfFormattedData