Github/littlefs
1
Fork 0
Code Actions Activity

Added sparse btree tests, fixed found bugs (grow/shrink bisect)

Browse Source 
- After a B-tree split, when we're append pending attributes, it's
  possible for the id chosen for bisection to be itself modified by
  pending grows/shrinks. This needs to be accounted for in the two
  passes for the two children.

But this means our tests are working.
This commit is contained in:
Christopher Haster
2023-03-08 02:52:34 -06:00
parent 0a3c6b39c1
commit ce18bec66d
3 changed files with 421 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lfs.c
+28 -5
View File
@@ -3495,8 +3495,9 @@ static int lfsr_btree_commit(lfs_t *lfs,
// upper layers should make sure this can't fail by limiting the
// maximum commit size
// TODO filter-like tag? "from" but from device?
lfs_ssize_t bisect_ = bisect;
for (const struct lfsr_attr *attr = attrs; attr; attr = attr->next) {
if (attr->id < bisect) {
if (attr->id < bisect_) {
err = lfsr_rbyd_append(lfs, &rbyd_,
attr->tag, attr->id,
LFSR_DATA_BUF(attr->buffer, attr->size));
@@ -3505,6 +3506,15 @@ static int lfsr_btree_commit(lfs_t *lfs,
return err;
}
}
// we need to make sure we keep bisect updated with weight changes
if (attr->id < bisect_) {
if (attr->tag == LFSR_TAG_GROW) {
bisect_ += attr->size;
} else if (attr->tag == LFSR_TAG_SHRINK) {
bisect_ -= attr->size;
}
}
}
// finalize commit
@@ -3567,16 +3577,26 @@ static int lfsr_btree_commit(lfs_t *lfs,
// commit pending attrs, these may need to go into both rbyds,
// upper layers should make sure this can't fail by limiting the
// maximum commit size
bisect_ = bisect;
for (const struct lfsr_attr *attr = attrs; attr; attr = attr->next) {
if (attr->id >= bisect) {
if (attr->id >= bisect_) {
err = lfsr_rbyd_append(lfs, &sibling,
attr->tag, attr->id-bisect,
attr->tag, attr->id-bisect_,
LFSR_DATA_BUF(attr->buffer, attr->size));
if (err) {
assert(!err);
return err;
}
}
// we need to make sure we keep bisect updated with weight changes
if (attr->id < bisect_) {
if (attr->tag == LFSR_TAG_GROW) {
bisect_ += attr->size;
} else if (attr->tag == LFSR_TAG_SHRINK) {
bisect_ -= attr->size;
}
}
}
// finalize commit
@@ -3978,16 +3998,19 @@ static int lfsr_btree_push(lfs_t *lfs,
// return ENOENT, is this ok?
lfsr_rbyd_t rbyd;
lfs_ssize_t rid;
lfs_size_t rweight;
lfs_ssize_t size = lfsr_btree_lookup(lfs, btree,
lfs_min32(id, btree->weight-1),
NULL, NULL, &rbyd, &rid, NULL, NULL, 0);
NULL, NULL, &rbyd, &rid, &rweight, NULL, 0);
if (size < 0) {
return size;
}
// adjust rid if we're appending
// adjust rid for push
if (id >= btree->weight) {
rid += 1;
} else {
rid -= rweight-1;
}
// commit our id into the tree, letting lfsr_btree_commit take care