Github/littlefs
1
Fork 0
Code Actions Activity

Dropped LFSR_ATTR() prefix magic

Browse Source 
Before:

  LFSR_ATTR(RM(SUBMASK(REG)), 0, BUF("hi", 2))

Now:

  LFSR_ATTR(
      LFSR_TAG_RM | LFSR_TAG_SUBMASK | LFSR_TAG_REG, 0,
      LFSR_DATA_BUF("hi", 2))

Yes, it's more verbose now.

But there were a couple reasons for dropping the idea:

- The implicit prefixing is a bit magical, and not really all that
  common in C code. It would likely confuse new users on first read.

- The implicitly prefixing macros did not play will with macro expansion
  rules.

  In particular, because the nested not-yet-prefixed macros aren't
  really macros, they aren't expanded as a part of argument prescan.
  This led to surprising compile-time errors, and prevented recursive
  attr-lists (which may be useful for shrubs).

- Implicit prefixes is not very C-like, and in particular it gets in the
  way of sed/grep operations on source files.

- RM(SUBMASK(REG)) for combining tags is (IMO) ugly, compared to
  LFSR_TAG_RM | LFSR_TAG_SUBMASK | LFSR_TAG_REG, even if the latter
  requires more typing.

- Sometimes you need runtime-dependent TAG/DATA values, which implicit
  prefixing gets in the way of. The LFSR_TAG_TAG(tag)/
  LFSR_DATA_DATA(tag) backdoors worked around this, but they are even
  more magical, and added noise to a not-actually-all-that-uncommon use
  case.

And it's really not _that_ much extra effort to write out the prefixes
everywhere.

lfs.c:

          lines           bytes
  before: 16894          537171
  after:  16907 (+0.1%)  538340 (+0.2%)

tests/*.toml:

          lines            bytes
  before: 53306          1811035
  after:  54517 (+2.3%)  1851006 (+2.2%)

qadte came in quite handy again for refactoring the tests without
completely losing my sanity.
This commit is contained in:
Christopher Haster
2024-02-22 17:46:20 -06:00
parent d09a14f352
commit 748bca0b61
4 changed files with 2392 additions and 1168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lfs.c
+172 -159
View File
@@ -764,22 +764,11 @@ enum lfsr_tag {
LFSR_TAG_DIVERGEDLOWER = 0x0000, LFSR_TAG_DIVERGEDLOWER = 0x0000,
}; };
// LFSR_TAG_TAG just provides and escape hatch to pass raw tags
// through the LFSR_ATTR macro
#define LFSR_TAG_TAG(tag) (tag)
// some tag modifiers
#define LFSR_TAG_SHRUB(tag) (LFSR_TAG_SHRUB | LFSR_TAG_##tag)
#define LFSR_TAG_RM(tag) (LFSR_TAG_RM | LFSR_TAG_##tag)
#define LFSR_TAG_GROW(tag) (LFSR_TAG_GROW | LFSR_TAG_##tag)
#define LFSR_TAG_SUPMASK(tag) (LFSR_TAG_SUPMASK | LFSR_TAG_##tag)
#define LFSR_TAG_SUBMASK(tag) (LFSR_TAG_SUBMASK | LFSR_TAG_##tag)
// some other tag encodings with their own subfields // some other tag encodings with their own subfields
#define LFSR_TAG_ALT(d, c, key) \ #define LFSR_TAG_ALT(d, c, key) \
(LFSR_TAG_ALT \ (LFSR_TAG_ALT \
| LFSR_TAG_##d \ | (0x2000 & (d)) \
| LFSR_TAG_##c \ | (0x1000 & (c)) \
| (0x0fff & (lfsr_tag_t)(key))) | (0x0fff & (lfsr_tag_t)(key)))
#define LFSR_TAG_UATTR(attr) \ #define LFSR_TAG_UATTR(attr) \
@@ -1109,10 +1098,6 @@ static lfs_ssize_t lfsr_bd_progtag(lfs_t *lfs,
#define LFSR_DATA_ISIMM 0x40000000 #define LFSR_DATA_ISIMM 0x40000000
#define LFSR_DATA_ISCAT 0xc0000000 #define LFSR_DATA_ISCAT 0xc0000000
// LFSR_DATA_DATA just provides and escape hatch to pass raw datas
// through the LFSR_ATTR macro
#define LFSR_DATA_DATA(_data) (_data)
#define LFSR_DATA_NULL() \ #define LFSR_DATA_NULL() \
((lfsr_data_t){ \ ((lfsr_data_t){ \
.u.buf.size=0, \ .u.buf.size=0, \
@@ -1530,13 +1515,10 @@ typedef struct lfsr_attr {
lfsr_data_t data; lfsr_data_t data;
} lfsr_attr_t; } lfsr_attr_t;
#define LFSR_ATTR(_type, _delta, _data) \ #define LFSR_ATTR(_tag, _delta, _data) \
((const lfsr_attr_t){ \ ((const lfsr_attr_t){_tag, _delta, _data})
LFSR_TAG_##_type, \
_delta, \
LFSR_DATA_##_data})
#define LFSR_ATTR_NOOP() LFSR_ATTR(NULL, 0, NULL()) #define LFSR_ATTR_NOOP() LFSR_ATTR(LFSR_TAG_NULL, 0, LFSR_DATA_NULL())
#define LFSR_ATTRS(...) \ #define LFSR_ATTRS(...) \
(const lfsr_attr_t[]){__VA_ARGS__}, \ (const lfsr_attr_t[]){__VA_ARGS__}, \
@@ -3063,17 +3045,17 @@ static int lfsr_rbyd_appendattr(lfs_t *lfs, lfsr_rbyd_t *rbyd,
&& lfsr_tag_key(tag_) < lfsr_tag_key(tag)))))) { && lfsr_tag_key(tag_) < lfsr_tag_key(tag)))))) {
if (lfsr_tag_isrm(tag) || !lfsr_tag_key(tag)) { if (lfsr_tag_isrm(tag) || !lfsr_tag_key(tag)) {
// if removed, make our tag unreachable // if removed, make our tag unreachable
alt = LFSR_TAG_ALT(GT, B, 0); alt = LFSR_TAG_ALT(LFSR_TAG_GT, LFSR_TAG_B, 0);
weight = upper_rid - lower_rid + delta; weight = upper_rid - lower_rid + delta;
upper_rid -= weight; upper_rid -= weight;
} else { } else {
// split less than // split less than
alt = LFSR_TAG_ALT( alt = LFSR_TAG_ALT(
LE, LFSR_TAG_LE,
TAG((!lfsr_tag_hasdiverged(tag_)) (!lfsr_tag_hasdiverged(tag_))
? LFSR_TAG_R ? LFSR_TAG_R
: LFSR_TAG_B), : LFSR_TAG_B,
lfsr_tag_key(tag_)); tag_);
weight = upper_rid - lower_rid; weight = upper_rid - lower_rid;
lower_rid += weight; lower_rid += weight;
} }
@@ -3089,17 +3071,17 @@ static int lfsr_rbyd_appendattr(lfs_t *lfs, lfsr_rbyd_t *rbyd,
&& lfsr_tag_key(tag_) > lfsr_tag_key(tag)))))) { && lfsr_tag_key(tag_) > lfsr_tag_key(tag)))))) {
if (lfsr_tag_isrm(tag) || !lfsr_tag_key(tag)) { if (lfsr_tag_isrm(tag) || !lfsr_tag_key(tag)) {
// if removed, make our tag unreachable // if removed, make our tag unreachable
alt = LFSR_TAG_ALT(GT, B, 0); alt = LFSR_TAG_ALT(LFSR_TAG_GT, LFSR_TAG_B, 0);
weight = upper_rid - lower_rid + delta; weight = upper_rid - lower_rid + delta;
upper_rid -= weight; upper_rid -= weight;
} else { } else {
// split greater than // split greater than
alt = LFSR_TAG_ALT( alt = LFSR_TAG_ALT(
GT, LFSR_TAG_GT,
TAG((!lfsr_tag_hasdiverged(tag_)) (!lfsr_tag_hasdiverged(tag_))
? LFSR_TAG_R ? LFSR_TAG_R
: LFSR_TAG_B), : LFSR_TAG_B,
lfsr_tag_key(tag)); tag);
weight = upper_rid - (rid+1); weight = upper_rid - (rid+1);
upper_rid -= weight; upper_rid -= weight;
} }
@@ -3634,7 +3616,7 @@ static int lfsr_rbyd_appendcompaction(lfs_t *lfs, lfsr_rbyd_t *rbyd,
// connect with an altle // connect with an altle
lfs_ssize_t d = lfsr_bd_progtag(lfs, lfs_ssize_t d = lfsr_bd_progtag(lfs,
rbyd->blocks[0], rbyd->eoff, rbyd->blocks[0], rbyd->eoff,
LFSR_TAG_ALT(LE, B, lfsr_tag_key(tag)), LFSR_TAG_ALT(LFSR_TAG_LE, LFSR_TAG_B, tag),
weight, weight,
rbyd->eoff - trunk, rbyd->eoff - trunk,
&rbyd->cksum); &rbyd->cksum);
@@ -3713,7 +3695,9 @@ static int lfsr_rbyd_appendgdelta(lfs_t *lfs, lfsr_rbyd_t *rbyd) {
lfs_size_t size = lfsr_gdelta_size(grm_, LFSR_GRM_DSIZE); lfs_size_t size = lfsr_gdelta_size(grm_, LFSR_GRM_DSIZE);
err = lfsr_rbyd_appendattr(lfs, rbyd, -1, err = lfsr_rbyd_appendattr(lfs, rbyd, -1,
// opportunistically remove this tag if delta is all zero // opportunistically remove this tag if delta is all zero
(size == 0) ? LFSR_TAG_RM(GRMDELTA) : LFSR_TAG_GRMDELTA, 0, (size == 0)
? LFSR_TAG_RM | LFSR_TAG_GRMDELTA
: LFSR_TAG_GRMDELTA, 0,
LFSR_DATA_BUF(grm_, size)); LFSR_DATA_BUF(grm_, size));
if (err) { if (err) {
return err; return err;
@@ -4284,15 +4268,16 @@ static int lfsr_btree_commit_(lfs_t *lfs, lfsr_btree_t *btree,
bid -= pid - (rbyd.weight-1); bid -= pid - (rbyd.weight-1);
if (rbyd_.weight == 0) { if (rbyd_.weight == 0) {
attrs__[attr_count++] = LFSR_ATTR( attrs__[attr_count++] = LFSR_ATTR(
RM, -rbyd.weight, NULL()); LFSR_TAG_RM, -rbyd.weight, LFSR_DATA_NULL());
} else { } else {
attrs__[attr_count++] = LFSR_ATTR( attrs__[attr_count++] = LFSR_ATTR(
BRANCH, 0, LFSR_TAG_BRANCH, 0,
DATA(lfsr_data_frombranch(&rbyd_, &buf__[buf_size]))); lfsr_data_frombranch(&rbyd_, &buf__[buf_size]));
buf_size += LFSR_BRANCH_DSIZE; buf_size += LFSR_BRANCH_DSIZE;
if (rbyd_.weight != rbyd.weight) { if (rbyd_.weight != rbyd.weight) {
attrs__[attr_count++] = LFSR_ATTR( attrs__[attr_count++] = LFSR_ATTR(
GROW, -rbyd.weight + rbyd_.weight, NULL()); LFSR_TAG_GROW, -rbyd.weight + rbyd_.weight,
LFSR_DATA_NULL());
} }
} }
attrs = attrs__; attrs = attrs__;
@@ -4559,35 +4544,36 @@ static int lfsr_btree_commit_(lfs_t *lfs, lfsr_btree_t *btree,
// new root? // new root?
if (!lfsr_rbyd_hastrunk(&parent)) { if (!lfsr_rbyd_hastrunk(&parent)) {
attrs__[attr_count++] = LFSR_ATTR( attrs__[attr_count++] = LFSR_ATTR(
BRANCH, +rbyd_.weight, LFSR_TAG_BRANCH, +rbyd_.weight,
DATA(lfsr_data_frombranch(&rbyd_, &buf__[buf_size]))); lfsr_data_frombranch(&rbyd_, &buf__[buf_size]));
buf_size += LFSR_BRANCH_DSIZE; buf_size += LFSR_BRANCH_DSIZE;
attrs__[attr_count++] = LFSR_ATTR( attrs__[attr_count++] = LFSR_ATTR(
BRANCH, +sibling.weight, LFSR_TAG_BRANCH, +sibling.weight,
DATA(lfsr_data_frombranch(&sibling, &buf__[buf_size]))); lfsr_data_frombranch(&sibling, &buf__[buf_size]));
buf_size += LFSR_BRANCH_DSIZE; buf_size += LFSR_BRANCH_DSIZE;
if (lfsr_tag_suptype(split_tag) == LFSR_TAG_NAME) { if (lfsr_tag_suptype(split_tag) == LFSR_TAG_NAME) {
attrs__[attr_count++] = LFSR_ATTR( attrs__[attr_count++] = LFSR_ATTR(
NAME, 0, DATA(split_data)); LFSR_TAG_NAME, 0, split_data);
} }
// split root? // split root?
} else { } else {
bid -= pid - (rbyd.weight-1); bid -= pid - (rbyd.weight-1);
attrs__[attr_count++] = LFSR_ATTR( attrs__[attr_count++] = LFSR_ATTR(
BRANCH, 0, LFSR_TAG_BRANCH, 0,
DATA(lfsr_data_frombranch(&rbyd_, &buf__[buf_size]))); lfsr_data_frombranch(&rbyd_, &buf__[buf_size]));
buf_size += LFSR_BRANCH_DSIZE; buf_size += LFSR_BRANCH_DSIZE;
if (rbyd_.weight != rbyd.weight) { if (rbyd_.weight != rbyd.weight) {
attrs__[attr_count++] = LFSR_ATTR( attrs__[attr_count++] = LFSR_ATTR(
GROW, -rbyd.weight + rbyd_.weight, NULL()); LFSR_TAG_GROW, -rbyd.weight + rbyd_.weight,
LFSR_DATA_NULL());
} }
attrs__[attr_count++] = LFSR_ATTR( attrs__[attr_count++] = LFSR_ATTR(
BRANCH, +sibling.weight, LFSR_TAG_BRANCH, +sibling.weight,
DATA(lfsr_data_frombranch(&sibling, &buf__[buf_size]))); lfsr_data_frombranch(&sibling, &buf__[buf_size]));
buf_size += LFSR_BRANCH_DSIZE; buf_size += LFSR_BRANCH_DSIZE;
if (lfsr_tag_suptype(split_tag) == LFSR_TAG_NAME) { if (lfsr_tag_suptype(split_tag) == LFSR_TAG_NAME) {
attrs__[attr_count++] = LFSR_ATTR( attrs__[attr_count++] = LFSR_ATTR(
NAME, 0, DATA(split_data)); LFSR_TAG_NAME, 0, split_data);
} }
} }
attrs = attrs__; attrs = attrs__;
@@ -4653,14 +4639,15 @@ static int lfsr_btree_commit_(lfs_t *lfs, lfsr_btree_t *btree,
buf_size = 0; buf_size = 0;
bid -= pid - (rbyd.weight-1); bid -= pid - (rbyd.weight-1);
attrs__[attr_count++] = LFSR_ATTR( attrs__[attr_count++] = LFSR_ATTR(
RM, -sibling.weight, NULL()); LFSR_TAG_RM, -sibling.weight, LFSR_DATA_NULL());
attrs__[attr_count++] = LFSR_ATTR( attrs__[attr_count++] = LFSR_ATTR(
BRANCH, 0, LFSR_TAG_BRANCH, 0,
DATA(lfsr_data_frombranch(&rbyd_, &buf__[buf_size]))); lfsr_data_frombranch(&rbyd_, &buf__[buf_size]));
buf_size += LFSR_BRANCH_DSIZE; buf_size += LFSR_BRANCH_DSIZE;
if (rbyd_.weight != rbyd.weight) { if (rbyd_.weight != rbyd.weight) {
attrs__[attr_count++] = LFSR_ATTR( attrs__[attr_count++] = LFSR_ATTR(
GROW, -rbyd.weight + rbyd_.weight, NULL()); LFSR_TAG_GROW, -rbyd.weight + rbyd_.weight,
LFSR_DATA_NULL());
} }
attrs = attrs__; attrs = attrs__;
@@ -5822,7 +5809,7 @@ static int lfsr_mdir_commit__(lfs_t *lfs, lfsr_mdir_t *mdir,
&& file->bshrub_.u.bsprout.u.disk.block && file->bshrub_.u.bsprout.u.disk.block
!= rbyd_.blocks[0]) { != rbyd_.blocks[0]) {
int err = lfsr_rbyd_appendcompactattr(lfs, &rbyd_, int err = lfsr_rbyd_appendcompactattr(lfs, &rbyd_,
LFSR_TAG_SHRUB(DATA), 0, LFSR_TAG_SHRUB | LFSR_TAG_DATA, 0,
file->bshrub.u.bsprout); file->bshrub.u.bsprout);
if (err) { if (err) {
LFS_ASSERT(err != LFS_ERR_RANGE); LFS_ASSERT(err != LFS_ERR_RANGE);
@@ -6210,7 +6197,7 @@ static int lfsr_mdir_compact__(lfs_t *lfs, lfsr_mdir_t *mdir_,
&& file->bshrub_.u.bsprout.u.disk.block && file->bshrub_.u.bsprout.u.disk.block
!= mdir_->rbyd.blocks[0]) { != mdir_->rbyd.blocks[0]) {
err = lfsr_rbyd_appendcompactattr(lfs, &mdir_->rbyd, err = lfsr_rbyd_appendcompactattr(lfs, &mdir_->rbyd,
LFSR_TAG_SHRUB(DATA), 0, file->bshrub.u.bsprout); LFSR_TAG_SHRUB | LFSR_TAG_DATA, 0, file->bshrub.u.bsprout);
if (err) { if (err) {
LFS_ASSERT(err != LFS_ERR_RANGE); LFS_ASSERT(err != LFS_ERR_RANGE);
return err; return err;
@@ -6539,13 +6526,13 @@ static int lfsr_mdir_commit(lfs_t *lfs, lfsr_mdir_t *mdir,
err = lfsr_btree_commit(lfs, &mtree_.u.btree, err = lfsr_btree_commit(lfs, &mtree_.u.btree,
0, LFSR_ATTRS( 0, LFSR_ATTRS(
LFSR_ATTR( LFSR_ATTR(
MDIR, +lfsr_mleafweight(lfs), LFSR_TAG_MDIR, +lfsr_mleafweight(lfs),
FROMMPTR(lfsr_mdir_mptr(&mdir_))), LFSR_DATA_FROMMPTR(lfsr_mdir_mptr(&mdir_))),
LFSR_ATTR( LFSR_ATTR(
NAME, +lfsr_mleafweight(lfs), DATA(split_data)), LFSR_TAG_NAME, +lfsr_mleafweight(lfs), split_data),
LFSR_ATTR( LFSR_ATTR(
MDIR, 0, LFSR_TAG_MDIR, 0,
FROMMPTR(lfsr_mdir_mptr(&msibling_))))); LFSR_DATA_FROMMPTR(lfsr_mdir_mptr(&msibling_)))));
if (err) { if (err) {
return err; return err;
} }
@@ -6558,13 +6545,13 @@ static int lfsr_mdir_commit(lfs_t *lfs, lfsr_mdir_t *mdir,
err = lfsr_btree_commit(lfs, &mtree_.u.btree, err = lfsr_btree_commit(lfs, &mtree_.u.btree,
lfsr_mid_bid(lfs, mdir->mid), LFSR_ATTRS( lfsr_mid_bid(lfs, mdir->mid), LFSR_ATTRS(
LFSR_ATTR( LFSR_ATTR(
MDIR, 0, LFSR_TAG_MDIR, 0,
FROMMPTR(lfsr_mdir_mptr(&mdir_))), LFSR_DATA_FROMMPTR(lfsr_mdir_mptr(&mdir_))),
LFSR_ATTR( LFSR_ATTR(
NAME, +lfsr_mleafweight(lfs), DATA(split_data)), LFSR_TAG_NAME, +lfsr_mleafweight(lfs), split_data),
LFSR_ATTR( LFSR_ATTR(
MDIR, 0, LFSR_TAG_MDIR, 0,
FROMMPTR(lfsr_mdir_mptr(&msibling_))))); LFSR_DATA_FROMMPTR(lfsr_mdir_mptr(&msibling_)))));
if (err) { if (err) {
return err; return err;
} }
@@ -6596,7 +6583,9 @@ static int lfsr_mdir_commit(lfs_t *lfs, lfsr_mdir_t *mdir,
// update our mtree // update our mtree
err = lfsr_btree_commit(lfs, &mtree_.u.btree, err = lfsr_btree_commit(lfs, &mtree_.u.btree,
lfsr_mid_bid(lfs, mdir->mid), LFSR_ATTRS( lfsr_mid_bid(lfs, mdir->mid), LFSR_ATTRS(
LFSR_ATTR(RM, -lfsr_mleafweight(lfs), NULL()))); LFSR_ATTR(
LFSR_TAG_RM, -lfsr_mleafweight(lfs),
LFSR_DATA_NULL())));
if (err) { if (err) {
return err; return err;
} }
@@ -6625,8 +6614,8 @@ static int lfsr_mdir_commit(lfs_t *lfs, lfsr_mdir_t *mdir,
err = lfsr_btree_commit(lfs, &mtree_.u.btree, err = lfsr_btree_commit(lfs, &mtree_.u.btree,
lfsr_mid_bid(lfs, mdir->mid), LFSR_ATTRS( lfsr_mid_bid(lfs, mdir->mid), LFSR_ATTRS(
LFSR_ATTR( LFSR_ATTR(
MDIR, 0, LFSR_TAG_MDIR, 0,
FROMMPTR(lfsr_mdir_mptr(&mdir_))))); LFSR_DATA_FROMMPTR(lfsr_mdir_mptr(&mdir_)))));
if (err) { if (err) {
return err; return err;
} }
@@ -6685,11 +6674,11 @@ static int lfsr_mdir_commit(lfs_t *lfs, lfsr_mdir_t *mdir,
err = lfsr_mdir_commit_(lfs, &mroot_, -1, 0, NULL, -1, LFSR_ATTRS( err = lfsr_mdir_commit_(lfs, &mroot_, -1, 0, NULL, -1, LFSR_ATTRS(
(lfsr_mtree_ismptr(&mtree_)) (lfsr_mtree_ismptr(&mtree_))
? LFSR_ATTR( ? LFSR_ATTR(
SUBMASK(MDIR), 0, LFSR_TAG_SUBMASK | LFSR_TAG_MDIR, 0,
FROMMPTR(&mtree_.u.mptr.mptr)) LFSR_DATA_FROMMPTR(&mtree_.u.mptr.mptr))
: LFSR_ATTR( : LFSR_ATTR(
SUBMASK(MTREE), 0, LFSR_TAG_SUBMASK | LFSR_TAG_MTREE, 0,
FROMBTREE(&mtree_.u.btree)))); LFSR_DATA_FROMBTREE(&mtree_.u.btree))));
if (err) { if (err) {
LFS_ASSERT(err != LFS_ERR_RANGE); LFS_ASSERT(err != LFS_ERR_RANGE);
return err; return err;
@@ -6723,8 +6712,8 @@ static int lfsr_mdir_commit(lfs_t *lfs, lfsr_mdir_t *mdir,
err = lfsr_mdir_commit_(lfs, &mrootparent_, -1, -1, NULL, err = lfsr_mdir_commit_(lfs, &mrootparent_, -1, -1, NULL,
-1, LFSR_ATTRS( -1, LFSR_ATTRS(
LFSR_ATTR( LFSR_ATTR(
MROOT, 0, LFSR_TAG_MROOT, 0,
FROMMPTR(lfsr_mdir_mptr(&mrootchild_))))); LFSR_DATA_FROMMPTR(lfsr_mdir_mptr(&mrootchild_)))));
if (err) { if (err) {
LFS_ASSERT(err != LFS_ERR_RANGE); LFS_ASSERT(err != LFS_ERR_RANGE);
LFS_ASSERT(err != LFS_ERR_NOENT); LFS_ASSERT(err != LFS_ERR_NOENT);
@@ -6790,8 +6779,8 @@ static int lfsr_mdir_commit(lfs_t *lfs, lfsr_mdir_t *mdir,
err = lfsr_mdir_commit__(lfs, &mrootanchor_, -1, -1, err = lfsr_mdir_commit__(lfs, &mrootanchor_, -1, -1,
-1, LFSR_ATTRS( -1, LFSR_ATTRS(
LFSR_ATTR( LFSR_ATTR(
SUBMASK(MROOT), 0, LFSR_TAG_SUBMASK | LFSR_TAG_MROOT, 0,
FROMMPTR(lfsr_mdir_mptr(&mrootchild_))))); LFSR_DATA_FROMMPTR(lfsr_mdir_mptr(&mrootchild_)))));
if (err) { if (err) {
LFS_ASSERT(err != LFS_ERR_RANGE); LFS_ASSERT(err != LFS_ERR_RANGE);
LFS_ASSERT(err != LFS_ERR_NOENT); LFS_ASSERT(err != LFS_ERR_NOENT);
@@ -8132,17 +8121,32 @@ static int lfsr_formatinited(lfs_t *lfs) {
// - any format-time configuration // - any format-time configuration
// - the root's bookmark tag, which reserves did = 0 for the root // - the root's bookmark tag, which reserves did = 0 for the root
err = lfsr_rbyd_commit(lfs, &rbyd, -1, LFSR_ATTRS( err = lfsr_rbyd_commit(lfs, &rbyd, -1, LFSR_ATTRS(
LFSR_ATTR(MAGIC, 0, BUF("littlefs", 8)), LFSR_ATTR(
LFSR_ATTR(VERSION, 0, IMM(((const uint8_t[2]){ LFSR_TAG_MAGIC, 0,
LFS_DISK_VERSION_MAJOR, LFSR_DATA_BUF("littlefs", 8)),
LFS_DISK_VERSION_MINOR}), 2)), LFSR_ATTR(
LFSR_ATTR(RCOMPATFLAGS, 0, IMM((&(uint8_t){ LFSR_TAG_VERSION, 0,
LFSR_RCOMPAT_GRM}), 1)), LFSR_DATA_IMM(((const uint8_t[2]){
LFSR_ATTR(BLOCKSIZE, 0, LEB128(lfs->cfg->block_size-1)), LFS_DISK_VERSION_MAJOR,
LFSR_ATTR(BLOCKCOUNT, 0, LEB128(lfs->cfg->block_count-1)), LFS_DISK_VERSION_MINOR}), 2)),
LFSR_ATTR(NAMELIMIT, 0, LEB128(lfs->name_limit)), LFSR_ATTR(
LFSR_ATTR(SIZELIMIT, 0, LEB128(lfs->size_limit)), LFSR_TAG_RCOMPATFLAGS, 0,
LFSR_ATTR(BOOKMARK, +1, LEB128(0)))); LFSR_DATA_IMM(((uint8_t[1]){LFSR_RCOMPAT_GRM}), 1)),
LFSR_ATTR(
LFSR_TAG_BLOCKSIZE, 0,
LFSR_DATA_LEB128(lfs->cfg->block_size-1)),
LFSR_ATTR(
LFSR_TAG_BLOCKCOUNT, 0,
LFSR_DATA_LEB128(lfs->cfg->block_count-1)),
LFSR_ATTR(
LFSR_TAG_NAMELIMIT, 0,
LFSR_DATA_LEB128(lfs->name_limit)),
LFSR_ATTR(
LFSR_TAG_SIZELIMIT, 0,
LFSR_DATA_LEB128(lfs->size_limit)),
LFSR_ATTR(
LFSR_TAG_BOOKMARK, +1,
LFSR_DATA_LEB128(0))));
if (err) { if (err) {
return err; return err;
} }
@@ -8392,8 +8396,8 @@ static int lfsr_fs_fixgrm(lfs_t *lfs) {
LFS_ASSERT(lfsr_mid_rid(lfs, lfs->grm.rms[0]) LFS_ASSERT(lfsr_mid_rid(lfs, lfs->grm.rms[0])
< (lfsr_srid_t)mdir.rbyd.weight); < (lfsr_srid_t)mdir.rbyd.weight);
err = lfsr_mdir_commit(lfs, &mdir, LFSR_ATTRS( err = lfsr_mdir_commit(lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(RM, -1, NULL()), LFSR_ATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()),
LFSR_ATTR(GRM, 0, GRM(&grm)))); LFSR_ATTR(LFSR_TAG_GRM, 0, LFSR_DATA_GRM(&grm))));
} }
return 0; return 0;
@@ -8424,7 +8428,7 @@ static int lfsr_fs_fixorphans(lfs_t *lfs) {
if (err != LFS_ERR_NOENT) { if (err != LFS_ERR_NOENT) {
// remove orphaned file // remove orphaned file
err = lfsr_mdir_commit(lfs, &mdir, LFSR_ATTRS( err = lfsr_mdir_commit(lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(RM, -1, NULL()))); LFSR_ATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL())));
if (err) { if (err) {
return err; return err;
} }
@@ -8609,8 +8613,10 @@ int lfsr_mkdir(lfs_t *lfs, const char *path) {
// commit our bookmark and a grm to self-remove in case of powerloss // commit our bookmark and a grm to self-remove in case of powerloss
err = lfsr_mdir_commit(lfs, &mdir, LFSR_ATTRS( err = lfsr_mdir_commit(lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(BOOKMARK, +1, LEB128(did_)), LFSR_ATTR(LFSR_TAG_BOOKMARK, +1, LFSR_DATA_LEB128(did_)),
LFSR_ATTR(GRM, 0, GRM(&((lfsr_grm_t){{mdir.mid, -1}}))))); LFSR_ATTR(
LFSR_TAG_GRM, 0,
LFSR_DATA_GRM(&((lfsr_grm_t){{mdir.mid, -1}})))));
if (err) { if (err) {
return err; return err;
} }
@@ -8629,11 +8635,14 @@ int lfsr_mkdir(lfs_t *lfs, const char *path) {
// process // process
err = lfsr_mdir_commit(lfs, &mdir, LFSR_ATTRS( err = lfsr_mdir_commit(lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR( LFSR_ATTR(
SUPMASK(DIR), (!exists) ? +1 : 0, CAT( LFSR_TAG_SUPMASK | LFSR_TAG_DIR, (!exists) ? +1 : 0,
LFSR_DATA_CAT(
LFSR_DATA_LEB128(did), LFSR_DATA_LEB128(did),
LFSR_DATA_BUF(name, name_size))), LFSR_DATA_BUF(name, name_size))),
LFSR_ATTR(DID, 0, LEB128(did_)), LFSR_ATTR(LFSR_TAG_DID, 0, LFSR_DATA_LEB128(did_)),
LFSR_ATTR(GRM, 0, GRM(&((lfsr_grm_t){{-1, -1}}))))); LFSR_ATTR(
LFSR_TAG_GRM, 0,
LFSR_DATA_GRM(&((lfsr_grm_t){{-1, -1}})))));
if (err) { if (err) {
return err; return err;
} }
@@ -8732,11 +8741,14 @@ int lfsr_remove(lfs_t *lfs, const char *path) {
// we use a create+delete here to also clear any attrs // we use a create+delete here to also clear any attrs
// and trim the entry size // and trim the entry size
(zombie) (zombie)
? LFSR_ATTR(SUPMASK(ORPHAN), 0, CAT( ? LFSR_ATTR(
LFSR_DATA_LEB128(did), LFSR_TAG_SUPMASK | LFSR_TAG_ORPHAN, 0,
LFSR_DATA_BUF(name, name_size))) LFSR_DATA_CAT(
: LFSR_ATTR(RM, -1, NULL()), LFSR_DATA_LEB128(did),
LFSR_ATTR(GRM, 0, GRM(&grm)))); LFSR_DATA_BUF(name, name_size)))
: LFSR_ATTR(
LFSR_TAG_RM, -1, LFSR_DATA_NULL()),
LFSR_ATTR(LFSR_TAG_GRM, 0, LFSR_DATA_GRM(&grm))));
if (err) { if (err) {
return err; return err;
} }
@@ -8880,11 +8892,12 @@ int lfsr_rename(lfs_t *lfs, const char *old_path, const char *new_path) {
// new rid, while also marking the old rid for removal // new rid, while also marking the old rid for removal
err = lfsr_mdir_commit(lfs, &new_mdir, LFSR_ATTRS( err = lfsr_mdir_commit(lfs, &new_mdir, LFSR_ATTRS(
LFSR_ATTR( LFSR_ATTR(
SUPMASK(TAG(old_tag)), (!exists) ? +1 : 0, CAT( LFSR_TAG_SUPMASK | old_tag, (!exists) ? +1 : 0,
LFSR_DATA_CAT(
LFSR_DATA_LEB128(new_did), LFSR_DATA_LEB128(new_did),
LFSR_DATA_BUF(new_name, new_name_size))), LFSR_DATA_BUF(new_name, new_name_size))),
LFSR_ATTR(MOVE, 0, MOVE(&old_mdir)), LFSR_ATTR(LFSR_TAG_MOVE, 0, LFSR_DATA_MOVE(&old_mdir)),
LFSR_ATTR(GRM, 0, GRM(&grm)))); LFSR_ATTR(LFSR_TAG_GRM, 0, LFSR_DATA_GRM(&grm))));
if (err) { if (err) {
return err; return err;
} }
@@ -9358,7 +9371,8 @@ int lfsr_file_opencfg(lfs_t *lfs, lfsr_file_t *file,
if (!err) { if (!err) {
err = lfsr_mdir_commit(lfs, &file->m.mdir, LFSR_ATTRS( err = lfsr_mdir_commit(lfs, &file->m.mdir, LFSR_ATTRS(
LFSR_ATTR( LFSR_ATTR(
ORPHAN, +1, CAT( LFSR_TAG_ORPHAN, +1,
LFSR_DATA_CAT(
LFSR_DATA_LEB128(did), LFSR_DATA_LEB128(did),
LFSR_DATA_BUF(name, name_size))))); LFSR_DATA_BUF(name, name_size)))));
if (err) { if (err) {
@@ -9906,10 +9920,10 @@ static int lfsr_bshrub_commit(lfs_t *lfs, lfsr_file_t *file, lfsr_bid_t bid,
// commit to shrub // commit to shrub
int err = lfsr_mdir_commit(lfs, &file->m.mdir, LFSR_ATTRS( int err = lfsr_mdir_commit(lfs, &file->m.mdir, LFSR_ATTRS(
LFSR_ATTR( LFSR_ATTR(
TAG((alloc) (alloc)
? LFSR_TAG_SHRUBALLOC ? LFSR_TAG_SHRUBALLOC
: LFSR_TAG_SHRUBCOMMIT), 0, : LFSR_TAG_SHRUBCOMMIT, 0,
SHRUBCOMMIT(&file->bshrub_.u.bshrub, bid, LFSR_DATA_SHRUBCOMMIT(&file->bshrub_.u.bshrub, bid,
attrs, attr_count)))); attrs, attr_count))));
if (err) { if (err) {
return err; return err;
@@ -9997,14 +10011,12 @@ static int lfsr_file_carve(lfs_t *lfs, lfsr_file_t *file,
// data before insertion // data before insertion
if (lfsr_bshrub_isbsprout(&file->m.mdir, &file->bshrub)) { if (lfsr_bshrub_isbsprout(&file->m.mdir, &file->bshrub)) {
attrs[attr_count++] = LFSR_ATTR( attrs[attr_count++] = LFSR_ATTR(
DATA, +lfsr_bshrub_size(&file->bshrub), LFSR_TAG_DATA, +lfsr_bshrub_size(&file->bshrub),
DATA(file->bshrub.u.bsprout)); file->bshrub.u.bsprout);
} else if (lfsr_bshrub_isbptr(&file->m.mdir, &file->bshrub)) { } else if (lfsr_bshrub_isbptr(&file->m.mdir, &file->bshrub)) {
attrs[attr_count++] = LFSR_ATTR( attrs[attr_count++] = LFSR_ATTR(
BLOCK, +lfsr_bshrub_size(&file->bshrub), LFSR_TAG_BLOCK, +lfsr_bshrub_size(&file->bshrub),
DATA(lfsr_data_frombptr( lfsr_data_frombptr(&file->bshrub.u.bptr, &buf[buf_size]));
&file->bshrub.u.bptr,
&buf[buf_size])));
buf_size += LFSR_BPTR_DSIZE; buf_size += LFSR_BPTR_DSIZE;
} }
@@ -10034,13 +10046,15 @@ static int lfsr_file_carve(lfs_t *lfs, lfsr_file_t *file,
if (lfsr_bshrub_size(&file->bshrub) > 0) { if (lfsr_bshrub_size(&file->bshrub) > 0) {
bid = lfs_min32(bid, lfsr_bshrub_size(&file->bshrub)-1); bid = lfs_min32(bid, lfsr_bshrub_size(&file->bshrub)-1);
attrs[attr_count++] = LFSR_ATTR( attrs[attr_count++] = LFSR_ATTR(
GROW, +(pos - lfsr_bshrub_size(&file->bshrub)), NULL()); LFSR_TAG_GROW, +(pos - lfsr_bshrub_size(&file->bshrub)),
LFSR_DATA_NULL());
// new hole // new hole
} else { } else {
bid = lfs_min32(bid, lfsr_bshrub_size(&file->bshrub)); bid = lfs_min32(bid, lfsr_bshrub_size(&file->bshrub));
attrs[attr_count++] = LFSR_ATTR( attrs[attr_count++] = LFSR_ATTR(
DATA, +(pos - lfsr_bshrub_size(&file->bshrub)), NULL()); LFSR_TAG_DATA, +(pos - lfsr_bshrub_size(&file->bshrub)),
LFSR_DATA_NULL());
} }
} }
@@ -10076,13 +10090,13 @@ static int lfsr_file_carve(lfs_t *lfs, lfsr_file_t *file,
err = lfsr_bshrub_commit(lfs, file, bid, LFSR_ATTRS( err = lfsr_bshrub_commit(lfs, file, bid, LFSR_ATTRS(
LFSR_ATTR( LFSR_ATTR(
GROW(SUBMASK(DATA)), LFSR_TAG_GROW | LFSR_TAG_SUBMASK | LFSR_TAG_DATA,
-(weight_ - lfs->cfg->fragment_size), -(weight_ - lfs->cfg->fragment_size),
DATA(lfsr_data_truncate(left_slice_, lfsr_data_truncate(left_slice_,
lfs->cfg->fragment_size))), lfs->cfg->fragment_size)),
LFSR_ATTR( LFSR_ATTR(
BLOCK, +(weight_ - lfs->cfg->fragment_size), LFSR_TAG_BLOCK, +(weight_ - lfs->cfg->fragment_size),
FROMBPTR(&bptr_)))); LFSR_DATA_FROMBPTR(&bptr_))));
if (err) { if (err) {
return err; return err;
} }
@@ -10103,13 +10117,14 @@ static int lfsr_file_carve(lfs_t *lfs, lfsr_file_t *file,
err = lfsr_bshrub_commit(lfs, file, bid, LFSR_ATTRS( err = lfsr_bshrub_commit(lfs, file, bid, LFSR_ATTRS(
LFSR_ATTR( LFSR_ATTR(
GROW(SUBMASK(BLOCK)), LFSR_TAG_GROW | LFSR_TAG_SUBMASK | LFSR_TAG_BLOCK,
-(weight_ - lfsr_data_size(&bptr_.data)), -(weight_ - lfsr_data_size(&bptr_.data)),
FROMBPTR(&bptr_)), LFSR_DATA_FROMBPTR(&bptr_)),
LFSR_ATTR( LFSR_ATTR(
DATA, +(weight_ - lfsr_data_size(&bptr_.data)), LFSR_TAG_DATA,
DATA(lfsr_data_fruncate(right_slice_, +(weight_ - lfsr_data_size(&bptr_.data)),
lfs->cfg->fragment_size))))); lfsr_data_fruncate(right_slice_,
lfs->cfg->fragment_size))));
if (err) { if (err) {
return err; return err;
} }
@@ -10126,7 +10141,7 @@ static int lfsr_file_carve(lfs_t *lfs, lfsr_file_t *file,
// can we get away with a grow attribute? // can we get away with a grow attribute?
if (lfsr_data_size(&bptr_.data) == lfsr_data_size(&left_slice_)) { if (lfsr_data_size(&bptr_.data) == lfsr_data_size(&left_slice_)) {
attrs[attr_count++] = LFSR_ATTR( attrs[attr_count++] = LFSR_ATTR(
GROW, -(bid+1 - pos), NULL()); LFSR_TAG_GROW, -(bid+1 - pos), LFSR_DATA_NULL());
// carve bptr? // carve bptr?
} else if (tag_ == LFSR_TAG_BLOCK) { } else if (tag_ == LFSR_TAG_BLOCK) {
@@ -10136,21 +10151,23 @@ static int lfsr_file_carve(lfs_t *lfs, lfsr_file_t *file,
.cksum = bptr_.cksum, .cksum = bptr_.cksum,
}; };
attrs[attr_count++] = LFSR_ATTR( attrs[attr_count++] = LFSR_ATTR(
GROW(SUBMASK(BLOCK)), -(bid+1 - pos), LFSR_TAG_GROW | LFSR_TAG_SUBMASK | LFSR_TAG_BLOCK,
DATA(lfsr_data_frombptr(&bptr__, &buf[buf_size]))); -(bid+1 - pos),
lfsr_data_frombptr(&bptr__, &buf[buf_size]));
buf_size += LFSR_BPTR_DSIZE; buf_size += LFSR_BPTR_DSIZE;
// carve fragment? // carve fragment?
} else { } else {
attrs[attr_count++] = LFSR_ATTR( attrs[attr_count++] = LFSR_ATTR(
GROW(SUBMASK(DATA)), -(bid+1 - pos), LFSR_TAG_GROW | LFSR_TAG_SUBMASK | LFSR_TAG_DATA,
DATA(left_slice_)); -(bid+1 - pos),
left_slice_);
} }
// completely overwriting this entry? // completely overwriting this entry?
} else { } else {
attrs[attr_count++] = LFSR_ATTR( attrs[attr_count++] = LFSR_ATTR(
RM, -weight_, NULL()); LFSR_TAG_RM, -weight_, LFSR_DATA_NULL());
} }
// spans more than one entry? we can't do everything in one commit, // spans more than one entry? we can't do everything in one commit,
@@ -10187,25 +10204,23 @@ static int lfsr_file_carve(lfs_t *lfs, lfsr_file_t *file,
.cksum = bptr_.cksum, .cksum = bptr_.cksum,
}; };
attrs[attr_count+attr_tnuoc++] = LFSR_ATTR( attrs[attr_count+attr_tnuoc++] = LFSR_ATTR(
BLOCK, +(bid+1 - (pos+weight)), LFSR_TAG_BLOCK, +(bid+1 - (pos+weight)),
DATA(lfsr_data_frombptr(&bptr__, &buf[buf_size]))); lfsr_data_frombptr(&bptr__, &buf[buf_size]));
buf_size += LFSR_BPTR_DSIZE; buf_size += LFSR_BPTR_DSIZE;
// copy over becksum since erase-state is still valid // copy over becksum since erase-state is still valid
if (becksum_.cksize != -1) { if (becksum_.cksize != -1) {
attrs[attr_count+attr_tnuoc++] = LFSR_ATTR( attrs[attr_count+attr_tnuoc++] = LFSR_ATTR(
BECKSUM, 0, LFSR_TAG_BECKSUM, 0,
DATA(lfsr_data_fromecksum( lfsr_data_fromecksum(&becksum_, &buf[buf_size]));
&becksum_,
&buf[buf_size])));
buf_size += LFSR_ECKSUM_DSIZE; buf_size += LFSR_ECKSUM_DSIZE;
} }
// carve fragment? // carve fragment?
} else { } else {
attrs[attr_count+attr_tnuoc++] = LFSR_ATTR( attrs[attr_count+attr_tnuoc++] = LFSR_ATTR(
DATA, +(bid+1 - (pos+weight)), LFSR_TAG_DATA, +(bid+1 - (pos+weight)),
DATA(right_slice_)); right_slice_);
} }
} }
@@ -10222,7 +10237,7 @@ static int lfsr_file_carve(lfs_t *lfs, lfsr_file_t *file,
memmove(&attrs[attr_count+1], &attrs[attr_count], memmove(&attrs[attr_count+1], &attrs[attr_count],
attr_tnuoc*sizeof(lfsr_attr_t)); attr_tnuoc*sizeof(lfsr_attr_t));
attrs[attr_count++] = LFSR_ATTR( attrs[attr_count++] = LFSR_ATTR(
GROW, +(weight + delta), NULL()); LFSR_TAG_GROW, +(weight + delta), LFSR_DATA_NULL());
// need a new hole? // need a new hole?
} else if (!bptr || lfsr_data_size(&bptr->data) == 0) { } else if (!bptr || lfsr_data_size(&bptr->data) == 0) {
@@ -10230,7 +10245,7 @@ static int lfsr_file_carve(lfs_t *lfs, lfsr_file_t *file,
memmove(&attrs[attr_count+1], &attrs[attr_count], memmove(&attrs[attr_count+1], &attrs[attr_count],
attr_tnuoc*sizeof(lfsr_attr_t)); attr_tnuoc*sizeof(lfsr_attr_t));
attrs[attr_count++] = LFSR_ATTR( attrs[attr_count++] = LFSR_ATTR(
DATA, +(weight + delta), NULL()); LFSR_TAG_DATA, +(weight + delta), LFSR_DATA_NULL());
// append new fragment? // append new fragment?
} else if (tag == LFSR_TAG_DATA) { } else if (tag == LFSR_TAG_DATA) {
@@ -10238,7 +10253,7 @@ static int lfsr_file_carve(lfs_t *lfs, lfsr_file_t *file,
memmove(&attrs[attr_count+1], &attrs[attr_count], memmove(&attrs[attr_count+1], &attrs[attr_count],
attr_tnuoc*sizeof(lfsr_attr_t)); attr_tnuoc*sizeof(lfsr_attr_t));
attrs[attr_count++] = LFSR_ATTR( attrs[attr_count++] = LFSR_ATTR(
DATA, +(weight + delta), DATA(bptr->data)); LFSR_TAG_DATA, +(weight + delta), bptr->data);
// append a new block? // append a new block?
} else if (tag == LFSR_TAG_BLOCK) { } else if (tag == LFSR_TAG_BLOCK) {
@@ -10246,8 +10261,8 @@ static int lfsr_file_carve(lfs_t *lfs, lfsr_file_t *file,
memmove(&attrs[attr_count+1], &attrs[attr_count], memmove(&attrs[attr_count+1], &attrs[attr_count],
attr_tnuoc*sizeof(lfsr_attr_t)); attr_tnuoc*sizeof(lfsr_attr_t));
attrs[attr_count++] = LFSR_ATTR( attrs[attr_count++] = LFSR_ATTR(
BLOCK, +(weight + delta), LFSR_TAG_BLOCK, +(weight + delta),
DATA(lfsr_data_frombptr(bptr, &buf[buf_size]))); lfsr_data_frombptr(bptr, &buf[buf_size]));
buf_size += LFSR_BPTR_DSIZE; buf_size += LFSR_BPTR_DSIZE;
// append becksum? // append becksum?
@@ -10255,10 +10270,8 @@ static int lfsr_file_carve(lfs_t *lfs, lfsr_file_t *file,
memmove(&attrs[attr_count+1], &attrs[attr_count], memmove(&attrs[attr_count+1], &attrs[attr_count],
attr_tnuoc*sizeof(lfsr_attr_t)); attr_tnuoc*sizeof(lfsr_attr_t));
attrs[attr_count++] = LFSR_ATTR( attrs[attr_count++] = LFSR_ATTR(
BECKSUM, 0, LFSR_TAG_BECKSUM, 0,
DATA(lfsr_data_fromecksum( lfsr_data_fromecksum(becksum, &buf[buf_size]));
becksum,
&buf[buf_size])));
buf_size += LFSR_ECKSUM_DSIZE; buf_size += LFSR_ECKSUM_DSIZE;
} }
@@ -11140,7 +11153,7 @@ int lfsr_file_sync(lfs_t *lfs, lfsr_file_t *file) {
} }
attrs[attr_count++] = LFSR_ATTR( attrs[attr_count++] = LFSR_ATTR(
SUBMASK(REG), 0, DATA(data)); LFSR_TAG_SUBMASK | LFSR_TAG_REG, 0, data);
} }
// commit the file state // commit the file state
@@ -11148,25 +11161,25 @@ int lfsr_file_sync(lfs_t *lfs, lfsr_file_t *file) {
// null? no attr? // null? no attr?
if (lfsr_f_isunflush(file->m.flags) && file->buffer_size == 0) { if (lfsr_f_isunflush(file->m.flags) && file->buffer_size == 0) {
attrs[attr_count++] = LFSR_ATTR( attrs[attr_count++] = LFSR_ATTR(
SUBMASK(RM(STRUCT)), 0, LFSR_TAG_RM | LFSR_TAG_SUBMASK | LFSR_TAG_STRUCT, 0,
NULL()); LFSR_DATA_NULL());
// small file inlined in mdir? // small file inlined in mdir?
} else if (lfsr_f_isunflush(file->m.flags)) { } else if (lfsr_f_isunflush(file->m.flags)) {
attrs[attr_count++] = LFSR_ATTR( attrs[attr_count++] = LFSR_ATTR(
SUBMASK(DATA), 0, LFSR_TAG_SUBMASK | LFSR_TAG_DATA, 0,
BUF(file->buffer, file->buffer_size)); LFSR_DATA_BUF(file->buffer, file->buffer_size));
// bshrub? // bshrub?
} else if (lfsr_bshrub_isbshrub(&file->m.mdir, &file->bshrub)) { } else if (lfsr_bshrub_isbshrub(&file->m.mdir, &file->bshrub)) {
attrs[attr_count++] = LFSR_ATTR( attrs[attr_count++] = LFSR_ATTR(
SUBMASK(SHRUBTRUNK), 0, LFSR_TAG_SUBMASK | LFSR_TAG_SHRUBTRUNK, 0,
SHRUBTRUNK(&file->bshrub_.u.bshrub)); LFSR_DATA_SHRUBTRUNK(&file->bshrub_.u.bshrub));
// btree? // btree?
} else if (lfsr_bshrub_isbtree(&file->m.mdir, &file->bshrub)) { } else if (lfsr_bshrub_isbtree(&file->m.mdir, &file->bshrub)) {
attrs[attr_count++] = LFSR_ATTR( attrs[attr_count++] = LFSR_ATTR(
SUBMASK(BTREE), 0, LFSR_TAG_SUBMASK | LFSR_TAG_BTREE, 0,
DATA(lfsr_data_frombtree( lfsr_data_frombtree(
&file->bshrub.u.btree, &file->bshrub.u.btree,
&buf[buf_size]))); &buf[buf_size]));
buf_size += LFSR_BTREE_DSIZE; buf_size += LFSR_BTREE_DSIZE;
} else { } else {
LFS_UNREACHABLE(); LFS_UNREACHABLE();
tests/test_btree.toml
+378 -215
View File
File diff suppressed because it is too large Load Diff
tests/test_mtree.toml
+129 -125
View File
@@ -26,7 +26,9 @@ code = '''
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS(
LFSR_ATTR(UATTR(i), 0, BUF(&(uint8_t){'a'+(i % 26)}, 1)))) => 0; LFSR_ATTR(
LFSR_TAG_UATTR(i), 0,
LFSR_DATA_BUF(&(uint8_t){'a'+(i % 26)}, 1)))) => 0;
} }
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
@@ -70,7 +72,8 @@ code = '''
lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS(
LFSR_ATTR( LFSR_ATTR(
UATTR(i), 0, BUF(&(uint8_t){'a'+(i % 26)}, 1)))) => 0; LFSR_TAG_UATTR(i), 0,
LFSR_DATA_BUF(&(uint8_t){'a'+(i % 26)}, 1)))) => 0;
} }
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
@@ -111,7 +114,8 @@ code = '''
for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t i = 0; i < N; i++) {
lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS(
LFSR_ATTR( LFSR_ATTR(
UATTR(1), 0, BUF(&(uint8_t){'a'+(i % 26)}, 1)))) => 0; LFSR_TAG_UATTR(1), 0,
LFSR_DATA_BUF(&(uint8_t){'a'+(i % 26)}, 1)))) => 0;
lfsr_data_t data; lfsr_data_t data;
uint8_t buffer[4]; uint8_t buffer[4];
@@ -158,13 +162,13 @@ code = '''
uint8_t buffer[SIZE]; uint8_t buffer[SIZE];
memset(buffer, 'a', SIZE); memset(buffer, 'a', SIZE);
lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS(
LFSR_ATTR(UATTR(1), 0, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_UATTR(1), 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
memset(buffer, 'b', SIZE); memset(buffer, 'b', SIZE);
lfsr_mdir_t mdir; lfsr_mdir_t mdir;
lfsr_mtree_lookup(&lfs, &lfs.mtree, 0, &mdir) => 0; lfsr_mtree_lookup(&lfs, &lfs.mtree, 0, &mdir) => 0;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(UATTR(1), 0, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_UATTR(1), 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mroot to compact // force mroot to compact
lfs.mroot.rbyd.eoff = -1; lfs.mroot.rbyd.eoff = -1;
@@ -228,13 +232,13 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
memset(buffer+1, 'b', SIZE-1); memset(buffer+1, 'b', SIZE-1);
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mroot to compact // force mroot to compact
lfs.mroot.rbyd.eoff = -1; lfs.mroot.rbyd.eoff = -1;
@@ -302,13 +306,13 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
memset(buffer+1, 'b', SIZE-1); memset(buffer+1, 'b', SIZE-1);
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mroot to compact // force mroot to compact
lfs.mroot.rbyd.eoff = -1; lfs.mroot.rbyd.eoff = -1;
@@ -324,7 +328,7 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mdir to compact // force mdir to compact
mdir.rbyd.eoff = -1; mdir.rbyd.eoff = -1;
@@ -411,7 +415,7 @@ code = '''
mdir.rbyd.eoff = -1; mdir.rbyd.eoff = -1;
} }
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(name, 4)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(name, 4)))) => 0;
lfsr_data_t data; lfsr_data_t data;
uint8_t buffer[256]; uint8_t buffer[256];
@@ -501,7 +505,7 @@ code = '''
mdir.rbyd.eoff = -1; mdir.rbyd.eoff = -1;
} }
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(name, 4)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(name, 4)))) => 0;
lfsr_data_t data; lfsr_data_t data;
// double check // double check
@@ -584,13 +588,13 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
memset(buffer+1, 'b', SIZE-1); memset(buffer+1, 'b', SIZE-1);
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mroot to compact // force mroot to compact
lfs.mroot.rbyd.eoff = -1; lfs.mroot.rbyd.eoff = -1;
@@ -606,7 +610,7 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => 0; &mdir, NULL, NULL) => 0;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(RM, -1, NULL()))) => 0; LFSR_ATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0;
// assert mdir was dropped // assert mdir was dropped
assert(lfsr_mtree_weight(&lfs.mtree) == 1*lfsr_mleafweight(&lfs)); assert(lfsr_mtree_weight(&lfs.mtree) == 1*lfsr_mleafweight(&lfs));
@@ -658,13 +662,13 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
memset(buffer+1, 'b', SIZE-1); memset(buffer+1, 'b', SIZE-1);
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mroot to compact // force mroot to compact
lfs.mroot.rbyd.eoff = -1; lfs.mroot.rbyd.eoff = -1;
@@ -682,7 +686,7 @@ code = '''
// force mdir to compact while we're removing // force mdir to compact while we're removing
mdir.rbyd.eoff = -1; mdir.rbyd.eoff = -1;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(RM, -1, NULL()))) => 0; LFSR_ATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0;
// assert mdir was dropped // assert mdir was dropped
assert(lfsr_mtree_weight(&lfs.mtree) == 1*lfsr_mleafweight(&lfs)); assert(lfsr_mtree_weight(&lfs.mtree) == 1*lfsr_mleafweight(&lfs));
@@ -734,13 +738,13 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
memset(buffer+1, 'b', SIZE-1); memset(buffer+1, 'b', SIZE-1);
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// remove an entry, forcing the mdir to be dropped // remove an entry, forcing the mdir to be dropped
memset(buffer+1, 'b', SIZE-1); memset(buffer+1, 'b', SIZE-1);
@@ -750,7 +754,7 @@ code = '''
lfs.mroot.rbyd.eoff = -1; lfs.mroot.rbyd.eoff = -1;
mdir.rbyd.eoff = -1; mdir.rbyd.eoff = -1;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(RM, -1, NULL()))) => 0; LFSR_ATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0;
// assert split/drop worked out // assert split/drop worked out
assert(lfsr_mtree_weight(&lfs.mtree) == 1*lfsr_mleafweight(&lfs)); assert(lfsr_mtree_weight(&lfs.mtree) == 1*lfsr_mleafweight(&lfs));
@@ -802,13 +806,13 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
memset(buffer+1, 'b', SIZE-1); memset(buffer+1, 'b', SIZE-1);
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mroot to compact // force mroot to compact
lfs.mroot.rbyd.eoff = -1; lfs.mroot.rbyd.eoff = -1;
@@ -824,7 +828,7 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// remove an entry, forcing the mdir to be dropped // remove an entry, forcing the mdir to be dropped
memset(buffer+1, 'b', SIZE-1); memset(buffer+1, 'b', SIZE-1);
@@ -833,7 +837,7 @@ code = '''
// force mdir to compact while we're removing // force mdir to compact while we're removing
mdir.rbyd.eoff = -1; mdir.rbyd.eoff = -1;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(RM, -1, NULL()))) => 0; LFSR_ATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0;
// assert split/drop worked out // assert split/drop worked out
assert(lfsr_mtree_weight(&lfs.mtree) == 2*lfsr_mleafweight(&lfs)); assert(lfsr_mtree_weight(&lfs.mtree) == 2*lfsr_mleafweight(&lfs));
@@ -897,13 +901,13 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
memset(buffer+1, 'b', SIZE-1); memset(buffer+1, 'b', SIZE-1);
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mroot to compact // force mroot to compact
lfs.mroot.rbyd.eoff = -1; lfs.mroot.rbyd.eoff = -1;
@@ -919,7 +923,7 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// remove an entry, forcing the mdir to be dropped // remove an entry, forcing the mdir to be dropped
memset(buffer+1, 'c', SIZE-1); memset(buffer+1, 'c', SIZE-1);
@@ -928,7 +932,7 @@ code = '''
// force mdir to compact while we're removing // force mdir to compact while we're removing
mdir.rbyd.eoff = -1; mdir.rbyd.eoff = -1;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(RM, -1, NULL()))) => 0; LFSR_ATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0;
// assert split/drop worked out // assert split/drop worked out
assert(lfsr_mtree_weight(&lfs.mtree) == 2*lfsr_mleafweight(&lfs)); assert(lfsr_mtree_weight(&lfs.mtree) == 2*lfsr_mleafweight(&lfs));
@@ -1019,7 +1023,7 @@ code = '''
mdir.rbyd.eoff = -1; mdir.rbyd.eoff = -1;
} }
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(name, 4)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(name, 4)))) => 0;
lfsr_data_t data; lfsr_data_t data;
// double check // double check
@@ -1048,7 +1052,7 @@ code = '''
mdir.rbyd.eoff = -1; mdir.rbyd.eoff = -1;
} }
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(RM, -1, NULL()))) => 0; LFSR_ATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0;
} }
} }
@@ -1123,13 +1127,13 @@ code = '''
uint8_t buffer[SIZE]; uint8_t buffer[SIZE];
memset(buffer, 'a', SIZE); memset(buffer, 'a', SIZE);
lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS(
LFSR_ATTR(UATTR(1), 0, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_UATTR(1), 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
memset(buffer, 'b', SIZE); memset(buffer, 'b', SIZE);
lfsr_mdir_t mdir; lfsr_mdir_t mdir;
lfsr_mtree_lookup(&lfs, &lfs.mtree, 0, &mdir) => 0; lfsr_mtree_lookup(&lfs, &lfs.mtree, 0, &mdir) => 0;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(UATTR(1), 0, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_UATTR(1), 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mroot to compact // force mroot to compact
lfs.mroot.rbyd.eoff = -1; lfs.mroot.rbyd.eoff = -1;
@@ -1145,10 +1149,10 @@ code = '''
lfsr_mdir_t old_mdir = mdir; lfsr_mdir_t old_mdir = mdir;
mdir.rbyd.eoff = -1; mdir.rbyd.eoff = -1;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, 0, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
mdir.rbyd.eoff = -1; mdir.rbyd.eoff = -1;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, 0, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// assert we relocated // assert we relocated
assert(lfsr_mdir_cmp(&old_mdir, &mdir) != 0); assert(lfsr_mdir_cmp(&old_mdir, &mdir) != 0);
@@ -1212,13 +1216,13 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
memset(buffer+1, 'b', SIZE-1); memset(buffer+1, 'b', SIZE-1);
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mroot to compact // force mroot to compact
lfs.mroot.rbyd.eoff = -1; lfs.mroot.rbyd.eoff = -1;
@@ -1236,10 +1240,10 @@ code = '''
lfsr_mdir_t old_mdir = mdir; lfsr_mdir_t old_mdir = mdir;
mdir.rbyd.eoff = -1; mdir.rbyd.eoff = -1;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, 0, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
mdir.rbyd.eoff = -1; mdir.rbyd.eoff = -1;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, 0, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// assert we relocated // assert we relocated
assert(lfsr_mdir_cmp(&old_mdir, &mdir) != 0); assert(lfsr_mdir_cmp(&old_mdir, &mdir) != 0);
@@ -1307,13 +1311,13 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
memset(buffer+1, 'b', SIZE-1); memset(buffer+1, 'b', SIZE-1);
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mroot to compact // force mroot to compact
lfs.mroot.rbyd.eoff = -1; lfs.mroot.rbyd.eoff = -1;
@@ -1331,10 +1335,10 @@ code = '''
lfsr_mdir_t old_mdir = mdir; lfsr_mdir_t old_mdir = mdir;
mdir.rbyd.eoff = -1; mdir.rbyd.eoff = -1;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, 0, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
mdir.rbyd.eoff = -1; mdir.rbyd.eoff = -1;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, 0, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// assert we relocated // assert we relocated
assert(lfsr_mdir_cmp(&old_mdir, &mdir) != 0); assert(lfsr_mdir_cmp(&old_mdir, &mdir) != 0);
@@ -1402,7 +1406,7 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mroot to compact twice, this should extend the mroot // force mroot to compact twice, this should extend the mroot
lfsr_mdir_t old_mroot = lfs.mroot; lfsr_mdir_t old_mroot = lfs.mroot;
@@ -1458,7 +1462,7 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mroot to compact twice, this should extend the mroot // force mroot to compact twice, this should extend the mroot
lfsr_mdir_t old_mroot = lfs.mroot; lfsr_mdir_t old_mroot = lfs.mroot;
@@ -1525,7 +1529,7 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mroot to compact twice, this should extend the mroot // force mroot to compact twice, this should extend the mroot
lfsr_mdir_t old_mroot = lfs.mroot; lfsr_mdir_t old_mroot = lfs.mroot;
@@ -1587,13 +1591,13 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
memset(buffer+1, 'b', SIZE-1); memset(buffer+1, 'b', SIZE-1);
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mroot to compact // force mroot to compact
lfs.mroot.rbyd.eoff = -1; lfs.mroot.rbyd.eoff = -1;
@@ -1614,10 +1618,10 @@ code = '''
lfsr_mdir_t old_mdir = mdir; lfsr_mdir_t old_mdir = mdir;
mdir.rbyd.eoff = -1; mdir.rbyd.eoff = -1;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, 0, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
mdir.rbyd.eoff = -1; mdir.rbyd.eoff = -1;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, 0, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// assert we relocated // assert we relocated
assert(lfsr_mdir_cmp(&old_mdir, &mdir) != 0); assert(lfsr_mdir_cmp(&old_mdir, &mdir) != 0);
// assert mroot relocated // assert mroot relocated
@@ -1687,13 +1691,13 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
memset(buffer+1, 'b', SIZE-1); memset(buffer+1, 'b', SIZE-1);
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mroot to compact // force mroot to compact
lfs.mroot.rbyd.eoff = -1; lfs.mroot.rbyd.eoff = -1;
@@ -1709,7 +1713,7 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// setup mroot to compact and relocate on next commit // setup mroot to compact and relocate on next commit
lfs.mroot.rbyd.eoff = -1; lfs.mroot.rbyd.eoff = -1;
@@ -1718,10 +1722,10 @@ code = '''
lfsr_mdir_t old_mdir = mdir; lfsr_mdir_t old_mdir = mdir;
mdir.rbyd.eoff = -1; mdir.rbyd.eoff = -1;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, 0, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
mdir.rbyd.eoff = -1; mdir.rbyd.eoff = -1;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, 0, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// assert we relocated // assert we relocated
assert(lfsr_mdir_cmp(&old_mdir, &mdir) != 0); assert(lfsr_mdir_cmp(&old_mdir, &mdir) != 0);
// assert mroot relocated // assert mroot relocated
@@ -1803,13 +1807,13 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
memset(buffer+1, 'b', SIZE-1); memset(buffer+1, 'b', SIZE-1);
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mroot to compact // force mroot to compact
lfs.mroot.rbyd.eoff = -1; lfs.mroot.rbyd.eoff = -1;
@@ -1830,11 +1834,11 @@ code = '''
// force mdir to compact twice, this should relocate // force mdir to compact twice, this should relocate
mdir.rbyd.eoff = -1; mdir.rbyd.eoff = -1;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, 0, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mdir to compact while we're removing // force mdir to compact while we're removing
mdir.rbyd.eoff = -1; mdir.rbyd.eoff = -1;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(RM, -1, NULL()))) => 0; LFSR_ATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0;
// assert mroot relocated // assert mroot relocated
assert(lfsr_mdir_cmp(&old_mroot, &lfs.mroot) != 0); assert(lfsr_mdir_cmp(&old_mroot, &lfs.mroot) != 0);
@@ -1891,13 +1895,13 @@ code = '''
uint8_t buffer[SIZE]; uint8_t buffer[SIZE];
memset(buffer, 'a', SIZE); memset(buffer, 'a', SIZE);
lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS(
LFSR_ATTR(UATTR(1), 0, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_UATTR(1), 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
memset(buffer, 'b', SIZE); memset(buffer, 'b', SIZE);
lfsr_mdir_t mdir; lfsr_mdir_t mdir;
lfsr_mtree_lookup(&lfs, &lfs.mtree, 0, &mdir) => 0; lfsr_mtree_lookup(&lfs, &lfs.mtree, 0, &mdir) => 0;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(UATTR(1), 0, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_UATTR(1), 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mroot to compact, this should both uninline and relocate // force mroot to compact, this should both uninline and relocate
lfsr_mdir_t old_mroot = lfs.mroot; lfsr_mdir_t old_mroot = lfs.mroot;
@@ -1971,13 +1975,13 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
memset(buffer+1, 'b', SIZE-1); memset(buffer+1, 'b', SIZE-1);
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mroot to compact, this should both split and relocate // force mroot to compact, this should both split and relocate
lfsr_mdir_t old_mroot = lfs.mroot; lfsr_mdir_t old_mroot = lfs.mroot;
@@ -2077,7 +2081,7 @@ code = '''
mdir.rbyd.eoff = -1; mdir.rbyd.eoff = -1;
} }
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(name, 4)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(name, 4)))) => 0;
lfsr_data_t data; lfsr_data_t data;
// double check // double check
@@ -2107,7 +2111,7 @@ code = '''
// we can't really change metadata names, but commits still // we can't really change metadata names, but commits still
// trigger writes to the mdir // trigger writes to the mdir
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, 0, BUF(name, 4)))) => 0; LFSR_ATTR(LFSR_TAG_REG, 0, LFSR_DATA_BUF(name, 4)))) => 0;
lfsr_data_t data; lfsr_data_t data;
// double check // double check
@@ -2136,7 +2140,7 @@ code = '''
mdir.rbyd.eoff = -1; mdir.rbyd.eoff = -1;
} }
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(RM, -1, NULL()))) => 0; LFSR_ATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0;
} }
} }
@@ -2206,14 +2210,14 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "a", 1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "a", 1,
&left.mdir, NULL, NULL) => LFS_ERR_NOENT; &left.mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &left.mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &left.mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF("\0a", 2)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0a", 2)))) => 0;
lfsr_opened_add(&lfs, &left); lfsr_opened_add(&lfs, &left);
lfsr_opened_t right = {.type=0}; lfsr_opened_t right = {.type=0};
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "c", 1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "c", 1,
&right.mdir, NULL, NULL) => LFS_ERR_NOENT; &right.mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &right.mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &right.mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF("\0c", 2)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0c", 2)))) => 0;
lfsr_opened_add(&lfs, &right); lfsr_opened_add(&lfs, &right);
// insert a new entry, this should update our neighbors // insert a new entry, this should update our neighbors
@@ -2221,7 +2225,7 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "b", 1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "b", 1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF("\0b", 2)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0b", 2)))) => 0;
lfsr_data_t data; lfsr_data_t data;
// assert our entry was created // assert our entry was created
@@ -2262,14 +2266,14 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "a", 1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "a", 1,
&left.mdir, NULL, NULL) => LFS_ERR_NOENT; &left.mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &left.mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &left.mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF("\0a", 2)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0a", 2)))) => 0;
lfsr_opened_add(&lfs, &left); lfsr_opened_add(&lfs, &left);
lfsr_opened_t right = {.type=0}; lfsr_opened_t right = {.type=0};
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "b", 1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "b", 1,
&right.mdir, NULL, NULL) => LFS_ERR_NOENT; &right.mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &right.mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &right.mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF("\0b", 2)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0b", 2)))) => 0;
lfsr_opened_add(&lfs, &right); lfsr_opened_add(&lfs, &right);
// try removing left neighbor // try removing left neighbor
@@ -2277,7 +2281,7 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "a", 1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "a", 1,
&mdir, NULL, NULL) => 0; &mdir, NULL, NULL) => 0;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(RM, -1, NULL()))) => 0; LFSR_ATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0;
// assert neighbor was removed // assert neighbor was removed
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "a", 1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "a", 1,
@@ -2309,14 +2313,14 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "a", 1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "a", 1,
&left.mdir, NULL, NULL) => LFS_ERR_NOENT; &left.mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &left.mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &left.mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF("\0a", 2)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0a", 2)))) => 0;
lfsr_opened_add(&lfs, &left); lfsr_opened_add(&lfs, &left);
lfsr_opened_t right = {.type=0}; lfsr_opened_t right = {.type=0};
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "b", 1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "b", 1,
&right.mdir, NULL, NULL) => LFS_ERR_NOENT; &right.mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &right.mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &right.mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF("\0b", 2)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0b", 2)))) => 0;
lfsr_opened_add(&lfs, &right); lfsr_opened_add(&lfs, &right);
// try removing right neighbor // try removing right neighbor
@@ -2324,7 +2328,7 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "b", 1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "b", 1,
&mdir, NULL, NULL) => 0; &mdir, NULL, NULL) => 0;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(RM, -1, NULL()))) => 0; LFSR_ATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0;
// assert neighbor was removed // assert neighbor was removed
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "b", 1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "b", 1,
@@ -2358,14 +2362,14 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "a", 1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "a", 1,
&left.mdir, NULL, NULL) => LFS_ERR_NOENT; &left.mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &left.mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &left.mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF("\0a", 2)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0a", 2)))) => 0;
lfsr_opened_add(&lfs, &left); lfsr_opened_add(&lfs, &left);
lfsr_opened_t right = {.type=0}; lfsr_opened_t right = {.type=0};
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "d", 1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "d", 1,
&right.mdir, NULL, NULL) => LFS_ERR_NOENT; &right.mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &right.mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &right.mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF("\0d", 2)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0d", 2)))) => 0;
lfsr_opened_add(&lfs, &right); lfsr_opened_add(&lfs, &right);
// create 2 large entries that needs to be uninlined and split // create 2 large entries that needs to be uninlined and split
@@ -2376,13 +2380,13 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
memset(buffer+1, 'c', SIZE-1); memset(buffer+1, 'c', SIZE-1);
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mroot to compact // force mroot to compact
lfs.mroot.rbyd.eoff = -1; lfs.mroot.rbyd.eoff = -1;
@@ -2427,14 +2431,14 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "a", 1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "a", 1,
&left.mdir, NULL, NULL) => LFS_ERR_NOENT; &left.mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &left.mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &left.mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF("\0a", 2)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0a", 2)))) => 0;
lfsr_opened_add(&lfs, &left); lfsr_opened_add(&lfs, &left);
lfsr_opened_t right = {.type=0}; lfsr_opened_t right = {.type=0};
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "e", 1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "e", 1,
&right.mdir, NULL, NULL) => LFS_ERR_NOENT; &right.mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &right.mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &right.mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF("\0e", 2)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0e", 2)))) => 0;
lfsr_opened_add(&lfs, &right); lfsr_opened_add(&lfs, &right);
// create 2 large entries that needs to be uninlined and split // create 2 large entries that needs to be uninlined and split
@@ -2445,13 +2449,13 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
memset(buffer+1, 'd', SIZE-1); memset(buffer+1, 'd', SIZE-1);
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mroot to compact // force mroot to compact
lfs.mroot.rbyd.eoff = -1; lfs.mroot.rbyd.eoff = -1;
@@ -2462,7 +2466,7 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mdir to compact // force mdir to compact
mdir.rbyd.eoff = -1; mdir.rbyd.eoff = -1;
@@ -2507,14 +2511,14 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "a", 1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "a", 1,
&left.mdir, NULL, NULL) => LFS_ERR_NOENT; &left.mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &left.mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &left.mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF("\0a", 2)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0a", 2)))) => 0;
lfsr_opened_add(&lfs, &left); lfsr_opened_add(&lfs, &left);
lfsr_opened_t right = {.type=0}; lfsr_opened_t right = {.type=0};
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "b", 1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "b", 1,
&right.mdir, NULL, NULL) => LFS_ERR_NOENT; &right.mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &right.mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &right.mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF("\0b", 2)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0b", 2)))) => 0;
lfsr_opened_add(&lfs, &right); lfsr_opened_add(&lfs, &right);
// force mroot to compact twice, this should extend the mroot // force mroot to compact twice, this should extend the mroot
@@ -2563,14 +2567,14 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "a", 1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "a", 1,
&left.mdir, NULL, NULL) => LFS_ERR_NOENT; &left.mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &left.mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &left.mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF("\0a", 2)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0a", 2)))) => 0;
lfsr_opened_add(&lfs, &left); lfsr_opened_add(&lfs, &left);
lfsr_opened_t right = {.type=0}; lfsr_opened_t right = {.type=0};
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "d", 1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "d", 1,
&right.mdir, NULL, NULL) => LFS_ERR_NOENT; &right.mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &right.mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &right.mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF("\0d", 2)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0d", 2)))) => 0;
lfsr_opened_add(&lfs, &right); lfsr_opened_add(&lfs, &right);
// create 2 large entries that needs to be uninlined and split // create 2 large entries that needs to be uninlined and split
@@ -2581,13 +2585,13 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
memset(buffer+1, 'c', SIZE-1); memset(buffer+1, 'c', SIZE-1);
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mroot to compact // force mroot to compact
lfs.mroot.rbyd.eoff = -1; lfs.mroot.rbyd.eoff = -1;
@@ -2605,10 +2609,10 @@ code = '''
lfsr_mdir_t old_mdir = mdir; lfsr_mdir_t old_mdir = mdir;
mdir.rbyd.eoff = -1; mdir.rbyd.eoff = -1;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, 0, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
mdir.rbyd.eoff = -1; mdir.rbyd.eoff = -1;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, 0, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// assert we relocated // assert we relocated
assert(lfsr_mdir_cmp(&old_mdir, &mdir) != 0); assert(lfsr_mdir_cmp(&old_mdir, &mdir) != 0);
@@ -2648,14 +2652,14 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "a", 1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "a", 1,
&left.mdir, NULL, NULL) => LFS_ERR_NOENT; &left.mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &left.mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &left.mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF("\0a", 2)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0a", 2)))) => 0;
lfsr_opened_add(&lfs, &left); lfsr_opened_add(&lfs, &left);
lfsr_opened_t right = {.type=0}; lfsr_opened_t right = {.type=0};
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "d", 1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "d", 1,
&right.mdir, NULL, NULL) => LFS_ERR_NOENT; &right.mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &right.mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &right.mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF("\0d", 2)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0d", 2)))) => 0;
lfsr_opened_add(&lfs, &right); lfsr_opened_add(&lfs, &right);
// create 2 large entries that needs to be uninlined and split // create 2 large entries that needs to be uninlined and split
@@ -2666,13 +2670,13 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
memset(buffer+1, 'c', SIZE-1); memset(buffer+1, 'c', SIZE-1);
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mroot to compact // force mroot to compact
lfs.mroot.rbyd.eoff = -1; lfs.mroot.rbyd.eoff = -1;
@@ -2690,10 +2694,10 @@ code = '''
lfsr_mdir_t old_mdir = mdir; lfsr_mdir_t old_mdir = mdir;
mdir.rbyd.eoff = -1; mdir.rbyd.eoff = -1;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, 0, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
mdir.rbyd.eoff = -1; mdir.rbyd.eoff = -1;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, 0, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// assert we relocated // assert we relocated
assert(lfsr_mdir_cmp(&old_mdir, &mdir) != 0); assert(lfsr_mdir_cmp(&old_mdir, &mdir) != 0);
@@ -2731,14 +2735,14 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "a", 1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "a", 1,
&left.mdir, NULL, NULL) => LFS_ERR_NOENT; &left.mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &left.mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &left.mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF("\0a", 2)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0a", 2)))) => 0;
lfsr_opened_add(&lfs, &left); lfsr_opened_add(&lfs, &left);
lfsr_opened_t right = {.type=0}; lfsr_opened_t right = {.type=0};
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "f", 1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "f", 1,
&right.mdir, NULL, NULL) => LFS_ERR_NOENT; &right.mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &right.mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &right.mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF("\0f", 2)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0f", 2)))) => 0;
lfsr_opened_add(&lfs, &right); lfsr_opened_add(&lfs, &right);
// create 2 large entries that needs to be uninlined and split // create 2 large entries that needs to be uninlined and split
@@ -2749,13 +2753,13 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
memset(buffer+1, 'e', SIZE-1); memset(buffer+1, 'e', SIZE-1);
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mroot to compact // force mroot to compact
lfs.mroot.rbyd.eoff = -1; lfs.mroot.rbyd.eoff = -1;
@@ -2766,7 +2770,7 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mdir to compact // force mdir to compact
mdir.rbyd.eoff = -1; mdir.rbyd.eoff = -1;
@@ -2782,7 +2786,7 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mdir to compact // force mdir to compact
mdir.rbyd.eoff = -1; mdir.rbyd.eoff = -1;
@@ -2827,14 +2831,14 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "a", 1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "a", 1,
&left.mdir, NULL, NULL) => LFS_ERR_NOENT; &left.mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &left.mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &left.mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF("\0a", 2)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0a", 2)))) => 0;
lfsr_opened_add(&lfs, &left); lfsr_opened_add(&lfs, &left);
lfsr_opened_t right = {.type=0}; lfsr_opened_t right = {.type=0};
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "e", 1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "e", 1,
&right.mdir, NULL, NULL) => LFS_ERR_NOENT; &right.mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &right.mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &right.mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF("\0e", 2)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0e", 2)))) => 0;
lfsr_opened_add(&lfs, &right); lfsr_opened_add(&lfs, &right);
// create 2 large entries that needs to be uninlined and split // create 2 large entries that needs to be uninlined and split
@@ -2845,13 +2849,13 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
memset(buffer+1, 'd', SIZE-1); memset(buffer+1, 'd', SIZE-1);
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mroot to compact // force mroot to compact
lfs.mroot.rbyd.eoff = -1; lfs.mroot.rbyd.eoff = -1;
@@ -2862,7 +2866,7 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mdir to compact // force mdir to compact
mdir.rbyd.eoff = -1; mdir.rbyd.eoff = -1;
@@ -2875,7 +2879,7 @@ code = '''
// now remove the middle entry, forcing a drop // now remove the middle entry, forcing a drop
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(RM, -1, NULL()))) => 0; LFSR_ATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0;
// assert mdir was dropped correctly // assert mdir was dropped correctly
assert(lfsr_mtree_weight(&lfs.mtree) == 2*lfsr_mleafweight(&lfs)); assert(lfsr_mtree_weight(&lfs.mtree) == 2*lfsr_mleafweight(&lfs));
@@ -2919,7 +2923,7 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "a", 1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "a", 1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF("\0a", 2)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0a", 2)))) => 0;
// test that we can traverse the tree, keeping track of all blocks we see // test that we can traverse the tree, keeping track of all blocks we see
uint8_t *seen = malloc((BLOCK_COUNT+7)/8); uint8_t *seen = malloc((BLOCK_COUNT+7)/8);
@@ -3018,13 +3022,13 @@ code = '''
uint8_t buffer[SIZE]; uint8_t buffer[SIZE];
memset(buffer, 'a', SIZE); memset(buffer, 'a', SIZE);
lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS(
LFSR_ATTR(UATTR(1), 0, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_UATTR(1), 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
memset(buffer, 'b', SIZE); memset(buffer, 'b', SIZE);
lfsr_mdir_t mdir; lfsr_mdir_t mdir;
lfsr_mtree_lookup(&lfs, &lfs.mtree, 0, &mdir) => 0; lfsr_mtree_lookup(&lfs, &lfs.mtree, 0, &mdir) => 0;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(UATTR(1), 0, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_UATTR(1), 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mroot to compact // force mroot to compact
lfs.mroot.rbyd.eoff = -1; lfs.mroot.rbyd.eoff = -1;
@@ -3152,13 +3156,13 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
memset(buffer+1, 'b', SIZE-1); memset(buffer+1, 'b', SIZE-1);
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mroot to compact // force mroot to compact
lfs.mroot.rbyd.eoff = -1; lfs.mroot.rbyd.eoff = -1;
@@ -3290,13 +3294,13 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
memset(buffer+1, 'b', SIZE-1); memset(buffer+1, 'b', SIZE-1);
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mroot to compact // force mroot to compact
lfs.mroot.rbyd.eoff = -1; lfs.mroot.rbyd.eoff = -1;
@@ -3312,7 +3316,7 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mdir to compact // force mdir to compact
mdir.rbyd.eoff = -1; mdir.rbyd.eoff = -1;
@@ -3452,7 +3456,7 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "a", 1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, "a", 1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF("\0a", 2)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0a", 2)))) => 0;
// force mroot to compact twice, this should extend the mroot // force mroot to compact twice, this should extend the mroot
lfsr_mdir_t old_mroot = lfs.mroot; lfsr_mdir_t old_mroot = lfs.mroot;
@@ -3570,7 +3574,7 @@ code = '''
mdir.rbyd.eoff = -1; mdir.rbyd.eoff = -1;
} }
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(name, 4)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(name, 4)))) => 0;
lfsr_data_t data; lfsr_data_t data;
uint8_t buffer[256]; uint8_t buffer[256];
@@ -3718,7 +3722,7 @@ code = '''
mdir.rbyd.eoff = -1; mdir.rbyd.eoff = -1;
} }
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(name, 4)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(name, 4)))) => 0;
lfsr_data_t data; lfsr_data_t data;
// double check // double check
@@ -3851,8 +3855,8 @@ code = '''
lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS(
LFSR_ATTR( LFSR_ATTR(
MROOT, 0, LFSR_TAG_MROOT, 0,
FROMMPTR(&LFSR_MPTR_MROOTANCHOR())))) => 0; LFSR_DATA_FROMMPTR(&LFSR_MPTR_MROOTANCHOR())))) => 0;
// technically, cycle detection only needs to work when we're validating // technically, cycle detection only needs to work when we're validating
lfsr_traversal_t traversal = LFSR_TRAVERSAL(LFSR_TRAVERSAL_VALIDATE); lfsr_traversal_t traversal = LFSR_TRAVERSAL(LFSR_TRAVERSAL_VALIDATE);
@@ -3930,7 +3934,7 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mroot to compact twice, this should extend the mroot // force mroot to compact twice, this should extend the mroot
lfsr_mdir_t old_mroot = lfs.mroot; lfsr_mdir_t old_mroot = lfs.mroot;
@@ -3986,7 +3990,7 @@ code = '''
lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1, lfsr_mtree_namelookup(&lfs, &lfs.mtree, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => LFS_ERR_NOENT; &mdir, NULL, NULL) => LFS_ERR_NOENT;
lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS(
LFSR_ATTR(REG, +1, BUF(buffer, SIZE)))) => 0; LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0;
// force mroot to compact twice, this should extend the mroot // force mroot to compact twice, this should extend the mroot
lfsr_mdir_t old_mroot = lfs.mroot; lfsr_mdir_t old_mroot = lfs.mroot;
tests/test_rbyd.toml
+1713 -669
View File
File diff suppressed because it is too large Load Diff