ClusterCockpit/cc-metric-collector
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-metric-collector.git synced 2025-11-04 02:35:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix build errors in likwid collector due to likwid API changes. Fixes #164

Browse Source
This commit is contained in:
Thomas Roehl
2025-08-06 18:53:47 +02:00
parent 4804576ad6
commit 8c5a3cc07b
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
collectors/likwidMetric.go
View File

@@ -12,6 +12,12 @@ package collectors
#cgo LDFLAGS: -Wl,--unresolved-symbols=ignore-in-object-files
#include <stdlib.h>
#include <likwid.h>
int _HPMaddThread(int cpuid) {
return HPMaddThread(cpuid);
}
*/
import "C"
@@ -236,7 +242,7 @@ func (m *LikwidCollector) Init(config json.RawMessage) error {
major := C.likwid_getMajorVersion()
minor := C.likwid_getMinorVersion()
bugfix := C.likwid_getBugfixVersion()
cclog.ComponentDebug(m.name, fmt.Sprintf("Using LIKWID library %d.%d.%d", major, minor, bugfix))
cclog.ComponentDebug(m.name, fmt.Sprintf("Using LIKWID library %d.%d.%d at %s with %s access", major, minor, bugfix, m.config.LibraryPath, m.config.AccessMode))
m.meta = map[string]string{"group": "PerfCounter"}
cclog.ComponentDebug(m.name, "Get cpulist and init maps and lists")
@@ -331,7 +337,7 @@ func (m *LikwidCollector) Init(config json.RawMessage) error {
for _, c := range m.cpulist {
m.measureThread.Call(
func() {
retCode := C.HPMaddThread(c)
retCode := C._HPMaddThread(c)
if retCode != 0 {
err := fmt.Errorf("C.HPMaddThread(%v) failed with return code %v", c, retCode)
cclog.ComponentError(m.name, err.Error())