summaryrefslogtreecommitdiff
path: root/tools/lib/perf/include/internal/evlist.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-04-02 12:57:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2022-04-02 12:57:17 -0700
commitbe2d3ecedd9911fbfd7e55cc9ceac5f8b79ae4cf (patch)
treef56532b66ad2a4f1a14dfb0ef18ab4d031153e2a /tools/lib/perf/include/internal/evlist.h
parentd897b680418db98f01a0bff038f1b03770a33722 (diff)
parent7e2022af7921978ce37bb8fc1a35239b81cbc1af (diff)
downloadlinux-be2d3ecedd9911fbfd7e55cc9ceac5f8b79ae4cf.tar.gz
linux-be2d3ecedd9911fbfd7e55cc9ceac5f8b79ae4cf.tar.bz2
linux-be2d3ecedd9911fbfd7e55cc9ceac5f8b79ae4cf.zip
Merge tag 'perf-tools-for-v5.18-2022-04-02' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux
Pull more perf tools updates from Arnaldo Carvalho de Melo: - Avoid SEGV if core.cpus isn't set in 'perf stat'. - Stop depending on .git files for building PERF-VERSION-FILE, used in 'perf --version', fixing some perf tools build scenarios. - Convert tracepoint.py example to python3. - Update UAPI header copies from the kernel sources: socket, mman-common, msr-index, KVM, i915 and cpufeatures. - Update copy of libbpf's hashmap.c. - Directly return instead of using local ret variable in evlist__create_syswide_maps(), found by coccinelle. * tag 'perf-tools-for-v5.18-2022-04-02' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux: perf python: Convert tracepoint.py example to python3 perf evlist: Directly return instead of using local ret variable perf cpumap: More cpu map reuse by merge. perf cpumap: Add is_subset function perf evlist: Rename cpus to user_requested_cpus perf tools: Stop depending on .git files for building PERF-VERSION-FILE tools headers cpufeatures: Sync with the kernel sources tools headers UAPI: Sync drm/i915_drm.h with the kernel sources tools headers UAPI: Sync linux/kvm.h with the kernel sources tools kvm headers arm64: Update KVM headers from the kernel sources tools arch x86: Sync the msr-index.h copy with the kernel sources tools headers UAPI: Sync asm-generic/mman-common.h with the kernel perf beauty: Update copy of linux/socket.h with the kernel sources perf tools: Update copy of libbpf's hashmap.c perf stat: Avoid SEGV if core.cpus isn't set
Diffstat (limited to 'tools/lib/perf/include/internal/evlist.h')
-rw-r--r--tools/lib/perf/include/internal/evlist.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/lib/perf/include/internal/evlist.h b/tools/lib/perf/include/internal/evlist.h
index 4cefade540bd..e3e64f37db7b 100644
--- a/tools/lib/perf/include/internal/evlist.h
+++ b/tools/lib/perf/include/internal/evlist.h
@@ -19,7 +19,12 @@ struct perf_evlist {
int nr_entries;
int nr_groups;
bool has_user_cpus;
- struct perf_cpu_map *cpus;
+ /**
+ * The cpus passed from the command line or all online CPUs by
+ * default.
+ */
+ struct perf_cpu_map *user_requested_cpus;
+ /** The union of all evsel cpu maps. */
struct perf_cpu_map *all_cpus;
struct perf_thread_map *threads;
int nr_mmaps;