ClusterCockpit/cc-metric-collector
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-metric-collector.git synced 2024-11-10 04:27:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix for NumaDomain getter in ccTopology

Browse Source
This commit is contained in:
Thomas Roehl 2022-02-07 13:22:26 +01:00
parent fdb58b0be2
commit 25bb395f02
1 changed files with 78 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
internal/ccTopology/ccTopology.go
View File

@ -6,12 +6,17 @@ import (
"log" "log"
"os" "os"
"path/filepath" "path/filepath"
"regexp"
"strconv" "strconv"
"strings" "strings"
cclogger "github.com/ClusterCockpit/cc-metric-collector/internal/ccLogger" cclogger "github.com/ClusterCockpit/cc-metric-collector/internal/ccLogger"
) )
const SYSFS_NUMABASE = `/sys/devices/system/node`
const SYSFS_CPUBASE = `/sys/devices/system/cpu`
const PROCFS_CPUINFO = `/proc/cpuinfo`
// intArrayContains scans an array of ints if the value str is present in the array // intArrayContains scans an array of ints if the value str is present in the array
// If the specified value is found, the corresponding array index is returned. // If the specified value is found, the corresponding array index is returned.
// The bool value is used to signal success or failure // The bool value is used to signal success or failure
@ -43,7 +48,7 @@ func fileToInt(path string) int {
} }
func SocketList() []int { func SocketList() []int {
buffer, err := ioutil.ReadFile("/proc/cpuinfo") buffer, err := ioutil.ReadFile(string(PROCFS_CPUINFO))
if err != nil { if err != nil {
log.Print(err) log.Print(err)
return nil return nil
@ -68,7 +73,7 @@ func SocketList() []int {
} }
func CpuList() []int { func CpuList() []int {
buffer, err := ioutil.ReadFile("/proc/cpuinfo") buffer, err := ioutil.ReadFile(string(PROCFS_CPUINFO))
if err != nil { if err != nil {
log.Print(err) log.Print(err)
return nil return nil
@ -93,7 +98,7 @@ func CpuList() []int {
} }
func CoreList() []int { func CoreList() []int {
buffer, err := ioutil.ReadFile("/proc/cpuinfo") buffer, err := ioutil.ReadFile(string(PROCFS_CPUINFO))
if err != nil { if err != nil {
log.Print(err) log.Print(err)
return nil return nil
@ -118,36 +123,50 @@ func CoreList() []int {
} }
func NumaNodeList() []int { func NumaNodeList() []int {
numalist := make([]int, 0) numaList := make([]int, 0)
files, err := filepath.Glob("/sys/devices/system/node/node*") globPath := filepath.Join(string(SYSFS_NUMABASE), "node*")
regexPath := filepath.Join(string(SYSFS_NUMABASE), "node(\\d+)")
regex := regexp.MustCompile(regexPath)
files, err := filepath.Glob(globPath)
if err != nil { if err != nil {
log.Print(err) cclogger.ComponentError("CCTopology", "NumaNodeList", err.Error())
} }
for _, f := range files { for _, f := range files {
if !regex.MatchString(f) {
continue
}
finfo, err := os.Lstat(f) finfo, err := os.Lstat(f)
if err == nil && (finfo.IsDir() || finfo.Mode()&os.ModeSymlink != 0) { if err != nil {
var id int continue
parts := strings.Split(f, "/") }
_, err = fmt.Scanf("node%d", parts[len(parts)-1], &id) if !finfo.IsDir() {
continue
}
matches := regex.FindStringSubmatch(f)
if len(matches) == 2 {
id, err := strconv.Atoi(matches[1])
if err == nil { if err == nil {
_, found := intArrayContains(numalist, int(id)) if _, found := intArrayContains(numaList, id); !found {
if !found { numaList = append(numaList, id)
numalist = append(numalist, int(id))
} }
} }
} }
} }
return numalist return numaList
} }
func DieList() []int { func DieList() []int {
cpulist := CpuList() cpulist := CpuList()
dielist := make([]int, 0) dielist := make([]int, 0)
for _, c := range cpulist { for _, c := range cpulist {
dieid := fileToInt(fmt.Sprintf("/sys/devices/system/cpu/cpu%d/topology/die_id", c)) diepath := filepath.Join(string(SYSFS_CPUBASE), fmt.Sprintf("cpu%d", c), "topology/die_id")
_, found := intArrayContains(dielist, int(dieid)) dieid := fileToInt(diepath)
if !found { if dieid > 0 {
dielist = append(dielist, int(dieid)) _, found := intArrayContains(dielist, int(dieid))
if !found {
dielist = append(dielist, int(dieid))
}
} }
} }
return dielist return dielist
@ -196,14 +215,14 @@ func CpuData() []CpuEntry {
getSMT := func(cpuid int, basepath string) int { getSMT := func(cpuid int, basepath string) int {
buffer, err := ioutil.ReadFile(fmt.Sprintf("%s/thread_siblings_list", basepath)) buffer, err := ioutil.ReadFile(fmt.Sprintf("%s/thread_siblings_list", basepath))
if err != nil { if err != nil {
log.Print(err) cclogger.ComponentError("CCTopology", "CpuData:getSMT", err.Error())
} }
threadlist := make([]int, 0) threadlist := make([]int, 0)
sbuffer := strings.Replace(string(buffer), "\n", "", -1) sbuffer := strings.Replace(string(buffer), "\n", "", -1)
for _, x := range strings.Split(sbuffer, ",") { for _, x := range strings.Split(sbuffer, ",") {
id, err := strconv.ParseInt(x, 10, 32) id, err := strconv.ParseInt(x, 10, 32)
if err != nil { if err != nil {
log.Print(err) cclogger.ComponentError("CCTopology", "CpuData:getSMT", err.Error())
} }
threadlist = append(threadlist, int(id)) threadlist = append(threadlist, int(id))
} }
@ -216,18 +235,22 @@ func CpuData() []CpuEntry {
} }
getNumaDomain := func(basepath string) int { getNumaDomain := func(basepath string) int {
files, err := filepath.Glob(fmt.Sprintf("%s/node*", basepath)) globPath := filepath.Join(basepath, "node*")
regexPath := filepath.Join(basepath, "node(\\d+)")
regex := regexp.MustCompile(regexPath)
files, err := filepath.Glob(globPath)
if err != nil { if err != nil {
log.Print(err) cclogger.ComponentError("CCTopology", "CpuData:getNumaDomain", err.Error())
} }
for _, f := range files { for _, f := range files {
finfo, err := os.Lstat(f) finfo, err := os.Lstat(f)
if err == nil && (finfo.IsDir() || finfo.Mode()&os.ModeSymlink != 0) { if err == nil && finfo.IsDir() {
var id int matches := regex.FindStringSubmatch(f)
parts := strings.Split(f, "/") if len(matches) == 2 {
_, err = fmt.Scanf("node%d", parts[len(parts)-1], &id) id, err := strconv.Atoi(matches[1])
if err == nil { if err == nil {
return id return id
}
} }
} }
} }
@ -244,22 +267,24 @@ func CpuData() []CpuEntry {
centry.Die = -1 centry.Die = -1
centry.Core = -1 centry.Core = -1
// Set base directory for topology lookup // Set base directory for topology lookup
base := fmt.Sprintf("/sys/devices/system/cpu/cpu%d/topology", centry.Cpuid) cpustr := fmt.Sprintf("cpu%d", centry.Cpuid)
base := filepath.Join("/sys/devices/system/cpu", cpustr)
topoBase := filepath.Join(base, "topology")
// Lookup CPU core id // Lookup CPU core id
centry.Core = getCore(base) centry.Core = getCore(topoBase)
// Lookup CPU socket id // Lookup CPU socket id
centry.Socket = getSocket(base) centry.Socket = getSocket(topoBase)
// Lookup CPU die id // Lookup CPU die id
centry.Die = getDie(base) centry.Die = getDie(topoBase)
if centry.Die < 0 { if centry.Die < 0 {
centry.Die = centry.Socket centry.Die = centry.Socket
} }
// Lookup SMT thread id // Lookup SMT thread id
centry.SMT = getSMT(centry.Cpuid, base) centry.SMT = getSMT(centry.Cpuid, topoBase)
// Lookup NUMA domain id // Lookup NUMA domain id
centry.Numadomain = getNumaDomain(base) centry.Numadomain = getNumaDomain(base)
@ -280,34 +305,34 @@ type CpuInformation struct {
func CpuInfo() CpuInformation { func CpuInfo() CpuInformation {
var c CpuInformation var c CpuInformation
smt := 0 smtList := make([]int, 0)
numa := 0 numaList := make([]int, 0)
die := 0 dieList := make([]int, 0)
socket := 0 socketList := make([]int, 0)
core := 0 coreList := make([]int, 0)
cdata := CpuData() cdata := CpuData()
for _, d := range cdata { for _, d := range cdata {
if d.SMT > smt { if _, ok := intArrayContains(smtList, d.SMT); !ok {
smt = d.SMT smtList = append(smtList, d.SMT)
} }
if d.Numadomain > numa { if _, ok := intArrayContains(numaList, d.Numadomain); !ok {
numa = d.Numadomain numaList = append(numaList, d.Numadomain)
} }
if d.Die > die { if _, ok := intArrayContains(dieList, d.Die); !ok {
die = d.Die dieList = append(dieList, d.Die)
} }
if d.Socket > socket { if _, ok := intArrayContains(socketList, d.Socket); !ok {
socket = d.Socket socketList = append(socketList, d.Socket)
} }
if d.Core > core { if _, ok := intArrayContains(coreList, d.Core); !ok {
core = d.Core coreList = append(coreList, d.Core)
} }
} }
c.NumNumaDomains = numa + 1 c.NumNumaDomains = len(numaList)
c.SMTWidth = smt + 1 c.SMTWidth = len(smtList)
c.NumDies = die + 1 c.NumDies = len(dieList)
c.NumCores = core + 1 c.NumCores = len(coreList)
c.NumSockets = socket + 1 c.NumSockets = len(socketList)
c.NumHWthreads = len(cdata) c.NumHWthreads = len(cdata)
return c return c
} }