Merge branch 'master' of https://github.com/shirou/gopsutil into cpu_test

cpu/cpu_darwin_nocgo.go

@@ -3,7 +3,7 @@
 
 package cpu
 
-import "github.com/shirou/gopsutil/common"
+import "github.com/shirou/gopsutil/internal/common"
 
 func perCPUTimes() ([]CPUTimesStat, error) {
 	return []CPUTimesStat{}, common.NotImplementedError

cpu/cpu_freebsd.go

@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"strings"
 
-	common "github.com/shirou/gopsutil/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 // sys/resource.h

cpu/cpu_windows.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/StackExchange/wmi"
 
-	common "github.com/shirou/gopsutil/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 type Win32_Processor struct {

disk/disk_darwin.go

@@ -6,7 +6,7 @@ import (
 	"syscall"
 	"unsafe"
 
-	common "github.com/shirou/gopsutil/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 func DiskPartitions(all bool) ([]DiskPartitionStat, error) {

disk/disk_freebsd.go

@@ -9,7 +9,7 @@ import (
 	"syscall"
 	"unsafe"
 
-	common "github.com/shirou/gopsutil/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 const (

disk/disk_windows.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/StackExchange/wmi"
 
-	common "github.com/shirou/gopsutil/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 var (

host/host_darwin.go

@@ -13,7 +13,7 @@ import (
 	"strings"
 	"unsafe"
 
-	common "github.com/shirou/gopsutil/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 func HostInfo() (*HostInfoStat, error) {

host/host_freebsd.go

@@ -13,7 +13,7 @@ import (
 	"strings"
 	"unsafe"
 
-	common "github.com/shirou/gopsutil/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 const (

host/host_windows.go

@@ -11,8 +11,8 @@ import (
 
 	"github.com/StackExchange/wmi"
 
-	common "github.com/shirou/gopsutil/common"
-	process "github.com/shirou/gopsutil/common/process"
+	"github.com/shirou/gopsutil/internal/common"
+	process "github.com/shirou/gopsutil/process"
 )
 
 var (

load/load_darwin.go

@@ -5,7 +5,7 @@ package load
 import (
 	"strconv"
 
-	common "github.com/shirou/gopsutil/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 func LoadAvg() (*LoadAvgStat, error) {

load/load_freebsd.go

@@ -5,7 +5,7 @@ package load
 import (
 	"strconv"
 
-	common "github.com/shirou/gopsutil/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 func LoadAvg() (*LoadAvgStat, error) {

load/load_windows.go

@@ -3,7 +3,7 @@
 package load
 
 import (
-	common "github.com/shirou/gopsutil/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 func LoadAvg() (*LoadAvgStat, error) {

mem/mem_darwin.go

@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	common "github.com/shirou/gopsutil/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 func getPageSize() (uint64, error) {

mem/mem_freebsd.go

@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	common "github.com/shirou/gopsutil/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 func VirtualMemory() (*VirtualMemoryStat, error) {

mem/mem_windows.go

@@ -6,7 +6,7 @@ import (
 	"syscall"
 	"unsafe"
 
-	common "github.com/shirou/gopsutil/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 var (

net/net_darwin.go

@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/shirou/gopsutil/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 // example of netstat -idbn output on yosemite

net/net_freebsd.go

@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/shirou/gopsutil/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 func NetIOCounters(pernic bool) ([]NetIOCountersStat, error) {

net/net_windows.go

@@ -8,7 +8,7 @@ import (
 	"syscall"
 	"unsafe"
 
-	common "github.com/shirou/gopsutil/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 var (

process/process_darwin.go

@@ -10,7 +10,7 @@ import (
 	"syscall"
 	"unsafe"
 
-	"github.com/shirou/gopsutil/common"
+	"github.com/shirou/gopsutil/internal/common"
 	"github.com/shirou/gopsutil/cpu"
 	"github.com/shirou/gopsutil/net"
 )

process/process_freebsd.go

@@ -7,7 +7,7 @@ import (
 	"encoding/binary"
 	"unsafe"
 
-	common "github.com/shirou/gopsutil/common"
+	"github.com/shirou/gopsutil/internal/common"
 	cpu "github.com/shirou/gopsutil/cpu"
 	net "github.com/shirou/gopsutil/net"
 )

process/process_windows.go

@@ -12,7 +12,7 @@ import (
 	"github.com/StackExchange/wmi"
 	"github.com/shirou/w32"
 
-	common "github.com/shirou/gopsutil/common"
+	"github.com/shirou/gopsutil/internal/common"
 	cpu "github.com/shirou/gopsutil/cpu"
 	net "github.com/shirou/gopsutil/net"
 )