test windows cpu.Time(true) returning time instead of percentages

README.rst

@@ -61,7 +61,7 @@ Note: gopsutil v2 breaks compatibility. If you want to stay with compatibility,
    import (
        "fmt"
 
-       "github.com/shirou/gopsutil/mem"
+       "github.com/marcospedreiro/gopsutil/mem"
    )
 
    func main() {

cpu/cpu.go

@@ -10,7 +10,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 )
 
 // TimesStat contains the amounts of time the CPU has spent performing different

cpu/cpu_darwin_nocgo.go

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

cpu/cpu_fallback.go

@@ -5,7 +5,7 @@ package cpu
 import (
 	"context"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 )
 
 func Times(percpu bool) ([]TimesStat, error) {

cpu/cpu_freebsd.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 	"unsafe"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 	"golang.org/x/sys/unix"
 )
 

cpu/cpu_freebsd_test.go

@@ -5,7 +5,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 )
 
 func TestParseDmesgBoot(t *testing.T) {

cpu/cpu_linux.go

@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 )
 
 var CPUTick = float64(100)

cpu/cpu_openbsd.go

@@ -11,7 +11,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 	"golang.org/x/sys/unix"
 )
 

cpu/cpu_solaris.go

@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 )
 
 var ClocksPerSec = float64(128)

cpu/cpu_windows.go

@@ -8,7 +8,7 @@ import (
 	"unsafe"
 
 	"github.com/StackExchange/wmi"
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 	"golang.org/x/sys/windows"
 )
 
@@ -38,6 +38,20 @@ type win32_PerfFormattedData_Counters_ProcessorInformation struct {
 	DPCRate               uint32
 }
 
+type win32_PerfRawData_Counters_ProcessorInformation struct {
+	Name                  string
+	PercentDPCTime        uint64
+	PercentIdleTime       uint64
+	PercentUserTime       uint64
+	PercentProcessorTime  uint64
+	PercentInterruptTime  uint64
+	PercentPriorityTime   uint64
+	PercentPrivilegedTime uint64
+	InterruptsPerSec      uint32
+	ProcessorFrequency    uint32
+	DPCRate               uint32
+}
+
 // Win32_PerfFormattedData_PerfOS_System struct to have count of processes and processor queue length
 type Win32_PerfFormattedData_PerfOS_System struct {
 	Processes            uint32
@@ -119,13 +133,14 @@ func InfoWithContext(ctx context.Context) ([]InfoStat, error) {
 
 // PerfInfo returns the performance counter's instance value for ProcessorInformation.
 // Name property is the key by which overall, per cpu and per core metric is known.
-func perfInfoWithContext(ctx context.Context) ([]win32_PerfFormattedData_Counters_ProcessorInformation, error) {
-	var ret []win32_PerfFormattedData_Counters_ProcessorInformation
+func perfInfoWithContext(ctx context.Context) ([]win32_PerfRawData_Counters_ProcessorInformation, error) {
+	var ret []win32_PerfRawData_Counters_ProcessorInformation
+	// Win32_PerfRawData_Counters_ProcessorInformation
 
 	q := wmi.CreateQuery(&ret, "WHERE NOT Name LIKE '%_Total'")
 	err := common.WMIQueryWithContext(ctx, q, &ret)
 	if err != nil {
-		return []win32_PerfFormattedData_Counters_ProcessorInformation{}, err
+		return []win32_PerfRawData_Counters_ProcessorInformation{}, err
 	}
 
 	return ret, err

disk/disk.go

@@ -3,7 +3,7 @@ package disk
 import (
 	"encoding/json"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 )
 
 var invoke common.Invoker = common.Invoke{}

disk/disk_darwin.go

@@ -7,7 +7,7 @@ import (
 	"path"
 	"unsafe"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 	"golang.org/x/sys/unix"
 )
 

disk/disk_darwin_cgo.go

@@ -31,7 +31,7 @@ import (
 	"strings"
 	"unsafe"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 )
 
 func IOCounters(names ...string) (map[string]IOCountersStat, error) {

disk/disk_darwin_nocgo.go

@@ -6,7 +6,7 @@ package disk
 import (
 	"context"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 )
 
 func IOCounters(names ...string) (map[string]IOCountersStat, error) {

disk/disk_fallback.go

@@ -5,7 +5,7 @@ package disk
 import (
 	"context"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 )
 
 func IOCounters(names ...string) (map[string]IOCountersStat, error) {

disk/disk_freebsd.go

@@ -12,7 +12,7 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 )
 
 func Partitions(all bool) ([]PartitionStat, error) {

disk/disk_linux.go

@@ -14,7 +14,7 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 )
 
 const (

disk/disk_openbsd.go

@@ -9,7 +9,7 @@ import (
 	"path"
 	"unsafe"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 	"golang.org/x/sys/unix"
 )
 

disk/disk_solaris.go

@@ -10,7 +10,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 	"golang.org/x/sys/unix"
 )
 

disk/disk_unix.go

@@ -51,7 +51,7 @@ func UsageWithContext(ctx context.Context, path string) (*UsageStat, error) {
 		ret.UsedPercent = 0
 	} else {
 		// We don't use ret.Total to calculate percent.
-		// see https://github.com/shirou/gopsutil/issues/562
+		// see https://github.com/marcospedreiro/gopsutil/issues/562
 		ret.UsedPercent = (float64(ret.Used) / float64(ret.Used+ret.Free)) * 100.0
 	}
 

disk/disk_windows.go

@@ -7,7 +7,7 @@ import (
 	"context"
 	"unsafe"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 	"golang.org/x/sys/windows"
 )
 

docker/docker.go

@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"errors"
 
-	"github.com/shirou/gopsutil/cpu"
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/cpu"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 )
 
 var ErrDockerNotAvailable = errors.New("docker not available")

docker/docker_linux.go

@@ -11,8 +11,8 @@ import (
 	"strconv"
 	"strings"
 
-	cpu "github.com/shirou/gopsutil/cpu"
-	"github.com/shirou/gopsutil/internal/common"
+	cpu "github.com/marcospedreiro/gopsutil/cpu"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 )
 
 // GetDockerStat returns a list of Docker basic stats.

docker/docker_notlinux.go

@@ -5,8 +5,8 @@ package docker
 import (
 	"context"
 
-	cpu "github.com/shirou/gopsutil/cpu"
-	"github.com/shirou/gopsutil/internal/common"
+	cpu "github.com/marcospedreiro/gopsutil/cpu"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 )
 
 // GetDockerStat returns a list of Docker basic stats.

host/host.go

@@ -3,7 +3,7 @@ package host
 import (
 	"encoding/json"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 )
 
 var invoke common.Invoker = common.Invoke{}

host/host_darwin.go

@@ -16,8 +16,8 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/shirou/gopsutil/internal/common"
-	"github.com/shirou/gopsutil/process"
+	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/process"
 )
 
 // from utmpx.h

host/host_fallback.go

@@ -5,7 +5,7 @@ package host
 import (
 	"context"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 )
 
 func Info() (*InfoStat, error) {

host/host_freebsd.go

@@ -15,8 +15,8 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/shirou/gopsutil/internal/common"
-	"github.com/shirou/gopsutil/process"
+	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/process"
 	"golang.org/x/sys/unix"
 )
 

host/host_linux.go

@@ -18,7 +18,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 )
 
 type LSB struct {

host/host_openbsd.go

@@ -15,8 +15,8 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/shirou/gopsutil/internal/common"
-	"github.com/shirou/gopsutil/process"
+	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/process"
 )
 
 const (

host/host_solaris.go

@@ -14,7 +14,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 )
 
 func Info() (*InfoStat, error) {

host/host_windows.go

@@ -15,8 +15,8 @@ import (
 	"unsafe"
 
 	"github.com/StackExchange/wmi"
-	"github.com/shirou/gopsutil/internal/common"
-	process "github.com/shirou/gopsutil/process"
+	"github.com/marcospedreiro/gopsutil/internal/common"
+	process "github.com/marcospedreiro/gopsutil/process"
 	"golang.org/x/sys/windows"
 )
 
@@ -102,7 +102,7 @@ func InfoWithContext(ctx context.Context) (*InfoStat, error) {
 }
 
 func getMachineGuid() (string, error) {
-	// there has been reports of issues on 32bit using golang.org/x/sys/windows/registry, see https://github.com/shirou/gopsutil/pull/312#issuecomment-277422612
+	// there has been reports of issues on 32bit using golang.org/x/sys/windows/registry, see https://github.com/marcospedreiro/gopsutil/pull/312#issuecomment-277422612
 	// for rationale of using windows.RegOpenKeyEx/RegQueryValueEx instead of registry.OpenKey/GetStringValue
 	var h windows.Handle
 	err := windows.RegOpenKeyEx(windows.HKEY_LOCAL_MACHINE, windows.StringToUTF16Ptr(`SOFTWARE\Microsoft\Cryptography`), 0, windows.KEY_READ|windows.KEY_WOW64_64KEY, &h)

load/load.go

@@ -3,7 +3,7 @@ package load
 import (
 	"encoding/json"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 )
 
 var invoke common.Invoker = common.Invoke{}

load/load_darwin.go

@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 )
 
 func Avg() (*AvgStat, error) {

load/load_fallback.go

@@ -5,7 +5,7 @@ package load
 import (
 	"context"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 )
 
 func Avg() (*AvgStat, error) {

load/load_linux.go

@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 )
 
 func Avg() (*AvgStat, error) {

load/load_windows.go

@@ -5,7 +5,7 @@ package load
 import (
 	"context"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 )
 
 func Avg() (*AvgStat, error) {

mem/mem.go

@@ -3,7 +3,7 @@ package mem
 import (
 	"encoding/json"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 )
 
 var invoke common.Invoker = common.Invoke{}

mem/mem_darwin.go

@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 	"golang.org/x/sys/unix"
 )
 

mem/mem_fallback.go

@@ -5,7 +5,7 @@ package mem
 import (
 	"context"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 )
 
 func VirtualMemory() (*VirtualMemoryStat, error) {

mem/mem_linux.go

@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 	"golang.org/x/sys/unix"
 )
 

mem/mem_openbsd.go

@@ -10,7 +10,7 @@ import (
 	"fmt"
 	"os/exec"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 )
 
 func GetPageSize() (uint64, error) {

mem/mem_solaris.go

@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 )
 
 // VirtualMemory for Solaris is a minimal implementation which only returns

mem/mem_windows.go

@@ -6,7 +6,7 @@ import (
 	"context"
 	"unsafe"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 	"golang.org/x/sys/windows"
 )
 

net/net.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 )
 
 var invoke common.Invoker = common.Invoke{}

net/net_fallback.go

@@ -5,7 +5,7 @@ package net
 import (
 	"context"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 )
 
 func IOCounters(pernic bool) ([]IOCountersStat, error) {

net/net_freebsd.go

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

net/net_linux.go

@@ -15,7 +15,7 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 )
 
 // NetIOCounters returnes network I/O statistics for every network
@@ -661,7 +661,7 @@ func processInet(file string, kind netConnectionKindType, inodes map[string][]in
 	// Read the contents of the /proc file with a single read sys call.
 	// This minimizes duplicates in the returned connections
 	// For more info:
-	// https://github.com/shirou/gopsutil/pull/361
+	// https://github.com/marcospedreiro/gopsutil/pull/361
 	contents, err := ioutil.ReadFile(file)
 	if err != nil {
 		return nil, err
@@ -722,7 +722,7 @@ func processUnix(file string, kind netConnectionKindType, inodes map[string][]in
 	// Read the contents of the /proc file with a single read sys call.
 	// This minimizes duplicates in the returned connections
 	// For more info:
-	// https://github.com/shirou/gopsutil/pull/361
+	// https://github.com/marcospedreiro/gopsutil/pull/361
 	contents, err := ioutil.ReadFile(file)
 	if err != nil {
 		return nil, err

net/net_linux_test.go

@@ -8,7 +8,7 @@ import (
 	"syscall"
 	"testing"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 	"github.com/stretchr/testify/assert"
 )
 

net/net_openbsd.go

@@ -12,7 +12,7 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 )
 
 var portMatch = regexp.MustCompile(`(.*)\.(\d+)$`)

net/net_test.go

@@ -6,7 +6,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 )
 
 func TestAddrString(t *testing.T) {

net/net_unix.go

@@ -6,7 +6,7 @@ import (
 	"context"
 	"strings"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 )
 
 // Return a list of network connections opened.

net/net_windows.go

@@ -11,7 +11,7 @@ import (
 	"syscall"
 	"unsafe"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 	"golang.org/x/sys/windows"
 )
 

process/process.go

@@ -7,9 +7,9 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/shirou/gopsutil/cpu"
-	"github.com/shirou/gopsutil/internal/common"
-	"github.com/shirou/gopsutil/mem"
+	"github.com/marcospedreiro/gopsutil/cpu"
+	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/mem"
 )
 
 var (

process/process_darwin.go

@@ -13,9 +13,9 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/shirou/gopsutil/cpu"
-	"github.com/shirou/gopsutil/internal/common"
-	"github.com/shirou/gopsutil/net"
+	"github.com/marcospedreiro/gopsutil/cpu"
+	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/net"
 	"golang.org/x/sys/unix"
 )
 

process/process_fallback.go

@@ -6,9 +6,9 @@ import (
 	"context"
 	"syscall"
 
-	"github.com/shirou/gopsutil/cpu"
-	"github.com/shirou/gopsutil/internal/common"
-	"github.com/shirou/gopsutil/net"
+	"github.com/marcospedreiro/gopsutil/cpu"
+	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/net"
 )
 
 type MemoryMapsStat struct {

process/process_freebsd.go

@@ -8,9 +8,9 @@ import (
 	"encoding/binary"
 	"strings"
 
-	cpu "github.com/shirou/gopsutil/cpu"
-	"github.com/shirou/gopsutil/internal/common"
-	net "github.com/shirou/gopsutil/net"
+	cpu "github.com/marcospedreiro/gopsutil/cpu"
+	"github.com/marcospedreiro/gopsutil/internal/common"
+	net "github.com/marcospedreiro/gopsutil/net"
 	"golang.org/x/sys/unix"
 )
 

process/process_linux.go

@@ -15,10 +15,10 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/shirou/gopsutil/cpu"
-	"github.com/shirou/gopsutil/host"
-	"github.com/shirou/gopsutil/internal/common"
-	"github.com/shirou/gopsutil/net"
+	"github.com/marcospedreiro/gopsutil/cpu"
+	"github.com/marcospedreiro/gopsutil/host"
+	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/net"
 	"golang.org/x/sys/unix"
 )
 

process/process_openbsd.go

@@ -10,10 +10,10 @@ import (
 	"strings"
 	"unsafe"
 
-	cpu "github.com/shirou/gopsutil/cpu"
-	"github.com/shirou/gopsutil/internal/common"
-	mem "github.com/shirou/gopsutil/mem"
-	net "github.com/shirou/gopsutil/net"
+	cpu "github.com/marcospedreiro/gopsutil/cpu"
+	"github.com/marcospedreiro/gopsutil/internal/common"
+	mem "github.com/marcospedreiro/gopsutil/mem"
+	net "github.com/marcospedreiro/gopsutil/net"
 	"golang.org/x/sys/unix"
 )
 

process/process_test.go

@@ -12,7 +12,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/shirou/gopsutil/internal/common"
+	"github.com/marcospedreiro/gopsutil/internal/common"
 	"github.com/stretchr/testify/assert"
 )
 

process/process_windows.go

@@ -12,9 +12,9 @@ import (
 	"unsafe"
 
 	"github.com/StackExchange/wmi"
-	cpu "github.com/shirou/gopsutil/cpu"
-	"github.com/shirou/gopsutil/internal/common"
-	net "github.com/shirou/gopsutil/net"
+	cpu "github.com/marcospedreiro/gopsutil/cpu"
+	"github.com/marcospedreiro/gopsutil/internal/common"
+	net "github.com/marcospedreiro/gopsutil/net"
 	"github.com/shirou/w32"
 	"golang.org/x/sys/windows"
 )