From 9bdfb25a09e8c24a5a9c5737829944e2112f47b6 Mon Sep 17 00:00:00 2001 From: Christopher Haster Date: Thu, 16 Oct 2025 14:36:04 -0500 Subject: [PATCH] Renamed LFS3_T_LOOKAHEAD -> LFS3_T_REPOPLOOKAHEAD And friends: LFS3_M_REPOPLOOKAHEAD 0x00000200 Repopulate lookahead buffer LFS3_GC_REPOPLOOKAHEAD 0x00000200 Repopulate lookahead buffer LFS3_I_REPOPLOOKAHEAD 0x00000200 Lookahead buffer is not full LFS3_T_REPOPLOOKAHEAD 0x00000200 Repopulate lookahead buffer To match LFS3_T_REPOPGBMAP, which is more-or-less the same operation. Though this does turn into quite the mouthful... --- lfs3.c | 59 +++---- lfs3.h | 14 +- scripts/dbgflags.py | 12 +- tests/test_gc.toml | 120 +++++++------- tests/test_mount.toml | 40 ++--- tests/test_trvs.toml | 376 +++++++++++++++++++++--------------------- 6 files changed, 313 insertions(+), 308 deletions(-) diff --git a/lfs3.c b/lfs3.c index 9b27d8a9..590d2fbf 100644 --- a/lfs3.c +++ b/lfs3.c @@ -7390,10 +7390,10 @@ static inline bool lfs3_t_ismkconsistent(uint32_t flags) { #endif } -static inline bool lfs3_t_islookahead(uint32_t flags) { +static inline bool lfs3_t_isrepoplookahead(uint32_t flags) { (void)flags; #ifndef LFS3_RDONLY - return flags & LFS3_T_LOOKAHEAD; + return flags & LFS3_T_REPOPLOOKAHEAD; #else return false; #endif @@ -10629,7 +10629,7 @@ static lfs3_stag_t lfs3_mtree_gc(lfs3_t *lfs3, lfs3_mgc_t *mgc, if (lfs3_t_tstate(mgc->t.b.h.flags) == LFS3_TSTATE_MROOTANCHOR) { // checkpoint the allocator to maximize any lookahead scans #ifndef LFS3_RDONLY - if (lfs3_t_islookahead(mgc->t.b.h.flags) + if (lfs3_t_isrepoplookahead(mgc->t.b.h.flags) && !lfs3_t_isckpointed(mgc->t.b.h.flags)) { lfs3_alloc_ckpoint_(lfs3); // keep our own ckpointed flag clear @@ -10683,7 +10683,7 @@ dropped:; #ifndef LFS3_RDONLY // mark in-use blocks in lookahead? #ifndef LFS3_2BONLY - if (lfs3_t_islookahead(mgc->t.b.h.flags) + if (lfs3_t_isrepoplookahead(mgc->t.b.h.flags) && !lfs3_t_ismtreeonly(mgc->t.b.h.flags) && !lfs3_t_isckpointed(mgc->t.b.h.flags)) { lfs3_alloc_markinusebptr(lfs3, tag, bptr_); @@ -10767,7 +10767,7 @@ eot:; #ifndef LFS3_RDONLY // was lookahead scan successful? #ifndef LFS3_2BONLY - if (lfs3_t_islookahead(mgc->t.b.h.flags) + if (lfs3_t_isrepoplookahead(mgc->t.b.h.flags) && !lfs3_t_ismtreeonly(mgc->t.b.h.flags) && !lfs3_t_isckpointed(mgc->t.b.h.flags)) { lfs3_alloc_adopt(lfs3, lfs3->lookahead.ckpoint); @@ -11267,7 +11267,7 @@ static void lfs3_alloc_adopt(lfs3_t *lfs3, lfs3_block_t known) { known); // signal that lookahead is full, this is cleared on first alloc - lfs3->flags &= ~LFS3_I_LOOKAHEAD; + lfs3->flags &= ~LFS3_I_REPOPLOOKAHEAD; // eagerly find the next free block so lookahead scans can make // the most progress @@ -11285,7 +11285,7 @@ static void lfs3_alloc_inc(lfs3_t *lfs3) { &= ~(1 << (lfs3->lookahead.off % 8)); // signal that lookahead is no longer full - lfs3->flags |= LFS3_I_LOOKAHEAD; + lfs3->flags |= LFS3_I_REPOPLOOKAHEAD; // increment next/off lfs3->lookahead.off += 1; @@ -11420,7 +11420,7 @@ static lfs3_sblock_t lfs3_alloc(lfs3_t *lfs3, uint32_t flags) { // in-use in the next lookahead window // lfs3_mtrv_t mtrv; - lfs3_mtrv_init(&mtrv, LFS3_T_RDONLY | LFS3_T_LOOKAHEAD); + lfs3_mtrv_init(&mtrv, LFS3_T_RDONLY | LFS3_T_REPOPLOOKAHEAD); while (true) { lfs3_bptr_t bptr; lfs3_stag_t tag = lfs3_mtree_traverse(lfs3, &mtrv, @@ -15444,7 +15444,7 @@ static int lfs3_init(lfs3_t *lfs3, uint32_t flags, // unknown gc flags? LFS3_ASSERT((lfs3->cfg->gc_flags & ~( LFS3_GC_MKCONSISTENT - | LFS3_GC_LOOKAHEAD + | LFS3_GC_REPOPLOOKAHEAD | LFS3_IFDEF_GBMAP(LFS3_GC_REPOPGBMAP, 0) | LFS3_GC_COMPACT | LFS3_GC_CKMETA @@ -15473,7 +15473,7 @@ static int lfs3_init(lfs3_t *lfs3, uint32_t flags, // assume we contain orphans until proven otherwise | LFS3_IFDEF_RDONLY(0, LFS3_I_MKCONSISTENT) // default to an empty lookahead - | LFS3_IFDEF_RDONLY(0, LFS3_I_LOOKAHEAD) + | LFS3_IFDEF_RDONLY(0, LFS3_I_REPOPLOOKAHEAD) // default to assuming we need compaction somewhere, worst case // this just makes lfs3_fs_gc read more than is strictly needed | LFS3_IFDEF_RDONLY(0, LFS3_I_COMPACT) @@ -16343,8 +16343,8 @@ int lfs3_mount(lfs3_t *lfs3, uint32_t flags, #ifdef LFS3_YES_MKCONSISTENT flags |= LFS3_M_MKCONSISTENT; #endif - #ifdef LFS3_YES_LOOKAHEAD - flags |= LFS3_M_LOOKAHEAD; + #ifdef LFS3_YES_REPOPLOOKAHEAD + flags |= LFS3_M_REPOPLOOKAHEAD; #endif #ifdef LFS3_YES_REPOPGBMAP flags |= LFS3_YES_REPOPGBMAP; @@ -16372,7 +16372,7 @@ int lfs3_mount(lfs3_t *lfs3, uint32_t flags, | LFS3_IFDEF_CKMETAPARITY(LFS3_M_CKMETAPARITY, 0) | LFS3_IFDEF_CKDATACKSUMS(LFS3_M_CKDATACKSUMS, 0) | LFS3_IFDEF_RDONLY(0, LFS3_M_MKCONSISTENT) - | LFS3_IFDEF_RDONLY(0, LFS3_M_LOOKAHEAD) + | LFS3_IFDEF_RDONLY(0, LFS3_M_REPOPLOOKAHEAD) | LFS3_IFDEF_RDONLY(0, LFS3_IFDEF_GBMAP(LFS3_M_REPOPGBMAP, 0)) | LFS3_IFDEF_RDONLY(0, LFS3_M_COMPACT) @@ -16380,7 +16380,7 @@ int lfs3_mount(lfs3_t *lfs3, uint32_t flags, | LFS3_M_CKDATA)) == 0); // these flags require a writable filesystem LFS3_ASSERT(!lfs3_m_isrdonly(flags) || !lfs3_t_ismkconsistent(flags)); - LFS3_ASSERT(!lfs3_m_isrdonly(flags) || !lfs3_t_islookahead(flags)); + LFS3_ASSERT(!lfs3_m_isrdonly(flags) || !lfs3_t_isrepoplookahead(flags)); LFS3_ASSERT(!lfs3_m_isrdonly(flags) || !lfs3_t_isrepopgbmap(flags)); LFS3_ASSERT(!lfs3_m_isrdonly(flags) || !lfs3_t_iscompact(flags)); @@ -16409,7 +16409,7 @@ int lfs3_mount(lfs3_t *lfs3, uint32_t flags, // run gc if requested if (flags & ( LFS3_IFDEF_RDONLY(0, LFS3_M_MKCONSISTENT) - | LFS3_IFDEF_RDONLY(0, LFS3_M_LOOKAHEAD) + | LFS3_IFDEF_RDONLY(0, LFS3_M_REPOPLOOKAHEAD) | LFS3_IFDEF_RDONLY(0, LFS3_IFDEF_GBMAP(LFS3_M_REPOPGBMAP, 0)) | LFS3_IFDEF_RDONLY(0, LFS3_M_COMPACT) @@ -16419,7 +16419,7 @@ int lfs3_mount(lfs3_t *lfs3, uint32_t flags, err = lfs3_fs_gc_(lfs3, &mgc, flags & ( LFS3_IFDEF_RDONLY(0, LFS3_M_MKCONSISTENT) - | LFS3_IFDEF_RDONLY(0, LFS3_M_LOOKAHEAD) + | LFS3_IFDEF_RDONLY(0, LFS3_M_REPOPLOOKAHEAD) | LFS3_IFDEF_RDONLY(0, LFS3_IFDEF_GBMAP(LFS3_M_REPOPGBMAP, 0)) | LFS3_IFDEF_RDONLY(0, LFS3_M_COMPACT) @@ -16763,7 +16763,7 @@ int lfs3_fs_stat(lfs3_t *lfs3, struct lfs3_fsinfo *fsinfo) { | LFS3_IFDEF_CKMETAPARITY(LFS3_I_CKMETAPARITY, 0) | LFS3_IFDEF_CKDATACKSUMS(LFS3_I_CKDATACKSUMS, 0) | LFS3_IFDEF_RDONLY(0, LFS3_I_MKCONSISTENT) - | LFS3_IFDEF_RDONLY(0, LFS3_I_LOOKAHEAD) + | LFS3_IFDEF_RDONLY(0, LFS3_I_REPOPLOOKAHEAD) | LFS3_IFDEF_RDONLY(0, LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, 0)) | LFS3_IFDEF_RDONLY(0, LFS3_I_COMPACT) @@ -17032,7 +17032,7 @@ static int lfs3_fs_gc_(lfs3_t *lfs3, lfs3_mgc_t *mgc, // double check LFS3_ASSERT((flags & ~( LFS3_IFDEF_RDONLY(0, LFS3_T_MKCONSISTENT) - | LFS3_IFDEF_RDONLY(0, LFS3_T_LOOKAHEAD) + | LFS3_IFDEF_RDONLY(0, LFS3_T_REPOPLOOKAHEAD) | LFS3_IFDEF_RDONLY(0, LFS3_IFDEF_GBMAP(LFS3_T_REPOPGBMAP, 0)) | LFS3_IFDEF_RDONLY(0, LFS3_T_COMPACT) @@ -17040,11 +17040,12 @@ static int lfs3_fs_gc_(lfs3_t *lfs3, lfs3_mgc_t *mgc, | LFS3_T_CKDATA)) == 0); // these flags require a writable filesystem LFS3_ASSERT(!lfs3_m_isrdonly(lfs3->flags) || !lfs3_t_ismkconsistent(flags)); - LFS3_ASSERT(!lfs3_m_isrdonly(lfs3->flags) || !lfs3_t_islookahead(flags)); + LFS3_ASSERT(!lfs3_m_isrdonly(lfs3->flags) + || !lfs3_t_isrepoplookahead(flags)); LFS3_ASSERT(!lfs3_m_isrdonly(lfs3->flags) || !lfs3_t_isrepopgbmap(flags)); LFS3_ASSERT(!lfs3_m_isrdonly(lfs3->flags) || !lfs3_t_iscompact(flags)); // some flags don't make sense when only traversing the mtree - LFS3_ASSERT(!lfs3_t_ismtreeonly(flags) || !lfs3_t_islookahead(flags)); + LFS3_ASSERT(!lfs3_t_ismtreeonly(flags) || !lfs3_t_isrepoplookahead(flags)); LFS3_ASSERT(!lfs3_t_ismtreeonly(flags) || !lfs3_t_isrepopgbmap(flags)); LFS3_ASSERT(!lfs3_t_ismtreeonly(flags) || !lfs3_t_isckdata(flags)); @@ -17063,7 +17064,7 @@ static int lfs3_fs_gc_(lfs3_t *lfs3, lfs3_mgc_t *mgc, uint32_t pending = flags & ( (lfs3->flags & ( LFS3_IFDEF_RDONLY(0, LFS3_I_MKCONSISTENT) - | LFS3_IFDEF_RDONLY(0, LFS3_I_LOOKAHEAD) + | LFS3_IFDEF_RDONLY(0, LFS3_I_REPOPLOOKAHEAD) | LFS3_IFDEF_RDONLY(0, LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, 0)) | LFS3_IFDEF_RDONLY(0, LFS3_I_COMPACT) @@ -17080,7 +17081,7 @@ static int lfs3_fs_gc_(lfs3_t *lfs3, lfs3_mgc_t *mgc, // don't bother with lookahead/gbmap if we've ckpointed #ifndef LFS3_RDONLY if (lfs3_t_isckpointed(mgc->t.b.h.flags)) { - mgc->t.b.h.flags &= ~LFS3_T_LOOKAHEAD; + mgc->t.b.h.flags &= ~LFS3_T_REPOPLOOKAHEAD; #ifdef LFS3_GBMAP mgc->t.b.h.flags &= ~LFS3_T_REPOPGBMAP; #endif @@ -17090,7 +17091,7 @@ static int lfs3_fs_gc_(lfs3_t *lfs3, lfs3_mgc_t *mgc, // will this traversal still make progress? no? start over if (!(mgc->t.b.h.flags & ( LFS3_IFDEF_RDONLY(0, LFS3_T_MKCONSISTENT) - | LFS3_IFDEF_RDONLY(0, LFS3_T_LOOKAHEAD) + | LFS3_IFDEF_RDONLY(0, LFS3_T_REPOPLOOKAHEAD) | LFS3_IFDEF_RDONLY(0, LFS3_IFDEF_GBMAP(LFS3_T_REPOPGBMAP, 0)) | LFS3_IFDEF_RDONLY(0, LFS3_T_COMPACT) @@ -17102,7 +17103,7 @@ static int lfs3_fs_gc_(lfs3_t *lfs3, lfs3_mgc_t *mgc, // do we really need a full traversal? if (!(mgc->t.b.h.flags & ( - LFS3_IFDEF_RDONLY(0, LFS3_T_LOOKAHEAD) + LFS3_IFDEF_RDONLY(0, LFS3_T_REPOPLOOKAHEAD) | LFS3_IFDEF_RDONLY(0, LFS3_IFDEF_GBMAP(LFS3_T_REPOPGBMAP, 0)) | LFS3_T_CKMETA @@ -17125,7 +17126,7 @@ static int lfs3_fs_gc_(lfs3_t *lfs3, lfs3_mgc_t *mgc, // clear any pending flags we make progress on pending &= lfs3->flags & ( LFS3_IFDEF_RDONLY(0, LFS3_I_MKCONSISTENT) - | LFS3_IFDEF_RDONLY(0, LFS3_I_LOOKAHEAD) + | LFS3_IFDEF_RDONLY(0, LFS3_I_REPOPLOOKAHEAD) | LFS3_IFDEF_RDONLY(0, LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, 0)) | LFS3_IFDEF_RDONLY(0, LFS3_I_COMPACT) @@ -17160,7 +17161,7 @@ int lfs3_fs_unck(lfs3_t *lfs3, uint32_t flags) { // unknown flags? LFS3_ASSERT((flags & ~( LFS3_IFDEF_RDONLY(0, LFS3_I_MKCONSISTENT) - | LFS3_IFDEF_RDONLY(0, LFS3_I_LOOKAHEAD) + | LFS3_IFDEF_RDONLY(0, LFS3_I_REPOPLOOKAHEAD) | LFS3_IFDEF_RDONLY(0, LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, 0)) | LFS3_IFDEF_RDONLY(0, LFS3_I_COMPACT) @@ -17392,7 +17393,7 @@ int lfs3_trv_open(lfs3_t *lfs3, lfs3_trv_t *trv, uint32_t flags) { | LFS3_T_RDONLY | LFS3_T_MTREEONLY | LFS3_IFDEF_RDONLY(0, LFS3_T_MKCONSISTENT) - | LFS3_IFDEF_RDONLY(0, LFS3_T_LOOKAHEAD) + | LFS3_IFDEF_RDONLY(0, LFS3_T_REPOPLOOKAHEAD) | LFS3_IFDEF_RDONLY(0, LFS3_IFDEF_GBMAP(LFS3_T_REPOPGBMAP, 0)) | LFS3_IFDEF_RDONLY(0, LFS3_T_COMPACT) @@ -17402,11 +17403,11 @@ int lfs3_trv_open(lfs3_t *lfs3, lfs3_trv_t *trv, uint32_t flags) { LFS3_ASSERT(!lfs3_m_isrdonly(lfs3->flags) || lfs3_t_isrdonly(flags)); // these flags require a writable traversal LFS3_ASSERT(!lfs3_t_isrdonly(flags) || !lfs3_t_ismkconsistent(flags)); - LFS3_ASSERT(!lfs3_t_isrdonly(flags) || !lfs3_t_islookahead(flags)); + LFS3_ASSERT(!lfs3_t_isrdonly(flags) || !lfs3_t_isrepoplookahead(flags)); LFS3_ASSERT(!lfs3_t_isrdonly(flags) || !lfs3_t_isrepopgbmap(flags)); LFS3_ASSERT(!lfs3_t_isrdonly(flags) || !lfs3_t_iscompact(flags)); // some flags don't make sense when only traversing the mtree - LFS3_ASSERT(!lfs3_t_ismtreeonly(flags) || !lfs3_t_islookahead(flags)); + LFS3_ASSERT(!lfs3_t_ismtreeonly(flags) || !lfs3_t_isrepoplookahead(flags)); LFS3_ASSERT(!lfs3_t_ismtreeonly(flags) || !lfs3_t_isrepopgbmap(flags)); LFS3_ASSERT(!lfs3_t_ismtreeonly(flags) || !lfs3_t_isckdata(flags)); diff --git a/lfs3.h b/lfs3.h index 8c7e0257..ebdf84e9 100644 --- a/lfs3.h +++ b/lfs3.h @@ -233,8 +233,8 @@ enum lfs3_type { 0x00000100 // Make the filesystem consistent #endif #ifndef LFS3_RDONLY -#define LFS3_M_LOOKAHEAD \ - 0x00000200 // Populate lookahead buffer +#define LFS3_M_REPOPLOOKAHEAD \ + 0x00000200 // Repopulate lookahead buffer #endif #if !defined(LFS3_RDONLY) && defined(LFS3_GBMAP) #define LFS3_M_REPOPGBMAP \ @@ -278,7 +278,7 @@ enum lfs3_type { 0x00000100 // Filesystem needs mkconsistent to write #endif #ifndef LFS3_RDONLY -#define LFS3_I_LOOKAHEAD \ +#define LFS3_I_REPOPLOOKAHEAD \ 0x00000200 // Lookahead buffer is not full #endif #if !defined(LFS3_RDONLY) && defined(LFS3_GBMAP) @@ -323,8 +323,8 @@ enum lfs3_btype { 0x00000100 // Make the filesystem consistent #endif #ifndef LFS3_RDONLY -#define LFS3_T_LOOKAHEAD \ - 0x00000200 // Populate lookahead buffer +#define LFS3_T_REPOPLOOKAHEAD \ + 0x00000200 // Repopulate lookahead buffer #endif #if !defined(LFS3_RDONLY) && defined(LFS3_GBMAP) #define LFS3_T_REPOPGBMAP \ @@ -352,8 +352,8 @@ enum lfs3_btype { 0x00000100 // Make the filesystem consistent #endif #ifndef LFS3_RDONLY -#define LFS3_GC_LOOKAHEAD \ - 0x00000200 // Populate lookahead buffer +#define LFS3_GC_REPOPLOOKAHEAD \ + 0x00000200 // Repopulate lookahead buffer #endif #if !defined(LFS3_RDONLY) && defined(LFS3_GBMAP) #define LFS3_GC_REPOPGBMAP \ diff --git a/scripts/dbgflags.py b/scripts/dbgflags.py index 07afc59b..ff5e6c97 100755 --- a/scripts/dbgflags.py +++ b/scripts/dbgflags.py @@ -89,7 +89,8 @@ FLAGS = [ ('M_CKDATACKSUMS', 0x00800000, "Check data checksums on reads" ), ('M_MKCONSISTENT', 0x00000100, "Make the filesystem consistent" ), - ('M_LOOKAHEAD', 0x00000200, "Populate lookahead buffer" ), + ('M_REPOPLOOKAHEAD', + 0x00000200, "Repopulate lookahead buffer" ), ('M_REPOPGBMAP', 0x00000400, "Repopulate the gbmap" ), ('M_COMPACT', 0x00000800, "Compact metadata logs" ), ('M_CKMETA', 0x00001000, "Check metadata checksums" ), @@ -97,7 +98,8 @@ FLAGS = [ # GC flags ('GC_MKCONSISTENT',0x00000100, "Make the filesystem consistent" ), - ('GC_LOOKAHEAD', 0x00000200, "Populate lookahead buffer" ), + ('GC_REPOPLOOKAHEAD', + 0x00000200, "Repopulate lookahead buffer" ), ('GC_REPOPGBMAP', 0x00000400, "Repopulate the gbmap" ), ('GC_COMPACT', 0x00000800, "Compact metadata logs" ), ('GC_CKMETA', 0x00001000, "Check metadata checksums" ), @@ -115,7 +117,8 @@ FLAGS = [ ('I_CKDATACKSUMS', 0x00800000, "Mounted with LFS3_M_CKDATACKSUMS" ), ('I_MKCONSISTENT', 0x00000100, "Filesystem needs mkconsistent to write" ), - ('I_LOOKAHEAD', 0x00000200, "Lookahead buffer is not full" ), + ('I_REPOPLOOKAHEAD', + 0x00000200, "Lookahead buffer is not full" ), ('I_REPOPGBMAP', 0x00000400, "The gbmap is not full" ), ('I_COMPACT', 0x00000800, "Filesystem may have uncompacted metadata" ), ('I_CKMETA', 0x00001000, "Metadata checksums not checked recently" ), @@ -134,7 +137,8 @@ FLAGS = [ ('T_MTREEONLY', 0x00000002, "Only traverse the mtree" ), ('T_MKCONSISTENT', 0x00000100, "Make the filesystem consistent" ), - ('T_LOOKAHEAD', 0x00000200, "Populate lookahead buffer" ), + ('T_REPOPLOOKAHEAD', + 0x00000200, "Repopulate lookahead buffer" ), ('T_REPOPGBMAP', 0x00000400, "Repopulate the gbmap" ), ('T_COMPACT', 0x00000800, "Compact metadata logs" ), ('T_CKMETA', 0x00001000, "Check metadata checksums" ), diff --git a/tests/test_gc.toml b/tests/test_gc.toml index 85052f2e..dfb9af42 100644 --- a/tests/test_gc.toml +++ b/tests/test_gc.toml @@ -14,11 +14,11 @@ if = ''' # test that lookahead can make progress in isolation -[cases.test_gc_lookahead_progress] +[cases.test_gc_repoplookahead_progress] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.GC_FLAGS = ''' - LFS3_GC_LOOKAHEAD + LFS3_GC_REPOPLOOKAHEAD | ((CKMETA) ? LFS3_GC_CKMETA : 0) | ((CKDATA) ? LFS3_GC_CKDATA : 0) ''' @@ -56,7 +56,7 @@ code = ''' // expect dirty initial state or else our test doesn't work struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; - assert(fsinfo.flags & LFS3_I_LOOKAHEAD); + assert(fsinfo.flags & LFS3_I_REPOPLOOKAHEAD); assert(lfs3.handles != &lfs3.gc.gc.t.b.h); // run GC until we make progress @@ -67,7 +67,7 @@ code = ''' lfs3_fs_gc(&lfs3) => 0; lfs3_fs_stat(&lfs3, &fsinfo) => 0; - if (!(fsinfo.flags & LFS3_I_LOOKAHEAD)) { + if (!(fsinfo.flags & LFS3_I_REPOPLOOKAHEAD)) { break; } } @@ -83,11 +83,11 @@ code = ''' ''' # test that lookahead dirtying still works with the GC API -[cases.test_gc_lookahead_mutation] +[cases.test_gc_repoplookahead_mutation] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.GC_FLAGS = ''' - LFS3_GC_LOOKAHEAD + LFS3_GC_REPOPLOOKAHEAD | ((CKMETA) ? LFS3_GC_CKMETA : 0) | ((CKDATA) ? LFS3_GC_CKDATA : 0) ''' @@ -126,7 +126,7 @@ code = ''' // expect dirty initial state or else our test doesn't work struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; - assert(fsinfo.flags & LFS3_I_LOOKAHEAD); + assert(fsinfo.flags & LFS3_I_REPOPLOOKAHEAD); assert(lfs3.handles != &lfs3.gc.gc.t.b.h); // run GC one step @@ -149,7 +149,7 @@ code = ''' // we should _not_ make progress lfs3_fs_stat(&lfs3, &fsinfo) => 0; - assert(fsinfo.flags & LFS3_I_LOOKAHEAD); + assert(fsinfo.flags & LFS3_I_REPOPLOOKAHEAD); // check the file contents lfs3_file_open(&lfs3, &file, "spider", LFS3_O_RDONLY) => 0; @@ -164,12 +164,12 @@ code = ''' # test that repopgbmap can make progress in isolation [cases.test_gc_repopgbmap_progress] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.GC_FLAGS = ''' LFS3_GC_REPOPGBMAP - | ((LOOKAHEAD) ? LFS3_GC_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_GC_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_GC_CKMETA : 0) | ((CKDATA) ? LFS3_GC_CKDATA : 0) ''' @@ -234,12 +234,12 @@ code = ''' # test that repopgbmap dirtying still works with the GC API [cases.test_gc_repopgbmap_mutation] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.GC_FLAGS = ''' LFS3_GC_REPOPGBMAP - | ((LOOKAHEAD) ? LFS3_GC_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_GC_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_GC_CKMETA : 0) | ((CKDATA) ? LFS3_GC_CKDATA : 0) ''' @@ -317,12 +317,12 @@ code = ''' # test that compact can make progress in isolation [cases.test_gc_compact_progress] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.GC_FLAGS = ''' LFS3_GC_COMPACT - | ((LOOKAHEAD) ? LFS3_GC_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_GC_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_GC_CKMETA : 0) | ((CKDATA) ? LFS3_GC_CKDATA : 0) ''' @@ -408,12 +408,12 @@ code = ''' # test that compact dirtying still works with the GC API [cases.test_gc_compact_mutation] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.GC_FLAGS = ''' LFS3_GC_COMPACT - | ((LOOKAHEAD) ? LFS3_GC_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_GC_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_GC_CKMETA : 0) | ((CKDATA) ? LFS3_GC_CKDATA : 0) ''' @@ -514,13 +514,13 @@ code = ''' # test that mkconsistent can make progress in isolation [cases.test_gc_mkconsistent_progress] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.COMPACT = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.GC_FLAGS = ''' LFS3_GC_MKCONSISTENT - | ((LOOKAHEAD) ? LFS3_GC_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_GC_REPOPLOOKAHEAD : 0) | ((COMPACT) ? LFS3_GC_COMPACT : 0) | ((CKMETA) ? LFS3_GC_CKMETA : 0) | ((CKDATA) ? LFS3_GC_CKDATA : 0) @@ -732,13 +732,13 @@ code = ''' # test that mkconsistent dirtying still works with the GC API [cases.test_gc_mkconsistent_mutation] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.COMPACT = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.GC_FLAGS = ''' LFS3_GC_MKCONSISTENT - | ((LOOKAHEAD) ? LFS3_GC_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_GC_REPOPLOOKAHEAD : 0) | ((COMPACT) ? LFS3_GC_COMPACT : 0) | ((CKMETA) ? LFS3_GC_CKMETA : 0) | ((CKDATA) ? LFS3_GC_CKDATA : 0) @@ -1598,14 +1598,14 @@ done:; # AFTER=3 => after remounting defines.AFTER = [0, 1, 2, 3] defines.MKCONSISTENT = [false, true] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.REPOPGBMAP = [false, true] defines.COMPACT = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.GC_FLAGS = ''' ((MKCONSISTENT) ? LFS3_GC_MKCONSISTENT : 0) - | ((LOOKAHEAD) ? LFS3_GC_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_GC_REPOPLOOKAHEAD : 0) | ((REPOPGBMAP) ? LFS3_IFDEF_GBMAP(LFS3_GC_REPOPGBMAP, -1) : 0) | ((COMPACT) ? LFS3_GC_COMPACT : 0) | ((CKMETA) ? LFS3_GC_CKMETA : 0) @@ -1662,7 +1662,7 @@ code = ''' lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( LFS3_I_MKCONSISTENT - | LFS3_I_LOOKAHEAD + | LFS3_I_REPOPLOOKAHEAD | ((GBMAP) ? (LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) & fsinfo.flags) @@ -1687,7 +1687,7 @@ code = ''' lfs3_fs_stat(&lfs3, &fsinfo) => 0; if (!(fsinfo.flags & ( ((MKCONSISTENT) ? LFS3_I_MKCONSISTENT : 0) - | ((LOOKAHEAD) ? LFS3_I_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_I_REPOPLOOKAHEAD : 0) | ((REPOPGBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) @@ -1719,7 +1719,7 @@ code = ''' lfs3_fs_stat(&lfs3, &fsinfo) => 0; if (!(fsinfo.flags & ( ((MKCONSISTENT) ? LFS3_I_MKCONSISTENT : 0) - | ((LOOKAHEAD) ? LFS3_I_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_I_REPOPLOOKAHEAD : 0) | ((REPOPGBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) @@ -1733,11 +1733,11 @@ code = ''' lfs3_fs_mkconsistent(&lfs3) => 0; } - if (LOOKAHEAD && (fsinfo.flags & LFS3_I_LOOKAHEAD)) { + if (REPOPLOOKAHEAD && (fsinfo.flags & LFS3_I_REPOPLOOKAHEAD)) { // we need an explicit traversal for this lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, - LFS3_T_RDWR | LFS3_T_LOOKAHEAD) => 0; + LFS3_T_RDWR | LFS3_T_REPOPLOOKAHEAD) => 0; while (true) { struct lfs3_tinfo tinfo; int err = lfs3_trv_read(&lfs3, &trv, &tinfo); @@ -1805,7 +1805,7 @@ code = ''' lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( ((!MKCONSISTENT) ? LFS3_I_MKCONSISTENT : 0) - | ((!LOOKAHEAD) ? LFS3_I_LOOKAHEAD : 0) + | ((!REPOPLOOKAHEAD) ? LFS3_I_REPOPLOOKAHEAD : 0) | ((!REPOPGBMAP) ? ((GBMAP) ? (LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) @@ -1829,14 +1829,14 @@ code = ''' # AFTER=3 => after remounting defines.AFTER = [0, 1, 2, 3] defines.MKCONSISTENT = [false, true] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.REPOPGBMAP = [false, true] defines.COMPACT = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.GC_FLAGS = ''' ((MKCONSISTENT) ? LFS3_GC_MKCONSISTENT : 0) - | ((LOOKAHEAD) ? LFS3_GC_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_GC_REPOPLOOKAHEAD : 0) | ((REPOPGBMAP) ? LFS3_IFDEF_GBMAP(LFS3_GC_REPOPGBMAP, -1) : 0) | ((COMPACT) ? LFS3_GC_COMPACT : 0) | ((CKMETA) ? LFS3_GC_CKMETA : 0) @@ -1893,7 +1893,7 @@ code = ''' lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( LFS3_I_MKCONSISTENT - | LFS3_I_LOOKAHEAD + | LFS3_I_REPOPLOOKAHEAD | ((GBMAP) ? (LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) & fsinfo.flags) @@ -1918,7 +1918,7 @@ code = ''' lfs3_fs_stat(&lfs3, &fsinfo) => 0; if (!(fsinfo.flags & ( ((MKCONSISTENT) ? LFS3_I_MKCONSISTENT : 0) - | ((LOOKAHEAD) ? LFS3_I_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_I_REPOPLOOKAHEAD : 0) | ((REPOPGBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) @@ -1950,7 +1950,7 @@ code = ''' lfs3_fs_stat(&lfs3, &fsinfo) => 0; if (!(fsinfo.flags & ( ((MKCONSISTENT) ? LFS3_I_MKCONSISTENT : 0) - | ((LOOKAHEAD) ? LFS3_I_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_I_REPOPLOOKAHEAD : 0) | ((REPOPGBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) @@ -1964,11 +1964,11 @@ code = ''' lfs3_fs_mkconsistent(&lfs3) => 0; } - if (LOOKAHEAD && (fsinfo.flags & LFS3_I_LOOKAHEAD)) { + if (REPOPLOOKAHEAD && (fsinfo.flags & LFS3_I_REPOPLOOKAHEAD)) { // we need an explicit traversal for this lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, - LFS3_T_RDWR | LFS3_T_LOOKAHEAD) => 0; + LFS3_T_RDWR | LFS3_T_REPOPLOOKAHEAD) => 0; while (true) { struct lfs3_tinfo tinfo; int err = lfs3_trv_read(&lfs3, &trv, &tinfo); @@ -2036,7 +2036,7 @@ code = ''' lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( ((!MKCONSISTENT) ? LFS3_I_MKCONSISTENT : 0) - | ((!LOOKAHEAD) ? LFS3_I_LOOKAHEAD : 0) + | ((!REPOPLOOKAHEAD) ? LFS3_I_REPOPLOOKAHEAD : 0) | ((!REPOPGBMAP) ? ((GBMAP) ? (LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) @@ -2056,7 +2056,7 @@ code = ''' lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( LFS3_I_MKCONSISTENT - | LFS3_I_LOOKAHEAD + | LFS3_I_REPOPLOOKAHEAD | ((REPOPGBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1U) : (GBMAP) @@ -2085,7 +2085,7 @@ code = ''' lfs3_fs_stat(&lfs3, &fsinfo) => 0; if (!(fsinfo.flags & ( ((MKCONSISTENT) ? LFS3_I_MKCONSISTENT : 0) - | ((LOOKAHEAD) ? LFS3_I_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_I_REPOPLOOKAHEAD : 0) | ((REPOPGBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) @@ -2117,7 +2117,7 @@ code = ''' lfs3_fs_stat(&lfs3, &fsinfo) => 0; if (!(fsinfo.flags & ( ((MKCONSISTENT) ? LFS3_I_MKCONSISTENT : 0) - | ((LOOKAHEAD) ? LFS3_I_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_I_REPOPLOOKAHEAD : 0) | ((REPOPGBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) @@ -2131,11 +2131,11 @@ code = ''' lfs3_fs_mkconsistent(&lfs3) => 0; } - if (LOOKAHEAD && (fsinfo.flags & LFS3_I_LOOKAHEAD)) { + if (REPOPLOOKAHEAD && (fsinfo.flags & LFS3_I_REPOPLOOKAHEAD)) { // we need an explicit traversal for this lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, - LFS3_T_RDWR | LFS3_T_LOOKAHEAD) => 0; + LFS3_T_RDWR | LFS3_T_REPOPLOOKAHEAD) => 0; while (true) { struct lfs3_tinfo tinfo; int err = lfs3_trv_read(&lfs3, &trv, &tinfo); @@ -2203,7 +2203,7 @@ code = ''' lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( ((!MKCONSISTENT) ? LFS3_I_MKCONSISTENT : 0) - | ((!LOOKAHEAD) ? LFS3_I_LOOKAHEAD : 0) + | ((!REPOPLOOKAHEAD) ? LFS3_I_REPOPLOOKAHEAD : 0) | ((!REPOPGBMAP) ? ((GBMAP) ? (LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) @@ -2224,14 +2224,14 @@ code = ''' [cases.test_gc_mutation] defines.N = 100 defines.MKCONSISTENT = [false, true] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.REPOPGBMAP = [false, true] defines.COMPACT = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.GC_FLAGS = ''' ((MKCONSISTENT) ? LFS3_GC_MKCONSISTENT : 0) - | ((LOOKAHEAD) ? LFS3_GC_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_GC_REPOPLOOKAHEAD : 0) | ((REPOPGBMAP) ? LFS3_IFDEF_GBMAP(LFS3_GC_REPOPGBMAP, -1) : 0) | ((COMPACT) ? LFS3_GC_COMPACT : 0) | ((CKMETA) ? LFS3_GC_CKMETA : 0) @@ -2299,14 +2299,14 @@ code = ''' [cases.test_gc_mutation_unck] defines.N = 100 defines.MKCONSISTENT = [false, true] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.REPOPGBMAP = [false, true] defines.COMPACT = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.GC_FLAGS = ''' ((MKCONSISTENT) ? LFS3_GC_MKCONSISTENT : 0) - | ((LOOKAHEAD) ? LFS3_GC_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_GC_REPOPLOOKAHEAD : 0) | ((REPOPGBMAP) ? LFS3_IFDEF_GBMAP(LFS3_GC_REPOPGBMAP, -1) : 0) | ((COMPACT) ? LFS3_GC_COMPACT : 0) | ((CKMETA) ? LFS3_GC_CKMETA : 0) @@ -2381,7 +2381,7 @@ code = ''' [cases.test_gc_spam_dir_many] defines.MKCONSISTENT = [false, true] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.REPOPGBMAP = [false, true] defines.COMPACT = [false, true] defines.CKMETA = [false, true] @@ -2389,7 +2389,7 @@ defines.CKDATA = [false, true] defines.UNCK = [false, true] defines.GC_FLAGS = ''' ((MKCONSISTENT) ? LFS3_GC_MKCONSISTENT : 0) - | ((LOOKAHEAD) ? LFS3_GC_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_GC_REPOPLOOKAHEAD : 0) | ((REPOPGBMAP) ? LFS3_IFDEF_GBMAP(LFS3_GC_REPOPGBMAP, -1) : 0) | ((COMPACT) ? LFS3_GC_COMPACT : 0) | ((CKMETA) ? LFS3_GC_CKMETA : 0) @@ -2491,7 +2491,7 @@ code = ''' [cases.test_gc_spam_dir_fuzz] defines.MKCONSISTENT = [false, true] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.REPOPGBMAP = [false, true] defines.COMPACT = [false, true] defines.CKMETA = [false, true] @@ -2499,7 +2499,7 @@ defines.CKDATA = [false, true] defines.UNCK = [false, true] defines.GC_FLAGS = ''' ((MKCONSISTENT) ? LFS3_GC_MKCONSISTENT : 0) - | ((LOOKAHEAD) ? LFS3_GC_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_GC_REPOPLOOKAHEAD : 0) | ((REPOPGBMAP) ? LFS3_IFDEF_GBMAP(LFS3_GC_REPOPGBMAP, -1) : 0) | ((COMPACT) ? LFS3_GC_COMPACT : 0) | ((CKMETA) ? LFS3_GC_CKMETA : 0) @@ -2672,7 +2672,7 @@ code = ''' [cases.test_gc_spam_file_many] defines.MKCONSISTENT = [false, true] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.REPOPGBMAP = [false, true] defines.COMPACT = [false, true] defines.CKMETA = [false, true] @@ -2680,7 +2680,7 @@ defines.CKDATA = [false, true] defines.UNCK = [false, true] defines.GC_FLAGS = ''' ((MKCONSISTENT) ? LFS3_GC_MKCONSISTENT : 0) - | ((LOOKAHEAD) ? LFS3_GC_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_GC_REPOPLOOKAHEAD : 0) | ((REPOPGBMAP) ? LFS3_IFDEF_GBMAP(LFS3_GC_REPOPGBMAP, -1) : 0) | ((COMPACT) ? LFS3_GC_COMPACT : 0) | ((CKMETA) ? LFS3_GC_CKMETA : 0) @@ -2778,7 +2778,7 @@ code = ''' [cases.test_gc_spam_file_fuzz] defines.MKCONSISTENT = [false, true] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.REPOPGBMAP = [false, true] defines.COMPACT = [false, true] defines.CKMETA = [false, true] @@ -2786,7 +2786,7 @@ defines.CKDATA = [false, true] defines.UNCK = [false, true] defines.GC_FLAGS = ''' ((MKCONSISTENT) ? LFS3_GC_MKCONSISTENT : 0) - | ((LOOKAHEAD) ? LFS3_GC_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_GC_REPOPLOOKAHEAD : 0) | ((REPOPGBMAP) ? LFS3_IFDEF_GBMAP(LFS3_GC_REPOPGBMAP, -1) : 0) | ((COMPACT) ? LFS3_GC_COMPACT : 0) | ((CKMETA) ? LFS3_GC_CKMETA : 0) @@ -3023,7 +3023,7 @@ code = ''' [cases.test_gc_spam_fwrite_fuzz] defines.MKCONSISTENT = [false, true] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.REPOPGBMAP = [false, true] defines.COMPACT = [false, true] defines.CKMETA = [false, true] @@ -3031,7 +3031,7 @@ defines.CKDATA = [false, true] defines.UNCK = [false, true] defines.GC_FLAGS = ''' ((MKCONSISTENT) ? LFS3_GC_MKCONSISTENT : 0) - | ((LOOKAHEAD) ? LFS3_GC_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_GC_REPOPLOOKAHEAD : 0) | ((REPOPGBMAP) ? LFS3_IFDEF_GBMAP(LFS3_GC_REPOPGBMAP, -1) : 0) | ((COMPACT) ? LFS3_GC_COMPACT : 0) | ((CKMETA) ? LFS3_GC_CKMETA : 0) @@ -3186,7 +3186,7 @@ code = ''' [cases.test_gc_spam_uz_fuzz] defines.MKCONSISTENT = [false, true] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.REPOPGBMAP = [false, true] defines.COMPACT = [false, true] defines.CKMETA = [false, true] @@ -3194,7 +3194,7 @@ defines.CKDATA = [false, true] defines.UNCK = [false, true] defines.GC_FLAGS = ''' ((MKCONSISTENT) ? LFS3_GC_MKCONSISTENT : 0) - | ((LOOKAHEAD) ? LFS3_GC_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_GC_REPOPLOOKAHEAD : 0) | ((REPOPGBMAP) ? LFS3_IFDEF_GBMAP(LFS3_GC_REPOPGBMAP, -1) : 0) | ((COMPACT) ? LFS3_GC_COMPACT : 0) | ((CKMETA) ? LFS3_GC_CKMETA : 0) @@ -3638,7 +3638,7 @@ code = ''' [cases.test_gc_spam_uzd_fuzz] defines.MKCONSISTENT = [false, true] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.REPOPGBMAP = [false, true] defines.COMPACT = [false, true] defines.CKMETA = [false, true] @@ -3646,7 +3646,7 @@ defines.CKDATA = [false, true] defines.UNCK = [false, true] defines.GC_FLAGS = ''' ((MKCONSISTENT) ? LFS3_GC_MKCONSISTENT : 0) - | ((LOOKAHEAD) ? LFS3_GC_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_GC_REPOPLOOKAHEAD : 0) | ((REPOPGBMAP) ? LFS3_IFDEF_GBMAP(LFS3_GC_REPOPGBMAP, -1) : 0) | ((COMPACT) ? LFS3_GC_COMPACT : 0) | ((CKMETA) ? LFS3_GC_CKMETA : 0) diff --git a/tests/test_mount.toml b/tests/test_mount.toml index dc0dc61f..ca48ebf7 100644 --- a/tests/test_mount.toml +++ b/tests/test_mount.toml @@ -24,7 +24,7 @@ defines.CKFETCHES = [false, true] defines.CKMETAPARITY = [false, true] defines.CKDATACKSUMS = [false, true] defines.MKCONSISTENT = [false, true] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.REPOPGBMAP = [false, true] defines.COMPACT = [false, true] defines.CKMETA = [false, true] @@ -38,7 +38,7 @@ if = [ 'LFS3_IFDEF_CKMETAPARITY(true, !CKMETAPARITY)', 'LFS3_IFDEF_CKDATACKSUMS(true, !CKDATACKSUMS)', '!RDONLY || !MKCONSISTENT', - '!RDONLY || !LOOKAHEAD', + '!RDONLY || !REPOPLOOKAHEAD', 'LFS3_IFDEF_YES_GBMAP(true, !REPOPGBMAP)', '!RDONLY || !REPOPGBMAP', '!RDONLY || !COMPACT', @@ -61,7 +61,7 @@ code = ''' ? LFS3_IFDEF_CKDATACKSUMS(LFS3_M_CKDATACKSUMS, -1) : 0) | ((MKCONSISTENT) ? LFS3_M_MKCONSISTENT : 0) - | ((LOOKAHEAD) ? LFS3_M_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_M_REPOPLOOKAHEAD : 0) | ((REPOPGBMAP) ? LFS3_IFDEF_GBMAP(LFS3_M_REPOPGBMAP, -1) : 0) @@ -88,7 +88,7 @@ code = ''' ? LFS3_IFDEF_CKDATACKSUMS(LFS3_I_CKDATACKSUMS, -1) : 0) | ((!MKCONSISTENT) ? LFS3_I_MKCONSISTENT : 0) - | ((!LOOKAHEAD) ? LFS3_I_LOOKAHEAD : 0) + | ((!REPOPLOOKAHEAD) ? LFS3_I_REPOPLOOKAHEAD : 0) | ((!COMPACT) ? LFS3_I_COMPACT : 0) // note ckdata implies ckmeta | ((!CKMETA && !CKDATA) ? LFS3_I_CKMETA : 0) @@ -146,7 +146,7 @@ code = ''' lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( LFS3_I_MKCONSISTENT - | LFS3_I_LOOKAHEAD + | LFS3_I_REPOPLOOKAHEAD | LFS3_I_COMPACT | LFS3_I_CKMETA | LFS3_I_CKDATA @@ -160,7 +160,7 @@ code = ''' # test that on-mount traversals do what they say they do -[cases.test_mount_t_lookahead] +[cases.test_mount_t_repoplookahead] defines.CKMETA = [false, true] defines.CKDATA = [false, true] code = ''' @@ -173,17 +173,17 @@ code = ''' lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( LFS3_I_MKCONSISTENT - | LFS3_I_LOOKAHEAD + | LFS3_I_REPOPLOOKAHEAD | LFS3_I_COMPACT | LFS3_I_CKMETA | LFS3_I_CKDATA | LFS3_IFDEF_YES_GBMAP(LFS3_I_GBMAP, 0))); lfs3_unmount(&lfs3) => 0; - // with LFS3_M_LOOKAHEAD, mount performs a lookahead scan + // with LFS3_M_REPOPLOOKAHEAD, mount performs a lookahead scan lfs3_mount(&lfs3, LFS3_M_RDWR - | LFS3_M_LOOKAHEAD + | LFS3_M_REPOPLOOKAHEAD | ((CKMETA) ? LFS3_M_CKMETA : 0) | ((CKDATA) ? LFS3_M_CKDATA : 0), CFG) => 0; @@ -220,7 +220,7 @@ code = ''' lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( LFS3_I_MKCONSISTENT - | LFS3_I_LOOKAHEAD + | LFS3_I_REPOPLOOKAHEAD | LFS3_I_COMPACT | LFS3_I_CKMETA | LFS3_I_CKDATA @@ -242,7 +242,7 @@ code = ''' lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( LFS3_I_MKCONSISTENT - | LFS3_I_LOOKAHEAD + | LFS3_I_REPOPLOOKAHEAD | LFS3_I_REPOPGBMAP | LFS3_I_COMPACT | LFS3_I_CKMETA @@ -253,7 +253,7 @@ code = ''' // with LFS3_M_REPOPGBMAP, mount performs a gbmap repop lfs3_mount(&lfs3, LFS3_M_RDWR - | LFS3_M_LOOKAHEAD + | LFS3_M_REPOPLOOKAHEAD | LFS3_M_REPOPGBMAP | ((CKMETA) ? LFS3_M_CKMETA : 0) | ((CKDATA) ? LFS3_M_CKDATA : 0), @@ -270,7 +270,7 @@ code = ''' ''' [cases.test_mount_t_compact] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = [ @@ -317,7 +317,7 @@ code = ''' lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( LFS3_I_MKCONSISTENT - | LFS3_I_LOOKAHEAD + | LFS3_I_REPOPLOOKAHEAD | LFS3_IFDEF_YES_GBMAP( (SIZE >= BLOCK_SIZE/4) ? LFS3_I_REPOPGBMAP : 0, 0) @@ -331,14 +331,14 @@ code = ''' lfs3_mount(&lfs3, LFS3_M_RDWR | LFS3_M_COMPACT - | ((LOOKAHEAD) ? LFS3_M_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_M_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_M_CKMETA : 0) | ((CKDATA) ? LFS3_M_CKDATA : 0), CFG) => 0; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( LFS3_I_MKCONSISTENT - | ((!LOOKAHEAD) ? LFS3_I_LOOKAHEAD : 0) + | ((!REPOPLOOKAHEAD) ? LFS3_I_REPOPLOOKAHEAD : 0) | LFS3_IFDEF_YES_GBMAP( (SIZE >= BLOCK_SIZE/4) ? LFS3_I_REPOPGBMAP : 0, 0) @@ -361,7 +361,7 @@ code = ''' ''' [cases.test_mount_t_mkconsistent] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.COMPACT = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] @@ -427,7 +427,7 @@ code = ''' lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( LFS3_I_MKCONSISTENT - | LFS3_I_LOOKAHEAD + | LFS3_I_REPOPLOOKAHEAD | LFS3_IFDEF_YES_GBMAP( (ORPHANS >= 100) ? LFS3_I_REPOPGBMAP : 0, 0) @@ -441,14 +441,14 @@ code = ''' lfs3_mount(&lfs3, LFS3_M_RDWR | LFS3_M_MKCONSISTENT - | ((LOOKAHEAD) ? LFS3_M_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_M_REPOPLOOKAHEAD : 0) | ((COMPACT) ? LFS3_M_COMPACT : 0) | ((CKMETA) ? LFS3_M_CKMETA : 0) | ((CKDATA) ? LFS3_M_CKDATA : 0), CFG) => 0; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - ((!LOOKAHEAD) ? LFS3_I_LOOKAHEAD : 0) + ((!REPOPLOOKAHEAD) ? LFS3_I_REPOPLOOKAHEAD : 0) | LFS3_IFDEF_YES_GBMAP( (ORPHANS >= 100) ? LFS3_I_REPOPGBMAP : 0, 0) diff --git a/tests/test_trvs.toml b/tests/test_trvs.toml index a114a184..4aa9a354 100644 --- a/tests/test_trvs.toml +++ b/tests/test_trvs.toml @@ -19,7 +19,7 @@ if = ''' # a simple traversal test [cases.test_trvs_simple] defines.MKCONSISTENT = [false, true] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.REPOPGBMAP = [false, true] defines.COMPACT = [false, true] defines.CKMETA = [false, true] @@ -38,7 +38,7 @@ code = ''' lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR | ((MKCONSISTENT) ? LFS3_T_MKCONSISTENT : 0) - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((REPOPGBMAP) ? LFS3_IFDEF_GBMAP(LFS3_T_REPOPGBMAP, -1) : 0) @@ -66,7 +66,7 @@ code = ''' # can we rewind? [cases.test_trvs_rewind] defines.MKCONSISTENT = [false, true] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.COMPACT = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] @@ -83,7 +83,7 @@ code = ''' lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR | ((MKCONSISTENT) ? LFS3_T_MKCONSISTENT : 0) - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((REPOPGBMAP) ? LFS3_IFDEF_GBMAP(LFS3_T_REPOPGBMAP, -1) : 0) @@ -125,7 +125,7 @@ code = ''' # test that we don't get extra anything after end of traversal [cases.test_trvs_idempotent] defines.MKCONSISTENT = [false, true] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.REPOPGBMAP = [false, true] defines.COMPACT = [false, true] defines.CKMETA = [false, true] @@ -144,7 +144,7 @@ code = ''' lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR | ((MKCONSISTENT) ? LFS3_T_MKCONSISTENT : 0) - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((REPOPGBMAP) ? LFS3_IFDEF_GBMAP(LFS3_T_REPOPGBMAP, -1) : 0) @@ -1772,7 +1772,7 @@ done:; # test that in general fsinfo flags work [cases.test_trvs_flags] defines.MKCONSISTENT = [false, true] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.REPOPGBMAP = [false, true] defines.COMPACT = [false, true] defines.CKMETA = [false, true] @@ -1791,7 +1791,7 @@ code = ''' lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( LFS3_I_MKCONSISTENT - | LFS3_I_LOOKAHEAD + | LFS3_I_REPOPLOOKAHEAD | LFS3_I_COMPACT | LFS3_I_CKMETA | LFS3_I_CKDATA @@ -1802,7 +1802,7 @@ code = ''' lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR | ((MKCONSISTENT) ? LFS3_T_MKCONSISTENT : 0) - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((REPOPGBMAP) ? LFS3_IFDEF_GBMAP(LFS3_T_REPOPGBMAP, -1) : 0) @@ -1828,7 +1828,7 @@ code = ''' lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( ((!MKCONSISTENT) ? LFS3_I_MKCONSISTENT : 0) - | ((!LOOKAHEAD) ? LFS3_I_LOOKAHEAD : 0) + | ((!REPOPLOOKAHEAD) ? LFS3_I_REPOPLOOKAHEAD : 0) | ((!COMPACT) ? LFS3_I_COMPACT : 0) // note ckdata implies ckmeta | ((!CKMETA && !CKDATA) ? LFS3_I_CKMETA : 0) @@ -1841,7 +1841,7 @@ code = ''' # test that we detect filesystem mutation during traversal [cases.test_trvs_mutation] defines.WHEN = [0, 1, 2] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] code = ''' @@ -1856,7 +1856,7 @@ code = ''' lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; @@ -1902,7 +1902,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | LFS3_I_COMPACT | LFS3_I_CKMETA | LFS3_I_CKDATA @@ -1913,7 +1913,7 @@ code = ''' # test that we don't get extra anything after end of traversal [cases.test_trvs_mutation_idempotent] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] code = ''' @@ -1928,7 +1928,7 @@ code = ''' lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; struct lfs3_tinfo tinfo; @@ -1963,7 +1963,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | LFS3_I_COMPACT | LFS3_I_CKMETA | LFS3_I_CKDATA @@ -1984,7 +1984,7 @@ code = ''' // we should _not_ update lookahead/compact/ckmeta/ckdata lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | LFS3_I_COMPACT | LFS3_I_CKMETA | LFS3_I_CKDATA @@ -1997,7 +1997,7 @@ code = ''' [cases.test_trvs_mutation_mkdir] defines.WHEN = [0, 1, 2] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] code = ''' @@ -2012,7 +2012,7 @@ code = ''' lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; @@ -2049,7 +2049,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | LFS3_I_COMPACT | LFS3_I_CKMETA | LFS3_I_CKDATA @@ -2060,7 +2060,7 @@ code = ''' [cases.test_trvs_mutation_rm] defines.WHEN = [0, 1, 2] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] code = ''' @@ -2081,7 +2081,7 @@ code = ''' lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; @@ -2118,7 +2118,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | LFS3_I_COMPACT | LFS3_I_CKMETA | LFS3_I_CKDATA @@ -2129,7 +2129,7 @@ code = ''' [cases.test_trvs_mutation_mv] defines.WHEN = [0, 1, 2] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] code = ''' @@ -2150,7 +2150,7 @@ code = ''' lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; @@ -2187,7 +2187,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | LFS3_I_COMPACT | LFS3_I_CKMETA | LFS3_I_CKDATA @@ -2198,7 +2198,7 @@ code = ''' # some more complex mutation tests [cases.test_trvs_mutation_fwrite] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = [ @@ -2234,7 +2234,7 @@ code = ''' lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; @@ -2263,7 +2263,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | ((GBMAP && SIZE >= BLOCK_SIZE/4) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) @@ -2283,7 +2283,7 @@ code = ''' ''' [cases.test_trvs_mutation_fwrite_opened] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = [ @@ -2323,7 +2323,7 @@ code = ''' lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; @@ -2354,8 +2354,8 @@ code = ''' lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( // ok we might've updated lookahead if write stayed in cache - ((!LOOKAHEAD || SIZE > FILE_CACHE_SIZE || SYNC) - ? LFS3_I_LOOKAHEAD : 0) + ((!REPOPLOOKAHEAD || SIZE > FILE_CACHE_SIZE || SYNC) + ? LFS3_I_REPOPLOOKAHEAD : 0) | ((GBMAP && SIZE >= BLOCK_SIZE/4) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) @@ -2386,7 +2386,7 @@ code = ''' # these assume quite a bit more and may be a bit fragile... # [cases.test_trvs_mutation_file_bsprout] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = 'FILE_CACHE_SIZE/2' @@ -2425,7 +2425,7 @@ code = ''' lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; @@ -2461,7 +2461,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | LFS3_I_COMPACT | LFS3_I_CKMETA | LFS3_I_CKDATA @@ -2483,7 +2483,7 @@ code = ''' ''' [cases.test_trvs_mutation_file_btree] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -2523,7 +2523,7 @@ code = ''' lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; @@ -2573,7 +2573,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT | LFS3_I_CKMETA @@ -2596,7 +2596,7 @@ code = ''' ''' [cases.test_trvs_mutation_file_bshrub] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -2635,7 +2635,7 @@ code = ''' lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; @@ -2679,7 +2679,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT | LFS3_I_CKMETA @@ -2702,7 +2702,7 @@ code = ''' ''' [cases.test_trvs_mutation_uncreat_bsprout] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = 'FILE_CACHE_SIZE/2' @@ -2741,7 +2741,7 @@ code = ''' lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; @@ -2775,7 +2775,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | LFS3_I_COMPACT | LFS3_I_CKMETA | LFS3_I_CKDATA @@ -2801,7 +2801,7 @@ code = ''' ''' [cases.test_trvs_mutation_uncreat_btree] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -2841,7 +2841,7 @@ code = ''' lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; @@ -2889,7 +2889,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT | LFS3_I_CKMETA @@ -2916,7 +2916,7 @@ code = ''' ''' [cases.test_trvs_mutation_uncreat_bshrub] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -2955,7 +2955,7 @@ code = ''' lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; @@ -2997,7 +2997,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT | LFS3_I_CKMETA @@ -3024,7 +3024,7 @@ code = ''' ''' [cases.test_trvs_mutation_close_bsprout] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = 'FILE_CACHE_SIZE/2' @@ -3064,7 +3064,7 @@ code = ''' lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; @@ -3097,7 +3097,7 @@ code = ''' lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( ((DESYNC) ? LFS3_I_MKCONSISTENT : 0) - | ((!(LOOKAHEAD && DESYNC)) ? LFS3_I_LOOKAHEAD : 0) + | ((!(REPOPLOOKAHEAD && DESYNC)) ? LFS3_I_REPOPLOOKAHEAD : 0) | LFS3_I_COMPACT // note ckdata implies ckmeta | ((!(CKMETA && DESYNC) && !(CKDATA && DESYNC)) @@ -3130,7 +3130,7 @@ code = ''' ''' [cases.test_trvs_mutation_close_btree] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -3171,7 +3171,7 @@ code = ''' lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; @@ -3218,7 +3218,7 @@ code = ''' lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( ((DESYNC) ? LFS3_I_MKCONSISTENT : 0) - | ((!(LOOKAHEAD && DESYNC)) ? LFS3_I_LOOKAHEAD : 0) + | ((!(REPOPLOOKAHEAD && DESYNC)) ? LFS3_I_REPOPLOOKAHEAD : 0) | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT // note ckdata implies ckmeta @@ -3252,7 +3252,7 @@ code = ''' ''' [cases.test_trvs_mutation_close_bshrub] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -3292,7 +3292,7 @@ code = ''' lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; @@ -3333,7 +3333,7 @@ code = ''' lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( ((DESYNC) ? LFS3_I_MKCONSISTENT : 0) - | ((!(LOOKAHEAD && DESYNC)) ? LFS3_I_LOOKAHEAD : 0) + | ((!(REPOPLOOKAHEAD && DESYNC)) ? LFS3_I_REPOPLOOKAHEAD : 0) | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT // note ckdata implies ckmeta @@ -3367,7 +3367,7 @@ code = ''' ''' [cases.test_trvs_mutation_rm_bshrub] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -3405,7 +3405,7 @@ code = ''' lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; @@ -3443,7 +3443,7 @@ code = ''' lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( ((DESYNC) ? LFS3_I_MKCONSISTENT : 0) - | ((!(LOOKAHEAD && DESYNC)) ? LFS3_I_LOOKAHEAD : 0) + | ((!(REPOPLOOKAHEAD && DESYNC)) ? LFS3_I_REPOPLOOKAHEAD : 0) | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT // note ckdata implies ckmeta @@ -3466,7 +3466,7 @@ code = ''' ''' [cases.test_trvs_mutation_mv_src_bshrub] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -3513,7 +3513,7 @@ code = ''' lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; @@ -3555,7 +3555,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT | LFS3_I_CKMETA @@ -3580,7 +3580,7 @@ code = ''' ''' [cases.test_trvs_mutation_mv_dst_bshrub] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -3627,7 +3627,7 @@ code = ''' lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; @@ -3664,7 +3664,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT | LFS3_I_CKMETA @@ -3689,7 +3689,7 @@ code = ''' ''' [cases.test_trvs_mutation_mroot_split] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -3727,7 +3727,7 @@ code = ''' lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; @@ -3781,7 +3781,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT | LFS3_I_CKMETA @@ -3804,7 +3804,7 @@ code = ''' ''' [cases.test_trvs_mutation_mroot_split_bshrub_l] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -3851,7 +3851,7 @@ code = ''' lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; @@ -3909,7 +3909,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT | LFS3_I_CKMETA @@ -3937,7 +3937,7 @@ code = ''' ''' [cases.test_trvs_mutation_mroot_split_bshrub_r] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -3984,7 +3984,7 @@ code = ''' lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; @@ -4037,7 +4037,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT | LFS3_I_CKMETA @@ -4065,7 +4065,7 @@ code = ''' ''' [cases.test_trvs_mutation_mroot_extend] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -4105,7 +4105,7 @@ code = ''' lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; @@ -4152,7 +4152,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT | LFS3_I_CKMETA @@ -4175,7 +4175,7 @@ code = ''' ''' [cases.test_trvs_mutation_mroot_extend_bshrub] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -4215,7 +4215,7 @@ code = ''' lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; @@ -4261,7 +4261,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT | LFS3_I_CKMETA @@ -4284,7 +4284,7 @@ code = ''' ''' [cases.test_trvs_mutation_mroot_relocate] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -4333,7 +4333,7 @@ code = ''' lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; @@ -4385,7 +4385,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT | LFS3_I_CKMETA @@ -4408,7 +4408,7 @@ code = ''' ''' [cases.test_trvs_mutation_mroot_relocate_bshrub] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -4457,7 +4457,7 @@ code = ''' lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; @@ -4508,7 +4508,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT | LFS3_I_CKMETA @@ -4531,7 +4531,7 @@ code = ''' ''' [cases.test_trvs_mutation_mtree_split] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -4609,7 +4609,7 @@ code = ''' lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; @@ -4684,7 +4684,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT | LFS3_I_CKMETA @@ -4717,7 +4717,7 @@ code = ''' ''' [cases.test_trvs_mutation_mtree_split_bshrub_l] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -4795,7 +4795,7 @@ code = ''' lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; @@ -4877,7 +4877,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT | LFS3_I_CKMETA @@ -4910,7 +4910,7 @@ code = ''' ''' [cases.test_trvs_mutation_mtree_split_bshrub_r] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -4988,7 +4988,7 @@ code = ''' lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; @@ -5064,7 +5064,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT | LFS3_I_CKMETA @@ -5097,7 +5097,7 @@ code = ''' ''' [cases.test_trvs_mutation_mtree_extend] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -5181,7 +5181,7 @@ code = ''' lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; @@ -5248,7 +5248,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT | LFS3_I_CKMETA @@ -5281,7 +5281,7 @@ code = ''' ''' [cases.test_trvs_mutation_mtree_extend_bshrub] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -5365,7 +5365,7 @@ code = ''' lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; @@ -5439,7 +5439,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT | LFS3_I_CKMETA @@ -5472,7 +5472,7 @@ code = ''' ''' [cases.test_trvs_mutation_mtree_relocate] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -5561,7 +5561,7 @@ code = ''' lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; @@ -5629,7 +5629,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT | LFS3_I_CKMETA @@ -5662,7 +5662,7 @@ code = ''' ''' [cases.test_trvs_mutation_mtree_relocate_bshrub] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = '2*BLOCK_SIZE' @@ -5751,7 +5751,7 @@ code = ''' lfs3_trv_t trv; lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; @@ -5830,7 +5830,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT | LFS3_I_CKMETA @@ -5866,7 +5866,7 @@ code = ''' # test traversals with mdir compaction [cases.test_trvs_compact] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = 'FILE_CACHE_SIZE/2' @@ -5902,7 +5902,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | LFS3_I_COMPACT | LFS3_I_CKMETA | LFS3_I_CKDATA @@ -5913,7 +5913,7 @@ code = ''' lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR | LFS3_T_COMPACT - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; // traverse mroot @@ -5937,7 +5937,7 @@ code = ''' // but because we mutated, we're still marked as uncompacted lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | LFS3_I_COMPACT | LFS3_I_CKMETA | LFS3_I_CKDATA @@ -5960,7 +5960,7 @@ code = ''' // uncompacted flag should have been cleared lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - ((!LOOKAHEAD) ? LFS3_I_LOOKAHEAD : 0) + ((!REPOPLOOKAHEAD) ? LFS3_I_REPOPLOOKAHEAD : 0) // note ckdata implies ckmeta | ((!CKMETA && !CKDATA) ? LFS3_I_CKMETA : 0) | ((!CKDATA) ? LFS3_I_CKDATA : 0) @@ -5987,7 +5987,7 @@ code = ''' ''' [cases.test_trvs_compact_mrootchain] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = 'FILE_CACHE_SIZE/2' @@ -6044,7 +6044,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT | LFS3_I_CKMETA @@ -6056,7 +6056,7 @@ code = ''' lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR | LFS3_T_COMPACT - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; // traverse mrootanchor @@ -6088,7 +6088,7 @@ code = ''' // but because we mutated, we're still marked as uncompacted lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT | LFS3_I_CKMETA @@ -6114,7 +6114,7 @@ code = ''' // uncompacted flag should have been cleared lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - ((!LOOKAHEAD) ? LFS3_I_LOOKAHEAD : 0) + ((!REPOPLOOKAHEAD) ? LFS3_I_REPOPLOOKAHEAD : 0) | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) // note ckdata implies ckmeta | ((!CKMETA && !CKDATA) ? LFS3_I_CKMETA : 0) @@ -6142,7 +6142,7 @@ code = ''' ''' [cases.test_trvs_compact_mroot_extend] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = 'FILE_CACHE_SIZE/2' @@ -6181,7 +6181,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | LFS3_I_COMPACT | LFS3_I_CKMETA | LFS3_I_CKDATA @@ -6192,7 +6192,7 @@ code = ''' lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR | LFS3_T_COMPACT - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; // it's a bit unclear if we should follow the mroot or stay on the @@ -6218,7 +6218,7 @@ code = ''' // but because we mutated, we're still marked as uncompacted lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT | LFS3_I_CKMETA @@ -6242,7 +6242,7 @@ code = ''' // uncompacted flag should have been cleared lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - ((!LOOKAHEAD) ? LFS3_I_LOOKAHEAD : 0) + ((!REPOPLOOKAHEAD) ? LFS3_I_REPOPLOOKAHEAD : 0) | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) // note ckdata implies ckmeta | ((!CKMETA && !CKDATA) ? LFS3_I_CKMETA : 0) @@ -6270,7 +6270,7 @@ code = ''' ''' [cases.test_trvs_compact_mroot_split] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = 'FILE_CACHE_SIZE/2' @@ -6336,7 +6336,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | LFS3_I_COMPACT | LFS3_I_CKMETA | LFS3_I_CKDATA @@ -6347,7 +6347,7 @@ code = ''' lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR | LFS3_T_COMPACT - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; // traverse mroot @@ -6385,7 +6385,7 @@ code = ''' // but because we mutated, we're still marked as uncompacted lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT | LFS3_I_CKMETA @@ -6410,7 +6410,7 @@ code = ''' // uncompacted flag should have been cleared lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - ((!LOOKAHEAD) ? LFS3_I_LOOKAHEAD : 0) + ((!REPOPLOOKAHEAD) ? LFS3_I_REPOPLOOKAHEAD : 0) | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) // note ckdata implies ckmeta | ((!CKMETA && !CKDATA) ? LFS3_I_CKMETA : 0) @@ -6445,7 +6445,7 @@ code = ''' ''' [cases.test_trvs_compact_mtree] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = 'FILE_CACHE_SIZE/2' @@ -6558,7 +6558,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT | LFS3_I_CKMETA @@ -6570,7 +6570,7 @@ code = ''' lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR | LFS3_T_COMPACT - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; // traverse mroot @@ -6615,7 +6615,7 @@ code = ''' // but because we mutated, we're still marked as uncompacted lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT | LFS3_I_CKMETA @@ -6642,7 +6642,7 @@ code = ''' // uncompacted flag should have been cleared lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - ((!LOOKAHEAD) ? LFS3_I_LOOKAHEAD : 0) + ((!REPOPLOOKAHEAD) ? LFS3_I_REPOPLOOKAHEAD : 0) | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) // note ckdata implies ckmeta | ((!CKMETA && !CKDATA) ? LFS3_I_CKMETA : 0) @@ -6684,7 +6684,7 @@ code = ''' ''' [cases.test_trvs_compact_mtree_split] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = 'FILE_CACHE_SIZE/2' @@ -6795,7 +6795,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT | LFS3_I_CKMETA @@ -6807,7 +6807,7 @@ code = ''' lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR | LFS3_T_COMPACT - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; // traverse mroot @@ -6857,7 +6857,7 @@ code = ''' // but because we mutated, we're still marked as uncompacted lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT | LFS3_I_CKMETA @@ -6884,7 +6884,7 @@ code = ''' // uncompacted flag should have been cleared lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - ((!LOOKAHEAD) ? LFS3_I_LOOKAHEAD : 0) + ((!REPOPLOOKAHEAD) ? LFS3_I_REPOPLOOKAHEAD : 0) | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) // note ckdata implies ckmeta | ((!CKMETA && !CKDATA) ? LFS3_I_CKMETA : 0) @@ -6939,7 +6939,7 @@ code = ''' # test traversals with mkconsistent [cases.test_trvs_mkconsistent] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = 'FILE_CACHE_SIZE/2' @@ -7003,7 +7003,7 @@ code = ''' lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( ((ORPHANS > 0) ? LFS3_I_MKCONSISTENT : 0) - | LFS3_I_LOOKAHEAD + | LFS3_I_REPOPLOOKAHEAD | ((GBMAP && ORPHANS >= 100) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) @@ -7017,7 +7017,7 @@ code = ''' lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR | LFS3_T_MKCONSISTENT - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; // traverse mroot @@ -7063,7 +7063,7 @@ code = ''' // and we should be marked as consistent lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - ((!LOOKAHEAD || ORPHANS > 0) ? LFS3_I_LOOKAHEAD : 0) + ((!REPOPLOOKAHEAD || ORPHANS > 0) ? LFS3_I_REPOPLOOKAHEAD : 0) | ((GBMAP && ORPHANS >= 100) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) @@ -7101,7 +7101,7 @@ code = ''' ''' [cases.test_trvs_mkconsistent_conflict] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = 'FILE_CACHE_SIZE/2' @@ -7143,7 +7143,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | LFS3_I_COMPACT | LFS3_I_CKMETA | LFS3_I_CKDATA @@ -7154,7 +7154,7 @@ code = ''' lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR | LFS3_T_MKCONSISTENT - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; // traverse mroot @@ -7221,7 +7221,7 @@ code = ''' lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( ((ORPHANS >= 3) ? LFS3_I_MKCONSISTENT : 0) - | ((!LOOKAHEAD || ORPHANS > 0) ? LFS3_I_LOOKAHEAD : 0) + | ((!REPOPLOOKAHEAD || ORPHANS > 0) ? LFS3_I_REPOPLOOKAHEAD : 0) | ((GBMAP && ORPHANS >= 100) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) @@ -7259,7 +7259,7 @@ code = ''' ''' [cases.test_trvs_mkconsistent_btree] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] # limit files to very simple btrees @@ -7327,7 +7327,7 @@ code = ''' lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( ((ORPHANS > 0) ? LFS3_I_MKCONSISTENT : 0) - | LFS3_I_LOOKAHEAD + | LFS3_I_REPOPLOOKAHEAD | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT | LFS3_I_CKMETA @@ -7339,7 +7339,7 @@ code = ''' lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR | LFS3_T_MKCONSISTENT - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; // traverse mroot @@ -7399,7 +7399,7 @@ code = ''' // and we should be marked as consistent lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - ((!LOOKAHEAD || ORPHANS > 0) ? LFS3_I_LOOKAHEAD : 0) + ((!REPOPLOOKAHEAD || ORPHANS > 0) ? LFS3_I_REPOPLOOKAHEAD : 0) | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT // note ckdata implies ckmeta @@ -7435,7 +7435,7 @@ code = ''' ''' [cases.test_trvs_mkconsistent_btree_uncreat] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] # limit files to very simple btrees @@ -7503,7 +7503,7 @@ code = ''' lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( ((ORPHANS > 0) ? LFS3_I_MKCONSISTENT : 0) - | LFS3_I_LOOKAHEAD + | LFS3_I_REPOPLOOKAHEAD | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT | LFS3_I_CKMETA @@ -7515,7 +7515,7 @@ code = ''' lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR | LFS3_T_MKCONSISTENT - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; // traverse mroot @@ -7575,7 +7575,7 @@ code = ''' // and we should be marked as consistent lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - ((!LOOKAHEAD || ORPHANS > 0) ? LFS3_I_LOOKAHEAD : 0) + ((!REPOPLOOKAHEAD || ORPHANS > 0) ? LFS3_I_REPOPLOOKAHEAD : 0) | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT // note ckdata implies ckmeta @@ -7611,7 +7611,7 @@ code = ''' ''' [cases.test_trvs_mkconsistent_bshrub] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] # this configuration should create a 2-layer bshrub, which may be @@ -7680,7 +7680,7 @@ code = ''' lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( ((ORPHANS > 0) ? LFS3_I_MKCONSISTENT : 0) - | LFS3_I_LOOKAHEAD + | LFS3_I_REPOPLOOKAHEAD | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT | LFS3_I_CKMETA @@ -7692,7 +7692,7 @@ code = ''' lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR | LFS3_T_MKCONSISTENT - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; // traverse mroot @@ -7760,7 +7760,7 @@ code = ''' // and we should be marked as consistent lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - ((!LOOKAHEAD || ORPHANS > 0) ? LFS3_I_LOOKAHEAD : 0) + ((!REPOPLOOKAHEAD || ORPHANS > 0) ? LFS3_I_REPOPLOOKAHEAD : 0) | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT // note ckdata implies ckmeta @@ -7796,7 +7796,7 @@ code = ''' ''' [cases.test_trvs_mkconsistent_bshrub_uncreat] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] # this configuration should create a 2-layer bshrub, which may be @@ -7865,7 +7865,7 @@ code = ''' lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( ((ORPHANS > 0) ? LFS3_I_MKCONSISTENT : 0) - | LFS3_I_LOOKAHEAD + | LFS3_I_REPOPLOOKAHEAD | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT | LFS3_I_CKMETA @@ -7877,7 +7877,7 @@ code = ''' lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR | LFS3_T_MKCONSISTENT - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; // traverse mroot @@ -7945,7 +7945,7 @@ code = ''' // and we should be marked as consistent lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - ((!LOOKAHEAD || ORPHANS > 0) ? LFS3_I_LOOKAHEAD : 0) + ((!REPOPLOOKAHEAD || ORPHANS > 0) ? LFS3_I_REPOPLOOKAHEAD : 0) | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) | LFS3_I_COMPACT // note ckdata implies ckmeta @@ -7981,7 +7981,7 @@ code = ''' ''' [cases.test_trvs_mkconsistent_compact] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = 'FILE_CACHE_SIZE/2' @@ -8068,7 +8068,7 @@ code = ''' lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( ((ORPHANS > 0) ? LFS3_I_MKCONSISTENT : 0) - | LFS3_I_LOOKAHEAD + | LFS3_I_REPOPLOOKAHEAD | ((GBMAP && ORPHANS >= 100) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) @@ -8083,7 +8083,7 @@ code = ''' LFS3_T_RDWR | LFS3_T_MKCONSISTENT | LFS3_T_COMPACT - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; // traverse mroot @@ -8133,7 +8133,7 @@ code = ''' // still marked as uncompacted lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | ((GBMAP && ORPHANS >= 100) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) @@ -8160,7 +8160,7 @@ code = ''' // uncompacted flag should have been cleared lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - ((!LOOKAHEAD) ? LFS3_I_LOOKAHEAD : 0) + ((!REPOPLOOKAHEAD) ? LFS3_I_REPOPLOOKAHEAD : 0) | ((GBMAP && ORPHANS >= 100) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) @@ -8197,7 +8197,7 @@ code = ''' ''' [cases.test_trvs_mkconsistent_compact_conflict] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.CKMETA = [false, true] defines.CKDATA = [false, true] defines.SIZE = 'FILE_CACHE_SIZE/2' @@ -8262,7 +8262,7 @@ code = ''' struct lfs3_fsinfo fsinfo; lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( - LFS3_I_LOOKAHEAD + LFS3_I_REPOPLOOKAHEAD | LFS3_I_COMPACT | LFS3_I_CKMETA | LFS3_I_CKDATA @@ -8274,7 +8274,7 @@ code = ''' LFS3_T_RDWR | LFS3_T_MKCONSISTENT | LFS3_T_COMPACT - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((CKMETA) ? LFS3_T_CKMETA : 0) | ((CKDATA) ? LFS3_T_CKDATA : 0)) => 0; // traverse mroot @@ -8345,7 +8345,7 @@ code = ''' lfs3_fs_stat(&lfs3, &fsinfo) => 0; assert(fsinfo.flags == ( ((ORPHANS >= 3) ? LFS3_I_MKCONSISTENT : 0) - | LFS3_I_LOOKAHEAD + | LFS3_I_REPOPLOOKAHEAD | ((GBMAP && ORPHANS >= 100) ? LFS3_IFDEF_GBMAP(LFS3_I_REPOPGBMAP, -1) : 0) @@ -8395,7 +8395,7 @@ code = ''' # traverse steps between each op defines.STEPS = [1, 2, 4, 8, 16, 32, 64, 128] defines.MKCONSISTENT = [false, true] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.REPOPGBMAP = [false, true] defines.COMPACT = [false, true] defines.CKMETA = [true] @@ -8418,7 +8418,7 @@ code = ''' lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR | ((MKCONSISTENT) ? LFS3_T_MKCONSISTENT : 0) - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((REPOPGBMAP) ? LFS3_IFDEF_GBMAP(LFS3_T_REPOPGBMAP, -1) : 0) @@ -8514,7 +8514,7 @@ code = ''' # traverse steps between each op defines.STEPS = [1, 2, 4, 8, 16, 32, 64, 128] defines.MKCONSISTENT = [false, true] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.REPOPGBMAP = [false, true] defines.COMPACT = [false, true] defines.CKMETA = [true] @@ -8544,7 +8544,7 @@ code = ''' lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR | ((MKCONSISTENT) ? LFS3_T_MKCONSISTENT : 0) - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((REPOPGBMAP) ? LFS3_IFDEF_GBMAP(LFS3_T_REPOPGBMAP, -1) : 0) @@ -8704,7 +8704,7 @@ code = ''' # traverse steps between each op defines.STEPS = [1, 2, 4, 8, 16, 32, 64, 128] defines.MKCONSISTENT = [false, true] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.REPOPGBMAP = [false, true] defines.COMPACT = [false, true] defines.CKMETA = [true] @@ -8739,7 +8739,7 @@ code = ''' lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR | ((MKCONSISTENT) ? LFS3_T_MKCONSISTENT : 0) - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((REPOPGBMAP) ? LFS3_IFDEF_GBMAP(LFS3_T_REPOPGBMAP, -1) : 0) @@ -8819,7 +8819,7 @@ code = ''' # traverse steps between each op defines.STEPS = [1, 2, 4, 8, 16, 32, 64, 128] defines.MKCONSISTENT = [false, true] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.REPOPGBMAP = [false, true] defines.COMPACT = [false, true] defines.CKMETA = [true] @@ -8862,7 +8862,7 @@ code = ''' lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR | ((MKCONSISTENT) ? LFS3_T_MKCONSISTENT : 0) - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((REPOPGBMAP) ? LFS3_IFDEF_GBMAP(LFS3_T_REPOPGBMAP, -1) : 0) @@ -9073,7 +9073,7 @@ code = ''' # traverse steps between each op defines.STEPS = [1, 2, 4, 8, 16, 32, 64, 128] defines.MKCONSISTENT = [false, true] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.REPOPGBMAP = [false, true] defines.COMPACT = [false, true] defines.CKMETA = [true] @@ -9146,7 +9146,7 @@ code = ''' lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR | ((MKCONSISTENT) ? LFS3_T_MKCONSISTENT : 0) - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((REPOPGBMAP) ? LFS3_IFDEF_GBMAP(LFS3_T_REPOPGBMAP, -1) : 0) @@ -9245,7 +9245,7 @@ code = ''' # traverse steps between each op defines.STEPS = [1, 2, 4, 8, 16, 32, 64, 128] defines.MKCONSISTENT = [false, true] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.REPOPGBMAP = [false, true] defines.COMPACT = [false, true] defines.CKMETA = [true] @@ -9299,7 +9299,7 @@ code = ''' lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR | ((MKCONSISTENT) ? LFS3_T_MKCONSISTENT : 0) - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((REPOPGBMAP) ? LFS3_IFDEF_GBMAP(LFS3_T_REPOPGBMAP, -1) : 0) @@ -9706,7 +9706,7 @@ code = ''' # traverse steps between each op defines.STEPS = [1, 2, 4, 8, 16, 32, 64, 128] defines.MKCONSISTENT = [false, true] -defines.LOOKAHEAD = [false, true] +defines.REPOPLOOKAHEAD = [false, true] defines.REPOPGBMAP = [false, true] defines.COMPACT = [false, true] defines.CKMETA = [true] @@ -9761,7 +9761,7 @@ code = ''' lfs3_trv_open(&lfs3, &trv, LFS3_T_RDWR | ((MKCONSISTENT) ? LFS3_T_MKCONSISTENT : 0) - | ((LOOKAHEAD) ? LFS3_T_LOOKAHEAD : 0) + | ((REPOPLOOKAHEAD) ? LFS3_T_REPOPLOOKAHEAD : 0) | ((REPOPGBMAP) ? LFS3_IFDEF_GBMAP(LFS3_T_REPOPGBMAP, -1) : 0)