From 3aff6c79170717478ba89bb1a3b8bb2063adc735 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Wed, 27 May 2020 11:37:58 +0200
Subject: [PATCH] gdb: update accessors for bucket counts and entry sizes

Afaict, this code never worked, since even when this code was added in
2ea8c08306c7e33f8217a878cf990fc491c9432c, neither all_entry_sizes nor
all_direct_buckets were defined.
---
 tools/gdb-sd_dump_hashmaps.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tools/gdb-sd_dump_hashmaps.py b/tools/gdb-sd_dump_hashmaps.py
index 4e8593f..6933d2d 100644
--- a/tools/gdb-sd_dump_hashmaps.py
+++ b/tools/gdb-sd_dump_hashmaps.py
@@ -13,8 +13,7 @@ class sd_dump_hashmaps(gdb.Command):
 
         def invoke(self, arg, from_tty):
                 d = gdb.parse_and_eval("hashmap_debug_list")
-                all_entry_sizes = gdb.parse_and_eval("all_entry_sizes")
-                all_direct_buckets = gdb.parse_and_eval("all_direct_buckets")
+                hashmap_type_info = gdb.parse_and_eval("hashmap_type_info")
                 uchar_t = gdb.lookup_type("unsigned char")
                 ulong_t = gdb.lookup_type("unsigned long")
                 debug_offset = gdb.parse_and_eval("(unsigned long)&((HashmapBase*)0)->debug")
@@ -30,14 +29,14 @@ class sd_dump_hashmaps(gdb.Command):
                         else:
                                 storage_ptr = h["direct"]["storage"].cast(uchar_t.pointer())
                                 n_entries = h["n_direct_entries"]
-                                n_buckets = all_direct_buckets[int(h["type"])];
+                                n_buckets = hashmap_type_info[h["type"]]["n_direct_buckets"]
 
                         t = ["plain", "ordered", "set"][int(h["type"])]
 
                         print("{}, {}, {}, {}, {}, {}, {} ({}:{})".format(t, h["hash_ops"], bool(h["has_indirect"]), n_entries, d["max_entries"], n_buckets, d["func"], d["file"], d["line"]))
 
                         if arg != "" and n_entries > 0:
-                                dib_raw_addr = storage_ptr + (all_entry_sizes[h["type"]] * n_buckets)
+                                dib_raw_addr = storage_ptr + hashmap_type_info[h["type"]]["entry_size"] * n_buckets
 
                                 histogram = {}
                                 for i in xrange(0, n_buckets):
-- 
2.27.0

