ClusterCockpit/cc-metric-collector
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-metric-collector.git synced 2025-01-13 23:59:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Lookup core ID from /sys/devices/system/cpu, /proc/cpuinfo is not portable

Browse Source
This commit is contained in:
Holger Obermaier 2023-09-08 09:25:03 +02:00
parent 35c20110ca
commit fd56a14eb6
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/ccTopology/ccTopology.go
View File

@ -71,13 +71,6 @@ func init() {
return return
} }
cache.HwthreadList = append(cache.HwthreadList, id) cache.HwthreadList = append(cache.HwthreadList, id)
case "core id":
id, err := strconv.Atoi(value)
if err != nil {
log.Print(err)
return
}
cache.CoreList = append(cache.CoreList, id)
} }
} }
} }
@ -134,6 +127,7 @@ func init() {
return id return id
} }
cache.CoreList = make([]int, len(cache.HwthreadList))
cache.DieList = make([]int, len(cache.HwthreadList)) cache.DieList = make([]int, len(cache.HwthreadList))
cache.SMTList = make([]int, len(cache.HwthreadList)) cache.SMTList = make([]int, len(cache.HwthreadList))
cache.NumaDomainList = make([]int, len(cache.HwthreadList)) cache.NumaDomainList = make([]int, len(cache.HwthreadList))
@ -146,6 +140,9 @@ func init() {
) )
topoBase := filepath.Join(base, "topology") topoBase := filepath.Join(base, "topology")
// Lookup Core ID
cache.CoreList[i] = fileToInt(filepath.Join(topoBase, "core_id"))
// Lookup CPU die id // Lookup CPU die id
cache.DieList[i] = fileToInt(filepath.Join(topoBase, "die_id")) cache.DieList[i] = fileToInt(filepath.Join(topoBase, "die_id"))
if cache.DieList[i] < 0 { if cache.DieList[i] < 0 {