From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ian Rogers <irogers@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
Kan Liang <kan.liang@linux.intel.com>,
Zhengjun Xing <zhengjun.xing@linux.intel.com>,
Ravi Bangoria <ravi.bangoria@amd.com>,
Adrian Hunter <adrian.hunter@intel.com>,
"Steinar H. Gunderson" <sesse@google.com>,
Qi Liu <liuqi115@huawei.com>, Kim Phillips <kim.phillips@amd.com>,
Florian Fischer <florian.fischer@muhq.space>,
James Clark <james.clark@arm.com>,
Suzuki Poulouse <suzuki.poulose@arm.com>,
Sean Christopherson <seanjc@google.com>,
Leo Yan <leo.yan@linaro.org>,
John Garry <john.g.garry@oracle.com>,
Kajol Jain <kjain@linux.ibm.com>,
linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org,
Stephane Eranian <eranian@google.com>
Subject: Re: [PATCH v1 06/10] perf evsel: Allow const evsel for certain accesses
Date: Thu, 2 Mar 2023 11:36:44 -0300 [thread overview]
Message-ID: <ZAC0fGpZpT+3lDVU@kernel.org> (raw)
In-Reply-To: <20230302041211.852330-7-irogers@google.com>
Em Wed, Mar 01, 2023 at 08:12:07PM -0800, Ian Rogers escreveu:
> List sorting, added later to evlist, passes const elements requiring
> helper functions to also be const. Make the argument to
> evsel__find_pmu, evsel__is_aux_event and evsel__leader const.
But then you have to de-constify it at some point :-\
- Arnaldo
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
> tools/perf/util/evsel.c | 2 +-
> tools/perf/util/evsel.h | 6 +++---
> tools/perf/util/pmu.c | 6 +++---
> tools/perf/util/python.c | 2 +-
> 4 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
> index 51e8ce6edddc..2dc2c24252bb 100644
> --- a/tools/perf/util/evsel.c
> +++ b/tools/perf/util/evsel.c
> @@ -3139,7 +3139,7 @@ bool evsel__is_hybrid(const struct evsel *evsel)
> return evsel->pmu_name && perf_pmu__is_hybrid(evsel->pmu_name);
> }
>
> -struct evsel *evsel__leader(struct evsel *evsel)
> +struct evsel *evsel__leader(const struct evsel *evsel)
> {
> return container_of(evsel->core.leader, struct evsel, core);
> }
> diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
> index 814a49ebb7e3..676c499323e9 100644
> --- a/tools/perf/util/evsel.h
> +++ b/tools/perf/util/evsel.h
> @@ -212,8 +212,8 @@ int evsel__object_config(size_t object_size,
> int (*init)(struct evsel *evsel),
> void (*fini)(struct evsel *evsel));
>
> -struct perf_pmu *evsel__find_pmu(struct evsel *evsel);
> -bool evsel__is_aux_event(struct evsel *evsel);
> +struct perf_pmu *evsel__find_pmu(const struct evsel *evsel);
> +bool evsel__is_aux_event(const struct evsel *evsel);
>
> struct evsel *evsel__new_idx(struct perf_event_attr *attr, int idx);
>
> @@ -505,7 +505,7 @@ int evsel__store_ids(struct evsel *evsel, struct evlist *evlist);
>
> void evsel__zero_per_pkg(struct evsel *evsel);
> bool evsel__is_hybrid(const struct evsel *evsel);
> -struct evsel *evsel__leader(struct evsel *evsel);
> +struct evsel *evsel__leader(const struct evsel *evsel);
> bool evsel__has_leader(struct evsel *evsel, struct evsel *leader);
> bool evsel__is_leader(struct evsel *evsel);
> void evsel__set_leader(struct evsel *evsel, struct evsel *leader);
> diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
> index 43b6182d96b7..45d9b8e28e16 100644
> --- a/tools/perf/util/pmu.c
> +++ b/tools/perf/util/pmu.c
> @@ -988,7 +988,7 @@ struct perf_pmu *perf_pmu__scan(struct perf_pmu *pmu)
> return NULL;
> }
>
> -struct perf_pmu *evsel__find_pmu(struct evsel *evsel)
> +struct perf_pmu *evsel__find_pmu(const struct evsel *evsel)
> {
> struct perf_pmu *pmu = NULL;
>
> @@ -1000,11 +1000,11 @@ struct perf_pmu *evsel__find_pmu(struct evsel *evsel)
> break;
> }
>
> - evsel->pmu = pmu;
> + ((struct evsel *)evsel)->pmu = pmu;
Hu
> return pmu;
> }
>
> -bool evsel__is_aux_event(struct evsel *evsel)
> +bool evsel__is_aux_event(const struct evsel *evsel)
> {
> struct perf_pmu *pmu = evsel__find_pmu(evsel);
>
> diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c
> index 42e8b813d010..ab48ffbb6448 100644
> --- a/tools/perf/util/python.c
> +++ b/tools/perf/util/python.c
> @@ -83,7 +83,7 @@ const char *perf_env__arch(struct perf_env *env __maybe_unused)
> * far, for the perf python binding known usecases, revisit if this become
> * necessary.
> */
> -struct perf_pmu *evsel__find_pmu(struct evsel *evsel __maybe_unused)
> +struct perf_pmu *evsel__find_pmu(const struct evsel *evsel __maybe_unused)
> {
> return NULL;
> }
> --
> 2.39.2.722.g9855ee24e9-goog
>
--
- Arnaldo
next prev parent reply other threads:[~2023-03-02 14:36 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-02 4:12 [PATCH v1 00/10] Better fixes for grouping of events Ian Rogers
2023-03-02 4:12 ` [PATCH v1 01/10] libperf evlist: Avoid a use of evsel idx Ian Rogers
2023-03-02 14:33 ` Arnaldo Carvalho de Melo
2023-03-02 4:12 ` [PATCH v1 02/10] perf stat: Don't remove all grouped events when CPU maps disagree Ian Rogers
2023-03-02 14:33 ` Arnaldo Carvalho de Melo
2023-03-02 4:12 ` [PATCH v1 03/10] perf record: Early auxtrace initialization before event parsing Ian Rogers
2023-03-02 14:32 ` Arnaldo Carvalho de Melo
2023-03-02 16:05 ` Ian Rogers
2023-03-02 4:12 ` [PATCH v1 04/10] perf stat: Modify the group test Ian Rogers
2023-03-02 14:34 ` Arnaldo Carvalho de Melo
2023-03-02 16:10 ` Ian Rogers
2023-03-02 4:12 ` [PATCH v1 05/10] perf evsel: Limit in group test to CPUs Ian Rogers
2023-03-02 14:35 ` Arnaldo Carvalho de Melo
2023-03-02 15:24 ` Liang, Kan
2023-03-02 19:38 ` Ian Rogers
2023-03-02 20:28 ` Liang, Kan
2023-03-02 4:12 ` [PATCH v1 06/10] perf evsel: Allow const evsel for certain accesses Ian Rogers
2023-03-02 14:36 ` Arnaldo Carvalho de Melo [this message]
2023-03-02 4:12 ` [PATCH v1 07/10] perf evsel: Add function to compute pmu_name Ian Rogers
2023-03-02 14:39 ` Arnaldo Carvalho de Melo
2023-03-02 16:13 ` Ian Rogers
2023-03-02 4:12 ` [PATCH v1 08/10] perf parse-events: Pass ownership of the group name Ian Rogers
2023-03-02 14:45 ` Arnaldo Carvalho de Melo
2023-03-02 4:12 ` [PATCH v1 09/10] perf parse-events: Sort and group parsed events Ian Rogers
2023-03-02 14:51 ` Arnaldo Carvalho de Melo
2023-03-02 17:20 ` Ian Rogers
2023-03-02 4:12 ` [PATCH v1 10/10] perf evsel: Remove use_uncore_alias Ian Rogers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZAC0fGpZpT+3lDVU@kernel.org \
--to=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=eranian@google.com \
--cc=florian.fischer@muhq.space \
--cc=irogers@google.com \
--cc=james.clark@arm.com \
--cc=john.g.garry@oracle.com \
--cc=jolsa@kernel.org \
--cc=kan.liang@linux.intel.com \
--cc=kim.phillips@amd.com \
--cc=kjain@linux.ibm.com \
--cc=leo.yan@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=liuqi115@huawei.com \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=ravi.bangoria@amd.com \
--cc=seanjc@google.com \
--cc=sesse@google.com \
--cc=suzuki.poulose@arm.com \
--cc=zhengjun.xing@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.