Re: [PATCH 05/25] perf tools: Propagate cpu maps through the evlist

Arnaldo Carvalho de Melo
2015-06-10T19:10:33Z

Em Wed, Jun 10, 2015 at 08:10:38PM +0200, Jiri Olsa escreveu:
> Propagate evlist's cpu_map object through all the evsel objects,
> while keeping already configured evsel->cpus.
>
> It'll be handy to access evsel's cpus directly
> in following patches.
>
> Link: http://lkml.kernel.org/n/tip-myadl53clbkjvzeqolwp95w0@git.kernel.org
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
> tools/perf/util/evlist.c | 24 +++++++++++++++++++++++-
> 1 file changed, 23 insertions(+), 1 deletion(-)
>
> diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
> index 493675cfa90c..7cb579ca5629 100644
> --- a/tools/perf/util/evlist.c
> +++ b/tools/perf/util/evlist.c
> @@ -1085,6 +1085,28 @@ int perf_evlist__mmap(struct perf_evlist *evlist, unsigned int pages,
> return perf_evlist__mmap_ex(evlist, pages, overwrite, 0, false);
> }
>
> +static int propagate_maps(struct perf_evlist *evlist, struct target *target)
> +{
> + struct perf_evsel *evsel;
> +
> + evlist__for_each(evlist, evsel) {
> + /*
> + * We already have cpus for evsel (via PMU sysfs) so
> + * keep it, if there's no target cpu list defined.
> + */

There was some discussion about this with Stephane, lost track, will try
to dig it... :-\

- Arnaldo

> + if (evsel->cpus && target->cpu_list)
> + cpu_map__put(evsel->cpus);
> +
> + if (!evsel->cpus || target->cpu_list)
> + evsel->cpus = cpu_map__get(evlist->cpus);
> +
> + if (!evsel->cpus)
> + return -ENOMEM;
> + }
> +
> + return 0;
> +}
> +
> int perf_evlist__create_maps(struct perf_evlist *evlist, struct target *target)
> {
> evlist->threads = thread_map__new_str(target->pid, target->tid,
> @@ -1101,7 +1123,7 @@ int perf_evlist__create_maps(struct perf_evlist *evlist, struct target *target)
> if (evlist->cpus == NULL)
> goto out_delete_threads;
>
> - return 0;
> + return propagate_maps(evlist, target);
>
> out_delete_threads:
> thread_map__put(evlist->threads);
> --
> 1.9.3