picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

gdb: update accessors for bucket counts and entry sizes

Browse source 
Afaict, this code never worked, since even when this code was added in
2ea8c08306, neither all_entry_sizes nor
all_direct_buckets were defined.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2020-05-27 11:37:58 +02:00
parent 31ca609f8a
commit 3aff6c7917
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tools/gdb-sd_dump_hashmaps.py
View file

@ -11,8 +11,7 @@ class sd_dump_hashmaps(gdb.Command):
def invoke(self, arg, from_tty): def invoke(self, arg, from_tty):
d = gdb.parse_and_eval("hashmap_debug_list") d = gdb.parse_and_eval("hashmap_debug_list")
all_entry_sizes = gdb.parse_and_eval("all_entry_sizes") hashmap_type_info = gdb.parse_and_eval("hashmap_type_info")
all_direct_buckets = gdb.parse_and_eval("all_direct_buckets")
uchar_t = gdb.lookup_type("unsigned char") uchar_t = gdb.lookup_type("unsigned char")
ulong_t = gdb.lookup_type("unsigned long") ulong_t = gdb.lookup_type("unsigned long")
debug_offset = gdb.parse_and_eval("(unsigned long)&((HashmapBase*)0)->debug") debug_offset = gdb.parse_and_eval("(unsigned long)&((HashmapBase*)0)->debug")
@ -28,14 +27,14 @@ class sd_dump_hashmaps(gdb.Command):
else: else:
storage_ptr = h["direct"]["storage"].cast(uchar_t.pointer()) storage_ptr = h["direct"]["storage"].cast(uchar_t.pointer())
n_entries = h["n_direct_entries"] 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"])] t = ["plain", "ordered", "set"][int(h["type"])]
print(f'{t}, {h["hash_ops"]}, {bool(h["has_indirect"])}, {n_entries}, {d["max_entries"]}, {n_buckets}, {d["func"]}, {d["file"]}, {d["line"]}') print(f'{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: 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 = {} histogram = {}
for i in range(0, n_buckets): for i in range(0, n_buckets):