Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-12-29 17:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

perf tool_pmu: Rename perf_tool_event__* to tool_pmu__*

Browse Source 
Now the events are associated with the tool PMU, rename the functions
to reflect this.

Signed-off-by: Ian Rogers <irogers@google.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20241002032016.333748-7-irogers@google.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
This commit is contained in:
Ian Rogers 2024-10-01 20:20:09 -07:00 committed by Namhyung Kim
parent 0709a82c10
commit b8f1a1b068
5 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/perf/util/evsel.c
View File

@ -1678,7 +1678,7 @@ bool __evsel__match(const struct evsel *evsel, u32 type, u64 config)
int evsel__read_counter(struct evsel *evsel, int cpu_map_idx, int thread)
{
if (evsel__is_tool(evsel))
return evsel__read_tool(evsel, cpu_map_idx, thread);
return evsel__tool_pmu_read(evsel, cpu_map_idx, thread);
if (evsel__is_retire_lat(evsel))
return evsel__read_retire_lat(evsel, cpu_map_idx, thread);

22
tools/perf/util/metricgroup.c
View File

@ -686,7 +686,7 @@ static int metricgroup__build_event_string(struct strbuf *events,
pr_debug("found event %s\n", id);
/* Always move tool events outside of the group. */
ev = perf_tool_event__from_str(id);
ev = tool_pmu__str_to_event(id);
if (ev != TOOL_PMU__EVENT_NONE) {
has_tool_events = true;
tool_events[ev] = true;
@ -755,14 +755,14 @@ static int metricgroup__build_event_string(struct strbuf *events,
if (has_tool_events) {
int i;
perf_tool_event__for_each_event(i) {
tool_pmu__for_each_event(i) {
if (tool_events[i]) {
if (!no_group) {
ret = strbuf_addch(events, ',');
RETURN_IF_NON_ZERO(ret);
}
no_group = false;
ret = strbuf_addstr(events, perf_tool_event__to_str(i));
ret = strbuf_addstr(events, tool_pmu__event_to_str(i));
RETURN_IF_NON_ZERO(ret);
}
}
@ -1148,14 +1148,14 @@ static int metric_list_cmp(void *priv __maybe_unused, const struct list_head *l,
int i, left_count, right_count;
left_count = hashmap__size(left->pctx->ids);
perf_tool_event__for_each_event(i) {
if (!expr__get_id(left->pctx, perf_tool_event__to_str(i), &data))
tool_pmu__for_each_event(i) {
if (!expr__get_id(left->pctx, tool_pmu__event_to_str(i), &data))
left_count--;
}
right_count = hashmap__size(right->pctx->ids);
perf_tool_event__for_each_event(i) {
if (!expr__get_id(right->pctx, perf_tool_event__to_str(i), &data))
tool_pmu__for_each_event(i) {
if (!expr__get_id(right->pctx, tool_pmu__event_to_str(i), &data))
right_count--;
}
@ -1382,11 +1382,11 @@ static void find_tool_events(const struct list_head *metric_list,
list_for_each_entry(m, metric_list, nd) {
int i;
perf_tool_event__for_each_event(i) {
tool_pmu__for_each_event(i) {
struct expr_id_data *data;
if (!tool_events[i] &&
!expr__get_id(m->pctx, perf_tool_event__to_str(i), &data))
!expr__get_id(m->pctx, tool_pmu__event_to_str(i), &data))
tool_events[i] = true;
}
}
@ -1472,9 +1472,9 @@ static int parse_ids(bool metric_no_merge, bool fake_pmu,
* event1 if #smt_on else 0
* Add a tool event to avoid a parse error on an empty string.
*/
perf_tool_event__for_each_event(i) {
tool_pmu__for_each_event(i) {
if (tool_events[i]) {
char *tmp = strdup(perf_tool_event__to_str(i));
char *tmp = strdup(tool_pmu__event_to_str(i));
if (!tmp)
return -ENOMEM;

4
tools/perf/util/pmu.c
View File

@ -1836,7 +1836,7 @@ bool perf_pmu__have_event(struct perf_pmu *pmu, const char *name)
if (!name)
return false;
if (perf_pmu__is_tool(pmu))
return perf_tool_event__from_str(name) != TOOL_PMU__EVENT_NONE;
return tool_pmu__str_to_event(name) != TOOL_PMU__EVENT_NONE;
if (perf_pmu__find_alias(pmu, name, /*load=*/ true) != NULL)
return true;
if (pmu->cpu_aliases_added || !pmu->events_table)
@ -2331,7 +2331,7 @@ const char *perf_pmu__name_from_config(struct perf_pmu *pmu, u64 config)
return NULL;
if (perf_pmu__is_tool(pmu))
return perf_tool_event__to_str(config);
return tool_pmu__event_to_str(config);
pmu_aliases_parse(pmu);
pmu_add_cpu_aliases(pmu);

16
tools/perf/util/tool_pmu.c
View File

@ -20,7 +20,7 @@ static const char *const tool_pmu__event_names[TOOL_PMU__EVENT_MAX] = {
};
const char *perf_tool_event__to_str(enum tool_pmu_event ev)
const char *tool_pmu__event_to_str(enum tool_pmu_event ev)
{
if (ev > TOOL_PMU__EVENT_NONE && ev < TOOL_PMU__EVENT_MAX)
return tool_pmu__event_names[ev];
@ -28,11 +28,11 @@ const char *perf_tool_event__to_str(enum tool_pmu_event ev)
return NULL;
}
enum tool_pmu_event perf_tool_event__from_str(const char *str)
enum tool_pmu_event tool_pmu__str_to_event(const char *str)
{
int i;
perf_tool_event__for_each_event(i) {
tool_pmu__for_each_event(i) {
if (!strcasecmp(str, tool_pmu__event_names[i]))
return i;
}
@ -44,7 +44,7 @@ static int tool_pmu__config_term(struct perf_event_attr *attr,
struct parse_events_error *err)
{
if (term->type_term == PARSE_EVENTS__TERM_TYPE_USER) {
enum tool_pmu_event ev = perf_tool_event__from_str(term->config);
enum tool_pmu_event ev = tool_pmu__str_to_event(term->config);
if (ev == TOOL_PMU__EVENT_NONE)
goto err_out;
@ -91,10 +91,10 @@ int tool_pmu__for_each_event_cb(struct perf_pmu *pmu, void *state, pmu_event_cal
};
int i;
perf_tool_event__for_each_event(i) {
tool_pmu__for_each_event(i) {
int ret;
info.name = perf_tool_event__to_str(i);
info.name = tool_pmu__event_to_str(i);
info.alias = NULL;
info.scale_unit = NULL;
info.desc = NULL;
@ -130,7 +130,7 @@ enum tool_pmu_event evsel__tool_event(const struct evsel *evsel)
const char *evsel__tool_pmu_event_name(const struct evsel *evsel)
{
return perf_tool_event__to_str(evsel->core.attr.config);
return tool_pmu__event_to_str(evsel->core.attr.config);
}
static bool read_until_char(struct io *io, char e)
@ -328,7 +328,7 @@ int evsel__tool_pmu_open(struct evsel *evsel,
return err;
}
int evsel__read_tool(struct evsel *evsel, int cpu_map_idx, int thread)
int evsel__tool_pmu_read(struct evsel *evsel, int cpu_map_idx, int thread)
{
__u64 *start_time, cur_time, delta_start;
int fd, err = 0;

8
tools/perf/util/tool_pmu.h
View File

@ -17,7 +17,7 @@ enum tool_pmu_event {
TOOL_PMU__EVENT_MAX,
};
#define perf_tool_event__for_each_event(ev) \
#define tool_pmu__for_each_event(ev) \
for ((ev) = TOOL_PMU__EVENT_DURATION_TIME; (ev) < TOOL_PMU__EVENT_MAX; ev++)
static inline size_t tool_pmu__num_events(void)
@ -25,8 +25,8 @@ static inline size_t tool_pmu__num_events(void)
return TOOL_PMU__EVENT_MAX - 1;
}
const char *perf_tool_event__to_str(enum tool_pmu_event ev);
enum tool_pmu_event perf_tool_event__from_str(const char *str);
const char *tool_pmu__event_to_str(enum tool_pmu_event ev);
enum tool_pmu_event tool_pmu__str_to_event(const char *str);
int tool_pmu__config_terms(struct perf_event_attr *attr,
struct parse_events_terms *terms,
struct parse_events_error *err);
@ -44,7 +44,7 @@ int evsel__tool_pmu_prepare_open(struct evsel *evsel,
int evsel__tool_pmu_open(struct evsel *evsel,
struct perf_thread_map *threads,
int start_cpu_map_idx, int end_cpu_map_idx);
int evsel__read_tool(struct evsel *evsel, int cpu_map_idx, int thread);
int evsel__tool_pmu_read(struct evsel *evsel, int cpu_map_idx, int thread);
struct perf_pmu *perf_pmus__tool_pmu(void);