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

Cleanup

Browse Source
This commit is contained in:
Holger Obermaier 2023-09-06 17:29:37 +02:00
parent 5fa53a7ab8
commit b3922b3255
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkg/ccTopology/ccTopology.go
View File

@ -57,7 +57,7 @@ func fileToInt(path string) int {
}
func initSocketHwthreadCoreList() {
file, err := os.Open(string(PROCFS_CPUINFO))
file, err := os.Open(PROCFS_CPUINFO)
if err != nil {
log.Print(err)
return
@ -136,8 +136,8 @@ func CoreList() []int {
// Get list of NUMA node IDs
func NumaNodeList() []int {
numaList := make([]int, 0)
globPath := filepath.Join(string(SYSFS_NUMABASE), "node*")
regexPath := filepath.Join(string(SYSFS_NUMABASE), "node(\\d+)")
globPath := filepath.Join(SYSFS_NUMABASE, "node*")
regexPath := filepath.Join(SYSFS_NUMABASE, "node(\\d+)")
regex := regexp.MustCompile(regexPath)
files, err := filepath.Glob(globPath)
if err != nil {
@ -173,7 +173,7 @@ func DieList() []int {
dieList := make([]int, 0)
for _, c := range cpuList {
diePath := filepath.Join(
string(SYSFS_CPUBASE),
SYSFS_CPUBASE,
fmt.Sprintf("cpu%d", c),
"topology/die_id")
dieID := fileToInt(diePath)
@ -268,14 +268,17 @@ func initCpuData() {
}
for _, c := range HwthreadList() {
cache.CpuData = append(cache.CpuData,
HwthreadEntry{
CpuID: c,
Socket: -1,
NumaDomain: -1,
Die: -1,
Core: -1,
})
cache.CpuData =
append(
cache.CpuData,
HwthreadEntry{
CpuID: c,
Socket: -1,
NumaDomain: -1,
Die: -1,
Core: -1,
},
)
}
for i := range cache.CpuData {
cEntry := &cache.CpuData[i]
@ -325,12 +328,12 @@ type CpuInformation struct {
// CpuInformation reports basic information about the CPU
func CpuInfo() CpuInformation {
cpuData := CpuData()
smtList := make([]int, 0)
numaList := make([]int, 0)
dieList := make([]int, 0)
socketList := make([]int, 0)
coreList := make([]int, 0)
cpuData := CpuData()
for i := range cpuData {
d := &cpuData[i]
if ok := slices.Contains(smtList, d.SMT); !ok {