perf stat: Exit perf stat if parse groups fails
Ian Rogers
reviewerPATCH 1/1 perf stat: Exit perf stat if parse groups fails
Metrics were added by a callback but commit a4b8cfcabb1d ("perf stat:
Delay metric parsing") postponed this to allow optimizations based on the CPU configuration. In doing so it stopped errors in metric parsing from causing perf stat termination. This change adds the termination for bad metric names back in.
Reported-by Arnaldo Carvalho de Melo <[email protected]>
Fixes a4b8cfcabb1d ("perf stat: Delay metric parsing")
Signed-off-by Ian Rogers <[email protected]>
--- tools/perf/builtin-stat.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
tools/perf/builtin-stat.c +11 -7
@@ -2695,15 +2695,19 @@ int cmd_stat(int argc, const char **argv)*/ if (metrics) {const char *pmu = parse_events_option_args.pmu_filter ?:"all" ; +int ret =metricgroup__parse_groups (evsel_list, pmu, metrics, + stat_config.metric_no_group, + stat_config.metric_no_merge, + stat_config.metric_no_threshold, + stat_config.user_requested_cpu_list, + stat_config.system_wide, + &stat_config.metric_events); -metricgroup__parse_groups (evsel_list, pmu, metrics, - stat_config.metric_no_group, - stat_config.metric_no_merge, - stat_config.metric_no_threshold, - stat_config.user_requested_cpu_list, - stat_config.system_wide, - &stat_config.metric_events);zfree (&metrics); +if (ret) { + status = ret; + goto out; + } }if (add_default_attributes ())
Signature · 1 line
2.43.0.rc2.451.g8631bc7472-goog