Re: [PATCH 05/19] perf stat: Add cpu aggr id for no aggregation mode

From: Namhyung Kim
Date: Wed Oct 12 2022 - 12:28:04 EST


On Wed, Oct 12, 2022 at 3:40 AM Jiri Olsa <olsajiri@xxxxxxxxx> wrote:
>
> On Sun, Oct 09, 2022 at 10:35:46PM -0700, Namhyung Kim wrote:
> > Likewise, add an aggr_id for cpu for none aggregation mode. This is not
> > used actually yet but later code will use to unify the aggregation code.
> >
> > No functional change intended.
> >
> > Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxxx>
> > ---
> > tools/perf/builtin-stat.c | 48 +++++++++++++++++++++++++++++++++++----
> > 1 file changed, 43 insertions(+), 5 deletions(-)
> >
> > diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
> > index 144bb3a657f2..b00ef20aef5b 100644
> > --- a/tools/perf/builtin-stat.c
> > +++ b/tools/perf/builtin-stat.c
> > @@ -1339,6 +1339,12 @@ static struct aggr_cpu_id perf_stat__get_global(struct perf_stat_config *config
> > return id;
> > }
> >
> > +static struct aggr_cpu_id perf_stat__get_cpu(struct perf_stat_config *config __maybe_unused,
> > + struct perf_cpu cpu)
> > +{
> > + return aggr_cpu_id__cpu(cpu, /*data=*/NULL);
> > +}
> > +
> > static struct aggr_cpu_id perf_stat__get_aggr(struct perf_stat_config *config,
> > aggr_get_id_t get_id, struct perf_cpu cpu)
> > {
> > @@ -1381,6 +1387,12 @@ static struct aggr_cpu_id perf_stat__get_global_cached(struct perf_stat_config *
> > return perf_stat__get_aggr(config, perf_stat__get_global, cpu);
> > }
> >
> > +static struct aggr_cpu_id perf_stat__get_cpu_cached(struct perf_stat_config *config,
> > + struct perf_cpu cpu)
> > +{
> > + return perf_stat__get_aggr(config, perf_stat__get_cpu, cpu);
> > +}
> > +
> > static bool term_percore_set(void)
> > {
> > struct evsel *counter;
> > @@ -1407,8 +1419,7 @@ static aggr_cpu_id_get_t aggr_mode__get_aggr(enum aggr_mode aggr_mode)
> > case AGGR_NONE:
> > if (term_percore_set())
> > return aggr_cpu_id__core;
> > -
> > - return NULL;
> > + return aggr_cpu_id__cpu;;
>
> nit, double ;; ;-)

Good eye :) I'll remove it.

Thanks,
Namhyung