[PATCH v1 23/26] perf inject: Use generic hashmap for aslr remap_addresses

[Ian Rogers <irogers@google.com>]

Convert aslr_tool::remap_addresses in util/aslr.c to
DECLARE_HASHMAP(remap_addresses_map, struct remap_addresses_key *, u64 *).

Signed-off-by: Ian Rogers <irogers@google.com>
---
 tools/perf/util/aslr.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/tools/perf/util/aslr.c b/tools/perf/util/aslr.c
index e365f807b021..068e0250b151 100644
--- a/tools/perf/util/aslr.c
+++ b/tools/perf/util/aslr.c
@@ -6,6 +6,7 @@
 #include "event.h"
 #include "evsel.h"
 #include "evlist.h"
+#include "hashmap.h"
 #include "machine.h"
 #include "map.h"
 #include "thread.h"
@@ -69,6 +70,9 @@ static bool evsel_equal(long key1, long key2, void *ctx __maybe_unused)
 struct process_top_address {
 	u64 remapped_max;
 };
+
+DECLARE_HASHMAP(remap_addresses_map, struct remap_addresses_key *, u64 *);
+
 struct aslr_tool {
 	/** @tool: The tool implemented here and a pointer to a delegate to process the data. */
 	struct delegate_tool tool;
@@ -77,7 +81,7 @@ struct aslr_tool {
 	/** @event_copy: Buffer used to create an event to pass to the delegate. */
 	char event_copy[PERF_SAMPLE_MAX_SIZE] __aligned(8);
 	/** @remap_addresses: mapping from remap_addresses_key to remapped address. */
-	struct hashmap remap_addresses;
+	struct remap_addresses_map remap_addresses;
 	/** @top_addresses: mapping from process to max remapped address. */
 	struct hashmap top_addresses;
 	/**
@@ -1331,6 +1335,8 @@ void aslr_tool__delete(struct perf_tool *tool)
 {
 	struct delegate_tool *del_tool;
 	struct aslr_tool *aslr;
+	struct remap_addresses_key *rkey;
+	u64 *rval;
 	struct hashmap_entry *cur;
 	size_t bkt;
 	struct rb_node *nd;
@@ -1341,13 +1347,11 @@ void aslr_tool__delete(struct perf_tool *tool)
 	del_tool = container_of(tool, struct delegate_tool, tool);
 	aslr = container_of(del_tool, struct aslr_tool, tool);
 
-	hashmap__for_each_entry(&aslr->remap_addresses, cur, bkt) {
-		struct remap_addresses_key *key = (struct remap_addresses_key *)cur->pkey;
-
-		if (key)
-			dso__put(key->dso);
-		zfree(&cur->pkey);
-		zfree(&cur->pvalue);
+	hashmap__for_each(&aslr->remap_addresses, rkey, rval) {
+		if (rkey)
+			dso__put(rkey->dso);
+		free(rkey);
+		free(rval);
 	}
 	hashmap__for_each_entry(&aslr->top_addresses, cur, bkt) {
 		zfree(&cur->pkey);
-- 
2.56.1.703.gf848ed807c-goog