Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf parse-events: Expose/rename config_term_name

Expose config_term_name as parse_events__term_type_str so that PMUs not
in pmu.c may access it.

Signed-off-by: Ian Rogers <irogers@google.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20241002032016.333748-4-irogers@google.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>

authored by

Ian Rogers and committed by
Namhyung Kim
d2f3ecb0 c798f72c

+13 -9
+11 -9
tools/perf/util/parse-events.c
··· 800 800 801 801 static bool config_term_shrinked; 802 802 803 - static const char *config_term_name(enum parse_events__term_type term_type) 803 + const char *parse_events__term_type_str(enum parse_events__term_type term_type) 804 804 { 805 805 /* 806 806 * Update according to parse-events.l ··· 886 886 887 887 /* term_type is validated so indexing is safe */ 888 888 if (asprintf(&err_str, "'%s' is not usable in 'perf stat'", 889 - config_term_name(term_type)) >= 0) 889 + parse_events__term_type_str(term_type)) >= 0) 890 890 parse_events_error__handle(err, -1, err_str, NULL); 891 891 return false; 892 892 } ··· 1010 1010 case PARSE_EVENTS__TERM_TYPE_HARDWARE: 1011 1011 default: 1012 1012 parse_events_error__handle(err, term->err_term, 1013 - strdup(config_term_name(term->type_term)), 1013 + strdup(parse_events__term_type_str(term->type_term)), 1014 1014 parse_events_formats_error_string(NULL)); 1015 1015 return -EINVAL; 1016 1016 } ··· 1134 1134 default: 1135 1135 if (err) { 1136 1136 parse_events_error__handle(err, term->err_term, 1137 - strdup(config_term_name(term->type_term)), 1138 - strdup("valid terms: call-graph,stack-size\n")); 1137 + strdup(parse_events__term_type_str(term->type_term)), 1138 + strdup("valid terms: call-graph,stack-size\n") 1139 + ); 1139 1140 } 1140 1141 return -EINVAL; 1141 1142 } ··· 2583 2582 struct parse_events_term temp = { 2584 2583 .type_val = PARSE_EVENTS__TERM_TYPE_NUM, 2585 2584 .type_term = type_term, 2586 - .config = config ? : strdup(config_term_name(type_term)), 2585 + .config = config ? : strdup(parse_events__term_type_str(type_term)), 2587 2586 .no_value = no_value, 2588 2587 .err_term = loc_term ? loc_term->first_column : 0, 2589 2588 .err_val = loc_val ? loc_val->first_column : 0, ··· 2617 2616 void *loc_term, void *loc_val) 2618 2617 { 2619 2618 return parse_events_term__str(term, term_lhs, NULL, 2620 - strdup(config_term_name(term_rhs)), 2619 + strdup(parse_events__term_type_str(term_rhs)), 2621 2620 loc_term, loc_val); 2622 2621 } 2623 2622 ··· 2724 2723 if (ret < 0) 2725 2724 return ret; 2726 2725 } else if ((unsigned int)term->type_term < __PARSE_EVENTS__TERM_TYPE_NR) { 2727 - ret = strbuf_addf(sb, "%s=", config_term_name(term->type_term)); 2726 + ret = strbuf_addf(sb, "%s=", 2727 + parse_events__term_type_str(term->type_term)); 2728 2728 if (ret < 0) 2729 2729 return ret; 2730 2730 } ··· 2745 2743 2746 2744 buf[0] = '\0'; 2747 2745 for (i = 0; i < __PARSE_EVENTS__TERM_TYPE_NR; i++) { 2748 - const char *name = config_term_name(i); 2746 + const char *name = parse_events__term_type_str(i); 2749 2747 2750 2748 if (!config_term_avail(i, NULL)) 2751 2749 continue;
+2
tools/perf/util/parse-events.h
··· 168 168 bool wild_card_pmus; 169 169 }; 170 170 171 + const char *parse_events__term_type_str(enum parse_events__term_type term_type); 172 + 171 173 bool parse_events__filter_pmu(const struct parse_events_state *parse_state, 172 174 const struct perf_pmu *pmu); 173 175 void parse_events__shrink_config_terms(void);