[PATCH v1 14/26] perf stat: Use generic hashmap for per_pkg_mask

[Ian Rogers <irogers@google.com>]

Convert evsel::per_pkg_mask in util/evsel.{c,h} and util/stat.c to
DECLARE_HASHMAP(per_pkg_mask_map, uint64_t *, bool) and use
hashmap__for_each() to free keys in evsel__free_per_pkg().

Signed-off-by: Ian Rogers <irogers@google.com>
---
 tools/perf/util/evsel.c | 10 +++++-----
 tools/perf/util/evsel.h |  6 ++++--
 tools/perf/util/stat.c  |  6 +++---
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 6d69f63b7fb1..a37d0d66fb45 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -2094,7 +2094,7 @@ static void evsel__exit(struct evsel *evsel)
 	zfree(&evsel->unit);
 	zfree(&evsel->metric_id);
 	evsel__zero_per_pkg(evsel);
-	hashmap__free(evsel->per_pkg_mask);
+	per_pkg_mask_map__free(evsel->per_pkg_mask);
 	evsel->per_pkg_mask = NULL;
 	if (evsel__priv_destructor)
 		evsel__priv_destructor(evsel->priv);
@@ -4761,12 +4761,12 @@ int evsel__store_ids(struct evsel *evsel, struct evlist *evlist)
 
 void evsel__zero_per_pkg(struct evsel *evsel)
 {
-	struct hashmap_entry *cur;
-	size_t bkt;
+	uint64_t *key;
+	bool val;
 
 	if (evsel->per_pkg_mask) {
-		hashmap__for_each_entry(evsel->per_pkg_mask, cur, bkt)
-			zfree(&cur->pkey);
+		hashmap__for_each(evsel->per_pkg_mask, key, val)
+			free(key);
 
 		hashmap__clear(evsel->per_pkg_mask);
 	}
diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index 53f3641b66e1..eeb2ece1490c 100644
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -13,6 +13,7 @@
 #include <internal/evsel.h>
 #include <perf/evsel.h>
 
+#include "hashmap.h"
 #include "symbol_conf.h"
 
 struct bperf_follower_bpf;
@@ -20,7 +21,6 @@ struct bperf_leader_bpf;
 struct bpf_counter_ops;
 struct bpf_object;
 struct cgroup;
-struct hashmap;
 struct perf_counts;
 struct perf_pmu;
 struct perf_stat_config;
@@ -28,6 +28,8 @@ struct perf_stat_evsel;
 struct target;
 union perf_event;
 
+DECLARE_HASHMAP(per_pkg_mask_map, uint64_t *, bool);
+
 typedef int (evsel__sb_cb_t)(union perf_event *event, void *data);
 
 /** struct evsel - event selector
@@ -135,7 +137,7 @@ struct evsel {
 	bool			fallenback_eacces;
 	bool			fallenback_eopnotsupp;
 	u8			probe_type:3;
-	struct hashmap		*per_pkg_mask;
+	struct per_pkg_mask_map	*per_pkg_mask;
 	int			err;
 	int			script_output_type;
 	struct {
diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c
index 097985da3dbb..c502f4928f9d 100644
--- a/tools/perf/util/stat.c
+++ b/tools/perf/util/stat.c
@@ -310,7 +310,7 @@ static bool pkg_id_equal(long __key1, long __key2, void *ctx __maybe_unused)
 static int check_per_pkg(struct evsel *counter, struct perf_counts_values *vals,
 			 int cpu_map_idx, bool *skip)
 {
-	struct hashmap *mask = counter->per_pkg_mask;
+	struct per_pkg_mask_map *mask = counter->per_pkg_mask;
 	struct perf_cpu_map *cpus = evsel__cpus(counter);
 	struct perf_cpu cpu = perf_cpu_map__cpu(cpus, cpu_map_idx);
 	int s, d, ret = 0;
@@ -325,7 +325,7 @@ static int check_per_pkg(struct evsel *counter, struct perf_counts_values *vals,
 		return 0;
 
 	if (!mask) {
-		mask = hashmap__new(pkg_id_hash, pkg_id_equal, NULL);
+		mask = per_pkg_mask_map__new(pkg_id_hash, pkg_id_equal, NULL);
 		if (!mask)
 			return -ENOMEM;
 
@@ -364,7 +364,7 @@ static int check_per_pkg(struct evsel *counter, struct perf_counts_values *vals,
 		*skip = true;
 		free(key);
 	} else {
-		ret = hashmap__add(mask, key, 1);
+		ret = hashmap__add(mask, key, true);
 		if (ret)
 			free(key);
 	}
-- 
2.56.1.703.gf848ed807c-goog