Merge pull request #207 from klihub/fixes/sysfs-discovery

fixes: don't use deprecated sysfs entry.

pkg/sysfs/system.go

@@ -15,8 +15,9 @@
 package sysfs
 
 import (
+	"errors"
 	"fmt"
-	"io/ioutil"
+	"io/fs"
 	"path/filepath"
 	"sort"
 	"strconv"
@@ -587,8 +588,14 @@ func (sys *system) discoverCPU(path string) error {
 		if _, err := readSysfsEntry(path, "topology/core_id", &cpu.core); err != nil {
 			return err
 		}
-		if _, err := readSysfsEntry(path, "topology/thread_siblings_list", &cpu.threads, ","); err != nil {
-			return err
+
+		if _, err := readSysfsEntry(path, "topology/core_cpus_list", &cpu.threads, ","); err != nil {
+			if errors.Is(err, fs.ErrNotExist) {
+				_, err = readSysfsEntry(path, "topology/thread_siblings_list", &cpu.threads, ",")
+			}
+			if err != nil {
+				return err
+			}
 		}
 	} else {
 		sys.offline.Add(cpu.id)
@@ -725,17 +732,6 @@ func (c *cpu) SetFrequencyLimits(min, max uint64) error {
 	return nil
 }
 
-func readCPUsetFile(base, entry string) (cpuset.CPUSet, error) {
-	path := filepath.Join(base, entry)
-
-	blob, err := ioutil.ReadFile(path)
-	if err != nil {
-		return cpuset.New(), sysfsError(path, "failed to read sysfs entry: %v", err)
-	}
-
-	return cpuset.Parse(strings.Trim(string(blob), "\n"))
-}
-
 // Discover NUMA nodes present in the system.
 func (sys *system) discoverNodes() error {
 	if sys.nodes != nil {

pkg/sysfs/utils.go

@@ -56,7 +56,7 @@ func readSysfsEntry(base, entry string, ptr interface{}, args ...interface{}) (s
 
 	blob, err := ioutil.ReadFile(path)
 	if err != nil {
-		return "", sysfsError(path, "failed to read sysfs entry: %v", err)
+		return "", sysfsError(path, "failed to read sysfs entry: %w", err)
 	}
 	buf = strings.Trim(string(blob), "\n")
 
@@ -68,18 +68,18 @@ func readSysfsEntry(base, entry string, ptr interface{}, args ...interface{}) (s
 	case *string, *int, *uint, *int8, *uint8, *int16, *uint16, *int32, *uint32, *int64, *uint64:
 		err := parseValue(buf, ptr)
 		if err != nil {
-			return "", sysfsError(path, "%v", err)
+			return "", sysfsError(path, "%w", err)
 		}
 		return buf, nil
 
 	case *idset.IDSet, *[]int, *[]uint, *[]int8, *[]uint8, *[]int16, *[]uint16, *[]int32, *[]uint32, *[]int64, *[]uint64:
 		sep, err := getSeparator(" ", args)
 		if err != nil {
-			return "", sysfsError(path, "%v", err)
+			return "", sysfsError(path, "%w", err)
 		}
 		err = parseValueList(buf, sep, ptr)
 		if err != nil {
-			return "", sysfsError(path, "%v", err)
+			return "", sysfsError(path, "%w", err)
 		}
 		return buf, nil
 	case *EPP:
@@ -107,17 +107,17 @@ func writeSysfsEntry(base, entry string, val, oldp interface{}, args ...interfac
 	case string, int, uint, int8, uint8, int16, uint16, int32, uint32, int64, uint64:
 		buf, err = formatValue(val)
 		if err != nil {
-			return "", sysfsError(path, "%v", err)
+			return "", sysfsError(path, "%w", err)
 		}
 
 	case idset.IDSet, []int, []uint, []int8, []uint8, []int16, []uint16, []int32, []uint32, []int64, []uint64:
 		sep, err := getSeparator(" ", args)
 		if err != nil {
-			return "", sysfsError(path, "%v", err)
+			return "", sysfsError(path, "%w", err)
 		}
 		buf, err = formatValueList(sep, val)
 		if err != nil {
-			return "", sysfsError(path, "%v", err)
+			return "", sysfsError(path, "%w", err)
 		}
 
 	default:
@@ -126,12 +126,12 @@ func writeSysfsEntry(base, entry string, val, oldp interface{}, args ...interfac
 
 	f, err := os.OpenFile(path, os.O_WRONLY, 0)
 	if err != nil {
-		return "", sysfsError(path, "cannot open: %v", err)
+		return "", sysfsError(path, "cannot open: %w", err)
 	}
 	defer f.Close()
 
 	if _, err = f.Write([]byte(buf + "\n")); err != nil {
-		return "", sysfsError(path, "cannot write: %v", err)
+		return "", sysfsError(path, "cannot write: %w", err)
 	}
 
 	return old, nil
@@ -158,7 +158,7 @@ func parseValue(str string, value interface{}) error {
 	case *int, *int8, *int16, *int32, *int64:
 		v, err := strconv.ParseInt(str, 0, 0)
 		if err != nil {
-			return fmt.Errorf("invalid entry '%s': %v", str, err)
+			return fmt.Errorf("invalid entry '%s': %w", str, err)
 		}
 
 		switch value.(type) {
@@ -177,7 +177,7 @@ func parseValue(str string, value interface{}) error {
 	case *uint, *uint8, *uint16, *uint32, *uint64:
 		v, err := strconv.ParseUint(str, 0, 0)
 		if err != nil {
-			return fmt.Errorf("invalid entry: '%s': %v", str, err)
+			return fmt.Errorf("invalid entry: '%s': %w", str, err)
 		}
 
 		switch value.(type) {
@@ -237,17 +237,17 @@ func parseValueList(str, sep string, valuep interface{}) error {
 			if rng := strings.Split(s, "-"); len(rng) == 1 {
 				id, err := strconv.Atoi(s)
 				if err != nil {
-					return fmt.Errorf("invalid entry '%s': %v", s, err)
+					return fmt.Errorf("invalid entry '%s': %w", s, err)
 				}
 				value.(idset.IDSet).Add(idset.ID(id))
 			} else {
 				beg, err := strconv.Atoi(rng[0])
 				if err != nil {
-					return fmt.Errorf("invalid entry '%s': %v", s, err)
+					return fmt.Errorf("invalid entry '%s': %w", s, err)
 				}
 				end, err := strconv.Atoi(rng[1])
 				if err != nil {
-					return fmt.Errorf("invalid entry '%s': %v", s, err)
+					return fmt.Errorf("invalid entry '%s': %w", s, err)
 				}
 				for id := beg; id <= end; id++ {
 					value.(idset.IDSet).Add(idset.ID(id))
@@ -257,7 +257,7 @@ func parseValueList(str, sep string, valuep interface{}) error {
 		case []int, []int8, []int16, []int32, []int64:
 			v, err := strconv.ParseInt(s, 0, 0)
 			if err != nil {
-				return fmt.Errorf("invalid entry '%s': %v", s, err)
+				return fmt.Errorf("invalid entry '%s': %w", s, err)
 			}
 			switch value.(type) {
 			case []int:
@@ -275,7 +275,7 @@ func parseValueList(str, sep string, valuep interface{}) error {
 		case []uint, []uint8, []uint16, []uint32, []uint64:
 			v, err := strconv.ParseUint(s, 0, 0)
 			if err != nil {
-				return fmt.Errorf("invalid entry '%s': %v", s, err)
+				return fmt.Errorf("invalid entry '%s': %w", s, err)
 			}
 			switch value.(type) {
 			case []uint: