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

Use CamelCase

Browse Source
This commit is contained in:
Holger Obermaier 2023-09-06 10:37:57 +02:00
parent 99ccc04933
commit 3171792bd6
1 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
pkg/ccTopology/ccTopology.go
View File

@ -165,26 +165,29 @@ func NumaNodeList() []int {
return numaList return numaList
} }
// Get list of CPU die IDs // DieList gets the list of CPU die IDs
func DieList() []int { func DieList() []int {
cpulist := HwthreadList() cpuList := HwthreadList()
dielist := make([]int, 0) dieList := make([]int, 0)
for _, c := range cpulist { for _, c := range cpuList {
diepath := filepath.Join(string(SYSFS_CPUBASE), fmt.Sprintf("cpu%d", c), "topology/die_id") diePath := filepath.Join(
dieid := fileToInt(diepath) string(SYSFS_CPUBASE),
if dieid > 0 { fmt.Sprintf("cpu%d", c),
if found := slices.Contains(dielist, int(dieid)); !found { "topology/die_id")
dielist = append(dielist, int(dieid)) dieID := fileToInt(diePath)
if dieID > 0 {
if found := slices.Contains(dieList, int(dieID)); !found {
dieList = append(dieList, int(dieID))
} }
} }
} }
if len(dielist) > 0 { if len(dieList) > 0 {
return dielist return dieList
} }
return SocketList() return SocketList()
} }
// Get list of specified type using the naming format inside ClusterCockpit // GetTypeList gets the list of specified type using the naming format inside ClusterCockpit
func GetTypeList(topology_type string) []int { func GetTypeList(topology_type string) []int {
switch topology_type { switch topology_type {
case "node": case "node":
@ -205,11 +208,11 @@ func GetTypeList(topology_type string) []int {
// Structure holding all information about a hardware thread // Structure holding all information about a hardware thread
type HwthreadEntry struct { type HwthreadEntry struct {
Cpuid int CpuID int
SMT int SMT int
Core int Core int
Socket int Socket int
Numadomain int NumaDomain int
Die int Die int
} }
@ -291,15 +294,15 @@ func CpuData() []HwthreadEntry {
clist := make([]HwthreadEntry, 0) clist := make([]HwthreadEntry, 0)
for _, c := range HwthreadList() { for _, c := range HwthreadList() {
clist = append(clist, HwthreadEntry{Cpuid: c}) clist = append(clist, HwthreadEntry{CpuID: c})
} }
for i, centry := range clist { for i, centry := range clist {
centry.Socket = -1 centry.Socket = -1
centry.Numadomain = -1 centry.NumaDomain = -1
centry.Die = -1 centry.Die = -1
centry.Core = -1 centry.Core = -1
// Set base directory for topology lookup // Set base directory for topology lookup
cpustr := fmt.Sprintf("cpu%d", centry.Cpuid) cpustr := fmt.Sprintf("cpu%d", centry.CpuID)
base := filepath.Join("/sys/devices/system/cpu", cpustr) base := filepath.Join("/sys/devices/system/cpu", cpustr)
topoBase := filepath.Join(base, "topology") topoBase := filepath.Join(base, "topology")
@ -316,10 +319,10 @@ func CpuData() []HwthreadEntry {
} }
// Lookup SMT thread id // Lookup SMT thread id
centry.SMT = getSMT(centry.Cpuid, topoBase) centry.SMT = getSMT(centry.CpuID, topoBase)
// Lookup NUMA domain id // Lookup NUMA domain id
centry.Numadomain = getNumaDomain(base) centry.NumaDomain = getNumaDomain(base)
// Update values in output list // Update values in output list
clist[i] = centry clist[i] = centry
@ -350,8 +353,8 @@ func CpuInfo() CpuInformation {
if ok := slices.Contains(smtList, d.SMT); !ok { if ok := slices.Contains(smtList, d.SMT); !ok {
smtList = append(smtList, d.SMT) smtList = append(smtList, d.SMT)
} }
if ok := slices.Contains(numaList, d.Numadomain); !ok { if ok := slices.Contains(numaList, d.NumaDomain); !ok {
numaList = append(numaList, d.Numadomain) numaList = append(numaList, d.NumaDomain)
} }
if ok := slices.Contains(dieList, d.Die); !ok { if ok := slices.Contains(dieList, d.Die); !ok {
dieList = append(dieList, d.Die) dieList = append(dieList, d.Die)
@ -377,7 +380,7 @@ func CpuInfo() CpuInformation {
func GetHwthreadSocket(cpuid int) int { func GetHwthreadSocket(cpuid int) int {
cdata := CpuData() cdata := CpuData()
for _, d := range cdata { for _, d := range cdata {
if d.Cpuid == cpuid { if d.CpuID == cpuid {
return d.Socket return d.Socket
} }
} }
@ -388,8 +391,8 @@ func GetHwthreadSocket(cpuid int) int {
func GetHwthreadNumaDomain(cpuid int) int { func GetHwthreadNumaDomain(cpuid int) int {
cdata := CpuData() cdata := CpuData()
for _, d := range cdata { for _, d := range cdata {
if d.Cpuid == cpuid { if d.CpuID == cpuid {
return d.Numadomain return d.NumaDomain
} }
} }
return -1 return -1
@ -399,7 +402,7 @@ func GetHwthreadNumaDomain(cpuid int) int {
func GetHwthreadDie(cpuid int) int { func GetHwthreadDie(cpuid int) int {
cdata := CpuData() cdata := CpuData()
for _, d := range cdata { for _, d := range cdata {
if d.Cpuid == cpuid { if d.CpuID == cpuid {
return d.Die return d.Die
} }
} }
@ -410,7 +413,7 @@ func GetHwthreadDie(cpuid int) int {
func GetHwthreadCore(cpuid int) int { func GetHwthreadCore(cpuid int) int {
cdata := CpuData() cdata := CpuData()
for _, d := range cdata { for _, d := range cdata {
if d.Cpuid == cpuid { if d.CpuID == cpuid {
return d.Core return d.Core
} }
} }
@ -423,7 +426,7 @@ func GetSocketHwthreads(socket int) []int {
cpulist := make([]int, 0) cpulist := make([]int, 0)
for _, d := range all { for _, d := range all {
if d.Socket == socket { if d.Socket == socket {
cpulist = append(cpulist, d.Cpuid) cpulist = append(cpulist, d.CpuID)
} }
} }
return cpulist return cpulist
@ -434,8 +437,8 @@ func GetNumaDomainHwthreads(domain int) []int {
all := CpuData() all := CpuData()
cpulist := make([]int, 0) cpulist := make([]int, 0)
for _, d := range all { for _, d := range all {
if d.Numadomain == domain { if d.NumaDomain == domain {
cpulist = append(cpulist, d.Cpuid) cpulist = append(cpulist, d.CpuID)
} }
} }
return cpulist return cpulist
@ -447,7 +450,7 @@ func GetDieHwthreads(die int) []int {
cpulist := make([]int, 0) cpulist := make([]int, 0)
for _, d := range all { for _, d := range all {
if d.Die == die { if d.Die == die {
cpulist = append(cpulist, d.Cpuid) cpulist = append(cpulist, d.CpuID)
} }
} }
return cpulist return cpulist
@ -459,7 +462,7 @@ func GetCoreHwthreads(core int) []int {
cpulist := make([]int, 0) cpulist := make([]int, 0)
for _, d := range all { for _, d := range all {
if d.Core == core { if d.Core == core {
cpulist = append(cpulist, d.Cpuid) cpulist = append(cpulist, d.CpuID)
} }
} }
return cpulist return cpulist