mirror of
https://github.com/ClusterCockpit/cc-metric-collector.git
synced 2025-04-19 19:21:41 +02:00
If no CPU die id available, use the socket id instead
This commit is contained in:
parent
d24b8c198b
commit
2839dc2881
@ -168,7 +168,7 @@ func CpuData() []CpuEntry {
|
|||||||
buffer, err := ioutil.ReadFile(path)
|
buffer, err := ioutil.ReadFile(path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Print(err)
|
log.Print(err)
|
||||||
cclogger.ComponentError("ccTopology", "Reading", path, ":", err.Error())
|
//cclogger.ComponentError("ccTopology", "Reading", path, ":", err.Error())
|
||||||
return -1
|
return -1
|
||||||
}
|
}
|
||||||
sbuffer := strings.Replace(string(buffer), "\n", "", -1)
|
sbuffer := strings.Replace(string(buffer), "\n", "", -1)
|
||||||
@ -254,6 +254,9 @@ func CpuData() []CpuEntry {
|
|||||||
|
|
||||||
// Lookup CPU die id
|
// Lookup CPU die id
|
||||||
centry.Die = getDie(base)
|
centry.Die = getDie(base)
|
||||||
|
if centry.Die < 0 {
|
||||||
|
centry.Die = centry.Socket
|
||||||
|
}
|
||||||
|
|
||||||
// Lookup SMT thread id
|
// Lookup SMT thread id
|
||||||
centry.SMT = getSMT(centry.Cpuid, base)
|
centry.SMT = getSMT(centry.Cpuid, base)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user