Github/littlefs
1
Fork 0
Code Actions Activity

Tweaked lfs3_btree/bshrub_traverse to include weight

Browse Source 
Not sure why we weren't already, it doesn't really make sense to return
bid without weight, and this matches lfs3_btree/bshrub_lookupnext.

Sure we don't need weight currently, but this is useful to include in
case we need it in the future (lfs3_bptr_fetch during traversal?).

And while we're not using it, the compiler is happy to optimize it out,
so no code changes:

           code          stack          ctx
  before: 37964           2424          636
  after   37964 (+0.0%)   2424 (+0.0%)  636 (+0.0%)
This commit is contained in:
Christopher Haster
2025-06-27 19:14:49 -05:00
parent 10c0a60ced
commit 4747477057
3 changed files with 144 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_btree.toml
+18 -10
View File
@@ -4281,9 +4281,10 @@ code = '''
lfs3_bid_t bid;
lfs3_tag_t tag;
lfs3_bid_t weight;
lfs3_data_t data;
int err = lfs3_btree_traverse(&lfs3, &btree, &bt,
&bid, &tag, &data);
&bid, &tag, &weight, &data);
assert(!err || err == LFS3_ERR_NOENT);
if (err == LFS3_ERR_NOENT) {
break;
@@ -4291,25 +4292,28 @@ code = '''
if (tag == LFS3_TAG_BRANCH) {
lfs3_rbyd_t *rbyd = (lfs3_rbyd_t*)data.u.buffer;
printf("traversal: %d 0x%x btree 0x%x.%x\n",
printf("traversal: %d 0x%x w%d btree 0x%x.%x\n",
bid,
tag,
weight,
rbyd->blocks[0], rbyd->trunk);
// keep track of seen blocks
seen[rbyd->blocks[0] / 8] |= 1 << (rbyd->blocks[0] % 8);
} else if (tag == LFS3_TAG_DATA) {
printf("traversal: %d 0x%x data %d\n",
printf("traversal: %d 0x%x w%d data %d\n",
bid,
tag,
weight,
lfs3_data_size(data));
} else {
// well this shouldn't happen
printf("traversal: %d 0x%x\n",
printf("traversal: %d 0x%x w%d\n",
bid,
tag);
tag,
weight);
assert(false);
}
}
@@ -4435,9 +4439,10 @@ code = '''
lfs3_bid_t bid;
lfs3_tag_t tag;
lfs3_bid_t weight;
lfs3_data_t data;
int err = lfs3_btree_traverse(&lfs3, &btree, &bt,
&bid, &tag, &data);
&bid, &tag, &weight, &data);
assert(!err || err == LFS3_ERR_NOENT);
if (err == LFS3_ERR_NOENT) {
break;
@@ -4445,25 +4450,28 @@ code = '''
if (tag == LFS3_TAG_BRANCH) {
lfs3_rbyd_t *rbyd = (lfs3_rbyd_t*)data.u.buffer;
printf("traversal: %d 0x%x btree 0x%x.%x\n",
printf("traversal: %d 0x%x w%d btree 0x%x.%x\n",
bid,
tag,
weight,
rbyd->blocks[0], rbyd->trunk);
// keep track of seen blocks
seen[rbyd->blocks[0] / 8] |= 1 << (rbyd->blocks[0] % 8);
} else if (tag == LFS3_TAG_DATA) {
printf("traversal: %d 0x%x data %d\n",
printf("traversal: %d 0x%x w%d data %d\n",
bid,
tag,
weight,
lfs3_data_size(data));
} else {
// well this shouldn't happen
printf("traversal: %d 0x%x\n",
printf("traversal: %d 0x%x w%d\n",
bid,
tag);
tag,
weight);
assert(false);
}
}