Add const to related APIs, this is so they can be used to default
initialize a perf_event_attr from a const pmu.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/pmu.c | 10 +++++-----
tools/perf/util/pmu.h | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index e11901c923d7..eb17f00bd0d2 100644
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -156,7 +156,7 @@ static void __perf_pmu_format__load(struct perf_pmu_format *format, FILE *file)
format->loaded = true;
}
-static void perf_pmu_format__load(struct perf_pmu *pmu, struct perf_pmu_format *format)
+static void perf_pmu_format__load(const struct perf_pmu *pmu, struct perf_pmu_format *format)
{
char path[PATH_MAX];
FILE *file = NULL;
@@ -1132,7 +1132,7 @@ void evsel__set_config_if_unset(struct perf_pmu *pmu, struct evsel *evsel,
}
static struct perf_pmu_format *
-pmu_find_format(struct list_head *formats, const char *name)
+pmu_find_format(const struct list_head *formats, const char *name)
{
struct perf_pmu_format *format;
@@ -1230,7 +1230,7 @@ static int pmu_resolve_param_term(struct parse_events_term *term,
return -1;
}
-static char *pmu_formats_string(struct list_head *formats)
+static char *pmu_formats_string(const struct list_head *formats)
{
struct perf_pmu_format *format;
char *str = NULL;
@@ -1256,7 +1256,7 @@ static char *pmu_formats_string(struct list_head *formats)
* Setup one of config[12] attr members based on the
* user input data - term parameter.
*/
-static int pmu_config_term(struct perf_pmu *pmu,
+static int pmu_config_term(const struct perf_pmu *pmu,
struct perf_event_attr *attr,
struct parse_events_term *term,
struct parse_events_terms *head_terms,
@@ -1379,7 +1379,7 @@ static int pmu_config_term(struct perf_pmu *pmu,
return 0;
}
-int perf_pmu__config_terms(struct perf_pmu *pmu,
+int perf_pmu__config_terms(const struct perf_pmu *pmu,
struct perf_event_attr *attr,
struct parse_events_terms *terms,
bool zero, struct parse_events_error *err)
diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h
index 24af7297b522..5a05131aa4ce 100644
--- a/tools/perf/util/pmu.h
+++ b/tools/perf/util/pmu.h
@@ -193,7 +193,7 @@ void pmu_add_sys_aliases(struct perf_pmu *pmu);
int perf_pmu__config(struct perf_pmu *pmu, struct perf_event_attr *attr,
struct parse_events_terms *head_terms,
struct parse_events_error *error);
-int perf_pmu__config_terms(struct perf_pmu *pmu,
+int perf_pmu__config_terms(const struct perf_pmu *pmu,
struct perf_event_attr *attr,
struct parse_events_terms *terms,
bool zero, struct parse_events_error *error);
--
2.42.0.609.gbb76f46606-goog
On 7/10/23 05:13, Ian Rogers wrote:
> Add const to related APIs, this is so they can be used to default
> initialize a perf_event_attr from a const pmu.
>
> Signed-off-by: Ian Rogers <irogers@google.com>
Reviewed-by: Adrian Hunter <adrian.hunter@intel.com>
> ---
> tools/perf/util/pmu.c | 10 +++++-----
> tools/perf/util/pmu.h | 2 +-
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
> index e11901c923d7..eb17f00bd0d2 100644
> --- a/tools/perf/util/pmu.c
> +++ b/tools/perf/util/pmu.c
> @@ -156,7 +156,7 @@ static void __perf_pmu_format__load(struct perf_pmu_format *format, FILE *file)
> format->loaded = true;
> }
>
> -static void perf_pmu_format__load(struct perf_pmu *pmu, struct perf_pmu_format *format)
> +static void perf_pmu_format__load(const struct perf_pmu *pmu, struct perf_pmu_format *format)
> {
> char path[PATH_MAX];
> FILE *file = NULL;
> @@ -1132,7 +1132,7 @@ void evsel__set_config_if_unset(struct perf_pmu *pmu, struct evsel *evsel,
> }
>
> static struct perf_pmu_format *
> -pmu_find_format(struct list_head *formats, const char *name)
> +pmu_find_format(const struct list_head *formats, const char *name)
> {
> struct perf_pmu_format *format;
>
> @@ -1230,7 +1230,7 @@ static int pmu_resolve_param_term(struct parse_events_term *term,
> return -1;
> }
>
> -static char *pmu_formats_string(struct list_head *formats)
> +static char *pmu_formats_string(const struct list_head *formats)
> {
> struct perf_pmu_format *format;
> char *str = NULL;
> @@ -1256,7 +1256,7 @@ static char *pmu_formats_string(struct list_head *formats)
> * Setup one of config[12] attr members based on the
> * user input data - term parameter.
> */
> -static int pmu_config_term(struct perf_pmu *pmu,
> +static int pmu_config_term(const struct perf_pmu *pmu,
> struct perf_event_attr *attr,
> struct parse_events_term *term,
> struct parse_events_terms *head_terms,
> @@ -1379,7 +1379,7 @@ static int pmu_config_term(struct perf_pmu *pmu,
> return 0;
> }
>
> -int perf_pmu__config_terms(struct perf_pmu *pmu,
> +int perf_pmu__config_terms(const struct perf_pmu *pmu,
> struct perf_event_attr *attr,
> struct parse_events_terms *terms,
> bool zero, struct parse_events_error *err)
> diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h
> index 24af7297b522..5a05131aa4ce 100644
> --- a/tools/perf/util/pmu.h
> +++ b/tools/perf/util/pmu.h
> @@ -193,7 +193,7 @@ void pmu_add_sys_aliases(struct perf_pmu *pmu);
> int perf_pmu__config(struct perf_pmu *pmu, struct perf_event_attr *attr,
> struct parse_events_terms *head_terms,
> struct parse_events_error *error);
> -int perf_pmu__config_terms(struct perf_pmu *pmu,
> +int perf_pmu__config_terms(const struct perf_pmu *pmu,
> struct perf_event_attr *attr,
> struct parse_events_terms *terms,
> bool zero, struct parse_events_error *error);
© 2016 - 2026 Red Hat, Inc.