[PATCH v1 16/26] perf pmu: Use generic hashmap for pmu aliases
From: Ian Rogers
Date: Fri Nov 13 2026 - 19:20:32 EST
Convert perf_pmu::aliases in util/pmu.{c,h} to
DECLARE_HASHMAP(pmu_aliases_map, const char *, struct perf_pmu_alias *)
and replace hashmap__for_each_entry() loops with hashmap__for_each().
Signed-off-by: Ian Rogers <irogers@xxxxxxxxxx>
---
tools/perf/util/pmu.c | 30 ++++++++++++++----------------
tools/perf/util/pmu.h | 7 +++++--
2 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index a63fa0d9cfa5..cabc14260719 100644
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -425,16 +425,16 @@ static void perf_pmu_free_alias(struct perf_pmu_alias *alias)
static void perf_pmu__del_aliases(struct perf_pmu *pmu)
{
- struct hashmap_entry *entry;
- size_t bkt;
+ const char *key;
+ struct perf_pmu_alias *val;
if (!pmu->aliases)
return;
- hashmap__for_each_entry(pmu->aliases, entry, bkt)
- perf_pmu_free_alias(entry->pvalue);
+ hashmap__for_each(pmu->aliases, key, val)
+ perf_pmu_free_alias(val);
- hashmap__free(pmu->aliases);
+ pmu_aliases_map__free(pmu->aliases);
pmu->aliases = NULL;
}
@@ -676,7 +676,7 @@ static int perf_pmu__new_alias(struct perf_pmu *pmu, const char *name,
break;
}
- hashmap__set(pmu->aliases, alias->name, alias, /*old_key=*/ NULL, &old_alias);
+ hashmap__set(pmu->aliases, alias->name, alias, /*old_key=*/NULL, &old_alias);
perf_pmu_free_alias(old_alias);
return 0;
}
@@ -1198,7 +1198,7 @@ int perf_pmu__init(struct perf_pmu *pmu, __u32 type, const char *name)
if (!pmu->name)
return -ENOMEM;
- pmu->aliases = hashmap__new(aliases__hash, aliases__equal, /*ctx=*/ NULL);
+ pmu->aliases = pmu_aliases_map__new(aliases__hash, aliases__equal, /*ctx=*/NULL);
if (!pmu->aliases)
return -ENOMEM;
@@ -1313,7 +1313,7 @@ struct perf_pmu *perf_pmu__create_placeholder_core_pmu(struct list_head *core_pm
pmu->cpus = cpu_map__online();
INIT_LIST_HEAD(&pmu->format);
- pmu->aliases = hashmap__new(aliases__hash, aliases__equal, /*ctx=*/ NULL);
+ pmu->aliases = pmu_aliases_map__new(aliases__hash, aliases__equal, /*ctx=*/NULL);
if (!pmu->aliases) {
perf_cpu_map__put(pmu->cpus);
free((char *)pmu->name);
@@ -2276,8 +2276,8 @@ int perf_pmu__for_each_event(struct perf_pmu *pmu, bool skip_duplicate_pmus,
.event_type_desc = "Kernel PMU event",
};
int ret = 0;
- struct hashmap_entry *entry;
- size_t bkt;
+ const char *key;
+ struct perf_pmu_alias *event;
size_t size_rem;
if (perf_pmu__is_tracepoint(pmu))
@@ -2289,8 +2289,7 @@ int perf_pmu__for_each_event(struct perf_pmu *pmu, bool skip_duplicate_pmus,
pmu_aliases_parse(pmu);
pmu_add_cpu_aliases(pmu);
- hashmap__for_each_entry(pmu->aliases, entry, bkt) {
- struct perf_pmu_alias *event = entry->pvalue;
+ hashmap__for_each(pmu->aliases, key, event) {
size_t buf_used, pmu_name_len;
if (perf_pmu__is_tool(pmu) && tool_pmu__skip_event(event->name))
@@ -2809,16 +2808,15 @@ void perf_pmu__delete(struct perf_pmu *pmu)
const char *perf_pmu__name_from_config(struct perf_pmu *pmu, u64 config)
{
- struct hashmap_entry *entry;
- size_t bkt;
+ const char *key;
+ struct perf_pmu_alias *event;
if (!pmu)
return NULL;
pmu_aliases_parse(pmu);
pmu_add_cpu_aliases(pmu);
- hashmap__for_each_entry(pmu->aliases, entry, bkt) {
- struct perf_pmu_alias *event = entry->pvalue;
+ hashmap__for_each(pmu->aliases, key, event) {
struct perf_event_attr attr = {.config = 0,};
int ret = perf_pmu__parse_terms_to_attr(pmu, event->terms, &attr);
diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h
index 2c8916ad073e..928aee2486e7 100644
--- a/tools/perf/util/pmu.h
+++ b/tools/perf/util/pmu.h
@@ -10,15 +10,18 @@
#include <stdio.h>
#include "parse-events.h"
#include "pmu-events/pmu-events.h"
+#include "hashmap.h"
#include "map_symbol.h"
#include "mem-events.h"
struct evsel_config_term;
-struct hashmap;
struct perf_cpu_map;
struct perf_env;
+struct perf_pmu_alias;
struct print_callbacks;
+DECLARE_HASHMAP(pmu_aliases_map, const char *, struct perf_pmu_alias *);
+
enum {
PERF_PMU_FORMAT_VALUE_CONFIG,
PERF_PMU_FORMAT_VALUE_CONFIG1,
@@ -143,7 +146,7 @@ struct perf_pmu {
* event read from <sysfs>/bus/event_source/devices/<name>/events/ or
* from json events in pmu-events.c.
*/
- struct hashmap *aliases;
+ struct pmu_aliases_map *aliases;
/**
* @events_table: The events table for json events in pmu-events.c.
*/
--
2.56.1.703.gf848ed807c-goog