Re: [PATCH 07/19] perf metric: Rename __metricgroup__add_metric to __add_metric

Arnaldo Carvalho de Melo
2020-07-28T12:30:50Z

Em Sun, Jul 26, 2020 at 02:48:05PM +0530, kajoljain escreveu:
>
>
> On 7/19/20 11:43 PM, Jiri Olsa wrote:
> > Renaming __metricgroup__add_metric to __add_metric
> > to fit in the current function names.
> >
> > Acked-by: Ian Rogers <irogers@google.com>
> > Signed-off-by: Jiri Olsa <jolsa@kernel.org>
>
> Reviewed-By : Kajol Jain<kjain@linux.ibm.com>

Thanks, applied.

- Arnaldo
> Thanks,
> Kajol Jain
> > ---
> > tools/perf/util/metricgroup.c | 17 ++++++-----------
> > 1 file changed, 6 insertions(+), 11 deletions(-)
> >
> > diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
> > index 4096be7a7a9e..ccd80538a6ae 100644
> > --- a/tools/perf/util/metricgroup.c
> > +++ b/tools/perf/util/metricgroup.c
> > @@ -571,10 +571,10 @@ int __weak arch_get_runtimeparam(void)
> > return 1;
> > }
> >
> > -static int __metricgroup__add_metric(struct list_head *group_list,
> > - struct pmu_event *pe,
> > - bool metric_no_group,
> > - int runtime)
> > +static int __add_metric(struct list_head *group_list,
> > + struct pmu_event *pe,
> > + bool metric_no_group,
> > + int runtime)
> > {
> > struct egroup *eg;
> >
> > @@ -634,10 +634,7 @@ static int add_metric(struct list_head *group_list,
> > pr_debug("metric expr %s for %s\n", pe->metric_expr, pe->metric_name);
> >
> > if (!strstr(pe->metric_expr, "?")) {
> > - ret = __metricgroup__add_metric(group_list,
> > - pe,
> > - metric_no_group,
> > - 1);
> > + ret = __add_metric(group_list, pe, metric_no_group, 1);
> > } else {
> > int j, count;
> >
> > @@ -649,9 +646,7 @@ static int add_metric(struct list_head *group_list,
> > */
> >
> > for (j = 0; j < count && !ret; j++) {
> > - ret = __metricgroup__add_metric(
> > - group_list, pe,
> > - metric_no_group, j);
> > + ret = __add_metric(group_list, pe, metric_no_group, j);
> > }
> > }
> >
> >

--

- Arnaldo