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>

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 6ae611e70fae32246129461fadcb391647a29042..228ae469d44a002c253d704106180898079cef0c 100644 (file)
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -800,7 +800,7 @@ static int check_type_val(struct parse_events_term *term,
 
 static bool config_term_shrinked;
 
-static const char *config_term_name(enum parse_events__term_type term_type)
+const char *parse_events__term_type_str(enum parse_events__term_type term_type)
 {
        /*
         * Update according to parse-events.l
@@ -886,7 +886,7 @@ config_term_avail(enum parse_events__term_type term_type, struct parse_events_er
 
                /* term_type is validated so indexing is safe */
                if (asprintf(&err_str, "'%s' is not usable in 'perf stat'",
-                            config_term_name(term_type)) >= 0)
+                            parse_events__term_type_str(term_type)) >= 0)
                        parse_events_error__handle(err, -1, err_str, NULL);
                return false;
        }
@@ -1010,7 +1010,7 @@ do {                                                                         \
        case PARSE_EVENTS__TERM_TYPE_HARDWARE:
        default:
                parse_events_error__handle(err, term->err_term,
-                                       strdup(config_term_name(term->type_term)),
+                                       strdup(parse_events__term_type_str(term->type_term)),
                                        parse_events_formats_error_string(NULL));
                return -EINVAL;
        }
@@ -1134,8 +1134,9 @@ static int config_term_tracepoint(struct perf_event_attr *attr,
        default:
                if (err) {
                        parse_events_error__handle(err, term->err_term,
-                                                  strdup(config_term_name(term->type_term)),
-                               strdup("valid terms: call-graph,stack-size\n"));
+                                       strdup(parse_events__term_type_str(term->type_term)),
+                                       strdup("valid terms: call-graph,stack-size\n")
+                               );
                }
                return -EINVAL;
        }
@@ -2582,7 +2583,7 @@ int parse_events_term__num(struct parse_events_term **term,
        struct parse_events_term temp = {
                .type_val  = PARSE_EVENTS__TERM_TYPE_NUM,
                .type_term = type_term,
-               .config    = config ? : strdup(config_term_name(type_term)),
+               .config    = config ? : strdup(parse_events__term_type_str(type_term)),
                .no_value  = no_value,
                .err_term  = loc_term ? loc_term->first_column : 0,
                .err_val   = loc_val  ? loc_val->first_column  : 0,
@@ -2616,7 +2617,7 @@ int parse_events_term__term(struct parse_events_term **term,
                            void *loc_term, void *loc_val)
 {
        return parse_events_term__str(term, term_lhs, NULL,
-                                     strdup(config_term_name(term_rhs)),
+                                     strdup(parse_events__term_type_str(term_rhs)),
                                      loc_term, loc_val);
 }
 
@@ -2723,7 +2724,8 @@ int parse_events_terms__to_strbuf(const struct parse_events_terms *terms, struct
                                if (ret < 0)
                                        return ret;
                        } else if ((unsigned int)term->type_term < __PARSE_EVENTS__TERM_TYPE_NR) {
-                               ret = strbuf_addf(sb, "%s=", config_term_name(term->type_term));
+                               ret = strbuf_addf(sb, "%s=",
+                                                 parse_events__term_type_str(term->type_term));
                                if (ret < 0)
                                        return ret;
                        }
@@ -2743,7 +2745,7 @@ static void config_terms_list(char *buf, size_t buf_sz)
 
        buf[0] = '\0';
        for (i = 0; i < __PARSE_EVENTS__TERM_TYPE_NR; i++) {
-               const char *name = config_term_name(i);
+               const char *name = parse_events__term_type_str(i);
 
                if (!config_term_avail(i, NULL))
                        continue;

diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
index 2b52f8d6aa29acb8054c16a07e537bc07912599f..ac1feaaeb8d5d7cf8eacd2a75138361b98438856 100644 (file)
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h
@@ -168,6 +168,8 @@ struct parse_events_state {
        bool                       wild_card_pmus;
 };
 
+const char *parse_events__term_type_str(enum parse_events__term_type term_type);
+
 bool parse_events__filter_pmu(const struct parse_events_state *parse_state,
                              const struct perf_pmu *pmu);
 void parse_events__shrink_config_terms(void);