OrgGo
/
shirou_gopsutil
mirror of https://hub.fastgit.org/shirou/gopsutil.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Make IOCounters a variadic function
This commit is contained in:
shirou 2017-04-14 12:53:08 +09:00 committed by GitHub
parent dfbb3e40da 3830ed16b4
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)
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"
)
func IOCountersForNames(names []string) (map[string]IOCountersStat, error) {
func IOCounters(names ...string) (map[string]IOCountersStat, error) {
if C.StartIOCounterFetch() == 0 {
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"
func IOCountersForNames(names []string) (map[string]IOCountersStat, error) {
func IOCounters(names ...string) (map[string]IOCountersStat, error) {
return nil, common.ErrNotImplementedError
}

2
disk/disk_fallback.go
View File

@ -4,7 +4,7 @@ package disk
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
}

2
disk/disk_freebsd.go
View File

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

2
disk/disk_linux.go
View File

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

2
disk/disk_openbsd.go
View File

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