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
lfs3.c
+16 -5
View File
@@ -6282,7 +6282,8 @@ static void lfs3_btraversal_init(lfs3_btraversal_t *bt) {
#ifndef LFS3_2BONLY
static int lfs3_btree_traverse(lfs3_t *lfs3, const lfs3_btree_t *btree,
lfs3_btraversal_t *bt,
lfs3_bid_t *bid_, lfs3_tag_t *tag_, lfs3_data_t *data_) {
lfs3_bid_t *bid_, lfs3_tag_t *tag_, lfs3_bid_t *weight_,
lfs3_data_t *data_) {
// explicitly traverse the root even if weight=0
if (!bt->branch) {
bt->branch = btree;
@@ -6300,6 +6301,9 @@ static int lfs3_btree_traverse(lfs3_t *lfs3, const lfs3_btree_t *btree,
if (tag_) {
*tag_ = LFS3_TAG_BRANCH;
}
if (weight_) {
*weight_ = btree->weight;
}
if (data_) {
data_->u.buffer = (const uint8_t*)bt->branch;
}
@@ -6357,6 +6361,9 @@ static int lfs3_btree_traverse(lfs3_t *lfs3, const lfs3_btree_t *btree,
if (tag_) {
*tag_ = LFS3_TAG_BRANCH;
}
if (weight_) {
*weight_ = weight__;
}
if (data_) {
data_->u.buffer = (const uint8_t*)bt->branch;
}
@@ -6379,6 +6386,9 @@ static int lfs3_btree_traverse(lfs3_t *lfs3, const lfs3_btree_t *btree,
if (tag_) {
*tag_ = tag__;
}
if (weight_) {
*weight_ = weight__;
}
if (data_) {
*data_ = data__;
}
@@ -6742,9 +6752,10 @@ static int lfs3_bshrub_lookup(lfs3_t *lfs3, const lfs3_bshrub_t *bshrub,
#ifndef LFS3_2BONLY
static int lfs3_bshrub_traverse(lfs3_t *lfs3, const lfs3_bshrub_t *bshrub,
lfs3_btraversal_t *bt,
lfs3_bid_t *bid_, lfs3_tag_t *tag_, lfs3_data_t *data_) {
lfs3_bid_t *bid_, lfs3_tag_t *tag_, lfs3_bid_t *weight_,
lfs3_data_t *data_) {
return lfs3_btree_traverse(lfs3, &bshrub->shrub, bt,
bid_, tag_, data_);
bid_, tag_, weight_, data_);
}
#endif
@@ -9959,7 +9970,7 @@ static int lfs3_mtree_traverse_(lfs3_t *lfs3, lfs3_traversal_t *t,
case LFS3_TSTATE_OBTREE:;
// traverse through our bshrub/btree
err = lfs3_bshrub_traverse(lfs3, &t->b, &t->u.bt,
NULL, &tag, &data);
NULL, &tag, NULL, &data);
if (err) {
if (err == LFS3_ERR_NOENT) {
// clear the bshrub state
@@ -14193,7 +14204,7 @@ static int lfs3_file_ck(lfs3_t *lfs3, const lfs3_file_t *file,
lfs3_tag_t tag;
lfs3_data_t data;
int err = lfs3_bshrub_traverse(lfs3, &file->b, &bt,
NULL, &tag, &data);
NULL, &tag, NULL, &data);
if (err) {
if (err == LFS3_ERR_NOENT) {
break;