From f496db490560be20c6da1715ecdaacc6ce2d6910 Mon Sep 17 00:00:00 2001 From: Thomas Gruber Date: Mon, 4 Dec 2023 12:26:57 +0100 Subject: [PATCH 1/7] Fix job dependency in Release.yml --- .github/workflows/Release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml index b7190cb..4356715 100644 --- a/.github/workflows/Release.yml +++ b/.github/workflows/Release.yml @@ -195,7 +195,7 @@ jobs: Release: runs-on: ubuntu-latest # We need the RPMs, so add dependency - needs: [AlmaLinux-RPM-build, UBI-8-RPM-build, Ubuntu-focal-build] + needs: [AlmaLinux-RPM-build, UBI-8-RPM-build, Ubuntu-jammy-build] steps: # See: https://github.com/actions/download-artifact From 2e7990f87da625c99374d1a44c4709c62835e373 Mon Sep 17 00:00:00 2001 From: Thomas Gruber Date: Thu, 18 Apr 2024 13:14:32 +0200 Subject: [PATCH 2/7] Update likwidMetric.md --- collectors/likwidMetric.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/collectors/likwidMetric.md b/collectors/likwidMetric.md index 7740543..ca957d7 100644 --- a/collectors/likwidMetric.md +++ b/collectors/likwidMetric.md @@ -132,6 +132,9 @@ In some cases LIKWID returns `0.0` for some events that are further used in proc One might think this does not happen often but often used metrics in the world of performance engineering like Instructions-per-Cycle (IPC) or more frequently the actual CPU clock are derived with events like `CPU_CLK_UNHALTED_CORE` (Intel) which do not increment in halted state (as the name implies). In there are different power management systems in a chip which can cause a hardware thread to go in such a state. Moreover, if no cycles are executed by the core, also many other events are not incremented as well (like `INSTR_RETIRED_ANY` for retired instructions and part of IPC). +### `lockfile_path` option +LIKWID can be configured with a lock file with which the access to the performance monitoring registers can be disabled (only the owner of the lock file is allowed to access the registers). When the `lockfile_path` option is set, the collector subscribes to changes to this file to stop monitoring if the owner of the lock file changes. This feature is useful when users should be able to perform own hardware performance counter measurements through LIKWID or any other tool. + ### `send_*_total values` option - `send_core_total_values`: Metrics, which are usually collected on a per hardware thread basis, are additionally summed up per CPU core. From f6c94e32b3ca7e7b7889f406bf92aa8c0bdc85ca Mon Sep 17 00:00:00 2001 From: Thomas Gruber Date: Mon, 15 Jul 2024 12:38:34 +0200 Subject: [PATCH 3/7] Update README.md for sinks Wrong JSON format, it is an object, not a list. --- sinks/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sinks/README.md b/sinks/README.md index d6c88b8..d28fba8 100644 --- a/sinks/README.md +++ b/sinks/README.md @@ -17,7 +17,7 @@ This folder contains the SinkManager and sink implementations for the cc-metric- The configuration file for the sinks is a list of configurations. The `type` field in each specifies which sink to initialize. ```json -[ +{ "mystdout" : { "type" : "stdout", "meta_as_tags" : [ @@ -31,7 +31,7 @@ The configuration file for the sinks is a list of configurations. The `type` fie "database" : "ccmetric", "password" : "" } -] +} ``` From 7d3f67f15b8f2939bea207bf50bedfe16a356e15 Mon Sep 17 00:00:00 2001 From: Thomas Gruber Date: Mon, 7 Oct 2024 14:09:09 +0200 Subject: [PATCH 4/7] Update likwidMetric.md --- collectors/likwidMetric.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collectors/likwidMetric.md b/collectors/likwidMetric.md index ca957d7..a84d4e3 100644 --- a/collectors/likwidMetric.md +++ b/collectors/likwidMetric.md @@ -27,7 +27,7 @@ The `likwid` collector is probably the most complicated collector. The LIKWID li } ] } - ] + ], "globalmetrics" : [ { "name": "global_sum", From 8f336c1bb73145c456342f8febae35f02b715cac Mon Sep 17 00:00:00 2001 From: Thomas Gruber Date: Tue, 8 Oct 2024 13:36:46 +0200 Subject: [PATCH 5/7] Update likwidMetric.md --- collectors/likwidMetric.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collectors/likwidMetric.md b/collectors/likwidMetric.md index a84d4e3..0bd5b2b 100644 --- a/collectors/likwidMetric.md +++ b/collectors/likwidMetric.md @@ -15,7 +15,7 @@ The `likwid` collector is probably the most complicated collector. The LIKWID li { "events" : { "COUNTER0": "EVENT0", - "COUNTER1": "EVENT1", + "COUNTER1": "EVENT1" }, "metrics" : [ { From c96021c7cc69b186be05b32207898b82eaa2aaec Mon Sep 17 00:00:00 2001 From: brinkcoder Date: Thu, 14 Nov 2024 16:20:47 +0100 Subject: [PATCH 6/7] Fix: Create lock file if it does not exist in likwidMetric.go (#120) Co-authored-by: exterr2f --- collectors/likwidMetric.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/collectors/likwidMetric.go b/collectors/likwidMetric.go index 606f6a6..12757c3 100644 --- a/collectors/likwidMetric.go +++ b/collectors/likwidMetric.go @@ -374,10 +374,21 @@ func (m *LikwidCollector) takeMeasurement(evidx int, evset LikwidEventsetConfig, } defer watcher.Close() if len(m.config.LockfilePath) > 0 { + // Check if the lock file exists info, err := os.Stat(m.config.LockfilePath) + if os.IsNotExist(err) { + // Create the lock file if it does not exist + file, createErr := os.Create(m.config.LockfilePath) + if createErr != nil { + return true, fmt.Errorf("failed to create lock file: %v", createErr) + } + file.Close() + info, err = os.Stat(m.config.LockfilePath) // Recheck the file after creation + } if err != nil { return true, err } + // Check file ownership uid := info.Sys().(*syscall.Stat_t).Uid if uid != uint32(os.Getuid()) { usr, err := user.LookupId(fmt.Sprint(uid)) @@ -387,6 +398,7 @@ func (m *LikwidCollector) takeMeasurement(evidx int, evset LikwidEventsetConfig, return true, fmt.Errorf("Access to performance counters locked by %d", uid) } } + // Add the lock file to the watcher err = watcher.Add(m.config.LockfilePath) if err != nil { cclog.ComponentError(m.name, err.Error()) From 51dda886f1843c65d176cf32b4ac51ff9e6f5367 Mon Sep 17 00:00:00 2001 From: Thomas Gruber Date: Thu, 14 Nov 2024 16:31:51 +0100 Subject: [PATCH 7/7] Update runonce.yml to download golang from official sources --- .github/workflows/runonce.yml | 39 ++++++++++++++--------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/.github/workflows/runonce.yml b/.github/workflows/runonce.yml index 878d92c..96a7a9f 100644 --- a/.github/workflows/runonce.yml +++ b/.github/workflows/runonce.yml @@ -88,14 +88,11 @@ jobs: submodules: recursive fetch-depth: 0 - # Use dnf to install build dependencies - - name: Install build dependencies - run: | - dnf --assumeyes install \ - http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/golang-1.20.6-2.module_el8+658+f14b2092.x86_64.rpm \ - http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/golang-bin-1.20.6-2.module_el8+658+f14b2092.x86_64.rpm \ - http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/golang-src-1.20.6-2.module_el8+658+f14b2092.noarch.rpm \ - http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/go-toolset-1.20.6-1.module_el8+602+8bb8a8d6.x86_64.rpm + # See: https://github.com/marketplace/actions/setup-go-environment + - name: Setup Golang + uses: actions/setup-go@v4 + with: + go-version: '1.21' - name: RPM build MetricCollector id: rpmbuild @@ -126,14 +123,11 @@ jobs: submodules: recursive fetch-depth: 0 - # Use dnf to install build dependencies - - name: Install build dependencies - run: | - dnf --assumeyes --disableplugin=subscription-manager install \ - http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/golang-1.20.6-2.module_el8+658+f14b2092.x86_64.rpm \ - http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/golang-bin-1.20.6-2.module_el8+658+f14b2092.x86_64.rpm \ - http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/golang-src-1.20.6-2.module_el8+658+f14b2092.noarch.rpm \ - http://mirror.centos.org/centos/8-stream/AppStream/x86_64/os/Packages/go-toolset-1.20.6-1.module_el8+602+8bb8a8d6.x86_64.rpm + # See: https://github.com/marketplace/actions/setup-go-environment + - name: Setup Golang + uses: actions/setup-go@v4 + with: + go-version: '1.21' - name: RPM build MetricCollector id: rpmbuild @@ -163,15 +157,14 @@ jobs: submodules: recursive fetch-depth: 0 # Use official golang package - - name: Install Golang - run: | - wget -q https://go.dev/dl/go1.21.1.linux-amd64.tar.gz --output-document=- | \ - tar --directory=/usr/local --extract --gzip - export PATH=/usr/local/go/bin:/usr/local/go/pkg/tool/linux_amd64:$PATH - go version + # See: https://github.com/marketplace/actions/setup-go-environment + - name: Setup Golang + uses: actions/setup-go@v4 + with: + go-version: '1.21' - name: DEB build MetricCollector id: dpkg-build run: | export PATH=/usr/local/go/bin:/usr/local/go/pkg/tool/linux_amd64:$PATH git config --global --add safe.directory /__w/cc-metric-collector/cc-metric-collector - make DEB \ No newline at end of file + make DEB