Commit 5ccc4edf authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo

perf parse-events: Constify parse_events_add_numeric

Allow the term list to be const so that other functions can pass const
term lists. Add const as necessary to called functions.
Signed-off-by: default avatarIan Rogers <irogers@google.com>
Reviewed-by: default avatarKan Liang <kan.liang@linux.intel.com>
Tested-by: default avatarAtish Patra <atishp@rivosinc.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Beeman Strong <beeman@rivosinc.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20240416061533.921723-9-irogers@google.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 9d0dba23
...@@ -34,7 +34,8 @@ ...@@ -34,7 +34,8 @@
#ifdef PARSER_DEBUG #ifdef PARSER_DEBUG
extern int parse_events_debug; extern int parse_events_debug;
#endif #endif
static int get_config_terms(struct parse_events_terms *head_config, struct list_head *head_terms); static int get_config_terms(const struct parse_events_terms *head_config,
struct list_head *head_terms);
static int parse_events_terms__copy(const struct parse_events_terms *src, static int parse_events_terms__copy(const struct parse_events_terms *src,
struct parse_events_terms *dest); struct parse_events_terms *dest);
...@@ -154,7 +155,7 @@ const char *event_type(int type) ...@@ -154,7 +155,7 @@ const char *event_type(int type)
return "unknown"; return "unknown";
} }
static char *get_config_str(struct parse_events_terms *head_terms, static char *get_config_str(const struct parse_events_terms *head_terms,
enum parse_events__term_type type_term) enum parse_events__term_type type_term)
{ {
struct parse_events_term *term; struct parse_events_term *term;
...@@ -169,12 +170,12 @@ static char *get_config_str(struct parse_events_terms *head_terms, ...@@ -169,12 +170,12 @@ static char *get_config_str(struct parse_events_terms *head_terms,
return NULL; return NULL;
} }
static char *get_config_metric_id(struct parse_events_terms *head_terms) static char *get_config_metric_id(const struct parse_events_terms *head_terms)
{ {
return get_config_str(head_terms, PARSE_EVENTS__TERM_TYPE_METRIC_ID); return get_config_str(head_terms, PARSE_EVENTS__TERM_TYPE_METRIC_ID);
} }
static char *get_config_name(struct parse_events_terms *head_terms) static char *get_config_name(const struct parse_events_terms *head_terms)
{ {
return get_config_str(head_terms, PARSE_EVENTS__TERM_TYPE_NAME); return get_config_str(head_terms, PARSE_EVENTS__TERM_TYPE_NAME);
} }
...@@ -358,7 +359,7 @@ static int config_term_common(struct perf_event_attr *attr, ...@@ -358,7 +359,7 @@ static int config_term_common(struct perf_event_attr *attr,
struct parse_events_term *term, struct parse_events_term *term,
struct parse_events_error *err); struct parse_events_error *err);
static int config_attr(struct perf_event_attr *attr, static int config_attr(struct perf_event_attr *attr,
struct parse_events_terms *head, const struct parse_events_terms *head,
struct parse_events_error *err, struct parse_events_error *err,
config_term_func_t config_term); config_term_func_t config_term);
...@@ -1108,7 +1109,7 @@ static int config_term_tracepoint(struct perf_event_attr *attr, ...@@ -1108,7 +1109,7 @@ static int config_term_tracepoint(struct perf_event_attr *attr,
#endif #endif
static int config_attr(struct perf_event_attr *attr, static int config_attr(struct perf_event_attr *attr,
struct parse_events_terms *head, const struct parse_events_terms *head,
struct parse_events_error *err, struct parse_events_error *err,
config_term_func_t config_term) config_term_func_t config_term)
{ {
...@@ -1121,7 +1122,8 @@ static int config_attr(struct perf_event_attr *attr, ...@@ -1121,7 +1122,8 @@ static int config_attr(struct perf_event_attr *attr,
return 0; return 0;
} }
static int get_config_terms(struct parse_events_terms *head_config, struct list_head *head_terms) static int get_config_terms(const struct parse_events_terms *head_config,
struct list_head *head_terms)
{ {
#define ADD_CONFIG_TERM(__type, __weak) \ #define ADD_CONFIG_TERM(__type, __weak) \
struct evsel_config_term *__t; \ struct evsel_config_term *__t; \
...@@ -1325,7 +1327,7 @@ int parse_events_add_tracepoint(struct list_head *list, int *idx, ...@@ -1325,7 +1327,7 @@ int parse_events_add_tracepoint(struct list_head *list, int *idx,
static int __parse_events_add_numeric(struct parse_events_state *parse_state, static int __parse_events_add_numeric(struct parse_events_state *parse_state,
struct list_head *list, struct list_head *list,
struct perf_pmu *pmu, u32 type, u32 extended_type, struct perf_pmu *pmu, u32 type, u32 extended_type,
u64 config, struct parse_events_terms *head_config) u64 config, const struct parse_events_terms *head_config)
{ {
struct perf_event_attr attr; struct perf_event_attr attr;
LIST_HEAD(config_terms); LIST_HEAD(config_terms);
...@@ -1361,7 +1363,7 @@ static int __parse_events_add_numeric(struct parse_events_state *parse_state, ...@@ -1361,7 +1363,7 @@ static int __parse_events_add_numeric(struct parse_events_state *parse_state,
int parse_events_add_numeric(struct parse_events_state *parse_state, int parse_events_add_numeric(struct parse_events_state *parse_state,
struct list_head *list, struct list_head *list,
u32 type, u64 config, u32 type, u64 config,
struct parse_events_terms *head_config, const struct parse_events_terms *head_config,
bool wildcard) bool wildcard)
{ {
struct perf_pmu *pmu = NULL; struct perf_pmu *pmu = NULL;
......
...@@ -196,7 +196,7 @@ int parse_events_add_tracepoint(struct list_head *list, int *idx, ...@@ -196,7 +196,7 @@ int parse_events_add_tracepoint(struct list_head *list, int *idx,
int parse_events_add_numeric(struct parse_events_state *parse_state, int parse_events_add_numeric(struct parse_events_state *parse_state,
struct list_head *list, struct list_head *list,
u32 type, u64 config, u32 type, u64 config,
struct parse_events_terms *head_config, const struct parse_events_terms *head_config,
bool wildcard); bool wildcard);
int parse_events_add_tool(struct parse_events_state *parse_state, int parse_events_add_tool(struct parse_events_state *parse_state,
struct list_head *list, struct list_head *list,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment