Github/littlefs
1
Fork 0
Code Actions Activity

ecksum: Limited NULL => not-ecksum to lfs3_gbmap_set_

Browse Source 
This mostly reverts the previous commit, and makes non-NULL ecksums the
consistent API.

Non-NULL ecksums are what the original rbyd-level ecksum API expects,
and enforcing this avoids the ifdef mess required to minimize unused
code impact.

This unfortunately clutters up lfs3_gbmap_set_'s logic with NULL checks,
but at least keeps the mess constrained to lfs3_gbmap_set_.
lfs3_gbmap_set_ is really the only function that uses NULL ecksums, so
they should probably be lfs3_gbmap_set_'s problem to deal with.

Code changes:

                    code          stack          ctx
  before:          35144           2136          660
  after:           35144 (+0.0%)   2136 (+0.0%)  660 (+0.0%)

                    code          stack          ctx
  gbmap+np before: 38296           2144          776
  gbmap+np after:  38272 (-0.1%)   2144 (+0.0%)  776 (+0.0%)

                    code          stack          ctx
  gbmap+yp before: 38908           2168          796
  gbmap+yp after:  38940 (+0.1%)   2168 (+0.0%)  796 (+0.0%)
This commit is contained in:
Christopher Haster
2025-12-29 23:41:21 -06:00
parent 99d0e59589
commit 8de1903172
2 changed files with 38 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lfs3.c
+22 -29
View File
@@ -2483,12 +2483,7 @@ static int lfs3_bptr_ck(lfs3_t *lfs3, const lfs3_bptr_t *bptr) {
#ifndef LFS3_RDONLY
static inline bool lfs3_ecksum_isecksum(const lfs3_ecksum_t *ecksum) {
// accept NULL as cksize=-1 (gbmap relies on this)
#ifdef LFS3_GBMAP
return ecksum && ecksum->cksize != -1;
#else
return ecksum->cksize != -1;
#endif
}
#endif
@@ -2528,10 +2523,10 @@ static int lfs3_ecksum_ck(lfs3_t *lfs3, const lfs3_ecksum_t *ecksum,
static inline int lfs3_ecksum_cmp(
const lfs3_ecksum_t *a,
const lfs3_ecksum_t *b) {
// accept NULL as cksize=-1, note this cmps both not-ecksums and
// cmp cksize first, note this cmps both not-ecksums and
// not-not-ecksum cksizes
if (((a) ? a->cksize : -1) != ((b) ? b->cksize : -1)) {
return ((a) ? a->cksize : -1) - ((b) ? b->cksize : -1);
if (a->cksize != b->cksize) {
return a->cksize - b->cksize;
// only cmp cksum if not-not-ecksum
} else if (lfs3_ecksum_isecksum(a)) {
return a->cksum - b->cksum;
@@ -2545,15 +2540,8 @@ static inline int lfs3_ecksum_cmp(
#ifndef LFS3_RDONLY
static lfs3_data_t lfs3_data_fromecksum(const lfs3_ecksum_t *ecksum,
uint8_t buffer[static LFS3_ECKSUM_DSIZE]) {
// treat not-ecksums as nil data (gbmap relies on this)
#ifdef LFS3_GBMAP
if (!lfs3_ecksum_isecksum(ecksum)) {
return LFS3_DATA_NULL();
}
#else
// you shouldn't try to encode a not-ecksum, that doesn't make sense
LFS3_ASSERT(lfs3_ecksum_isecksum(ecksum));
#endif
// cksize should not exceed 28-bits
LFS3_ASSERT((lfs3_size_t)ecksum->cksize <= 0x0fffffff);
@@ -2574,14 +2562,6 @@ static lfs3_data_t lfs3_data_fromecksum(const lfs3_ecksum_t *ecksum,
#ifndef LFS3_RDONLY
static int lfs3_data_readecksum(lfs3_t *lfs3, lfs3_data_t *data,
lfs3_ecksum_t *ecksum) {
// treat nil data as not-ecksums (gbmap relies on this)
#ifdef LFS3_GBMAP
if (lfs3_data_size(data) == 0) {
ecksum->cksize = -1;
return 0;
}
#endif
int err = lfs3_data_readlleb128(lfs3, data, (lfs3_size_t*)&ecksum->cksize);
if (err) {
return err;
@@ -10500,7 +10480,7 @@ static lfs3_stag_t lfs3_gbmap_lookupnext(lfs3_t *lfs3, lfs3_btree_t *gbmap,
}
if (ecksum_) {
if (tag == LFS3_TAG_BMERASED) {
if (tag == LFS3_TAG_BMERASED && lfs3_data_size(&data) > 0) {
int err = lfs3_data_readecksum(lfs3, &data,
ecksum_);
if (err) {
@@ -10542,7 +10522,10 @@ static int lfs3_gbmap_set_(lfs3_t *lfs3, lfs3_btree_t *gbmap,
}
// wait, already set to expected type? guess we're done
if (tag__ == tag && lfs3_ecksum_cmp(&ecksum__, ecksum) == 0) {
if (tag__ == tag
&& ((ecksum)
? lfs3_ecksum_cmp(&ecksum__, ecksum) == 0
: !lfs3_ecksum_isecksum(&ecksum__))) {
return 0;
}
@@ -10572,7 +10555,10 @@ static int lfs3_gbmap_set_(lfs3_t *lfs3, lfs3_btree_t *gbmap,
}
LFS3_ASSERT(r_weight == r_bid - block);
if (r_tag == tag && lfs3_ecksum_cmp(&r_ecksum, ecksum) == 0) {
if (r_tag == tag
&& ((ecksum)
? lfs3_ecksum_cmp(&r_ecksum, ecksum) == 0
: !lfs3_ecksum_isecksum(&r_ecksum))) {
// delete to prepare merge
int err = lfs3_gbmap_commit(lfs3, &gbmap_, r_bid, LFS3_RATTRS(
LFS3_RATTR(2, LFS3_tag_RM, -2),
@@ -10604,7 +10590,10 @@ static int lfs3_gbmap_set_(lfs3_t *lfs3, lfs3_btree_t *gbmap,
}
LFS3_ASSERT(l_bid == block-weight);
if (l_tag == tag && lfs3_ecksum_cmp(&l_ecksum, ecksum) == 0) {
if (l_tag == tag
&& ((ecksum)
? lfs3_ecksum_cmp(&l_ecksum, ecksum) == 0
: !lfs3_ecksum_isecksum(&l_ecksum))) {
// delete to prepare merge
int err = lfs3_gbmap_commit(lfs3, &gbmap_, l_bid, LFS3_RATTRS(
LFS3_RATTR(2, LFS3_tag_RM, -2),
@@ -10634,11 +10623,15 @@ static int lfs3_gbmap_set_(lfs3_t *lfs3, lfs3_btree_t *gbmap,
? LFS3_RATTR(2, LFS3_tag_GROW, -2)
: LFS3_RATTR(2, LFS3_tag_RM, -2),
LFS3_RATTR_WEIGHT(-((bid__+1) - (block-(weight-1)))),
LFS3_RATTR(3, tag, -2, LFS3_FROM_ECKSUM),
(ecksum && lfs3_ecksum_isecksum(ecksum))
? LFS3_RATTR(3, tag, -2, LFS3_FROM_ECKSUM)
: LFS3_RATTR(3, tag, -2),
LFS3_RATTR_WEIGHT(+weight_),
LFS3_RATTR_ARG(ecksum),
(bid__ > block)
? LFS3_RATTR(3, tag__, -2, LFS3_FROM_ECKSUM)
? (lfs3_ecksum_isecksum(&ecksum__))
? LFS3_RATTR(3, tag__, -2, LFS3_FROM_ECKSUM)
: LFS3_RATTR(3, tag__, -2)
: LFS3_RATTR(3, LFS3_TAG_NULL, 0),
LFS3_RATTR_WEIGHT(+(bid__ - block)),
LFS3_RATTR_ARG(&ecksum__),
tests/test_gbmap.toml
+16 -16
View File
@@ -437,7 +437,7 @@ code = '''
&bid_, &weight_, &ecksum_) => LFS3_TAG_BMFREE;
assert(bid_ == 5);
assert(weight_ == 6);
assert(lfs3_ecksum_cmp(&ecksum_, NULL) == 0);
assert(!lfs3_ecksum_isecksum(&ecksum_));
lfs3_gbmap_lookupnext(&lfs3, &gbmap, 6,
&bid_, &weight_, &ecksum_) => LFS3_TAG_BMERASED;
assert(bid_ == 6);
@@ -447,7 +447,7 @@ code = '''
&bid_, &weight_, &ecksum_) => LFS3_TAG_BMFREE;
assert(bid_ == 7);
assert(weight_ == 1);
assert(lfs3_ecksum_cmp(&ecksum_, NULL) == 0);
assert(!lfs3_ecksum_isecksum(&ecksum_));
lfs3_gbmap_lookupnext(&lfs3, &gbmap, 8,
&bid_, &weight_, &ecksum_) => LFS3_TAG_BMERASED;
assert(bid_ == 8);
@@ -457,7 +457,7 @@ code = '''
&bid_, &weight_, &ecksum_) => LFS3_TAG_BMFREE;
assert(bid_ == 9);
assert(weight_ == 1);
assert(lfs3_ecksum_cmp(&ecksum_, NULL) == 0);
assert(!lfs3_ecksum_isecksum(&ecksum_));
lfs3_gbmap_lookupnext(&lfs3, &gbmap, 10,
&bid_, &weight_, &ecksum_) => LFS3_TAG_BMERASED;
assert(bid_ == 10);
@@ -467,7 +467,7 @@ code = '''
&bid_, &weight_, &ecksum_) => LFS3_TAG_BMFREE;
assert(bid_ == BLOCK_COUNT-1);
assert(weight_ == BLOCK_COUNT-11);
assert(lfs3_ecksum_cmp(&ecksum_, NULL) == 0);
assert(!lfs3_ecksum_isecksum(&ecksum_));
lfs3_unmount(&lfs3) => 0;
'''
@@ -515,7 +515,7 @@ code = '''
&bid_, &weight_, &ecksum_) => LFS3_TAG_BMFREE;
assert(bid_ == 5);
assert(weight_ == 6);
assert(lfs3_ecksum_cmp(&ecksum_, NULL) == 0);
assert(!lfs3_ecksum_isecksum(&ecksum_));
lfs3_gbmap_lookupnext(&lfs3, &gbmap, 6,
&bid_, &weight_, &ecksum_) => LFS3_TAG_BMERASED;
assert(bid_ == 6);
@@ -525,7 +525,7 @@ code = '''
&bid_, &weight_, &ecksum_) => LFS3_TAG_BMFREE;
assert(bid_ == 7);
assert(weight_ == 1);
assert(lfs3_ecksum_cmp(&ecksum_, NULL) == 0);
assert(!lfs3_ecksum_isecksum(&ecksum_));
lfs3_gbmap_lookupnext(&lfs3, &gbmap, 8,
&bid_, &weight_, &ecksum_) => LFS3_TAG_BMERASED;
assert(bid_ == 8);
@@ -535,7 +535,7 @@ code = '''
&bid_, &weight_, &ecksum_) => LFS3_TAG_BMFREE;
assert(bid_ == 9);
assert(weight_ == 1);
assert(lfs3_ecksum_cmp(&ecksum_, NULL) == 0);
assert(!lfs3_ecksum_isecksum(&ecksum_));
lfs3_gbmap_lookupnext(&lfs3, &gbmap, 10,
&bid_, &weight_, &ecksum_) => LFS3_TAG_BMERASED;
assert(bid_ == 10);
@@ -545,7 +545,7 @@ code = '''
&bid_, &weight_, &ecksum_) => LFS3_TAG_BMFREE;
assert(bid_ == BLOCK_COUNT-1);
assert(weight_ == BLOCK_COUNT-11);
assert(lfs3_ecksum_cmp(&ecksum_, NULL) == 0);
assert(!lfs3_ecksum_isecksum(&ecksum_));
lfs3_unmount(&lfs3) => 0;
'''
@@ -593,7 +593,7 @@ code = '''
&bid_, &weight_, &ecksum_) => LFS3_TAG_BMFREE;
assert(bid_ == 4);
assert(weight_ == 5);
assert(lfs3_ecksum_cmp(&ecksum_, NULL) == 0);
assert(!lfs3_ecksum_isecksum(&ecksum_));
lfs3_gbmap_lookupnext(&lfs3, &gbmap, 5,
&bid_, &weight_, &ecksum_) => LFS3_TAG_BMERASED;
assert(bid_ == 6);
@@ -603,7 +603,7 @@ code = '''
&bid_, &weight_, &ecksum_) => LFS3_TAG_BMFREE;
assert(bid_ == 7);
assert(weight_ == 1);
assert(lfs3_ecksum_cmp(&ecksum_, NULL) == 0);
assert(!lfs3_ecksum_isecksum(&ecksum_));
lfs3_gbmap_lookupnext(&lfs3, &gbmap, 8,
&bid_, &weight_, &ecksum_) => LFS3_TAG_BMERASED;
assert(bid_ == 10);
@@ -613,7 +613,7 @@ code = '''
&bid_, &weight_, &ecksum_) => LFS3_TAG_BMFREE;
assert(bid_ == 11);
assert(weight_ == 1);
assert(lfs3_ecksum_cmp(&ecksum_, NULL) == 0);
assert(!lfs3_ecksum_isecksum(&ecksum_));
lfs3_gbmap_lookupnext(&lfs3, &gbmap, 12,
&bid_, &weight_, &ecksum_) => LFS3_TAG_BMERASED;
assert(bid_ == 13);
@@ -623,7 +623,7 @@ code = '''
&bid_, &weight_, &ecksum_) => LFS3_TAG_BMFREE;
assert(bid_ == BLOCK_COUNT-1);
assert(weight_ == BLOCK_COUNT-14);
assert(lfs3_ecksum_cmp(&ecksum_, NULL) == 0);
assert(!lfs3_ecksum_isecksum(&ecksum_));
lfs3_unmount(&lfs3) => 0;
'''
@@ -673,7 +673,7 @@ code = '''
&bid_, &weight_, &ecksum_) => LFS3_TAG_BMFREE;
assert(bid_ == 4);
assert(weight_ == 5);
assert(lfs3_ecksum_cmp(&ecksum_, NULL) == 0);
assert(!lfs3_ecksum_isecksum(&ecksum_));
lfs3_gbmap_lookupnext(&lfs3, &gbmap, 5,
&bid_, &weight_, &ecksum_) => LFS3_TAG_BMERASED;
assert(bid_ == 5);
@@ -688,7 +688,7 @@ code = '''
&bid_, &weight_, &ecksum_) => LFS3_TAG_BMFREE;
assert(bid_ == 7);
assert(weight_ == 1);
assert(lfs3_ecksum_cmp(&ecksum_, NULL) == 0);
assert(!lfs3_ecksum_isecksum(&ecksum_));
lfs3_gbmap_lookupnext(&lfs3, &gbmap, 8,
&bid_, &weight_, &ecksum_) => LFS3_TAG_BMERASED;
assert(bid_ == 8);
@@ -708,7 +708,7 @@ code = '''
&bid_, &weight_, &ecksum_) => LFS3_TAG_BMFREE;
assert(bid_ == 11);
assert(weight_ == 1);
assert(lfs3_ecksum_cmp(&ecksum_, NULL) == 0);
assert(!lfs3_ecksum_isecksum(&ecksum_));
lfs3_gbmap_lookupnext(&lfs3, &gbmap, 12,
&bid_, &weight_, &ecksum_) => LFS3_TAG_BMERASED;
assert(bid_ == 12);
@@ -723,7 +723,7 @@ code = '''
&bid_, &weight_, &ecksum_) => LFS3_TAG_BMFREE;
assert(bid_ == BLOCK_COUNT-1);
assert(weight_ == BLOCK_COUNT-14);
assert(lfs3_ecksum_cmp(&ecksum_, NULL) == 0);
assert(!lfs3_ecksum_isecksum(&ecksum_));
lfs3_unmount(&lfs3) => 0;
'''