Skip to content

Commit c2e5096

Browse files
authored
pmu in use from error to warning (#370)
* pmu in use from error to warning Signed-off-by: Harper, Jason M <[email protected]> * lint error Signed-off-by: Harper, Jason M <[email protected]> --------- Signed-off-by: Harper, Jason M <[email protected]>
1 parent 98e3a37 commit c2e5096

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

cmd/metrics/metrics.go

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1042,7 +1042,7 @@ func prepareTarget(targetContext *targetContext, localTempDir string, localPerfP
10421042
myTarget := targetContext.target
10431043
var err error
10441044
_ = statusUpdate(myTarget.GetName(), "configuring target")
1045-
// make sure PMUs are not in use on target
1045+
// are PMUs being used on target?
10461046
if family, err := myTarget.GetFamily(); err == nil && family == "6" {
10471047
output, err := script.RunScript(myTarget, script.GetScriptByName(script.PMUBusyScriptName), localTempDir)
10481048
if err != nil {
@@ -1053,13 +1053,10 @@ func prepareTarget(targetContext *targetContext, localTempDir string, localPerfP
10531053
return
10541054
}
10551055
for line := range strings.SplitSeq(output.Stdout, "\n") {
1056-
// if one of the MSR registers is active (ignore cpu_cycles), then the PMU is in use
1056+
// if one of the PMU MSR registers is active, then the PMU is in use (ignore cpu_cycles)
10571057
if strings.Contains(line, "Active") && !strings.Contains(line, "0x30a") {
1058-
err = fmt.Errorf("PMU in use on target: %s", line)
1059-
_ = statusUpdate(myTarget.GetName(), fmt.Sprintf("Error: %v", err))
1060-
targetContext.err = err
1061-
channelError <- targetError{target: myTarget, err: err}
1062-
return
1058+
slog.Warn("PMU is in use on target", slog.String("target", myTarget.GetName()), slog.String("line", line))
1059+
_ = statusUpdate(myTarget.GetName(), "Warning: PMU in use, see log for details")
10631060
}
10641061
}
10651062
}

0 commit comments

Comments
 (0)