Merge pull request #2639 from katarzyna-z/kk_perf_helpful_logs

Add logs and simplify setup of raw perf events
google · Aug 13, 2020 · 888dc21 · 888dc21
2 parents dfe2477 + 9906af8
commit 888dc21
Showing 1 changed file with 12 additions and 5 deletions.
diff --git 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 {