From 9906af8f735bc6dbac44bb67a9f006861d2a6721 Mon Sep 17 00:00:00 2001 From: Katarzyna Kujawa Date: Tue, 11 Aug 2020 16:05:52 +0200 Subject: [PATCH] Add logs informing about incorrect configuration for perf events Simplify setup of raw perf events Signed-off-by: Katarzyna Kujawa --- perf/uncore_libpfm.go | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/perf/uncore_libpfm.go b/perf/uncore_libpfm.go index 042f012ca1..50a5e979b7 100644 --- a/perf/uncore_libpfm.go +++ b/perf/uncore_libpfm.go @@ -182,14 +182,21 @@ func (c *uncoreCollector) setup(events PerfEvents, devicesPath string) error { customEvent, ok := c.eventToCustomEvent[group[0]] if ok { if customEvent.Type != 0 { - pmus := obtainPMUs("uncore", readUncorePMUs) - err = c.setupRawNonGroupedUncore(customEvent, pmus) - } else { - pmus := obtainPMUs(pmuPrefix, readUncorePMUs) - err = c.setupRawNonGroupedUncore(customEvent, pmus) + pmuPrefix = uncorePMUPrefix } + + pmus := obtainPMUs(pmuPrefix, readUncorePMUs) + if len(pmus) == 0 { + klog.Warningf("Cannot obtain any PMU matching prefix, pmu_prefix: %s, eventName: %s", pmuPrefix, eventName) + continue + } + err = c.setupRawNonGroupedUncore(customEvent, pmus) } else { pmus := obtainPMUs(pmuPrefix, readUncorePMUs) + if len(pmus) == 0 { + klog.Warningf("Cannot obtain any PMU matching prefix, pmu_prefix: %s, eventName: %s", pmuPrefix, eventName) + continue + } err = c.setupNonGroupedUncore(eventName, pmus) } if err != nil {