Use timer_getCycleClock in likwidMetric

Co-authored-by: exterr2f <Robert.Externbrink@rub.de>

.github/workflows/Release.yml

@@ -73,21 +73,21 @@ jobs:
         NEW_SRPM=${OLD_SRPM/el8/alma8}
         mv "${OLD_RPM}" "${NEW_RPM}"
         mv "${OLD_SRPM}" "${NEW_SRPM}"
-        echo "SRPM=${NEW_SRPM}" >> $GITHUB_OUTPUT
-        echo "RPM=${NEW_RPM}" >> $GITHUB_OUTPUT
+        echo "EL8_SRPM=${NEW_SRPM}" >> $GITHUB_OUTPUT
+        echo "EL8_RPM=${NEW_RPM}" >> $GITHUB_OUTPUT
 
     # See: https://github.com/actions/upload-artifact
     - name: Save RPM as artifact
       uses: actions/upload-artifact@v4
       with:
         name: cc-metric-collector RPM for AlmaLinux 8
-        path: ${{ steps.rpmrename.outputs.RPM }}
+        path: ${{ steps.rpmrename.outputs.EL8_RPM }}
         overwrite: true
     - name: Save SRPM as artifact
       uses: actions/upload-artifact@v4
       with:
         name: cc-metric-collector SRPM for AlmaLinux 8
-        path: ${{ steps.rpmrename.outputs.SRPM }}
+        path: ${{ steps.rpmrename.outputs.EL8_SRPM }}
         overwrite: true
 
   #
@@ -152,21 +152,21 @@ jobs:
         NEW_SRPM=${OLD_SRPM/el9/alma9}
         mv "${OLD_RPM}" "${NEW_RPM}"
         mv "${OLD_SRPM}" "${NEW_SRPM}"
-        echo "SRPM=${NEW_SRPM}" >> $GITHUB_OUTPUT
-        echo "RPM=${NEW_RPM}" >> $GITHUB_OUTPUT
+        echo "EL9_SRPM=${NEW_SRPM}" >> $GITHUB_OUTPUT
+        echo "EL9_RPM=${NEW_RPM}" >> $GITHUB_OUTPUT
 
     # See: https://github.com/actions/upload-artifact
     - name: Save RPM as artifact
       uses: actions/upload-artifact@v4
       with:
         name: cc-metric-collector RPM for AlmaLinux 9
-        path: ${{ steps.rpmrename.outputs.RPM }}
+        path: ${{ steps.rpmrename.outputs.EL9_RPM }}
         overwrite: true
     - name: Save SRPM as artifact
       uses: actions/upload-artifact@v4
       with:
         name: cc-metric-collector SRPM for AlmaLinux 9
-        path: ${{ steps.rpmrename.outputs.SRPM }}
+        path: ${{ steps.rpmrename.outputs.EL9_SRPM }}
         overwrite: true
 
   #
@@ -235,10 +235,6 @@ jobs:
     # See: https://catalog.redhat.com/software/containers/ubi8/ubi/5c359854d70cc534b3a3784e?container-tabs=gti
     container: redhat/ubi9
     # The job outputs link to the outputs of the 'rpmbuild' step
-    # The job outputs link to the outputs of the 'rpmbuild' step
-    outputs:
-      rpm : ${{steps.rpmbuild.outputs.RPM}}
-      srpm : ${{steps.rpmbuild.outputs.SRPM}}
     steps:
 
     # Use dnf to install development packages

.github/workflows/runonce.yml

@@ -33,11 +33,6 @@ jobs:
     - name: Build MetricCollector
       run: make
 
-    - name: Set config file permissions
-      run: |
-        chown $USER .github/ci*.json
-        chmod 0600 .github/ci*.json
-
     - name: Run MetricCollector once
       run: ./cc-metric-collector --once --config .github/ci-config.json
 
@@ -64,11 +59,6 @@ jobs:
     - name: Build MetricCollector
       run: make
 
-    - name: Set config file permissions
-      run: |
-        chown $USER .github/ci*.json
-        chmod 0600 .github/ci*.json
-
     - name: Run MetricCollector once
       run: ./cc-metric-collector --once --config .github/ci-config.json
 
@@ -95,11 +85,6 @@ jobs:
     - name: Build MetricCollector
       run: make
 
-    - name: Set config file permissions
-      run: |
-        chown $USER .github/ci*.json
-        chmod 0600 .github/ci*.json
-
     - name: Run MetricCollector once
       run: ./cc-metric-collector --once --config .github/ci-config.json
 
@@ -346,4 +331,4 @@ jobs:
       id: dpkg-build
       run: |
           export PATH=/usr/local/go/bin:/usr/local/go/pkg/tool/linux_amd64:$PATH
-          make DEB
+          make DEB

cc-metric-collector.go

@@ -3,7 +3,6 @@ package main
 import (
 	"encoding/json"
 	"flag"
-	"fmt"
 	"os"
 	"os/signal"
 	"syscall"
@@ -16,9 +15,9 @@ import (
 	"sync"
 	"time"
 
-	lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message"
 	mr "github.com/ClusterCockpit/cc-metric-collector/internal/metricRouter"
 	cclog "github.com/ClusterCockpit/cc-metric-collector/pkg/ccLogger"
+	lp "github.com/ClusterCockpit/cc-energy-manager/pkg/cc-message"
 	mct "github.com/ClusterCockpit/cc-metric-collector/pkg/multiChanTicker"
 )
 
@@ -43,27 +42,6 @@ func LoadCentralConfiguration(file string, config *CentralConfigFile) error {
 	return err
 }
 
-func ConfigFileCheck(file string) error {
-
-	info, err := os.Stat(file)
-	if err != nil {
-		cclog.Error("Cannot access file", file)
-		return err
-	}
-	uid := info.Sys().(*syscall.Stat_t).Uid
-	perm := info.Mode().Perm()
-	if uid != uint32(os.Getuid()) {
-		err = fmt.Errorf("file %s has a different owner", file)
-		return err
-	}
-	if perm != 0600 {
-		err = fmt.Errorf("file %s has a invalid permissions", file)
-		return err
-	}
-
-	return nil
-}
-
 type RuntimeConfig struct {
 	Interval   time.Duration
 	Duration   time.Duration
@@ -189,12 +167,6 @@ func mainFunc() int {
 		CliArgs:        ReadCli(),
 	}
 
-	err = ConfigFileCheck(rcfg.CliArgs["configfile"])
-	if err != nil {
-		cclog.Error(err.Error())
-		return 1
-	}
-
 	// Load and check configuration
 	err = LoadCentralConfiguration(rcfg.CliArgs["configfile"], &rcfg.ConfigFile)
 	if err != nil {
@@ -236,31 +208,16 @@ func mainFunc() int {
 		cclog.Error("Metric router configuration file must be set")
 		return 1
 	}
-	err = ConfigFileCheck(rcfg.ConfigFile.RouterConfigFile)
-	if err != nil {
-		cclog.Error(err.Error())
-		return 1
-	}
 
 	if len(rcfg.ConfigFile.SinkConfigFile) == 0 {
 		cclog.Error("Sink configuration file must be set")
 		return 1
 	}
-	err = ConfigFileCheck(rcfg.ConfigFile.SinkConfigFile)
-	if err != nil {
-		cclog.Error(err.Error())
-		return 1
-	}
 
 	if len(rcfg.ConfigFile.CollectorConfigFile) == 0 {
 		cclog.Error("Metric collector configuration file must be set")
 		return 1
 	}
-	err = ConfigFileCheck(rcfg.ConfigFile.CollectorConfigFile)
-	if err != nil {
-		cclog.Error(err.Error())
-		return 1
-	}
 
 	// Set log file
 	if logfile := rcfg.CliArgs["logfile"]; logfile != "stderr" {
@@ -303,11 +260,6 @@ func mainFunc() int {
 
 	// Create new receive manager
 	if len(rcfg.ConfigFile.ReceiverConfigFile) > 0 {
-		err = ConfigFileCheck(rcfg.ConfigFile.ReceiverConfigFile)
-		if err != nil {
-			cclog.Error(err.Error())
-			return 1
-		}
 		rcfg.ReceiveManager, err = receivers.New(&rcfg.Sync, rcfg.ConfigFile.ReceiverConfigFile)
 		if err != nil {
 			cclog.Error(err.Error())

collectors/README.md

@@ -33,8 +33,10 @@ In contrast to the configuration files for sinks and receivers, the collectors c
 * [`topprocs`](./topprocsMetric.md)
 * [`nfs3stat`](./nfs3Metric.md)
 * [`nfs4stat`](./nfs4Metric.md)
+* [`nfsiostat`](./nfsiostatMetric.md)
 * [`cpufreq`](./cpufreqMetric.md)
 * [`cpufreq_cpuinfo`](./cpufreqCpuinfoMetric.md)
+* [`schedstat`](./schedstatMetric.md)
 * [`numastats`](./numastatsMetric.md)
 * [`gpfs`](./gpfsMetric.md)
 * [`beegfs_meta`](./beegfsmetaMetric.md)

collectors/likwidMetric.go

@@ -190,12 +190,8 @@ func getBaseFreq() float64 {
 	}
 
 	if math.IsNaN(freq) {
-		C.power_init(0)
-		info := C.get_powerInfo()
-		if float64(info.baseFrequency) != 0 {
-			freq = float64(info.baseFrequency)
-		}
-		C.power_finalize()
+		C.timer_init()
+		freq = float64(C.timer_getCycleClock()) / 1e3
 	}
 	return freq * 1e3
 }

receivers/natsReceiver.go

@@ -91,17 +91,18 @@ func (r *NatsReceiver) _NatsReceive(m *nats.Msg) {
 				return
 			}
 
-			y, _ := lp.NewMessage(
+			y, err := lp.NewMessage(
 				string(measurement),
 				tags,
 				nil,
 				fields,
 				t,
 			)
-
-			m, err := r.mp.ProcessMessage(y)
-			if err == nil && m != nil {
-				r.sink <- m
+			if err == nil {
+				m, err := r.mp.ProcessMessage(y)
+				if err == nil && m != nil && r.sink != nil {
+					r.sink <- m
+				}
 			}
 		}
 	}