Github/littlefs
1
Fork 0
Code Actions Activity

scripts: Skip branches in -t/--tree render, fixed color-repro issues

Browse Source 
The main difference between -t/--tree and -R/--tree-rbyd is that only
the latter shows all internal jumps (unconditional alt->alt), so it
makes sense to also hide internal branches (rbyd->rbyd).

Note that we already hide the rbyd->block branches in dbglfs.py.

Also added color-ignoring comparison operators to our internal
TreeBranch struct. This fixes an issue where our non-inner branch
merging logic could end up with identical branches with different
colors, resulting in different colorings per run. Not the end of the
world, but something we want to avoid.
This commit is contained in:
Christopher Haster
2025-03-24 12:41:29 -05:00
parent 45d9ea1f62
commit cc20610488
2 changed files with 88 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/dbgbtree.py
+36 -10
View File
@@ -277,6 +277,31 @@ class TreeBranch(co.namedtuple('TreeBranch', ['a', 'b', 'depth', 'color'])):
self.depth,
self.color)
# don't include color in branch comparisons, or else our tree
# renderings can end up with inconsistent colors between runs
def __eq__(self, other):
return (self.a, self.b, self.depth) == (other.a, other.b, other.depth)
def __ne__(self, other):
return (self.a, self.b, self.depth) != (other.a, other.b, other.depth)
def __hash__(self):
return hash((self.a, self.b, self.depth))
# also order by depth first, which can be useful for reproducibly
# prioritizing branches when simplifying trees
def __lt__(self, other):
return (self.depth, self.a, self.b) < (other.depth, other.a, other.b)
def __le__(self, other):
return (self.depth, self.a, self.b) <= (other.depth, other.a, other.b)
def __gt__(self, other):
return (self.depth, self.a, self.b) > (other.depth, other.a, other.b)
def __ge__(self, other):
return (self.depth, self.a, self.b) >= (other.depth, other.a, other.b)
def treerepr(tree, x, depth=None, color=False):
# find the max depth from the tree
if depth is None:
@@ -1232,7 +1257,8 @@ class Btree:
rtree = rtrees[rbyd]
rdepth = max((t.depth+1 for t in rtree), default=0)
d = sum(rdepths[d]+1 for d in range(len(path)))
d = sum(rdepths[d]+(1 if inner or args.get('tree_rbyd') else 0)
for d in range(len(path)))
# map into our btree space
for t in rtree:
@@ -1249,7 +1275,7 @@ class Btree:
t.color))
# connect rbyd branches to rbyd roots
if path:
if path and (inner or args.get('tree_rbyd')):
l_bid, l_rbyd, l_rid, l_name = path[-1]
l_branch = l_rbyd.lookup(l_rid, TAG_BRANCH, 0x3)
@@ -1273,19 +1299,19 @@ class Btree:
# find bid ranges at this level
bids = set()
for t in tree:
if t.a[1] == d:
bids.add(t.a[0])
if t.b[1] == d:
bids.add(t.b[0])
bids = sorted(bids)
# find the best root for each bid range
roots = {}
for i in range(len(bids)):
for t in tree:
if (t.b[1] > d
and t.b[0] >= bids[i]
and (i == len(bids)-1 or t.b[0] < bids[i+1])
if (t.a[1] > d
and t.a[0] >= bids[i]
and (i == len(bids)-1 or t.a[0] < bids[i+1])
and (bids[i] not in roots
or t.depth < roots[bids[i]].depth)):
or t < roots[bids[i]])):
roots[bids[i]] = t
# remap branches to leaf-roots
@@ -1293,14 +1319,14 @@ class Btree:
for t in tree:
if t.a[1] == d and t.a[0] in roots:
t = TreeBranch(
roots[t.a[0]].b,
roots[t.a[0]].a,
t.b,
t.depth,
t.color)
if t.b[1] == d and t.b[0] in roots:
t = TreeBranch(
t.a,
roots[t.b[0]].b,
roots[t.b[0]].a,
t.depth,
t.color)
tree_.add(t)