Skip to content

Commit ce05cac

Browse files
committed
perf parse-events: Expose/rename config_term_name
JIRA: https://issues.redhat.com/browse/RHEL-77935 upstream ======== commit d2f3ecb Author: Ian Rogers <irogers@google.com> Date: Tue Oct 1 20:20:06 2024 -0700 description =========== 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> Signed-off-by: Michael Petlan <mpetlan@redhat.com>
1 parent ce0a6d7 commit ce05cac

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

tools/perf/util/parse-events.c

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,7 @@ static int check_type_val(struct parse_events_term *term,
800800

801801
static bool config_term_shrinked;
802802

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)
804804
{
805805
/*
806806
* Update according to parse-events.l
@@ -886,7 +886,7 @@ config_term_avail(enum parse_events__term_type term_type, struct parse_events_er
886886

887887
/* term_type is validated so indexing is safe */
888888
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)
890890
parse_events_error__handle(err, -1, err_str, NULL);
891891
return false;
892892
}
@@ -1010,7 +1010,7 @@ do { \
10101010
case PARSE_EVENTS__TERM_TYPE_HARDWARE:
10111011
default:
10121012
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)),
10141014
parse_events_formats_error_string(NULL));
10151015
return -EINVAL;
10161016
}
@@ -1134,8 +1134,9 @@ static int config_term_tracepoint(struct perf_event_attr *attr,
11341134
default:
11351135
if (err) {
11361136
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+
);
11391140
}
11401141
return -EINVAL;
11411142
}
@@ -2582,7 +2583,7 @@ int parse_events_term__num(struct parse_events_term **term,
25822583
struct parse_events_term temp = {
25832584
.type_val = PARSE_EVENTS__TERM_TYPE_NUM,
25842585
.type_term = type_term,
2585-
.config = config ? : strdup(config_term_name(type_term)),
2586+
.config = config ? : strdup(parse_events__term_type_str(type_term)),
25862587
.no_value = no_value,
25872588
.err_term = loc_term ? loc_term->first_column : 0,
25882589
.err_val = loc_val ? loc_val->first_column : 0,
@@ -2616,7 +2617,7 @@ int parse_events_term__term(struct parse_events_term **term,
26162617
void *loc_term, void *loc_val)
26172618
{
26182619
return parse_events_term__str(term, term_lhs, NULL,
2619-
strdup(config_term_name(term_rhs)),
2620+
strdup(parse_events__term_type_str(term_rhs)),
26202621
loc_term, loc_val);
26212622
}
26222623

@@ -2723,7 +2724,8 @@ int parse_events_terms__to_strbuf(const struct parse_events_terms *terms, struct
27232724
if (ret < 0)
27242725
return ret;
27252726
} else if ((unsigned int)term->type_term < __PARSE_EVENTS__TERM_TYPE_NR) {
2726-
ret = strbuf_addf(sb, "%s=", config_term_name(term->type_term));
2727+
ret = strbuf_addf(sb, "%s=",
2728+
parse_events__term_type_str(term->type_term));
27272729
if (ret < 0)
27282730
return ret;
27292731
}
@@ -2743,7 +2745,7 @@ static void config_terms_list(char *buf, size_t buf_sz)
27432745

27442746
buf[0] = '\0';
27452747
for (i = 0; i < __PARSE_EVENTS__TERM_TYPE_NR; i++) {
2746-
const char *name = config_term_name(i);
2748+
const char *name = parse_events__term_type_str(i);
27472749

27482750
if (!config_term_avail(i, NULL))
27492751
continue;

tools/perf/util/parse-events.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,8 @@ struct parse_events_state {
168168
bool wild_card_pmus;
169169
};
170170

171+
const char *parse_events__term_type_str(enum parse_events__term_type term_type);
172+
171173
bool parse_events__filter_pmu(const struct parse_events_state *parse_state,
172174
const struct perf_pmu *pmu);
173175
void parse_events__shrink_config_terms(void);

0 commit comments

Comments
 (0)