ClusterCockpit/cc-metric-collector
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-metric-collector.git synced 2024-12-26 15:29:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed computing number of physical packages for non continous physical package IDs (e.g. on Ampere Altra Q80-30)

Browse Source
This commit is contained in:
Holger Obermaier 2022-11-16 14:58:11 +01:00
parent e66d52bb32
commit 7bb80780e0
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
collectors/cpufreqMetric.go
View File

@ -23,20 +23,18 @@ type CPUFreqCollectorTopology struct {
numPhysicalPackages string // number of sockets / packages numPhysicalPackages string // number of sockets / packages
numPhysicalPackages_int int64 numPhysicalPackages_int int64
isHT bool isHT bool
numNonHT string // number of non hyperthreading processors numNonHT string // number of non hyper-threading processors
numNonHT_int int64 numNonHT_int int64
scalingCurFreqFile string scalingCurFreqFile string
tagSet map[string]string tagSet map[string]string
} }
//
// CPUFreqCollector // CPUFreqCollector
// a metric collector to measure the current frequency of the CPUs // a metric collector to measure the current frequency of the CPUs
// as obtained from the hardware (in KHz) // as obtained from the hardware (in KHz)
// Only measure on the first hyper thread // Only measure on the first hyper-thread
// //
// See: https://www.kernel.org/doc/html/latest/admin-guide/pm/cpufreq.html // See: https://www.kernel.org/doc/html/latest/admin-guide/pm/cpufreq.html
//
type CPUFreqCollector struct { type CPUFreqCollector struct {
metricCollector metricCollector
topology []CPUFreqCollectorTopology topology []CPUFreqCollectorTopology
@ -126,7 +124,7 @@ func (m *CPUFreqCollector) Init(config json.RawMessage) error {
t.scalingCurFreqFile = scalingCurFreqFile t.scalingCurFreqFile = scalingCurFreqFile
} }
// is processor a hyperthread? // is processor a hyper-thread?
coreSeenBefore := make(map[string]bool) coreSeenBefore := make(map[string]bool)
for i := range m.topology { for i := range m.topology {
t := &m.topology[i] t := &m.topology[i]
@ -136,23 +134,20 @@ func (m *CPUFreqCollector) Init(config json.RawMessage) error {
coreSeenBefore[globalID] = true coreSeenBefore[globalID] = true
} }
// number of non hyper thread cores and packages / sockets // number of non hyper-thread cores and packages / sockets
var numNonHT_int int64 = 0 var numNonHT_int int64 = 0
var maxPhysicalPackageID int64 = 0 PhysicalPackageIDs := make(map[int64]struct{})
for i := range m.topology { for i := range m.topology {
t := &m.topology[i] t := &m.topology[i]
// Update maxPackageID
if t.physicalPackageID_int > maxPhysicalPackageID {
maxPhysicalPackageID = t.physicalPackageID_int
}
if !t.isHT { if !t.isHT {
numNonHT_int++ numNonHT_int++
} }
PhysicalPackageIDs[t.physicalPackageID_int] = struct{}{}
} }
numPhysicalPackageID_int := maxPhysicalPackageID + 1 numPhysicalPackageID_int := int64(len(PhysicalPackageIDs))
numPhysicalPackageID := fmt.Sprint(numPhysicalPackageID_int) numPhysicalPackageID := fmt.Sprint(numPhysicalPackageID_int)
numNonHT := fmt.Sprint(numNonHT_int) numNonHT := fmt.Sprint(numNonHT_int)
for i := range m.topology { for i := range m.topology {
@ -168,6 +163,13 @@ func (m *CPUFreqCollector) Init(config json.RawMessage) error {
} }
} }
// Initialized
cclog.ComponentDebug(
m.name,
"initialized",
numPhysicalPackageID_int, "physical packages,",
len(cpuDirs), "CPUs,",
numNonHT, "non-hyper-threading CPUs")
m.init = true m.init = true
return nil return nil
} }
@ -182,7 +184,7 @@ func (m *CPUFreqCollector) Read(interval time.Duration, output chan lp.CCMetric)
for i := range m.topology { for i := range m.topology {
t := &m.topology[i] t := &m.topology[i]
// skip hyperthreads // skip hyper-threads
if t.isHT { if t.isHT {
continue continue
} }

2
collectors/cpufreqMetric.md
View File

@ -1,4 +1,5 @@
## `cpufreq_cpuinfo` collector ## `cpufreq_cpuinfo` collector
```json ```json
"cpufreq": { "cpufreq": {
"exclude_metrics": [] "exclude_metrics": []
@ -8,4 +9,5 @@
The `cpufreq` collector reads the clock frequency from `/sys/devices/system/cpu/cpu*/cpufreq` and outputs a handful **hwthread** metrics. The `cpufreq` collector reads the clock frequency from `/sys/devices/system/cpu/cpu*/cpufreq` and outputs a handful **hwthread** metrics.
Metrics: Metrics:
* `cpufreq` * `cpufreq`