Merge pull request #1847 from mmorel-35/nakedret

fix ignore nakedret

.golangci.yml

@@ -29,13 +29,13 @@ linters:
     - perfsprint
     - predeclared
     - revive
+    - staticcheck
     - testifylint
     - thelper
     - unparam
     - usetesting
   disable:
     - errcheck
-    - staticcheck
     - unused
   settings:
     gocritic:
@@ -112,6 +112,17 @@ linters:
             - ["ID"] # AllowList
             - ["VM"] # DenyList
             - - upperCaseConst: true # Extra parameter (upperCaseConst|skipPackageNameChecks)
+    staticcheck:
+      checks:
+        - all
+        - -SA1019 # Using a deprecated function, variable, constant or field
+        - -SA2002 # Called testing.T.FailNow or SkipNow in a goroutine, which isn’t allowed
+        - -SA4003 # Comparing unsigned values against negative values is pointless
+        - -SA4004 # The loop exits unconditionally after one iteration
+        - -SA4008 # The variable in the loop condition never changes, are you incrementing the wrong variable?
+        - -SA5003 # Defers in infinite loops will never execute
+        - -SA9003 # Empty body in an if or else branch
+        - -ST1003 # Poorly chosen identifier
     testifylint:
       enable-all: true
     usetesting:

cpu/cpu_darwin_arm64.go

@@ -51,7 +51,7 @@ func getFrequency() (float64, error) {
 	var pCoreHz uint32
 	for {
 		service := ioIteratorNext(iterator)
-		if !(service > 0) {
+		if service <= 0 {
 			break
 		}
 

cpu/cpu_netbsd.go

@@ -57,7 +57,7 @@ func TimesWithContext(_ context.Context, percpu bool) (ret []TimesStat, err erro
 
 	ncpu, err := unix.SysctlUint32("hw.ncpu")
 	if err != nil {
-		return //nolint:nakedret //FIXME
+		return ret, err
 	}
 
 	var i uint32

cpu/cpu_openbsd.go

@@ -75,7 +75,7 @@ func TimesWithContext(_ context.Context, percpu bool) (ret []TimesStat, err erro
 
 	ncpu, err := unix.SysctlUint32("hw.ncpu")
 	if err != nil {
-		return //nolint:nakedret //FIXME
+		return ret, err
 	}
 
 	var i uint32

cpu/cpu_solaris.go

@@ -159,10 +159,7 @@ func parseISAInfo(cmdOutput string) ([]string, error) {
 		return nil, errors.New("attempted to parse invalid isainfo output")
 	}
 
-	flags := make([]string, len(words)-4)
+	flags := words[4:]
-	for i, val := range words[4:] { //nolint:gosimple //FIXME
-		flags[i] = val
-	}
 	sort.Strings(flags)
 
 	return flags, nil

cpu/cpu_test.go

@@ -59,16 +59,17 @@ func TestTimes(t *testing.T) {
 }
 
 func TestCounts(t *testing.T) {
-	v, err := Counts(true)
+	logicalCount, err := Counts(true)
 	common.SkipIfNotImplementedErr(t, err)
 	require.NoError(t, err)
-	assert.NotZerof(t, v, "could not get logical CPU counts: %v", v)
+	assert.NotZerof(t, logicalCount, "could not get logical CPU counts: %v", logicalCount)
-	t.Logf("logical cores: %d", v)
+	t.Logf("logical cores: %d", logicalCount)
-	v, err = Counts(false)
+	physicalCount, err := Counts(false)
 	common.SkipIfNotImplementedErr(t, err)
 	require.NoError(t, err)
-	assert.NotZerof(t, v, "could not get physical CPU counts: %v", v)
+	assert.NotZerof(t, physicalCount, "could not get physical CPU counts: %v", physicalCount)
-	t.Logf("physical cores: %d", v)
+	t.Logf("physical cores: %d", physicalCount)
+	assert.GreaterOrEqualf(t, logicalCount, physicalCount, "logical CPU count should be greater than or equal to physical CPU count: %v >= %v", logicalCount, physicalCount)
 }
 
 func TestTimeStat_String(t *testing.T) {

cpu/cpu_windows.go

@@ -5,6 +5,7 @@ package cpu
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"strconv"
 	"unsafe"
@@ -15,7 +16,10 @@ import (
 	"github.com/shirou/gopsutil/v4/internal/common"
 )
 
-var procGetNativeSystemInfo = common.Modkernel32.NewProc("GetNativeSystemInfo")
+var (
+	procGetNativeSystemInfo              = common.Modkernel32.NewProc("GetNativeSystemInfo")
+	procGetLogicalProcessorInformationEx = common.Modkernel32.NewProc("GetLogicalProcessorInformationEx")
+)
 
 type win32_Processor struct { //nolint:revive //FIXME
 	Family                    uint16
@@ -200,13 +204,70 @@ type systemInfo struct {
 	wProcessorRevision          uint16
 }
 
-func CountsWithContext(ctx context.Context, logical bool) (int, error) {
+type groupAffinity struct {
+	mask     uintptr // https://learn.microsoft.com/it-it/windows-hardware/drivers/kernel/interrupt-affinity-and-priority#about-kaffinity
+	group    uint16
+	reserved [3]uint16
+}
+
+// https://learn.microsoft.com/en-us/windows/win32/api/winnt/ns-winnt-processor_relationship
+type processorRelationship struct {
+	flags          byte
+	efficientClass byte
+	reserved       [20]byte
+	groupCount     uint16
+	groupMask      [1]groupAffinity
+}
+
+// https://learn.microsoft.com/en-us/windows/win32/api/winnt/ns-winnt-system_logical_processor_information_ex
+type systemLogicalProcessorInformationEx struct {
+	Relationship uint32
+	Size         uint32
+	Processor    processorRelationship
+}
+
+func getPhysicalCoreCount() (int, error) {
+	var length uint32
+	const relationAll = 0xffff
+	const relationProcessorCore = 0x0
+
+	// First call to determine the required buffer size
+	_, _, err := procGetLogicalProcessorInformationEx.Call(uintptr(relationAll), 0, uintptr(unsafe.Pointer(&length)))
+	if err != nil && !errors.Is(err, windows.ERROR_INSUFFICIENT_BUFFER) {
+		return 0, fmt.Errorf("failed to get buffer size: %w", err)
+	}
+
+	// Allocate the buffer
+	buffer := make([]byte, length)
+
+	// Second call to retrieve the processor information
+	_, _, err = procGetLogicalProcessorInformationEx.Call(uintptr(relationAll), uintptr(unsafe.Pointer(&buffer[0])), uintptr(unsafe.Pointer(&length)))
+	if err != nil && !errors.Is(err, windows.NTE_OP_OK) {
+		return 0, fmt.Errorf("failed to get logical processor information: %w", err)
+	}
+
+	// Iterate through the buffer to count physical cores
+	offset := uintptr(0)
+	ncpus := 0
+	for offset < uintptr(length) {
+		info := (*systemLogicalProcessorInformationEx)(unsafe.Pointer(uintptr(unsafe.Pointer(&buffer[0])) + offset))
+		if info.Relationship == relationProcessorCore {
+			ncpus++
+		}
+		offset += uintptr(info.Size)
+	}
+
+	return ncpus, nil
+}
+
+func CountsWithContext(_ context.Context, logical bool) (int, error) {
 	if logical {
-		// https://github.com/giampaolo/psutil/blob/d01a9eaa35a8aadf6c519839e987a49d8be2d891/psutil/_psutil_windows.c#L97
+		// Get logical processor count https://github.com/giampaolo/psutil/blob/d01a9eaa35a8aadf6c519839e987a49d8be2d891/psutil/_psutil_windows.c#L97
 		ret := windows.GetActiveProcessorCount(windows.ALL_PROCESSOR_GROUPS)
 		if ret != 0 {
 			return int(ret), nil
 		}
+
 		var systemInfo systemInfo
 		_, _, err := procGetNativeSystemInfo.Call(uintptr(unsafe.Pointer(&systemInfo)))
 		if systemInfo.dwNumberOfProcessors == 0 {
@@ -214,16 +275,7 @@ func CountsWithContext(ctx context.Context, logical bool) (int, error) {
 		}
 		return int(systemInfo.dwNumberOfProcessors), nil
 	}
-	// physical cores https://github.com/giampaolo/psutil/blob/d01a9eaa35a8aadf6c519839e987a49d8be2d891/psutil/_psutil_windows.c#L499
+
-	// for the time being, try with unreliable and slow WMI call…
+	// Get physical core count https://github.com/giampaolo/psutil/blob/d01a9eaa35a8aadf6c519839e987a49d8be2d891/psutil/_psutil_windows.c#L499
-	var dst []win32_Processor
+	return getPhysicalCoreCount()
-	q := wmi.CreateQuery(&dst, "")
-	if err := common.WMIQueryWithContext(ctx, q, &dst); err != nil {
-		return 0, err
-	}
-	var count uint32
-	for _, d := range dst {
-		count += d.NumberOfCores
-	}
-	return int(count), nil
 }

disk/disk_darwin.go

@@ -201,7 +201,7 @@ func IOCountersWithContext(_ context.Context, names ...string) (map[string]IOCou
 	stats := make([]IOCountersStat, 0, 16)
 	for {
 		d := ioIteratorNext(drives)
-		if !(d > 0) {
+		if d <= 0 {
 			break
 		}
 

go.mod

@@ -3,7 +3,7 @@ module github.com/shirou/gopsutil/v4
 go 1.23
 
 require (
-	github.com/ebitengine/purego v0.8.2
+	github.com/ebitengine/purego v0.8.3
 	github.com/google/go-cmp v0.7.0
 	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c

go.sum

@@ -1,7 +1,7 @@
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/ebitengine/purego v0.8.2 h1:jPPGWs2sZ1UgOSgD2bClL0MJIqu58nOmIcBuXr62z1I=
+github.com/ebitengine/purego v0.8.3 h1:K+0AjQp63JEZTEMZiwsI9g0+hAMNohwUOtY0RPGexmc=
-github.com/ebitengine/purego v0.8.2/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
+github.com/ebitengine/purego v0.8.3/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
 github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=

host/host_aix.go

@@ -67,8 +67,8 @@ func parseUptime(uptime string) uint64 {
 	var days, hours, mins uint64
 	var err error
 
-	switch {
+	switch ut[3] {
-	case ut[3] == "day," || ut[3] == "days,":
+	case "day,", "days,":
 		days, err = strconv.ParseUint(ut[2], 10, 64)
 		if err != nil {
 			return 0
@@ -105,12 +105,12 @@ func parseUptime(uptime string) uint64 {
 				return 0
 			}
 		}
-	case ut[3] == "hr," || ut[3] == "hrs,":
+	case "hr,", "hrs,":
 		hours, err = strconv.ParseUint(ut[2], 10, 64)
 		if err != nil {
 			return 0
 		}
-	case ut[3] == "min," || ut[3] == "mins,":
+	case "min,", "mins,":
 		mins, err = strconv.ParseUint(ut[2], 10, 64)
 		if err != nil {
 			return 0

host/host_darwin.go

@@ -67,8 +67,7 @@ func UsersWithContext(_ context.Context) ([]UserStat, error) {
 	// Skip macOS utmpx header part
 	buf = buf[604:]
 
-	u := Utmpx{}
+	entrySize := int(unsafe.Sizeof(Utmpx{}))
-	entrySize := int(unsafe.Sizeof(u))
 	count := len(buf) / entrySize
 
 	for i := 0; i < count; i++ {

host/host_freebsd.go

@@ -117,8 +117,7 @@ func getUsersFromUtmp(utmpfile string) ([]UserStat, error) {
 		return ret, err
 	}
 
-	u := Utmp{}
+	entrySize := int(unsafe.Sizeof(Utmp{}))
-	entrySize := int(unsafe.Sizeof(u))
 	count := len(buf) / entrySize
 
 	for i := 0; i < count; i++ {

host/host_openbsd.go

@@ -71,8 +71,7 @@ func UsersWithContext(_ context.Context) ([]UserStat, error) {
 		return ret, err
 	}
 
-	u := Utmp{}
+	entrySize := int(unsafe.Sizeof(Utmp{}))
-	entrySize := int(unsafe.Sizeof(u))
 	count := len(buf) / entrySize
 
 	for i := 0; i < count; i++ {

host/host_windows.go

@@ -80,7 +80,7 @@ func HostIDWithContext(_ context.Context) (string, error) {
 	hostID := windows.UTF16ToString(regBuf[:])
 	hostIDLen := len(hostID)
 	if hostIDLen != uuidLen {
-		return "", fmt.Errorf("HostID incorrect: %q\n", hostID) //nolint:revive //FIXME
+		return "", fmt.Errorf("HostID incorrect: %q", hostID)
 	}
 
 	return strings.ToLower(hostID), nil
@@ -153,26 +153,26 @@ func platformInformation() (platform, family, version, displayVersion string, er
 	osInfo.dwOSVersionInfoSize = uint32(unsafe.Sizeof(osInfo))
 	ret, _, err := procRtlGetVersion.Call(uintptr(unsafe.Pointer(&osInfo)))
 	if ret != 0 {
-		return //nolint:nakedret //FIXME
+		return platform, family, version, displayVersion, err
 	}
 
 	// Platform
 	var h windows.Handle // like HostIDWithContext(), we query the registry using the raw windows.RegOpenKeyEx/RegQueryValueEx
 	err = windows.RegOpenKeyEx(windows.HKEY_LOCAL_MACHINE, windows.StringToUTF16Ptr(`SOFTWARE\Microsoft\Windows NT\CurrentVersion`), 0, windows.KEY_READ|windows.KEY_WOW64_64KEY, &h)
 	if err != nil {
-		return //nolint:nakedret //FIXME
+		return platform, family, version, displayVersion, err
 	}
 	defer windows.RegCloseKey(h)
 	var bufLen uint32
 	var valType uint32
 	err = windows.RegQueryValueEx(h, windows.StringToUTF16Ptr(`ProductName`), nil, &valType, nil, &bufLen)
 	if err != nil {
-		return //nolint:nakedret //FIXME
+		return platform, family, version, displayVersion, err
 	}
 	regBuf := make([]uint16, bufLen/2+1)
 	err = windows.RegQueryValueEx(h, windows.StringToUTF16Ptr(`ProductName`), nil, &valType, (*byte)(unsafe.Pointer(&regBuf[0])), &bufLen)
 	if err != nil {
-		return //nolint:nakedret //FIXME
+		return platform, family, version, displayVersion, err
 	}
 	platform = windows.UTF16ToString(regBuf)
 	if strings.Contains(platform, "Windows 10") { // check build number to determine whether it's actually Windows 11

internal/common/common_darwin.go

@@ -393,10 +393,7 @@ func GoString(cStr *byte) string {
 		return ""
 	}
 	var length int
-	for {
+	for *(*byte)(unsafe.Add(unsafe.Pointer(cStr), uintptr(length))) != '\x00' {
-		if *(*byte)(unsafe.Add(unsafe.Pointer(cStr), uintptr(length))) == '\x00' {
-			break
-		}
 		length++
 	}
 	return string(unsafe.Slice(cStr, length))

net/net_darwin.go

@@ -16,7 +16,7 @@ import (
 )
 
 var (
-	errNetstatHeader  = errors.New("Can't parse header of netstat output")
+	errNetstatHeader  = errors.New("can't parse header of netstat output")
 	netstatLinkRegexp = regexp.MustCompile(`^<Link#(\d+)>$`)
 )
 
@@ -29,15 +29,14 @@ func parseNetstatLine(line string) (stat *IOCountersStat, linkID *uint, err erro
 	)
 
 	if columns[0] == "Name" {
-		err = errNetstatHeader
+		return nil, nil, errNetstatHeader
-		return //nolint:nakedret //FIXME
 	}
 
 	// try to extract the numeric value from <Link#123>
 	if subMatch := netstatLinkRegexp.FindStringSubmatch(columns[2]); len(subMatch) == 2 {
 		numericValue, err = strconv.ParseUint(subMatch[1], 10, 64)
 		if err != nil {
-			return //nolint:nakedret //FIXME
+			return nil, nil, err
 		}
 		linkIDUint := uint(numericValue)
 		linkID = &linkIDUint
@@ -50,8 +49,7 @@ func parseNetstatLine(line string) (stat *IOCountersStat, linkID *uint, err erro
 		base = 0
 	}
 	if numberColumns < 11 || numberColumns > 13 {
-		err = fmt.Errorf("Line %q do have an invalid number of columns %d", line, numberColumns)
+		return nil, nil, fmt.Errorf("line %q do have an invalid number of columns %d", line, numberColumns)
-		return //nolint:nakedret //FIXME
 	}
 
 	parsed := make([]uint64, 0, 7)
@@ -74,7 +72,7 @@ func parseNetstatLine(line string) (stat *IOCountersStat, linkID *uint, err erro
 		}
 
 		if numericValue, err = strconv.ParseUint(target, 10, 64); err != nil {
-			return //nolint:nakedret //FIXME
+			return nil, nil, err
 		}
 		parsed = append(parsed, numericValue)
 	}
@@ -91,7 +89,7 @@ func parseNetstatLine(line string) (stat *IOCountersStat, linkID *uint, err erro
 	if len(parsed) == 7 {
 		stat.Dropout = parsed[6]
 	}
-	return //nolint:nakedret //FIXME
+	return stat, linkID, nil
 }
 
 type netstatInterface struct {

net/net_openbsd.go

@@ -296,7 +296,7 @@ func ConnectionsWithContext(ctx context.Context, kind string) ([]ConnectionStat,
 	}
 	lines := strings.Split(string(out), "\n")
 	for _, line := range lines {
-		if !(strings.HasPrefix(line, "tcp") || strings.HasPrefix(line, "udp")) {
+		if !strings.HasPrefix(line, "tcp") && !strings.HasPrefix(line, "udp") {
 			continue
 		}
 		n, err := parseNetstatLine(line)

process/process_windows.go

@@ -594,7 +594,7 @@ func (p *Process) NumThreadsWithContext(_ context.Context) (int32, error) {
 
 	// if no errors and not cached already, cache ppid
 	p.parent = ppid
-	if 0 == p.getPpid() {
+	if p.getPpid() == 0 {
 		p.setPpid(ppid)
 	}