Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BTreeMap: remove shared root #70111

Merged
merged 7 commits into from
Mar 21, 2020
Merged

BTreeMap: remove shared root #70111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e61f126
Replace shared root with optional root
Mark-Simulacrum Mar 18, 2020
1c44f85
Remove shared root code and assertions from BTree nodes
Mark-Simulacrum Mar 18, 2020
3c04fda
Make functions dependent only on shared root avoidance safe
Mark-Simulacrum Mar 18, 2020
54b7c38
Drop NodeHeader type from BTree code
Mark-Simulacrum Mar 18, 2020
13f6d77
Simplify ensure_root_is_owned callers
Mark-Simulacrum Mar 18, 2020
4d85314
Update test commentary for shared root removal
Mark-Simulacrum Mar 20, 2020
bce7f6f
Fix debugger pretty printing of BTrees
Mark-Simulacrum Mar 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 21 additions & 13 deletions src/etc/gdb_rust_pretty_printing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,12 +370,17 @@ def to_string(self):
("(len: %i)" % self.__val.get_wrapped_value()['map']['length']))

def children(self):
root = self.__val.get_wrapped_value()['map']['root']
node_ptr = root['node']
i = 0
for child in children_of_node(node_ptr, root['height'], False):
yield (str(i), child)
i = i + 1
prev_idx = None
innermap = GdbValue(self.__val.get_wrapped_value()['map'])
if innermap.get_wrapped_value()['length'] > 0:
root = GdbValue(innermap.get_wrapped_value()['root'])
type_name = str(root.type.ty.name).replace('core::option::Option<', '')[:-1]
root = root.get_wrapped_value().cast(gdb.lookup_type(type_name))
node_ptr = root['node']
i = 0
for child in children_of_node(node_ptr, root['height'], False):
yield (str(i), child)
i = i + 1


class RustStdBTreeMapPrinter(object):
Expand All @@ -391,13 +396,16 @@ def to_string(self):
("(len: %i)" % self.__val.get_wrapped_value()['length']))

def children(self):
root = self.__val.get_wrapped_value()['root']
node_ptr = root['node']
i = 0
for child in children_of_node(node_ptr, root['height'], True):
yield (str(i), child[0])
yield (str(i), child[1])
i = i + 1
if self.__val.get_wrapped_value()['length'] > 0:
root = GdbValue(self.__val.get_wrapped_value()['root'])
type_name = str(root.type.ty.name).replace('core::option::Option<', '')[:-1]
root = root.get_wrapped_value().cast(gdb.lookup_type(type_name))
node_ptr = root['node']
i = 0
for child in children_of_node(node_ptr, root['height'], True):
yield (str(i), child[0])
yield (str(i), child[1])
i = i + 1


class RustStdStringPrinter(object):
Expand Down
Loading