Github/littlefs
1
Fork 0
Code Actions Activity

Tried to clean up rough edges around bshrub estimate

Browse Source 
The bshrub estimate now expects to include all synced struct contents,
so we need to set it to something greater than zero when converting from
a bsprout/bptr/btree.

But honestly, all of this bshrub estimate stuff needs work...
This commit is contained in:
Christopher Haster
2024-01-01 15:10:27 -06:00
parent 8c1fe11c4d
commit 9719ec7baf
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lfs.c
+11 -7
View File
@@ -6977,12 +6977,13 @@ static int lfsr_bshrub_compact__(lfs_t *lfs, lfsr_rbyd_t *rbyd_,
// lfsr_bshruballoc is a bit of a misnomer, this doesn't alloc, just // lfsr_bshruballoc is a bit of a misnomer, this doesn't alloc, just
// prepares a new bshrub in the given mdir // prepares a new bshrub in the given mdir
static int lfsr_bshrub_alloc(lfs_t *lfs, static int lfsr_bshrub_alloc(lfs_t *lfs,
const lfsr_mdir_t *mdir, lfsr_bshrub_t *bshrub) { const lfsr_mdir_t *mdir, lfsr_bshrub_t *bshrub,
lfs_size_t estimate) {
(void)lfs; (void)lfs;
bshrub->rbyd.blocks[0] = mdir->rbyd.blocks[0]; bshrub->rbyd.blocks[0] = mdir->rbyd.blocks[0];
bshrub->rbyd.trunk = 0; bshrub->rbyd.trunk = 0;
bshrub->rbyd.weight = 0; bshrub->rbyd.weight = 0;
bshrub->progged = 0; bshrub->progged = estimate;
return 0; return 0;
} }
@@ -7063,7 +7064,8 @@ static int lfsr_bshrub_commit(lfs_t *lfs,
if (attr_count > 0) { if (attr_count > 0) {
// new bshrub? // new bshrub?
if (bshrub->rbyd.trunk == 0) { if (bshrub->rbyd.trunk == 0) {
err = lfsr_bshrub_alloc(lfs, mdir, bshrub); err = lfsr_bshrub_alloc(lfs, mdir, bshrub,
LFSR_ATTR_ESTIMATE + LFSR_BTREE_DSIZE);
if (err) { if (err) {
return err; return err;
} }
@@ -9651,25 +9653,25 @@ static int lfsr_ftree_carve(lfs_t *lfs, lfsr_ftree_t *ftree,
// always convert to bshrub/btree when this function is called // always convert to bshrub/btree when this function is called
if (!lfsr_ftree_isbshruborbtree(ftree)) { if (!lfsr_ftree_isbshruborbtree(ftree)) {
// TODO adopt this pattern for other scratch attrs
//
// try to merge commits where possible
lfsr_attr_t attrs_[2]; lfsr_attr_t attrs_[2];
lfs_size_t attr_count_ = 0; lfs_size_t attr_count_ = 0;
uint8_t buf[LFSR_BPTR_DSIZE+LFSR_ECKSUM_DSIZE]; uint8_t buf[LFSR_BPTR_DSIZE+LFSR_ECKSUM_DSIZE];
lfs_size_t buf_size = 0; lfs_size_t buf_size = 0;
lfs_size_t estimate = 0;
// these also check if ftree is non-zero // these also check if ftree is non-zero
if (lfsr_ftree_isbsprout(ftree)) { if (lfsr_ftree_isbsprout(ftree)) {
attrs_[attr_count_++] = LFSR_ATTR(0, attrs_[attr_count_++] = LFSR_ATTR(0,
DATA, +lfsr_ftree_size(ftree), DATA, +lfsr_ftree_size(ftree),
DATA(ftree->u.bsprout.data)); DATA(ftree->u.bsprout.data));
estimate += LFSR_ATTR_ESTIMATE + lfsr_ftree_size(ftree);
} else if (lfsr_ftree_isbleaf(ftree)) { } else if (lfsr_ftree_isbleaf(ftree)) {
attrs_[attr_count_++] = LFSR_ATTR(0, attrs_[attr_count_++] = LFSR_ATTR(0,
BLOCK, +lfsr_ftree_size(ftree), BLOCK, +lfsr_ftree_size(ftree),
FROMBPTR(&ftree->u.bptr, &buf[buf_size])); FROMBPTR(&ftree->u.bptr, &buf[buf_size]));
buf_size += LFSR_BPTR_DSIZE; buf_size += LFSR_BPTR_DSIZE;
estimate += LFSR_ATTR_ESTIMATE + LFSR_BPTR_DSIZE;
// append becksum? // append becksum?
if (ftree->u.bleaf.becksum.size != -1) { if (ftree->u.bleaf.becksum.size != -1) {
@@ -9677,10 +9679,12 @@ static int lfsr_ftree_carve(lfs_t *lfs, lfsr_ftree_t *ftree,
BECKSUM, 0, BECKSUM, 0,
FROMECKSUM(&ftree->u.bleaf.becksum, &buf[buf_size])); FROMECKSUM(&ftree->u.bleaf.becksum, &buf[buf_size]));
buf_size += LFSR_ECKSUM_DSIZE; buf_size += LFSR_ECKSUM_DSIZE;
estimate += LFSR_ATTR_ESTIMATE + LFSR_ECKSUM_DSIZE;
} }
} }
int err = lfsr_bshrub_alloc(lfs, &ftree->mdir, &ftree->u.bshrub); int err = lfsr_bshrub_alloc(lfs, &ftree->mdir, &ftree->u.bshrub,
estimate);
if (err) { if (err) {
return err; return err;
} }