Fix IOCountersForNames on darwin

shirou · Apr 7, 2017 · ab6db76 · ab6db76
1 parent 3f35f00
commit ab6db76
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/disk/disk_darwin.go b/disk/disk_darwin.go
@@ -87,10 +87,6 @@ func Partitions(all bool) ([]PartitionStat, error) {
 	return ret, nil
 }
 
-func IOCountersForNames(names []string) (map[string]IOCountersStat, error) {
-	return nil, common.ErrNotImplementedError
-}
-
 func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
 	var _p0 unsafe.Pointer
 	var bufsize uintptr

diff --git a/disk/disk_darwin_cgo.go b/disk/disk_darwin_cgo.go
@@ -30,9 +30,11 @@ import (
 	"errors"
 	"strings"
 	"unsafe"
+
+	"github.com/shirou/gopsutil/internal/common"
 )
 
-func IOCounters() (map[string]IOCountersStat, error) {
+func IOCountersForNames(names []string) (map[string]IOCountersStat, error) {
 	if C.StartIOCounterFetch() == 0 {
 		return nil, errors.New("Unable to fetch disk list")
 	}
@@ -78,6 +80,10 @@ func IOCounters() (map[string]IOCountersStat, error) {
 			Name:       strings.TrimFunc(C.GoStringN(&di.DiskName[0], C.MAX_DISK_NAME), isRuneNull),
 		}
 
+		if len(names) > 0 && !common.StringsHas(names, d.Name) {
+			continue
+		}
+
 		ret[d.Name] = d
 	}
 

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