Github/littlefs
1
Fork 0
Code Actions Activity

btree: Renamed btree.leaf.rbyd -> btree.leaf.r

Browse Source 
This matches other internal rbyds: btree.r, mdir.r, etc.

The intention of the single-char names is to reduce clutter around these
severely nested structs, both btrees and mdirs _are_ rbyds, so the name
doesn't really besides C-level type info.

I was hesitant on btree.leaf.rbyd, but decided consistency probably wins
here.
This commit is contained in:
Christopher Haster
2025-07-21 16:40:31 -05:00
parent a871e02354
commit ff7e196f92
2 changed files with 29 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lfs3.c
+28 -31
View File
@@ -5077,20 +5077,20 @@ static void lfs3_btree_init(lfs3_btree_t *btree) {
btree->r.blocks[0] = -1; btree->r.blocks[0] = -1;
btree->r.trunk = 0; btree->r.trunk = 0;
// weight=0 indicates no leaf // weight=0 indicates no leaf
btree->leaf.rbyd.weight = 0; btree->leaf.r.weight = 0;
} }
// convenience operations // convenience operations
#if !defined(LFS3_RDONLY) && !defined(LFS3_2BONLY) #if !defined(LFS3_RDONLY) && !defined(LFS3_2BONLY)
static inline void lfs3_btree_claim(lfs3_btree_t *btree) { static inline void lfs3_btree_claim(lfs3_btree_t *btree) {
lfs3_rbyd_claim(&btree->r); lfs3_rbyd_claim(&btree->r);
lfs3_rbyd_claim(&btree->leaf.rbyd); lfs3_rbyd_claim(&btree->leaf.r);
} }
#endif #endif
#ifndef LFS3_2BONLY #ifndef LFS3_2BONLY
static inline void lfs3_btree_discardleaf(lfs3_btree_t *btree) { static inline void lfs3_btree_discardleaf(lfs3_btree_t *btree) {
btree->leaf.rbyd.weight = 0; btree->leaf.r.weight = 0;
} }
#endif #endif
@@ -5306,10 +5306,10 @@ static lfs3_stag_t lfs3_btree_lookupnext(lfs3_t *lfs3, lfs3_btree_t *btree,
// if not we need to restart from the root // if not we need to restart from the root
lfs3_bid_t bid__; lfs3_bid_t bid__;
lfs3_rbyd_t rbyd__; lfs3_rbyd_t rbyd__;
if (bid >= btree->leaf.bid-(btree->leaf.rbyd.weight-1) if (bid >= btree->leaf.bid-(btree->leaf.r.weight-1)
&& bid < btree->leaf.bid+1) { && bid < btree->leaf.bid+1) {
bid__ = btree->leaf.bid; bid__ = btree->leaf.bid;
rbyd__ = btree->leaf.rbyd; rbyd__ = btree->leaf.r;
} else { } else {
bid__ = btree->r.weight-1; bid__ = btree->r.weight-1;
rbyd__ = btree->r; rbyd__ = btree->r;
@@ -5354,7 +5354,7 @@ static lfs3_stag_t lfs3_btree_lookupnext(lfs3_t *lfs3, lfs3_btree_t *btree,
} else { } else {
// keep track of the most recent leaf // keep track of the most recent leaf
btree->leaf.bid = bid__; btree->leaf.bid = bid__;
btree->leaf.rbyd = rbyd__; btree->leaf.r = rbyd__;
// TODO how many of these should be conditional? // TODO how many of these should be conditional?
if (bid_) { if (bid_) {
@@ -5381,7 +5381,7 @@ static lfs3_stag_t lfs3_btree_lookupnext(lfs3_t *lfs3, lfs3_btree_t *btree,
static lfs3_stag_t lfs3_btree_lookup(lfs3_t *lfs3, lfs3_btree_t *btree, static lfs3_stag_t lfs3_btree_lookup(lfs3_t *lfs3, lfs3_btree_t *btree,
lfs3_bid_t bid, lfs3_tag_t tag, lfs3_bid_t bid, lfs3_tag_t tag,
lfs3_data_t *data_) { lfs3_data_t *data_) {
if (!(bid >= btree->leaf.bid-(btree->leaf.rbyd.weight-1) if (!(bid >= btree->leaf.bid-(btree->leaf.r.weight-1)
&& bid < btree->leaf.bid+1)) { && bid < btree->leaf.bid+1)) {
// lookup rbyd in btree // lookup rbyd in btree
lfs3_bid_t bid__; lfs3_bid_t bid__;
@@ -5399,8 +5399,8 @@ static lfs3_stag_t lfs3_btree_lookup(lfs3_t *lfs3, lfs3_btree_t *btree,
} }
// lookup tag in rbyd // lookup tag in rbyd
return lfs3_rbyd_lookup(lfs3, &btree->leaf.rbyd, return lfs3_rbyd_lookup(lfs3, &btree->leaf.r,
bid - (btree->leaf.bid-(btree->leaf.rbyd.weight-1)), tag, bid - (btree->leaf.bid-(btree->leaf.r.weight-1)), tag,
data_); data_);
} }
#endif #endif
@@ -5558,9 +5558,9 @@ static int lfs3_btree_commit_(lfs3_t *lfs3,
// //
// note this takes advantage of any earlier btree lookups that // note this takes advantage of any earlier btree lookups that
// leave the leaf populated // leave the leaf populated
child = btree->leaf.rbyd; child = btree->leaf.r;
// adjust rid // adjust rid
rid -= (btree->leaf.bid-(btree->leaf.rbyd.weight-1)); rid -= (btree->leaf.bid-(btree->leaf.r.weight-1));
} }
// tail-recursively commit to btree // tail-recursively commit to btree
@@ -6290,7 +6290,7 @@ static lfs3_scmp_t lfs3_btree_namelookup(lfs3_t *lfs3, lfs3_btree_t *btree,
} else { } else {
// keep track of the most recent leaf // keep track of the most recent leaf
btree->leaf.bid = bid__; btree->leaf.bid = bid__;
btree->leaf.rbyd = rbyd__; btree->leaf.r = rbyd__;
// TODO how many of these should be conditional? // TODO how many of these should be conditional?
if (bid_) { if (bid_) {
@@ -6325,7 +6325,7 @@ static lfs3_stag_t lfs3_btree_traverse(lfs3_t *lfs3, lfs3_btree_t *btree,
lfs3_sbid_t bid, lfs3_sbid_t bid,
lfs3_sbid_t *bid_, lfs3_bid_t *weight_, lfs3_data_t *data_) { lfs3_sbid_t *bid_, lfs3_bid_t *weight_, lfs3_data_t *data_) {
// restart from the root? // restart from the root?
if (bid == -1 || btree->leaf.rbyd.weight == 0) { if (bid == -1 || btree->leaf.r.weight == 0) {
// end of traversal? // end of traversal?
if (bid >= (lfs3_sbid_t)btree->r.weight) { if (bid >= (lfs3_sbid_t)btree->r.weight) {
return LFS3_ERR_NOENT; return LFS3_ERR_NOENT;
@@ -6333,7 +6333,7 @@ static lfs3_stag_t lfs3_btree_traverse(lfs3_t *lfs3, lfs3_btree_t *btree,
// restart from the root // restart from the root
btree->leaf.bid = btree->r.weight-1; btree->leaf.bid = btree->r.weight-1;
btree->leaf.rbyd = btree->r; btree->leaf.r = btree->r;
// explicitly traverse the root even if weight=0 // explicitly traverse the root even if weight=0
if (bid == -1) { if (bid == -1) {
@@ -6361,16 +6361,14 @@ static lfs3_stag_t lfs3_btree_traverse(lfs3_t *lfs3, lfs3_btree_t *btree,
} }
// did someone mess with the leaf rbyd? // did someone mess with the leaf rbyd?
LFS3_ASSERT(bid >= (lfs3_sbid_t)( LFS3_ASSERT(bid >= (lfs3_sbid_t)(btree->leaf.bid-(btree->leaf.r.weight-1))
btree->leaf.bid-(btree->leaf.rbyd.weight-1)) && bid <= (lfs3_sbid_t)(btree->leaf.bid+1));
&& bid <= (lfs3_sbid_t)(
btree->leaf.bid+1));
// the user increments bid to move the traversal forward, but if we // the user increments bid to move the traversal forward, but if we
// were at a btree inner node we remap this to descending down the // were at a btree inner node we remap this to descending down the
// tree // tree
if (bid == (lfs3_sbid_t)(btree->leaf.bid+1)) { if (bid == (lfs3_sbid_t)(btree->leaf.bid+1)) {
bid = btree->leaf.bid-(btree->leaf.rbyd.weight-1); bid = btree->leaf.bid-(btree->leaf.r.weight-1);
} }
// descend down the tree // descend down the tree
@@ -6378,8 +6376,8 @@ static lfs3_stag_t lfs3_btree_traverse(lfs3_t *lfs3, lfs3_btree_t *btree,
lfs3_srid_t rid__; lfs3_srid_t rid__;
lfs3_rid_t weight__; lfs3_rid_t weight__;
lfs3_data_t data__; lfs3_data_t data__;
lfs3_stag_t tag__ = lfs3_rbyd_lookupnext(lfs3, &btree->leaf.rbyd, lfs3_stag_t tag__ = lfs3_rbyd_lookupnext(lfs3, &btree->leaf.r,
bid - (btree->leaf.bid-(btree->leaf.rbyd.weight-1)), 0, bid - (btree->leaf.bid-(btree->leaf.r.weight-1)), 0,
&rid__, &weight__, &data__); &rid__, &weight__, &data__);
if (tag__ < 0) { if (tag__ < 0) {
return tag__; return tag__;
@@ -6387,7 +6385,7 @@ static lfs3_stag_t lfs3_btree_traverse(lfs3_t *lfs3, lfs3_btree_t *btree,
// if we found a bname, lookup the branch // if we found a bname, lookup the branch
if (tag__ == LFS3_TAG_BNAME) { if (tag__ == LFS3_TAG_BNAME) {
tag__ = lfs3_rbyd_lookup(lfs3, &btree->leaf.rbyd, tag__ = lfs3_rbyd_lookup(lfs3, &btree->leaf.r,
rid__, LFS3_TAG_BRANCH, rid__, LFS3_TAG_BRANCH,
&data__); &data__);
if (tag__ < 0) { if (tag__ < 0) {
@@ -6397,8 +6395,7 @@ static lfs3_stag_t lfs3_btree_traverse(lfs3_t *lfs3, lfs3_btree_t *btree,
} }
// adjust bid__ with subtree's weight // adjust bid__ with subtree's weight
lfs3_bid_t bid__ = (btree->leaf.bid-(btree->leaf.rbyd.weight-1)) lfs3_bid_t bid__ = (btree->leaf.bid-(btree->leaf.r.weight-1)) + rid__;
+ rid__;
// found another branch // found another branch
if (tag__ == LFS3_TAG_BRANCH) { if (tag__ == LFS3_TAG_BRANCH) {
@@ -6410,19 +6407,19 @@ static lfs3_stag_t lfs3_btree_traverse(lfs3_t *lfs3, lfs3_btree_t *btree,
return err; return err;
} }
btree->leaf.bid = bid__; btree->leaf.bid = bid__;
btree->leaf.rbyd = rbyd__; btree->leaf.r = rbyd__;
// return inner btree nodes if this is the first time we've // return inner btree nodes if this is the first time we've
// seen them // seen them
if (bid - (btree->leaf.bid-(btree->leaf.rbyd.weight-1)) == 0) { if (bid - (btree->leaf.bid-(btree->leaf.r.weight-1)) == 0) {
if (bid_) { if (bid_) {
*bid_ = btree->leaf.bid; *bid_ = btree->leaf.bid;
} }
if (weight_) { if (weight_) {
*weight_ = btree->leaf.rbyd.weight; *weight_ = btree->leaf.r.weight;
} }
if (data_) { if (data_) {
data_->u.buffer = (const uint8_t*)&btree->leaf.rbyd; data_->u.buffer = (const uint8_t*)&btree->leaf.r;
} }
return LFS3_TAG_BRANCH; return LFS3_TAG_BRANCH;
} }
@@ -6431,7 +6428,7 @@ static lfs3_stag_t lfs3_btree_traverse(lfs3_t *lfs3, lfs3_btree_t *btree,
} else { } else {
// discard the leaf when we're done with it to restart from // discard the leaf when we're done with it to restart from
// the root on the next call // the root on the next call
if (rid__ == (lfs3_srid_t)(btree->leaf.rbyd.weight-1)) { if (rid__ == (lfs3_srid_t)(btree->leaf.r.weight-1)) {
lfs3_btree_discardleaf(btree); lfs3_btree_discardleaf(btree);
} }
@@ -6652,7 +6649,7 @@ static void lfs3_bshrub_init(lfs3_bshrub_t *bshrub) {
bshrub->shrub.r.eoff = -1; bshrub->shrub.r.eoff = -1;
#endif #endif
// weight=0 indicates no leaf // weight=0 indicates no leaf
bshrub->shrub.leaf.rbyd.weight = 0; bshrub->shrub.leaf.r.weight = 0;
} }
static inline bool lfs3_bshrub_isbnull(const lfs3_bshrub_t *bshrub) { static inline bool lfs3_bshrub_isbnull(const lfs3_bshrub_t *bshrub) {
@@ -9449,7 +9446,7 @@ static int lfs3_mdir_commit(lfs3_t *lfs3, lfs3_mdir_t *mdir,
if (((lfs3_bshrub_t*)h)->shrub_.blocks[0] if (((lfs3_bshrub_t*)h)->shrub_.blocks[0]
!= ((lfs3_bshrub_t*)h)->shrub.r.blocks[0]) { != ((lfs3_bshrub_t*)h)->shrub.r.blocks[0]) {
// discard any bshrub leaves that moved // discard any bshrub leaves that moved
if (((lfs3_bshrub_t*)h)->shrub.leaf.rbyd.blocks[0] if (((lfs3_bshrub_t*)h)->shrub.leaf.r.blocks[0]
== ((lfs3_bshrub_t*)h)->shrub.r.blocks[0]) { == ((lfs3_bshrub_t*)h)->shrub.r.blocks[0]) {
lfs3_bshrub_discardleaf((lfs3_bshrub_t*)h); lfs3_bshrub_discardleaf((lfs3_bshrub_t*)h);
} }
lfs3.h
+1 -1
View File
@@ -691,7 +691,7 @@ typedef struct lfs3_btree {
lfs3_rbyd_t r; lfs3_rbyd_t r;
struct { struct {
lfs3_bid_t bid; lfs3_bid_t bid;
lfs3_rbyd_t rbyd; lfs3_rbyd_t r;
} leaf; } leaf;
} lfs3_btree_t; } lfs3_btree_t;