Commit 7e2450bb authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo

libperf: Propagate maps only if necessary

The current code propagate evsel's cpu map settings to evlist when it's
added to an evlist.  But the evlist->all_cpus and each evsel's cpus will
be updated in perf_evlist__set_maps() later.  No need to do it before
evlist's cpus are set actually.

In fact it discards this intermediate all_cpus maps at the beginning
of perf_evlist__set_maps().  Let's not do this.  It's only needed when
an evsel is added after the evlist cpu/thread maps are set.
Reviewed-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20221003204647.1481128-3-namhyung@kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 06b552ee
...@@ -67,9 +67,7 @@ static void perf_evlist__propagate_maps(struct perf_evlist *evlist) ...@@ -67,9 +67,7 @@ static void perf_evlist__propagate_maps(struct perf_evlist *evlist)
{ {
struct perf_evsel *evsel; struct perf_evsel *evsel;
/* Recomputing all_cpus, so start with a blank slate. */ evlist->needs_map_propagation = true;
perf_cpu_map__put(evlist->all_cpus);
evlist->all_cpus = NULL;
perf_evlist__for_each_evsel(evlist, evsel) perf_evlist__for_each_evsel(evlist, evsel)
__perf_evlist__propagate_maps(evlist, evsel); __perf_evlist__propagate_maps(evlist, evsel);
...@@ -81,7 +79,9 @@ void perf_evlist__add(struct perf_evlist *evlist, ...@@ -81,7 +79,9 @@ void perf_evlist__add(struct perf_evlist *evlist,
evsel->idx = evlist->nr_entries; evsel->idx = evlist->nr_entries;
list_add_tail(&evsel->node, &evlist->entries); list_add_tail(&evsel->node, &evlist->entries);
evlist->nr_entries += 1; evlist->nr_entries += 1;
__perf_evlist__propagate_maps(evlist, evsel);
if (evlist->needs_map_propagation)
__perf_evlist__propagate_maps(evlist, evsel);
} }
void perf_evlist__remove(struct perf_evlist *evlist, void perf_evlist__remove(struct perf_evlist *evlist,
...@@ -177,9 +177,6 @@ void perf_evlist__set_maps(struct perf_evlist *evlist, ...@@ -177,9 +177,6 @@ void perf_evlist__set_maps(struct perf_evlist *evlist,
evlist->threads = perf_thread_map__get(threads); evlist->threads = perf_thread_map__get(threads);
} }
if (!evlist->all_cpus && cpus)
evlist->all_cpus = perf_cpu_map__get(cpus);
perf_evlist__propagate_maps(evlist); perf_evlist__propagate_maps(evlist);
} }
......
...@@ -19,6 +19,7 @@ struct perf_evlist { ...@@ -19,6 +19,7 @@ struct perf_evlist {
int nr_entries; int nr_entries;
int nr_groups; int nr_groups;
bool has_user_cpus; bool has_user_cpus;
bool needs_map_propagation;
/** /**
* The cpus passed from the command line or all online CPUs by * The cpus passed from the command line or all online CPUs by
* default. * default.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment