Skip to content

Commit 6d765f5

Browse files
captain5050namhyung
authored andcommitted
libperf evsel: Rename own_cpus to pmu_cpus
own_cpus is generally the cpumask from the PMU. Rename to pmu_cpus to try to make this clearer. Variable rename with no other changes. Reviewed-by: Thomas Falcon <thomas.falcon@intel.com> Signed-off-by: Ian Rogers <irogers@google.com> Tested-by: James Clark <james.clark@linaro.org> Link: https://lore.kernel.org/r/20250719030517.1990983-7-irogers@google.com Signed-off-by: Namhyung Kim <namhyung@kernel.org>
1 parent 175c852 commit 6d765f5

9 files changed

Lines changed: 22 additions & 22 deletions

File tree

tools/lib/perf/evlist.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ static void __perf_evlist__propagate_maps(struct perf_evlist *evlist,
4646
* are valid by intersecting with those of the PMU.
4747
*/
4848
perf_cpu_map__put(evsel->cpus);
49-
evsel->cpus = perf_cpu_map__intersect(evlist->user_requested_cpus, evsel->own_cpus);
49+
evsel->cpus = perf_cpu_map__intersect(evlist->user_requested_cpus, evsel->pmu_cpus);
5050

5151
/*
5252
* Empty cpu lists would eventually get opened as "any" so remove
@@ -61,7 +61,7 @@ static void __perf_evlist__propagate_maps(struct perf_evlist *evlist,
6161
list_for_each_entry_from(next, &evlist->entries, node)
6262
next->idx--;
6363
}
64-
} else if (!evsel->own_cpus || evlist->has_user_cpus ||
64+
} else if (!evsel->pmu_cpus || evlist->has_user_cpus ||
6565
(!evsel->requires_cpu && perf_cpu_map__has_any_cpu(evlist->user_requested_cpus))) {
6666
/*
6767
* The PMU didn't specify a default cpu map, this isn't a core
@@ -72,13 +72,13 @@ static void __perf_evlist__propagate_maps(struct perf_evlist *evlist,
7272
*/
7373
perf_cpu_map__put(evsel->cpus);
7474
evsel->cpus = perf_cpu_map__get(evlist->user_requested_cpus);
75-
} else if (evsel->cpus != evsel->own_cpus) {
75+
} else if (evsel->cpus != evsel->pmu_cpus) {
7676
/*
7777
* No user requested cpu map but the PMU cpu map doesn't match
7878
* the evsel's. Reset it back to the PMU cpu map.
7979
*/
8080
perf_cpu_map__put(evsel->cpus);
81-
evsel->cpus = perf_cpu_map__get(evsel->own_cpus);
81+
evsel->cpus = perf_cpu_map__get(evsel->pmu_cpus);
8282
}
8383

8484
if (evsel->system_wide) {

tools/lib/perf/evsel.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ void perf_evsel__delete(struct perf_evsel *evsel)
4646
assert(evsel->mmap == NULL); /* If not munmap wasn't called. */
4747
assert(evsel->sample_id == NULL); /* If not free_id wasn't called. */
4848
perf_cpu_map__put(evsel->cpus);
49-
perf_cpu_map__put(evsel->own_cpus);
49+
perf_cpu_map__put(evsel->pmu_cpus);
5050
perf_thread_map__put(evsel->threads);
5151
free(evsel);
5252
}

tools/lib/perf/include/internal/evsel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ struct perf_evsel {
9999
* cpu map for opening the event on, for example, the first CPU on a
100100
* socket for an uncore event.
101101
*/
102-
struct perf_cpu_map *own_cpus;
102+
struct perf_cpu_map *pmu_cpus;
103103
struct perf_thread_map *threads;
104104
struct xyarray *fd;
105105
struct xyarray *mmap;

tools/perf/tests/event_update.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ static int test__event_update(struct test_suite *test __maybe_unused, int subtes
109109
TEST_ASSERT_VAL("failed to synthesize attr update name",
110110
!perf_event__synthesize_event_update_name(&tmp.tool, evsel, process_event_name));
111111

112-
perf_cpu_map__put(evsel->core.own_cpus);
113-
evsel->core.own_cpus = perf_cpu_map__new("1,2,3");
112+
perf_cpu_map__put(evsel->core.pmu_cpus);
113+
evsel->core.pmu_cpus = perf_cpu_map__new("1,2,3");
114114

115115
TEST_ASSERT_VAL("failed to synthesize attr update cpus",
116116
!perf_event__synthesize_event_update_cpus(&tmp.tool, evsel, process_event_cpus));

tools/perf/util/evsel.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ struct evsel *evsel__clone(struct evsel *dest, struct evsel *orig)
488488
return NULL;
489489

490490
evsel->core.cpus = perf_cpu_map__get(orig->core.cpus);
491-
evsel->core.own_cpus = perf_cpu_map__get(orig->core.own_cpus);
491+
evsel->core.pmu_cpus = perf_cpu_map__get(orig->core.pmu_cpus);
492492
evsel->core.threads = perf_thread_map__get(orig->core.threads);
493493
evsel->core.nr_members = orig->core.nr_members;
494494
evsel->core.system_wide = orig->core.system_wide;
@@ -1527,7 +1527,7 @@ void evsel__config(struct evsel *evsel, struct record_opts *opts,
15271527
attr->exclude_user = 1;
15281528
}
15291529

1530-
if (evsel->core.own_cpus || evsel->unit)
1530+
if (evsel->core.pmu_cpus || evsel->unit)
15311531
evsel->core.attr.read_format |= PERF_FORMAT_ID;
15321532

15331533
/*
@@ -1680,7 +1680,7 @@ void evsel__exit(struct evsel *evsel)
16801680
evsel__free_config_terms(evsel);
16811681
cgroup__put(evsel->cgrp);
16821682
perf_cpu_map__put(evsel->core.cpus);
1683-
perf_cpu_map__put(evsel->core.own_cpus);
1683+
perf_cpu_map__put(evsel->core.pmu_cpus);
16841684
perf_thread_map__put(evsel->core.threads);
16851685
zfree(&evsel->group_name);
16861686
zfree(&evsel->name);

tools/perf/util/header.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4507,8 +4507,8 @@ int perf_event__process_event_update(const struct perf_tool *tool __maybe_unused
45074507
case PERF_EVENT_UPDATE__CPUS:
45084508
map = cpu_map__new_data(&ev->cpus.cpus);
45094509
if (map) {
4510-
perf_cpu_map__put(evsel->core.own_cpus);
4511-
evsel->core.own_cpus = map;
4510+
perf_cpu_map__put(evsel->core.pmu_cpus);
4511+
evsel->core.pmu_cpus = map;
45124512
} else
45134513
pr_err("failed to get event_update cpus\n");
45144514
default:

tools/perf/util/parse-events.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ __add_event(struct list_head *list, int *idx,
320320

321321
(*idx)++;
322322
evsel->core.cpus = cpus;
323-
evsel->core.own_cpus = perf_cpu_map__get(cpus);
323+
evsel->core.pmu_cpus = perf_cpu_map__get(cpus);
324324
evsel->core.requires_cpu = pmu ? pmu->is_uncore : false;
325325
evsel->core.is_pmu_core = is_pmu_core;
326326
evsel->pmu = pmu;

tools/perf/util/synthetic-events.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2045,7 +2045,7 @@ int perf_event__synthesize_event_update_name(const struct perf_tool *tool, struc
20452045
int perf_event__synthesize_event_update_cpus(const struct perf_tool *tool, struct evsel *evsel,
20462046
perf_event__handler_t process)
20472047
{
2048-
struct synthesize_cpu_map_data syn_data = { .map = evsel->core.own_cpus };
2048+
struct synthesize_cpu_map_data syn_data = { .map = evsel->core.pmu_cpus };
20492049
struct perf_record_event_update *ev;
20502050
int err;
20512051

@@ -2126,7 +2126,7 @@ int perf_event__synthesize_extra_attr(const struct perf_tool *tool, struct evlis
21262126
}
21272127
}
21282128

2129-
if (evsel->core.own_cpus) {
2129+
if (evsel->core.pmu_cpus) {
21302130
err = perf_event__synthesize_event_update_cpus(tool, evsel, process);
21312131
if (err < 0) {
21322132
pr_err("Couldn't synthesize evsel cpus.\n");

tools/perf/util/tool_pmu.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -357,10 +357,10 @@ bool tool_pmu__read_event(enum tool_pmu_event ev, struct evsel *evsel, u64 *resu
357357
/*
358358
* "Any CPU" event that can be scheduled on any CPU in
359359
* the PMU's cpumask. The PMU cpumask should be saved in
360-
* own_cpus. If not present fall back to max.
360+
* pmu_cpus. If not present fall back to max.
361361
*/
362-
if (!perf_cpu_map__is_empty(evsel->core.own_cpus))
363-
*result = perf_cpu_map__nr(evsel->core.own_cpus);
362+
if (!perf_cpu_map__is_empty(evsel->core.pmu_cpus))
363+
*result = perf_cpu_map__nr(evsel->core.pmu_cpus);
364364
else
365365
*result = cpu__max_present_cpu().cpu;
366366
}
@@ -386,12 +386,12 @@ bool tool_pmu__read_event(enum tool_pmu_event ev, struct evsel *evsel, u64 *resu
386386
/*
387387
* "Any CPU" event that can be scheduled on any CPU in
388388
* the PMU's cpumask. The PMU cpumask should be saved in
389-
* own_cpus, if not present then just the online cpu
389+
* pmu_cpus, if not present then just the online cpu
390390
* mask.
391391
*/
392-
if (!perf_cpu_map__is_empty(evsel->core.own_cpus)) {
392+
if (!perf_cpu_map__is_empty(evsel->core.pmu_cpus)) {
393393
struct perf_cpu_map *tmp =
394-
perf_cpu_map__intersect(online, evsel->core.own_cpus);
394+
perf_cpu_map__intersect(online, evsel->core.pmu_cpus);
395395

396396
*result = perf_cpu_map__nr(tmp);
397397
perf_cpu_map__put(tmp);

0 commit comments

Comments
 (0)