Re: [RFC PATCH 23/25] perf stat: Fix a return error issue in hardware-grouping

[Liang, Kan]

On 2023-09-25 2:18 a.m., weilin.wang@xxxxxxxxx wrote:
> From: Weilin Wang <weilin.wang@xxxxxxxxx>
> 
> Update the hw_aware_parse_ids() goto to improve error handling.
> 

Seems like a bug fix. Please merge it with the patch which introduces
the issue.

Thanks,
Kan
> Signed-off-by: Weilin Wang <weilin.wang@xxxxxxxxx>
> ---
>  tools/perf/util/metricgroup.c | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
> index 07a82fa21..6a4404226 100644
> --- a/tools/perf/util/metricgroup.c
> +++ b/tools/perf/util/metricgroup.c
> @@ -2196,11 +2196,11 @@ static int hw_aware_parse_ids(struct perf_pmu *fake_pmu,
>  	*out_evlist = NULL;
>  	ret = hw_aware_build_grouping(ids, &grouping);
>  	if (ret)
> -		goto err_out;
> +		goto out;
>  	ret = hw_aware_metricgroup__build_event_string(&grouping_str, modifier,
>  						      tool_events, &grouping);
>  	if (ret)
> -		goto err_out;
> +		goto out;
>  
>  	parsed_evlist = evlist__new();
>  	if (!parsed_evlist) {
> @@ -2225,10 +2225,11 @@ static int hw_aware_parse_ids(struct perf_pmu *fake_pmu,
>  	*out_evlist = parsed_evlist;
>  	parsed_evlist = NULL;
>  err_out:
> -	metricgroup__free_group_list(&grouping);
> -	metricgroup__free_grouping_strs(&grouping_str);
>  	parse_events_error__exit(&parse_error);
>  	evlist__delete(parsed_evlist);
> +out:
> +	metricgroup__free_group_list(&grouping);
> +	metricgroup__free_grouping_strs(&grouping_str);
>  	return ret;
>  }
>