On Thu, Oct 05, 2017 at 07:00:28PM -0700, Andi Kleen wrote: > From: Andi Kleen <a...@linux.intel.com> > > Now that the xyarray stores the dimensions we can use those > to iterate over the FDs for a evsel. > > Signed-off-by: Andi Kleen <a...@linux.intel.com>
Acked-by: Jiri Olsa <jo...@kernel.org> thanks, jirka > --- > tools/perf/builtin-stat.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c > index dd525417880a..3c697118e44b 100644 > --- a/tools/perf/builtin-stat.c > +++ b/tools/perf/builtin-stat.c > @@ -557,14 +557,13 @@ static int perf_stat_synthesize_config(bool is_pipe) > > #define FD(e, x, y) (*(int *)xyarray__entry(e->fd, x, y)) > > -static int __store_counter_ids(struct perf_evsel *counter, > - struct cpu_map *cpus, > - struct thread_map *threads) > +static int __store_counter_ids(struct perf_evsel *counter) > { > int cpu, thread; > > - for (cpu = 0; cpu < cpus->nr; cpu++) { > - for (thread = 0; thread < threads->nr; thread++) { > + for (cpu = 0; cpu < xyarray__max_x(counter->fd); cpu++) { > + for (thread = 0; thread < xyarray__max_y(counter->fd); > + thread++) { > int fd = FD(counter, cpu, thread); > > if (perf_evlist__id_add_fd(evsel_list, counter, > @@ -584,7 +583,7 @@ static int store_counter_ids(struct perf_evsel *counter) > if (perf_evsel__alloc_id(counter, cpus->nr, threads->nr)) > return -ENOMEM; > > - return __store_counter_ids(counter, cpus, threads); > + return __store_counter_ids(counter); > } > > static bool perf_evsel__should_store_id(struct perf_evsel *counter) > -- > 2.13.6 >