[PATCH v1 11/26] perf trace: Use generic hashmap for syscall_stats
From: Ian Rogers
Date: Fri Nov 13 2026 - 17:16:47 EST
Convert trace and thread_trace syscall_stats maps in builtin-trace.c to
DECLARE_HASHMAP(syscall_stats_map, long, struct syscall_stats *) and
replace direct struct hashmap_entry and map->sz accesses with
hashmap__for_each() and hashmap__size().
Signed-off-by: Ian Rogers <irogers@xxxxxxxxxx>
---
tools/perf/builtin-trace.c | 43 ++++++++++++++++++++------------------
1 file changed, 23 insertions(+), 20 deletions(-)
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 128efe1be8c3..dcd7890db8ac 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -141,6 +141,9 @@ struct syscall_fmt {
bool hexret;
};
+struct syscall_stats;
+DECLARE_HASHMAP(syscall_stats_map, long, struct syscall_stats *);
+
struct trace {
struct perf_env host_env;
struct perf_tool tool;
@@ -187,7 +190,7 @@ struct trace {
* into the key, but this would make the code inconsistent with the
* per-thread version.
*/
- struct hashmap *syscall_stats;
+ struct syscall_stats_map *syscall_stats;
double duration_filter;
double runtime_ms;
unsigned long pfmaj, pfmin;
@@ -1658,7 +1661,7 @@ struct thread_trace {
struct file *table;
} files;
- struct hashmap *syscall_stats;
+ struct syscall_stats_map *syscall_stats;
};
static size_t syscall_id_hash(long key, void *ctx __maybe_unused)
@@ -1671,22 +1674,22 @@ static bool syscall_id_equal(long key1, long key2, void *ctx __maybe_unused)
return key1 == key2;
}
-static struct hashmap *alloc_syscall_stats(void)
+static struct syscall_stats_map *alloc_syscall_stats(void)
{
- return hashmap__new(syscall_id_hash, syscall_id_equal, NULL);
+ return syscall_stats_map__new(syscall_id_hash, syscall_id_equal, NULL);
}
-static void delete_syscall_stats(struct hashmap *syscall_stats)
+static void delete_syscall_stats(struct syscall_stats_map *syscall_stats)
{
- struct hashmap_entry *pos;
- size_t bkt;
+ long key;
+ struct syscall_stats *val;
if (!syscall_stats)
return;
- hashmap__for_each_entry(syscall_stats, pos, bkt)
- zfree(&pos->pvalue);
- hashmap__free(syscall_stats);
+ hashmap__for_each(syscall_stats, key, val)
+ free(val);
+ syscall_stats_map__free(syscall_stats);
}
static struct thread_trace *thread_trace__new(struct trace *trace)
@@ -2865,7 +2868,7 @@ static void thread__update_stats(struct thread *thread, struct thread_trace *ttr
int id, struct perf_sample *sample, long err,
struct trace *trace)
{
- struct hashmap *syscall_stats = ttrace->syscall_stats;
+ struct syscall_stats_map *syscall_stats = ttrace->syscall_stats;
struct syscall_stats *stats = NULL;
u64 duration = 0;
@@ -5210,25 +5213,25 @@ static int entry_cmp(const void *e1, const void *e2)
return entry1->msecs > entry2->msecs ? -1 : 1;
}
-static struct syscall_entry *syscall__sort_stats(struct hashmap *syscall_stats)
+static struct syscall_entry *syscall__sort_stats(struct syscall_stats_map *syscall_stats)
{
struct syscall_entry *entry;
- struct hashmap_entry *pos;
- unsigned bkt, i, nr;
+ unsigned int i, nr;
+ long id;
+ struct syscall_stats *ss;
- nr = syscall_stats->sz;
+ nr = hashmap__size(syscall_stats);
entry = malloc(nr * sizeof(*entry));
if (entry == NULL)
return NULL;
i = 0;
- hashmap__for_each_entry(syscall_stats, pos, bkt) {
- struct syscall_stats *ss = pos->pvalue;
+ hashmap__for_each(syscall_stats, id, ss) {
struct stats *st = &ss->stats;
entry[i].stats = ss;
entry[i].msecs = (u64)st->n * (avg_stats(st) / NSEC_PER_MSEC);
- entry[i].syscall = pos->key;
+ entry[i].syscall = id;
i++;
}
assert(i == nr);
@@ -5238,7 +5241,7 @@ static struct syscall_entry *syscall__sort_stats(struct hashmap *syscall_stats)
}
static size_t syscall__dump_stats(struct trace *trace, int e_machine, FILE *fp,
- struct hashmap *syscall_stats)
+ struct syscall_stats_map *syscall_stats)
{
size_t printed = 0;
int lines = 0;
@@ -5255,7 +5258,7 @@ static size_t syscall__dump_stats(struct trace *trace, int e_machine, FILE *fp,
printed += fprintf(fp, " (msec) (msec) (msec) (msec) (%%)\n");
printed += fprintf(fp, " --------------- -------- ------ -------- --------- --------- --------- ------\n");
- for (size_t i = 0; i < syscall_stats->sz; i++) {
+ for (size_t i = 0; i < hashmap__size(syscall_stats); i++) {
struct syscall_entry *entry = &entries[i];
struct syscall_stats *stats = entry->stats;
--
2.56.1.703.gf848ed807c-goog