Commit 63883cb0 authored by Ian Rogers's avatar Ian Rogers Committed by Namhyung Kim
Browse files

perf pmu: Const-ify perf_pmu__config_terms 



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: default avatarIan Rogers <irogers@google.com>
Reviewed-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: James Clark <james.clark@arm.com>
Cc: Suzuki K Poulose <suzuki.poulose@arm.com>
Cc: Yang Jihong <yangjihong1@huawei.com>
Cc: Will Deacon <will@kernel.org>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Jing Zhang <renyu.zj@linux.alibaba.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: John Garry <john.g.garry@oracle.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: coresight@lists.linaro.org
Link: https://lore.kernel.org/r/20231012175645.1849503-6-irogers@google.com


Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
parent 3a42f4c7

tools/perf/util/pmu.c

+5 −5
Original line number Diff line number Diff line
@@ -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;
@@ -1131,7 +1131,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;
@@ -1229,7 +1229,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;
@@ -1255,7 +1255,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,
@@ -1378,7 +1378,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)

tools/perf/util/pmu.h

+1 −1
Original line number Diff line number Diff line
@@ -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);