Re: [PATCH v1 03/15] perf evsel: Add accessor for tool_event

From: Arnaldo Carvalho de Melo
Date: Wed Sep 11 2024 - 10:30:14 EST

Next message: Ayush Singh: "[PATCH 7/8] addon_boards: mikrobus: Add Weather Click"
Previous message: Ayush Singh: "[PATCH 6/8] addon_boards: Add addon_boards plumbing"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

On Fri, Sep 06, 2024 at 10:08:18PM -0700, Ian Rogers wrote:
> Currently tool events use a dedicated variable within the evsel. Later
> changes will move this to the unused struct perf_event_attr config for
> these events. Add an accessor to allow the later change to be well
> typed and avoid changing all uses.

Thanks, applied to perf-tools-next,

- Arnaldo

> Signed-off-by: Ian Rogers <irogers@xxxxxxxxxx>
> ---
> tools/perf/builtin-stat.c | 6 +++---
> tools/perf/util/evsel.c | 24 ++++++++++++------------
> tools/perf/util/evsel.h | 5 +++++
> tools/perf/util/stat-shadow.c | 2 +-
> 4 files changed, 21 insertions(+), 16 deletions(-)
>
> diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
> index cf985cdb9a6e..689a3d43c258 100644
> --- a/tools/perf/builtin-stat.c
> +++ b/tools/perf/builtin-stat.c
> @@ -294,14 +294,14 @@ static int read_single_counter(struct evsel *counter, int cpu_map_idx, int threa
> * terminates. Use the wait4 values in that case.
> */
> if (err && cpu_map_idx == 0 &&
> - (counter->tool_event == PERF_TOOL_USER_TIME ||
> - counter->tool_event == PERF_TOOL_SYSTEM_TIME)) {
> + (evsel__tool_event(counter) == PERF_TOOL_USER_TIME ||
> + evsel__tool_event(counter) == PERF_TOOL_SYSTEM_TIME)) {
> u64 val, *start_time;
> struct perf_counts_values *count =
> perf_counts(counter->counts, cpu_map_idx, thread);
>
> start_time = xyarray__entry(counter->start_times, cpu_map_idx, thread);
> - if (counter->tool_event == PERF_TOOL_USER_TIME)
> + if (evsel__tool_event(counter) == PERF_TOOL_USER_TIME)
> val = ru_stats.ru_utime_usec_stat.mean;
> else
> val = ru_stats.ru_stime_usec_stat.mean;
> diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
> index 49cc71511c0c..dbf9c8cee3c5 100644
> --- a/tools/perf/util/evsel.c
> +++ b/tools/perf/util/evsel.c
> @@ -773,7 +773,7 @@ const char *evsel__name(struct evsel *evsel)
>
> case PERF_TYPE_SOFTWARE:
> if (evsel__is_tool(evsel))
> - evsel__tool_name(evsel->tool_event, bf, sizeof(bf));
> + evsel__tool_name(evsel__tool_event(evsel), bf, sizeof(bf));
> else
> evsel__sw_name(evsel, bf, sizeof(bf));
> break;
> @@ -811,7 +811,7 @@ const char *evsel__metric_id(const struct evsel *evsel)
> return evsel->metric_id;
>
> if (evsel__is_tool(evsel))
> - return perf_tool_event__to_str(evsel->tool_event);
> + return perf_tool_event__to_str(evsel__tool_event(evsel));
>
> return "unknown";
> }
> @@ -1503,8 +1503,8 @@ void evsel__exit(struct evsel *evsel)
> evsel->per_pkg_mask = NULL;
> zfree(&evsel->metric_events);
> perf_evsel__object.fini(evsel);
> - if (evsel->tool_event == PERF_TOOL_SYSTEM_TIME ||
> - evsel->tool_event == PERF_TOOL_USER_TIME)
> + if (evsel__tool_event(evsel) == PERF_TOOL_SYSTEM_TIME ||
> + evsel__tool_event(evsel) == PERF_TOOL_USER_TIME)
> xyarray__delete(evsel->start_times);
> }
>
> @@ -1785,7 +1785,7 @@ static int evsel__read_tool(struct evsel *evsel, int cpu_map_idx, int thread)
>
> count = perf_counts(evsel->counts, cpu_map_idx, thread);
>
> - switch (evsel->tool_event) {
> + switch (evsel__tool_event(evsel)) {
> case PERF_TOOL_DURATION_TIME:
> /*
> * Pretend duration_time is only on the first CPU and thread, or
> @@ -1800,7 +1800,7 @@ static int evsel__read_tool(struct evsel *evsel, int cpu_map_idx, int thread)
> break;
> case PERF_TOOL_USER_TIME:
> case PERF_TOOL_SYSTEM_TIME: {
> - bool system = evsel->tool_event == PERF_TOOL_SYSTEM_TIME;
> + bool system = evsel__tool_event(evsel) == PERF_TOOL_SYSTEM_TIME;
>
> start_time = xyarray__entry(evsel->start_times, cpu_map_idx, thread);
> fd = FD(evsel, cpu_map_idx, thread);
> @@ -2072,8 +2072,8 @@ static int __evsel__prepare_open(struct evsel *evsel, struct perf_cpu_map *cpus,
> perf_evsel__alloc_fd(&evsel->core, perf_cpu_map__nr(cpus), nthreads) < 0)
> return -ENOMEM;
>
> - if ((evsel->tool_event == PERF_TOOL_SYSTEM_TIME ||
> - evsel->tool_event == PERF_TOOL_USER_TIME) &&
> + if ((evsel__tool_event(evsel) == PERF_TOOL_SYSTEM_TIME ||
> + evsel__tool_event(evsel) == PERF_TOOL_USER_TIME) &&
> !evsel->start_times) {
> evsel->start_times = xyarray__new(perf_cpu_map__nr(cpus), nthreads, sizeof(__u64));
> if (!evsel->start_times)
> @@ -2262,7 +2262,7 @@ static int evsel__open_cpu(struct evsel *evsel, struct perf_cpu_map *cpus,
> int pid = -1, err, old_errno;
> enum rlimit_action set_rlimit = NO_CHANGE;
>
> - if (evsel->tool_event == PERF_TOOL_DURATION_TIME) {
> + if (evsel__tool_event(evsel) == PERF_TOOL_DURATION_TIME) {
> if (evsel->core.attr.sample_period) /* no sampling */
> return -EINVAL;
> evsel->start_time = rdclock();
> @@ -2304,9 +2304,9 @@ static int evsel__open_cpu(struct evsel *evsel, struct perf_cpu_map *cpus,
> if (!evsel->cgrp && !evsel->core.system_wide)
> pid = perf_thread_map__pid(threads, thread);
>
> - if (evsel->tool_event == PERF_TOOL_USER_TIME ||
> - evsel->tool_event == PERF_TOOL_SYSTEM_TIME) {
> - bool system = evsel->tool_event == PERF_TOOL_SYSTEM_TIME;
> + if (evsel__tool_event(evsel) == PERF_TOOL_USER_TIME ||
> + evsel__tool_event(evsel) == PERF_TOOL_SYSTEM_TIME) {
> + bool system = evsel__tool_event(evsel) == PERF_TOOL_SYSTEM_TIME;
> __u64 *start_time = NULL;
>
> if (evsel->core.attr.sample_period) {
> diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
> index 15acf293e12a..15e745a9a798 100644
> --- a/tools/perf/util/evsel.h
> +++ b/tools/perf/util/evsel.h
> @@ -330,6 +330,11 @@ static inline bool evsel__is_retire_lat(const struct evsel *evsel)
> return evsel->retire_lat;
> }
>
> +static inline enum perf_tool_event evsel__tool_event(const struct evsel *evsel)
> +{
> + return evsel->tool_event;
> +}
> +
> const char *evsel__group_name(struct evsel *evsel);
> int evsel__group_desc(struct evsel *evsel, char *buf, size_t size);
>
> diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c
> index 6bb975e46de3..99376c12dd8e 100644
> --- a/tools/perf/util/stat-shadow.c
> +++ b/tools/perf/util/stat-shadow.c
> @@ -380,7 +380,7 @@ static int prepare_metric(const struct metric_expr *mexp,
> struct stats *stats;
> double scale;
>
> - switch (metric_events[i]->tool_event) {
> + switch (evsel__tool_event(metric_events[i])) {
> case PERF_TOOL_DURATION_TIME:
> stats = &walltime_nsecs_stats;
> scale = 1e-9;
> --
> 2.46.0.469.g59c65b2a67-goog

Next message: Ayush Singh: "[PATCH 7/8] addon_boards: mikrobus: Add Weather Click"
Previous message: Ayush Singh: "[PATCH 6/8] addon_boards: Add addon_boards plumbing"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]