From d155750f1488e3ef96c78e2b0f18376bb4a07c6d Mon Sep 17 00:00:00 2001 From: Christopher Haster Date: Fri, 21 Jun 2024 13:07:08 -0500 Subject: [PATCH] t: Renamed LFS_T_CKMETADATA -> LFS_T_CKMETA Have you ever tried to type "metadata"? So much left hand motion while the right hand sits there with nothing to do. --- lfs.c | 8 +- lfs.h | 21 ++-- tests/test_alloc.toml | 12 +- tests/test_mtree.toml | 30 ++--- tests/test_traversal.toml | 228 +++++++++++++++++++------------------- 5 files changed, 149 insertions(+), 150 deletions(-) diff --git a/lfs.c b/lfs.c index 806a4326..673c05d3 100644 --- a/lfs.c +++ b/lfs.c @@ -7832,8 +7832,8 @@ static inline bool lfsr_t_iscompact(uint32_t flags) { return flags & LFS_T_COMPACT; } -static inline bool lfsr_t_isckmetadata(uint32_t flags) { - return flags & LFS_T_CKMETADATA; +static inline bool lfsr_t_isckmeta(uint32_t flags) { + return flags & LFS_T_CKMETA; } static inline bool lfsr_t_isckdata(uint32_t flags) { @@ -8180,7 +8180,7 @@ static int lfsr_mtree_traverse(lfs_t *lfs, lfsr_mtraversal_t *mt, } // validate btree nodes? note mdirs are already validated - if (lfsr_t_isckmetadata(mt->o.flags) + if (lfsr_t_isckmeta(mt->o.flags) && mtinfo->tag == LFSR_TAG_BRANCH) { err = lfsr_rbyd_fetchck(lfs, &mtinfo->u.rbyd, mtinfo->u.rbyd.blocks[0], mtinfo->u.rbyd.trunk, @@ -8684,7 +8684,7 @@ static int lfsr_mountinited(lfs_t *lfs) { // mdirs are valid if we haven't checked the btree inner nodes at // least once? lfsr_mtraversal_t mt = LFSR_MTRAVERSAL( - LFS_T_MTREEONLY | LFS_T_CKMETADATA); + LFS_T_MTREEONLY | LFS_T_CKMETA); while (true) { lfsr_mtinfo_t mtinfo; int err = lfsr_mtree_traverse(lfs, &mt, &mtinfo); diff --git a/lfs.h b/lfs.h index 3d38ffa8..87489788 100644 --- a/lfs.h +++ b/lfs.h @@ -168,20 +168,19 @@ enum lfs_btype { // Traversal flags enum lfs_traversal_flags { // traversal open flags - LFS_T_MTREEONLY = 0x0008, // Only traverse the mtree - LFS_T_EXCL = 0x0010, // Terminate if filesystem modified - LFS_T_MKCONSISTENT = 0x0020, // Make the filesystem consistent - LFS_T_LOOKAHEAD = 0x0040, // Populate lookahead buffer - LFS_T_COMPACT = 0x0080, // Compact metadata logs - LFS_T_CKMETADATA = 0x0100, // Check metadata checksums - LFS_T_CKDATA = 0x0200, // Check data checksums + LFS_T_MTREEONLY = 0x0008, // Only traverse the mtree + LFS_T_EXCL = 0x0010, // Terminate if filesystem modified + LFS_T_MKCONSISTENT = 0x0020, // Make the filesystem consistent + LFS_T_LOOKAHEAD = 0x0040, // Populate lookahead buffer + LFS_T_COMPACT = 0x0080, // Compact metadata logs + LFS_T_CKMETA = 0x0100, // Check metadata checksums + LFS_T_CKDATA = 0x0200, // Check data checksums // TODO -// LFS_T_REPAIRMETADATA = 0x0400, // Repair metadata blocks -// LFS_T_REPAIRDATA = 0x0800, // Repair data blocks +// LFS_T_REPAIRMETA = 0x0400, // Repair metadata blocks +// LFS_T_REPAIRDATA = 0x0800, // Repair data blocks // internally used flags - LFS_F_DIRTY = 0x1000, // Filesystem has been modified - //LFS_F_ZOMBIE = 0x8000, // File has been removed + LFS_F_DIRTY = 0x1000, // Filesystem has been modified }; diff --git a/tests/test_alloc.toml b/tests/test_alloc.toml index 77d79031..261df6f2 100644 --- a/tests/test_alloc.toml +++ b/tests/test_alloc.toml @@ -105,7 +105,7 @@ code = ''' # clobber tests test that our traversal algorithm works [cases.test_alloc_clobber_dirs] defines.N = [1, 2, 4, 8, 16, 32, 64, 128, 256, 512] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.REMOUNT = [false, true] in = 'lfs.c' code = ''' @@ -164,7 +164,7 @@ code = ''' memset(seen, 0, (BLOCK_COUNT+7)/8); lfsr_mtraversal_t mt = LFSR_MTRAVERSAL( - (CKMETADATA) ? LFS_T_CKMETADATA : 0); + (CKMETA) ? LFS_T_CKMETA : 0); for (lfs_block_t i = 0;; i++) { // a bit hacky, but this catches infinite loops assert(i < 2*BLOCK_COUNT); @@ -268,7 +268,7 @@ defines.SIZE = [ '2*BLOCK_SIZE', '8*BLOCK_SIZE', ] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.REMOUNT = [false, true] in = 'lfs.c' if = '(SIZE*N)/BLOCK_SIZE <= 32' @@ -332,7 +332,7 @@ code = ''' memset(seen, 0, (BLOCK_COUNT+7)/8); lfsr_mtraversal_t mt = LFSR_MTRAVERSAL( - ((CKMETADATA) ? LFS_T_CKMETADATA : 0)); + ((CKMETA) ? LFS_T_CKMETA : 0)); for (lfs_block_t i = 0;; i++) { // a bit hacky, but this catches infinite loops assert(i < 2*BLOCK_COUNT); @@ -441,7 +441,7 @@ defines.SIZE = [ '2*BLOCK_SIZE', '8*BLOCK_SIZE', ] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] in = 'lfs.c' if = '(SIZE*N)/BLOCK_SIZE <= 32' code = ''' @@ -486,7 +486,7 @@ code = ''' memset(seen, 0, (BLOCK_COUNT+7)/8); lfsr_mtraversal_t mt = LFSR_MTRAVERSAL( - ((CKMETADATA) ? LFS_T_CKMETADATA : 0)); + ((CKMETA) ? LFS_T_CKMETA : 0)); for (lfs_block_t i = 0;; i++) { // a bit hacky, but this catches infinite loops assert(i < 2*BLOCK_COUNT); diff --git a/tests/test_mtree.toml b/tests/test_mtree.toml index 431078c0..c75e8dd0 100644 --- a/tests/test_mtree.toml +++ b/tests/test_mtree.toml @@ -3342,7 +3342,7 @@ code = ''' # test specific corner cases [cases.test_mtree_traversal] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] in = 'lfs.c' code = ''' lfs_t lfs; @@ -3364,7 +3364,7 @@ code = ''' lfsr_mtraversal_t mt = LFSR_MTRAVERSAL( LFS_T_MTREEONLY - | ((CKMETADATA) ? LFS_T_CKMETADATA : 0)); + | ((CKMETA) ? LFS_T_CKMETA : 0)); for (lfs_block_t i = 0;; i++) { // a bit hacky, but this catches infinite loops assert(i < 2*BLOCK_COUNT); @@ -3441,7 +3441,7 @@ code = ''' ''' [cases.test_mtree_traversal_uninline] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] # this should be set so only one entry can fit in a metadata block defines.SIZE = 'BLOCK_SIZE / 4' in = 'lfs.c' @@ -3479,7 +3479,7 @@ code = ''' lfsr_mtraversal_t mt = LFSR_MTRAVERSAL( LFS_T_MTREEONLY - | ((CKMETADATA) ? LFS_T_CKMETADATA : 0)); + | ((CKMETA) ? LFS_T_CKMETA : 0)); for (lfs_block_t i = 0;; i++) { // a bit hacky, but this catches infinite loops assert(i < 2*BLOCK_COUNT); @@ -3572,7 +3572,7 @@ code = ''' ''' [cases.test_mtree_traversal_uninline_split] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] # this should be set so only one entry can fit in a metadata block defines.SIZE = 'BLOCK_SIZE / 4' in = 'lfs.c' @@ -3616,7 +3616,7 @@ code = ''' lfsr_mtraversal_t mt = LFSR_MTRAVERSAL( LFS_T_MTREEONLY - | ((CKMETADATA) ? LFS_T_CKMETADATA : 0)); + | ((CKMETA) ? LFS_T_CKMETA : 0)); for (lfs_block_t i = 0;; i++) { // a bit hacky, but this catches infinite loops assert(i < 2*BLOCK_COUNT); @@ -3713,7 +3713,7 @@ code = ''' ''' [cases.test_mtree_traversal_split] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] # this should be set so only one entry can fit in a metadata block defines.SIZE = 'BLOCK_SIZE / 4' in = 'lfs.c' @@ -3774,7 +3774,7 @@ code = ''' lfsr_mtraversal_t mt = LFSR_MTRAVERSAL( LFS_T_MTREEONLY - | ((CKMETADATA) ? LFS_T_CKMETADATA : 0)); + | ((CKMETA) ? LFS_T_CKMETA : 0)); for (lfs_block_t i = 0;; i++) { // a bit hacky, but this catches infinite loops assert(i < 2*BLOCK_COUNT); @@ -3883,7 +3883,7 @@ code = ''' ''' [cases.test_mtree_traversal_extend] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] # make it so blocks relocate every two compacts defines.BLOCK_RECYCLES = 0 in = 'lfs.c' @@ -3916,7 +3916,7 @@ code = ''' lfsr_mtraversal_t mt = LFSR_MTRAVERSAL( LFS_T_MTREEONLY - | ((CKMETADATA) ? LFS_T_CKMETADATA : 0)); + | ((CKMETA) ? LFS_T_CKMETA : 0)); for (lfs_block_t i = 0;; i++) { // a bit hacky, but this catches infinite loops assert(i < 2*BLOCK_COUNT); @@ -3995,7 +3995,7 @@ code = ''' # larger traversal tests [cases.test_mtree_traversal_many] defines.N = [5, 10, 20, 40, 80, 160, 320] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.FORCE_COMPACTION = [false, true] in = 'lfs.c' code = ''' @@ -4033,7 +4033,7 @@ code = ''' lfsr_mtraversal_t mt = LFSR_MTRAVERSAL( LFS_T_MTREEONLY - | ((CKMETADATA) ? LFS_T_CKMETADATA : 0)); + | ((CKMETA) ? LFS_T_CKMETA : 0)); for (lfs_block_t i = 0;; i++) { // a bit hacky, but this catches infinite loops assert(i < 2*BLOCK_COUNT); @@ -4134,7 +4134,7 @@ code = ''' [cases.test_mtree_traversal_fuzz] defines.N = [5, 10, 20, 40, 80, 160] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.FORCE_COMPACTION = [false, true] defines.SEED = 'range(100)' fuzz = 'SEED' @@ -4192,7 +4192,7 @@ code = ''' lfsr_mtraversal_t mt = LFSR_MTRAVERSAL( LFS_T_MTREEONLY - | ((CKMETADATA) ? LFS_T_CKMETADATA : 0)); + | ((CKMETA) ? LFS_T_CKMETA : 0)); for (lfs_block_t i = 0;; i++) { // a bit hacky, but this catches infinite loops assert(i < 2*BLOCK_COUNT); @@ -4314,7 +4314,7 @@ code = ''' // technically, cycle detection only needs to work when we're validating lfsr_mtraversal_t mt = LFSR_MTRAVERSAL( - LFS_T_MTREEONLY | LFS_T_CKMETADATA); + LFS_T_MTREEONLY | LFS_T_CKMETA); for (lfs_block_t i = 0;; i++) { // assert that we detect the cycle in a reasonable number of iterations assert(i < 2*BLOCK_COUNT); diff --git a/tests/test_traversal.toml b/tests/test_traversal.toml index 97832785..6af9b95e 100644 --- a/tests/test_traversal.toml +++ b/tests/test_traversal.toml @@ -9,7 +9,7 @@ after = [ # a simple traversal test [cases.test_traversal_simple] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] code = ''' @@ -20,7 +20,7 @@ code = ''' // try traversing lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; struct lfs_tinfo tinfo; @@ -38,7 +38,7 @@ code = ''' # can we rewind? [cases.test_traversal_rewind] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] code = ''' @@ -49,7 +49,7 @@ code = ''' // try traversing lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; struct lfs_tinfo tinfo; @@ -76,7 +76,7 @@ code = ''' # test that we don't get extra anything after end of traversal [cases.test_traversal_idempotent] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] code = ''' @@ -87,7 +87,7 @@ code = ''' // try traversing lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; struct lfs_tinfo tinfo; @@ -116,7 +116,7 @@ code = ''' # some simple traversal tests with clobbering [cases.test_traversal_clobber_dirs] defines.N = [1, 2, 4, 8, 16, 32, 64, 128, 256, 512] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] code = ''' lfs_t lfs; @@ -136,7 +136,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0)) => 0; for (lfs_block_t i = 0;; i++) { // a bit hacky, but this catches infinite loops @@ -225,7 +225,7 @@ defines.SIZE = [ '2*BLOCK_SIZE', '8*BLOCK_SIZE', ] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] if = '(SIZE*N)/BLOCK_SIZE <= 32' code = ''' @@ -257,7 +257,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0)) => 0; for (lfs_block_t i = 0;; i++) { // a bit hacky, but this catches infinite loops @@ -340,7 +340,7 @@ defines.SIZE = [ '2*BLOCK_SIZE', '8*BLOCK_SIZE', ] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] if = '(SIZE*N)/BLOCK_SIZE <= 32' code = ''' @@ -371,7 +371,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0)) => 0; for (lfs_block_t i = 0;; i++) { // a bit hacky, but this catches infinite loops @@ -467,7 +467,7 @@ code = ''' # a bit more aggressive rewind tests [cases.test_traversal_rewind_clobber_dirs] defines.N = [1, 2, 4, 8, 16, 32, 64, 128, 256, 512] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] code = ''' lfs_t lfs; @@ -487,7 +487,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0)) => 0; lfs_block_t r = 0; for (lfs_block_t i = 0;; i++) { @@ -585,7 +585,7 @@ defines.SIZE = [ '2*BLOCK_SIZE', '8*BLOCK_SIZE', ] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] if = '(SIZE*N)/BLOCK_SIZE <= 32' code = ''' @@ -617,7 +617,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0)) => 0; lfs_block_t r = 0; for (lfs_block_t i = 0;; i++) { @@ -709,7 +709,7 @@ defines.SIZE = [ '2*BLOCK_SIZE', '8*BLOCK_SIZE', ] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] if = '(SIZE*N)/BLOCK_SIZE <= 32' code = ''' @@ -740,7 +740,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0)) => 0; lfs_block_t r = 0; for (lfs_block_t i = 0;; i++) { @@ -897,7 +897,7 @@ code = ''' clobbered:; // traverse again, we should detect the clobbered metadata - lfsr_traversal_open(&lfs, &t, LFS_T_CKMETADATA) => 0; + lfsr_traversal_open(&lfs, &t, LFS_T_CKMETA) => 0; for (lfs_block_t j = 0;; j++) { assert(j < 2*BLOCK_COUNT); @@ -927,7 +927,7 @@ defines.SIZE = [ '2*BLOCK_SIZE', '8*BLOCK_SIZE', ] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] if = '(SIZE*N)/BLOCK_SIZE <= 32' code = ''' @@ -993,7 +993,7 @@ code = ''' clobbered:; // traverse again, we should detect the clobbered metadata - lfsr_traversal_open(&lfs, &t, LFS_T_CKMETADATA) => 0; + lfsr_traversal_open(&lfs, &t, LFS_T_CKMETA) => 0; for (lfs_block_t j = 0;; j++) { assert(j < 2*BLOCK_COUNT); @@ -1023,7 +1023,7 @@ defines.SIZE = [ '2*BLOCK_SIZE', '8*BLOCK_SIZE', ] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] if = '(SIZE*N)/BLOCK_SIZE <= 32' code = ''' @@ -1091,7 +1091,7 @@ code = ''' clobbered:; // traverse again, we should detect the clobbered metadata - lfsr_traversal_open(&lfs, &t, LFS_T_CKMETADATA) => 0; + lfsr_traversal_open(&lfs, &t, LFS_T_CKMETA) => 0; for (lfs_block_t j = 0;; j++) { assert(j < 2*BLOCK_COUNT); @@ -1169,7 +1169,7 @@ code = ''' clobbered:; // traverse again, we should detect the clobbered metadata - lfsr_traversal_open(&lfs, &t, LFS_T_CKMETADATA) => 0; + lfsr_traversal_open(&lfs, &t, LFS_T_CKMETA) => 0; for (lfs_block_t j = 0;; j++) { assert(j < 2*BLOCK_COUNT); @@ -1199,7 +1199,7 @@ defines.SIZE = [ '2*BLOCK_SIZE', '8*BLOCK_SIZE', ] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] if = '(SIZE*N)/BLOCK_SIZE <= 32' code = ''' @@ -1263,7 +1263,7 @@ code = ''' clobbered:; // traverse again, we should detect the clobbered metadata - lfsr_traversal_open(&lfs, &t, LFS_T_CKMETADATA) => 0; + lfsr_traversal_open(&lfs, &t, LFS_T_CKMETA) => 0; for (lfs_block_t j = 0;; j++) { assert(j < 2*BLOCK_COUNT); @@ -1293,7 +1293,7 @@ defines.SIZE = [ '2*BLOCK_SIZE', '8*BLOCK_SIZE', ] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] if = '(SIZE*N)/BLOCK_SIZE <= 32' code = ''' @@ -1359,7 +1359,7 @@ code = ''' clobbered:; // traverse again, we should detect the clobbered metadata - lfsr_traversal_open(&lfs, &t, LFS_T_CKMETADATA) => 0; + lfsr_traversal_open(&lfs, &t, LFS_T_CKMETA) => 0; for (lfs_block_t j = 0;; j++) { assert(j < 2*BLOCK_COUNT); @@ -1468,7 +1468,7 @@ defines.SIZE = [ '2*BLOCK_SIZE', '8*BLOCK_SIZE', ] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] if = '(SIZE*N)/BLOCK_SIZE <= 32' code = ''' @@ -1563,7 +1563,7 @@ defines.SIZE = [ '2*BLOCK_SIZE', '8*BLOCK_SIZE', ] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] if = '(SIZE*N)/BLOCK_SIZE <= 32' code = ''' @@ -1658,7 +1658,7 @@ done:; # test that we detect filesystem mutation during traversal [cases.test_traversal_mutation] defines.WHEN = [0, 1, 2] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] code = ''' @@ -1669,7 +1669,7 @@ code = ''' // try traversing lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -1716,7 +1716,7 @@ done:; [cases.test_traversal_mutation_excl] defines.WHEN = [0, 1, 2] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] code = ''' @@ -1728,7 +1728,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, LFS_T_EXCL - | ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + | ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -1784,7 +1784,7 @@ done:; # test that we don't get extra anything after end of traversal [cases.test_traversal_mutation_idempotent] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] code = ''' @@ -1795,7 +1795,7 @@ code = ''' // try traversing lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; struct lfs_tinfo tinfo; @@ -1836,7 +1836,7 @@ code = ''' ''' [cases.test_traversal_mutation_excl_idempotent] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] code = ''' @@ -1848,7 +1848,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, LFS_T_EXCL - | ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + | ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; struct lfs_tinfo tinfo; @@ -1891,7 +1891,7 @@ code = ''' [cases.test_traversal_mutation_mkdir] defines.WHEN = [0, 1, 2] defines.EXCL = [false, true] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] code = ''' @@ -1903,7 +1903,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((EXCL) ? LFS_T_EXCL : 0) - | ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + | ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -1963,7 +1963,7 @@ done:; [cases.test_traversal_mutation_rm] defines.WHEN = [0, 1, 2] defines.EXCL = [false, true] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] code = ''' @@ -1981,7 +1981,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((EXCL) ? LFS_T_EXCL : 0) - | ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + | ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -2041,7 +2041,7 @@ done:; [cases.test_traversal_mutation_mv] defines.WHEN = [0, 1, 2] defines.EXCL = [false, true] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] code = ''' @@ -2059,7 +2059,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((EXCL) ? LFS_T_EXCL : 0) - | ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + | ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -2119,7 +2119,7 @@ done:; # some more complex mutation tests [cases.test_traversal_mutation_fwrite] defines.EXCL = [false, true] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = [ @@ -2152,7 +2152,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((EXCL) ? LFS_T_EXCL : 0) - | ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + | ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -2192,7 +2192,7 @@ code = ''' [cases.test_traversal_mutation_fwrite_open] defines.EXCL = [false, true] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = [ @@ -2228,7 +2228,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((EXCL) ? LFS_T_EXCL : 0) - | ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + | ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -2279,7 +2279,7 @@ code = ''' # these assume quite a bit more and may be a bit fragile... # [cases.test_traversal_mutation_file_bsprout] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = 'FILE_BUFFER_SIZE/2' @@ -2314,7 +2314,7 @@ code = ''' // try traversing lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -2357,7 +2357,7 @@ code = ''' ''' [cases.test_traversal_mutation_file_btree] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -2393,7 +2393,7 @@ code = ''' // try traversing lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -2442,7 +2442,7 @@ code = ''' ''' [cases.test_traversal_mutation_file_bshrub] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -2477,7 +2477,7 @@ code = ''' // try traversing lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -2523,7 +2523,7 @@ code = ''' ''' [cases.test_traversal_mutation_orphan_bsprout] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = 'FILE_BUFFER_SIZE/2' @@ -2556,7 +2556,7 @@ code = ''' // try traversing lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -2600,7 +2600,7 @@ code = ''' ''' [cases.test_traversal_mutation_orphan_btree] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -2634,7 +2634,7 @@ code = ''' // try traversing lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -2692,7 +2692,7 @@ code = ''' ''' [cases.test_traversal_mutation_orphan_bshrub] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -2725,7 +2725,7 @@ code = ''' // try traversing lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -2772,7 +2772,7 @@ code = ''' ''' [cases.test_traversal_mutation_close_bsprout] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = 'FILE_BUFFER_SIZE/2' @@ -2806,7 +2806,7 @@ code = ''' // try traversing lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -2853,7 +2853,7 @@ code = ''' ''' [cases.test_traversal_mutation_close_btree] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -2888,7 +2888,7 @@ code = ''' // try traversing lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -2951,7 +2951,7 @@ code = ''' ''' [cases.test_traversal_mutation_close_bshrub] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -2985,7 +2985,7 @@ code = ''' // try traversing lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -3042,7 +3042,7 @@ code = ''' ''' [cases.test_traversal_mutation_rm_bshrub] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -3076,7 +3076,7 @@ code = ''' // try traversing lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -3112,7 +3112,7 @@ code = ''' ''' [cases.test_traversal_mutation_mv_src_bshrub] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -3146,7 +3146,7 @@ code = ''' // try traversing lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -3182,7 +3182,7 @@ code = ''' ''' [cases.test_traversal_mutation_mv_dst_bshrub] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -3216,7 +3216,7 @@ code = ''' // try traversing lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -3252,7 +3252,7 @@ code = ''' ''' [cases.test_traversal_mutation_mroot_split] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -3286,7 +3286,7 @@ code = ''' // try traversing lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -3327,7 +3327,7 @@ code = ''' ''' [cases.test_traversal_mutation_mroot_split_bshrub_l] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -3370,7 +3370,7 @@ code = ''' // try traversing lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -3422,7 +3422,7 @@ code = ''' ''' [cases.test_traversal_mutation_mroot_split_bshrub_r] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -3465,7 +3465,7 @@ code = ''' // try traversing lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -3522,7 +3522,7 @@ code = ''' ''' [cases.test_traversal_mutation_mroot_extend] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -3558,7 +3558,7 @@ code = ''' // try traversing lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -3597,7 +3597,7 @@ code = ''' ''' [cases.test_traversal_mutation_mroot_extend_bshrub] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -3633,7 +3633,7 @@ code = ''' // try traversing lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -3678,7 +3678,7 @@ code = ''' ''' [cases.test_traversal_mutation_mroot_relocate] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -3723,7 +3723,7 @@ code = ''' // try traversing lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -3782,7 +3782,7 @@ code = ''' ''' [cases.test_traversal_mutation_mroot_relocate_bshrub] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -3827,7 +3827,7 @@ code = ''' // try traversing lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -3877,7 +3877,7 @@ code = ''' ''' [cases.test_traversal_mutation_mtree_split] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -3951,7 +3951,7 @@ code = ''' // try traversing lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -4043,7 +4043,7 @@ code = ''' ''' [cases.test_traversal_mutation_mtree_split_bshrub_l] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -4117,7 +4117,7 @@ code = ''' // try traversing lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -4203,7 +4203,7 @@ code = ''' ''' [cases.test_traversal_mutation_mtree_split_bshrub_r] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -4277,7 +4277,7 @@ code = ''' // try traversing lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -4368,7 +4368,7 @@ code = ''' ''' [cases.test_traversal_mutation_mtree_extend] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -4448,7 +4448,7 @@ code = ''' // try traversing lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -4532,7 +4532,7 @@ code = ''' ''' [cases.test_traversal_mutation_mtree_extend_bshrub] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -4612,7 +4612,7 @@ code = ''' // try traversing lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -4695,7 +4695,7 @@ code = ''' ''' [cases.test_traversal_mutation_mtree_relocate] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -4780,7 +4780,7 @@ code = ''' // try traversing lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -4865,7 +4865,7 @@ code = ''' ''' [cases.test_traversal_mutation_mtree_relocate_bshrub] -defines.CKMETADATA = [false, true] +defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.LOOKAHEAD = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -4950,7 +4950,7 @@ code = ''' // try traversing lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, - ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -5048,7 +5048,7 @@ code = ''' # traverse steps between each op defines.STEPS = [1, 2, 4, 8, 16, 32, 64, 128] defines.EXCL = [false, true] -defines.CKMETADATA = [true] +defines.CKMETA = [true] defines.CKDATA = [true] defines.LOOKAHEAD = [false, true] defines.N = [1, 2, 4, 8, 16, 32, 64, 128, 256] @@ -5062,7 +5062,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((EXCL) ? LFS_T_EXCL : 0) - | ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + | ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -5154,7 +5154,7 @@ code = ''' # traverse steps between each op defines.STEPS = [1, 2, 4, 8, 16, 32, 64, 128] defines.EXCL = [false, true] -defines.CKMETADATA = [true] +defines.CKMETA = [true] defines.CKDATA = [true] defines.LOOKAHEAD = [false, true] defines.N = [1, 2, 4, 8, 16, 32, 64, 128, 256] @@ -5175,7 +5175,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((EXCL) ? LFS_T_EXCL : 0) - | ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + | ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -5331,7 +5331,7 @@ code = ''' # traverse steps between each op defines.STEPS = [1, 2, 4, 8, 16, 32, 64, 128] defines.EXCL = [false, true] -defines.CKMETADATA = [true] +defines.CKMETA = [true] defines.CKDATA = [true] defines.LOOKAHEAD = [false, true] defines.N = [1, 2, 4, 8, 16, 32, 64] @@ -5355,7 +5355,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((EXCL) ? LFS_T_EXCL : 0) - | ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + | ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -5431,7 +5431,7 @@ code = ''' # traverse steps between each op defines.STEPS = [1, 2, 4, 8, 16, 32, 64, 128] defines.EXCL = [false, true] -defines.CKMETADATA = [true] +defines.CKMETA = [true] defines.CKDATA = [true] defines.LOOKAHEAD = [false, true] defines.N = [1, 2, 4, 8, 16, 32, 64] @@ -5463,7 +5463,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((EXCL) ? LFS_T_EXCL : 0) - | ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + | ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -5670,7 +5670,7 @@ code = ''' # traverse steps between each op defines.STEPS = [1, 2, 4, 8, 16, 32, 64, 128] defines.EXCL = [false, true] -defines.CKMETADATA = [true] +defines.CKMETA = [true] defines.CKDATA = [true] defines.LOOKAHEAD = [false, true] defines.OPS = 20 @@ -5734,7 +5734,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((EXCL) ? LFS_T_EXCL : 0) - | ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + | ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -5829,7 +5829,7 @@ code = ''' # traverse steps between each op defines.STEPS = [1, 2, 4, 8, 16, 32, 64, 128] defines.EXCL = [false, true] -defines.CKMETADATA = [true] +defines.CKMETA = [true] defines.CKDATA = [true] defines.LOOKAHEAD = [false, true] defines.N = [1, 2, 4, 8, 16, 32, 64] @@ -5871,7 +5871,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((EXCL) ? LFS_T_EXCL : 0) - | ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + | ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0; @@ -6196,7 +6196,7 @@ code = ''' # traverse steps between each op defines.STEPS = [1, 2, 4, 8, 16, 32, 64, 128] defines.EXCL = [false, true] -defines.CKMETADATA = [true] +defines.CKMETA = [true] defines.CKDATA = [true] defines.LOOKAHEAD = [false, true] defines.N = [1, 2, 4, 8, 16, 32, 64] @@ -6239,7 +6239,7 @@ code = ''' lfsr_traversal_t t; lfsr_traversal_open(&lfs, &t, ((EXCL) ? LFS_T_EXCL : 0) - | ((CKMETADATA) ? LFS_T_CKMETADATA : 0) + | ((CKMETA) ? LFS_T_CKMETA : 0) | ((CKDATA) ? LFS_T_CKDATA : 0) | ((LOOKAHEAD) ? LFS_T_LOOKAHEAD : 0)) => 0;