Github/littlefs
1
Fork 0
Code Actions Activity

Renamed file_cache -> fcache and gbmap_re -> regbmap

Browse Source 
This walks back some of the attempt at strict object namespacing in
struct lfs3_cfg:

- cfg.file_cache_size  -> cfg.fcache_size
- filecfg.cache_size   -> filecfg.fcache_size
- filecfg.cache_buffer -> filecfg.fcache_buffer
- cfg.gbmap_re_thresh  -> cfg.regbmap_thresh

Motivation:

- cfg.regbmap_thresh now matches cfg.gc_regbmap_thresh, instead of using
  awkwardly different namespacing patterns.

- Giving fcache a more unique name is useful for discussion. Having
  pcache, rcache, and then file_cache was a bit awkward.

  Hopefully it's also more clear that cfg.fcache_size and
  filecfg.fcache_size are related.

- Config in struct lfs3_cfg is named a bit more consistently, well, if
  you ignore gc_*_* options.

- Less typing.

Though this gets into pretty subjective naming territory. May revert
this if the new terms are uncomfortable after use.
This commit is contained in:
Christopher Haster
2025-10-22 16:11:44 -05:00
parent 4dced81abc
commit 3ab7ecb2b0
18 changed files with 462 additions and 462 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lfs3.c
+25 -25
View File
@@ -11112,7 +11112,7 @@ static inline int lfs3_alloc_ckpoint(lfs3_t *lfs3) {
// do we need to repopulate the gbmap? // do we need to repopulate the gbmap?
if (lfs3_f_isgbmap(lfs3->flags) if (lfs3_f_isgbmap(lfs3->flags)
&& lfs3->gbmap.known < lfs3_min( && lfs3->gbmap.known < lfs3_min(
lfs3->cfg->gbmap_re_thresh, lfs3->cfg->regbmap_thresh,
lfs3->block_count)) { lfs3->block_count)) {
int err = lfs3_alloc_regbmap(lfs3); int err = lfs3_alloc_regbmap(lfs3);
if (err) { if (err) {
@@ -11265,7 +11265,7 @@ static inline bool lfs3_alloc_isregbmap(const lfs3_t *lfs3) {
<= lfs3_min( <= lfs3_min(
lfs3_max( lfs3_max(
lfs3->cfg->gc_regbmap_thresh, lfs3->cfg->gc_regbmap_thresh,
lfs3->cfg->gbmap_re_thresh), lfs3->cfg->regbmap_thresh),
lfs3->block_count-1); lfs3->block_count-1);
} }
#endif #endif
@@ -12574,11 +12574,11 @@ static inline void lfs3_file_discardbshrub(lfs3_file_t *file) {
lfs3_bshrub_init(&file->b); lfs3_bshrub_init(&file->b);
} }
static inline lfs3_size_t lfs3_file_cachesize(lfs3_t *lfs3, static inline lfs3_size_t lfs3_file_fcachesize(lfs3_t *lfs3,
const lfs3_file_t *file) { const lfs3_file_t *file) {
return (file->cfg->cache_buffer || file->cfg->cache_size) return (file->cfg->fcache_buffer || file->cfg->fcache_size)
? file->cfg->cache_size ? file->cfg->fcache_size
: lfs3->cfg->file_cache_size; : lfs3->cfg->fcache_size;
} }
static inline lfs3_off_t lfs3_file_size_(const lfs3_file_t *file) { static inline lfs3_off_t lfs3_file_size_(const lfs3_file_t *file) {
@@ -12709,16 +12709,16 @@ int lfs3_file_opencfg_(lfs3_t *lfs3, lfs3_file_t *file,
// the file cache, so make sure not to clobber it // the file cache, so make sure not to clobber it
if (lfs3_o_iswrset(file->b.h.flags)) { if (lfs3_o_iswrset(file->b.h.flags)) {
file->b.h.flags |= LFS3_o_UNFLUSH; file->b.h.flags |= LFS3_o_UNFLUSH;
file->cache.buffer = file->cfg->cache_buffer; file->cache.buffer = file->cfg->fcache_buffer;
#ifndef LFS3_KVONLY #ifndef LFS3_KVONLY
file->cache.pos = 0; file->cache.pos = 0;
#endif #endif
file->cache.size = file->cfg->cache_size; file->cache.size = file->cfg->fcache_size;
} else if (file->cfg->cache_buffer) { } else if (file->cfg->fcache_buffer) {
file->cache.buffer = file->cfg->cache_buffer; file->cache.buffer = file->cfg->fcache_buffer;
} else { } else {
#ifndef LFS3_KVONLY #ifndef LFS3_KVONLY
file->cache.buffer = lfs3_malloc(lfs3_file_cachesize(lfs3, file)); file->cache.buffer = lfs3_malloc(lfs3_file_fcachesize(lfs3, file));
if (!file->cache.buffer) { if (!file->cache.buffer) {
return LFS3_ERR_NOMEM; return LFS3_ERR_NOMEM;
} }
@@ -12922,7 +12922,7 @@ int lfs3_file_open(lfs3_t *lfs3, lfs3_file_t *file,
static void lfs3_file_close_(lfs3_t *lfs3, const lfs3_file_t *file) { static void lfs3_file_close_(lfs3_t *lfs3, const lfs3_file_t *file) {
(void)lfs3; (void)lfs3;
// clean up memory // clean up memory
if (!file->cfg->cache_buffer) { if (!file->cfg->fcache_buffer) {
lfs3_free(file->cache.buffer); lfs3_free(file->cache.buffer);
} }
@@ -13173,7 +13173,7 @@ lfs3_ssize_t lfs3_file_read(lfs3_t *lfs3, lfs3_file_t *file,
if (!lfs3_o_isuncryst(file->b.h.flags) if (!lfs3_o_isuncryst(file->b.h.flags)
&& !lfs3_o_isungraft(file->b.h.flags)) { && !lfs3_o_isungraft(file->b.h.flags)) {
// bypass cache? // bypass cache?
if ((lfs3_size_t)d >= lfs3_file_cachesize(lfs3, file)) { if ((lfs3_size_t)d >= lfs3_file_fcachesize(lfs3, file)) {
lfs3_ssize_t d_ = lfs3_file_readnext(lfs3, file, lfs3_ssize_t d_ = lfs3_file_readnext(lfs3, file,
pos_, buffer_, d); pos_, buffer_, d);
if (d_ < 0) { if (d_ < 0) {
@@ -14384,7 +14384,7 @@ lfs3_ssize_t lfs3_file_write(lfs3_t *lfs3, lfs3_file_t *file,
// and avoids weird cases with low-level write heuristics // and avoids weird cases with low-level write heuristics
// //
if (!lfs3_o_isunflush(file->b.h.flags) if (!lfs3_o_isunflush(file->b.h.flags)
&& size >= lfs3_file_cachesize(lfs3, file)) { && size >= lfs3_file_fcachesize(lfs3, file)) {
err = lfs3_file_flush_(lfs3, file, err = lfs3_file_flush_(lfs3, file,
pos, buffer_, size); pos, buffer_, size);
if (err) { if (err) {
@@ -14395,11 +14395,11 @@ lfs3_ssize_t lfs3_file_write(lfs3_t *lfs3, lfs3_file_t *file,
// //
// note we need to clear the cache anyways to avoid any // note we need to clear the cache anyways to avoid any
// out-of-date data // out-of-date data
file->cache.pos = pos + size - lfs3_file_cachesize(lfs3, file); file->cache.pos = pos + size - lfs3_file_fcachesize(lfs3, file);
lfs3_memcpy(file->cache.buffer, lfs3_memcpy(file->cache.buffer,
&buffer_[size - lfs3_file_cachesize(lfs3, file)], &buffer_[size - lfs3_file_fcachesize(lfs3, file)],
lfs3_file_cachesize(lfs3, file)); lfs3_file_fcachesize(lfs3, file));
file->cache.size = lfs3_file_cachesize(lfs3, file); file->cache.size = lfs3_file_fcachesize(lfs3, file);
file->b.h.flags &= ~LFS3_o_UNFLUSH; file->b.h.flags &= ~LFS3_o_UNFLUSH;
written += size; written += size;
@@ -14424,7 +14424,7 @@ lfs3_ssize_t lfs3_file_write(lfs3_t *lfs3, lfs3_file_t *file,
&& pos <= file->cache.pos + file->cache.size && pos <= file->cache.pos + file->cache.size
&& pos && pos
< file->cache.pos < file->cache.pos
+ lfs3_file_cachesize(lfs3, file))) { + lfs3_file_fcachesize(lfs3, file))) {
// unused cache? we can move it where we need it // unused cache? we can move it where we need it
if (!lfs3_o_isunflush(file->b.h.flags)) { if (!lfs3_o_isunflush(file->b.h.flags)) {
file->cache.pos = pos; file->cache.pos = pos;
@@ -14433,7 +14433,7 @@ lfs3_ssize_t lfs3_file_write(lfs3_t *lfs3, lfs3_file_t *file,
lfs3_size_t d = lfs3_min( lfs3_size_t d = lfs3_min(
size, size,
lfs3_file_cachesize(lfs3, file) lfs3_file_fcachesize(lfs3, file)
- (pos - file->cache.pos)); - (pos - file->cache.pos));
lfs3_memcpy(&file->cache.buffer[pos - file->cache.pos], lfs3_memcpy(&file->cache.buffer[pos - file->cache.pos],
buffer_, buffer_,
@@ -14757,7 +14757,7 @@ static int lfs3_file_sync_(lfs3_t *lfs3, lfs3_file_t *file,
// note we need to be careful if caches have different // note we need to be careful if caches have different
// sizes, prefer the most recent data in this case // sizes, prefer the most recent data in this case
lfs3_size_t d = file->cache.size - lfs3_min( lfs3_size_t d = file->cache.size - lfs3_min(
lfs3_file_cachesize(lfs3, file_), lfs3_file_fcachesize(lfs3, file_),
file->cache.size); file->cache.size);
file_->cache.pos = file->cache.pos + d; file_->cache.pos = file->cache.pos + d;
lfs3_memcpy(file_->cache.buffer, lfs3_memcpy(file_->cache.buffer,
@@ -15313,8 +15313,8 @@ int lfs3_file_ckdata(lfs3_t *lfs3, lfs3_file_t *file) {
// kv file config, we need to explicitly disable the file cache // kv file config, we need to explicitly disable the file cache
static const struct lfs3_file_cfg lfs3_file_kvcfg = { static const struct lfs3_file_cfg lfs3_file_kvcfg = {
// TODO is this the best way to do this? // TODO is this the best way to do this?
.cache_buffer = (uint8_t*)1, .fcache_buffer = (uint8_t*)1,
.cache_size = 0, .fcache_size = 0,
}; };
lfs3_ssize_t lfs3_get(lfs3_t *lfs3, const char *path, lfs3_ssize_t lfs3_get(lfs3_t *lfs3, const char *path,
@@ -15376,8 +15376,8 @@ int lfs3_set(lfs3_t *lfs3, const char *path,
// to try to commit small files atomically // to try to commit small files atomically
// //
struct lfs3_file_cfg cfg = { struct lfs3_file_cfg cfg = {
.cache_buffer = (uint8_t*)buffer, .fcache_buffer = (uint8_t*)buffer,
.cache_size = size, .fcache_size = size,
}; };
lfs3_file_t file; lfs3_file_t file;
int err = lfs3_file_opencfg_(lfs3, &file, path, int err = lfs3_file_opencfg_(lfs3, &file, path,
lfs3.h
+9 -9
View File
@@ -463,7 +463,7 @@ struct lfs3_cfg {
// Size of file caches in bytes. In addition to filesystem-wide // Size of file caches in bytes. In addition to filesystem-wide
// read/prog caches, each file gets its own cache to reduce disk // read/prog caches, each file gets its own cache to reduce disk
// accesses. // accesses.
lfs3_size_t file_cache_size; lfs3_size_t fcache_size;
// Size of the lookahead buffer in bytes. A larger lookahead buffer // Size of the lookahead buffer in bytes. A larger lookahead buffer
// increases the number of blocks found during an allocation scan. The // increases the number of blocks found during an allocation scan. The
@@ -512,10 +512,10 @@ struct lfs3_cfg {
// //
// Note this only affects explicit gc operations. During normal // Note this only affects explicit gc operations. During normal
// operations gbmap repopulations are controlled by // operations gbmap repopulations are controlled by
// gbmap_re_thresh. // regbmap_thresh.
// //
// Any value <= gbmap_re_thresh repopulates the gbmap when below // Any value <= regbmap_thresh repopulates the gbmap when below
// gbmap_re_thresh, while -1 or any value >= block_count // regbmap_thresh, while -1 or any value >= block_count
// repopulates the lookahead buffer after any block allocation. // repopulates the lookahead buffer after any block allocation.
#if !defined(LFS3_RDONLY) && defined(LFS3_GBMAP) #if !defined(LFS3_RDONLY) && defined(LFS3_GBMAP)
lfs3_block_t gc_regbmap_thresh; lfs3_block_t gc_regbmap_thresh;
@@ -614,7 +614,7 @@ struct lfs3_cfg {
// 0 only repopulates the gbmap when empty, minimizing gbmap // 0 only repopulates the gbmap when empty, minimizing gbmap
// repops at the risk of large latency spikes. // repops at the risk of large latency spikes.
#ifdef LFS3_GBMAP #ifdef LFS3_GBMAP
lfs3_block_t gbmap_re_thresh; lfs3_block_t regbmap_thresh;
#endif #endif
}; };
@@ -689,14 +689,14 @@ struct lfs3_attr {
// Optional configuration provided during lfs3_file_opencfg // Optional configuration provided during lfs3_file_opencfg
struct lfs3_file_cfg { struct lfs3_file_cfg {
// Optional statically allocated file cache buffer. Must be cache_size. // Optional statically allocated file cache buffer. Must be fcache_size.
// By default lfs3_malloc is used to allocate this buffer. // By default lfs3_malloc is used to allocate this buffer.
void *cache_buffer; void *fcache_buffer;
// Size of the file cache in bytes. In addition to filesystem-wide // Size of the file cache in bytes. In addition to filesystem-wide
// read/prog caches, each file gets its own cache to reduce disk // read/prog caches, each file gets its own cache to reduce disk
// accesses. Defaults to file_cache_size if cache_buffer is NULL. // accesses. Defaults to fcache_size if fcache_buffer is NULL.
lfs3_size_t cache_size; lfs3_size_t fcache_size;
// Optional list of custom attributes attached to the file. If readable, // Optional list of custom attributes attached to the file. If readable,
// these attributes will be kept up to date with the attributes on-disk. // these attributes will be kept up to date with the attributes on-disk.
runners/bench_runner.h
+4 -4
View File
@@ -112,7 +112,7 @@ void bench_permutation(size_t i, uint32_t *buffer, size_t size);
BENCH_DEFINE(BLOCK_RECYCLES, -1 ) \ BENCH_DEFINE(BLOCK_RECYCLES, -1 ) \
BENCH_DEFINE(RCACHE_SIZE, LFS3_MAX(16, READ_SIZE) ) \ BENCH_DEFINE(RCACHE_SIZE, LFS3_MAX(16, READ_SIZE) ) \
BENCH_DEFINE(PCACHE_SIZE, LFS3_MAX(16, PROG_SIZE) ) \ BENCH_DEFINE(PCACHE_SIZE, LFS3_MAX(16, PROG_SIZE) ) \
BENCH_DEFINE(FILE_CACHE_SIZE, 16 ) \ BENCH_DEFINE(FCACHE_SIZE, 16 ) \
BENCH_DEFINE(LOOKAHEAD_SIZE, 16 ) \ BENCH_DEFINE(LOOKAHEAD_SIZE, 16 ) \
BENCH_DEFINE(GC_FLAGS, LFS3_GC_ALL ) \ BENCH_DEFINE(GC_FLAGS, LFS3_GC_ALL ) \
BENCH_DEFINE(GC_STEPS, 0 ) \ BENCH_DEFINE(GC_STEPS, 0 ) \
@@ -122,7 +122,7 @@ void bench_permutation(size_t i, uint32_t *buffer, size_t size);
BENCH_DEFINE(SHRUB_SIZE, BLOCK_SIZE/4 ) \ BENCH_DEFINE(SHRUB_SIZE, BLOCK_SIZE/4 ) \
BENCH_DEFINE(FRAGMENT_SIZE, LFS3_MIN(BLOCK_SIZE/8, 512) ) \ BENCH_DEFINE(FRAGMENT_SIZE, LFS3_MIN(BLOCK_SIZE/8, 512) ) \
BENCH_DEFINE(CRYSTAL_THRESH, BLOCK_SIZE/8 ) \ BENCH_DEFINE(CRYSTAL_THRESH, BLOCK_SIZE/8 ) \
BENCH_DEFINE(GBMAP_RE_THRESH, BLOCK_COUNT/4 ) \ BENCH_DEFINE(REGBMAP_THRESH, BLOCK_COUNT/4 ) \
BENCH_DEFINE(ERASE_VALUE, 0xff ) \ BENCH_DEFINE(ERASE_VALUE, 0xff ) \
BENCH_DEFINE(ERASE_CYCLES, 0 ) \ BENCH_DEFINE(ERASE_CYCLES, 0 ) \
BENCH_DEFINE(BADBLOCK_BEHAVIOR, LFS3_EMUBD_BADBLOCK_PROGERROR ) \ BENCH_DEFINE(BADBLOCK_BEHAVIOR, LFS3_EMUBD_BADBLOCK_PROGERROR ) \
@@ -145,7 +145,7 @@ void bench_permutation(size_t i, uint32_t *buffer, size_t size);
.block_recycles = BLOCK_RECYCLES, \ .block_recycles = BLOCK_RECYCLES, \
.rcache_size = RCACHE_SIZE, \ .rcache_size = RCACHE_SIZE, \
.pcache_size = PCACHE_SIZE, \ .pcache_size = PCACHE_SIZE, \
.file_cache_size = FILE_CACHE_SIZE, \ .fcache_size = FCACHE_SIZE, \
.lookahead_size = LOOKAHEAD_SIZE, \ .lookahead_size = LOOKAHEAD_SIZE, \
BENCH_GBMAP_CFG \ BENCH_GBMAP_CFG \
BENCH_GC_CFG \ BENCH_GC_CFG \
@@ -158,7 +158,7 @@ void bench_permutation(size_t i, uint32_t *buffer, size_t size);
#ifdef LFS3_GBMAP #ifdef LFS3_GBMAP
#define BENCH_GBMAP_CFG \ #define BENCH_GBMAP_CFG \
.gc_regbmap_thresh = GC_REGBMAP_THRESH, \ .gc_regbmap_thresh = GC_REGBMAP_THRESH, \
.gbmap_re_thresh = GBMAP_RE_THRESH, .regbmap_thresh = REGBMAP_THRESH,
#else #else
#define BENCH_GBMAP_CFG #define BENCH_GBMAP_CFG
#endif #endif
runners/test_runner.h
+4 -4
View File
@@ -103,7 +103,7 @@ void test_permutation(size_t i, uint32_t *buffer, size_t size);
TEST_DEFINE(BLOCK_RECYCLES, -1 ) \ TEST_DEFINE(BLOCK_RECYCLES, -1 ) \
TEST_DEFINE(RCACHE_SIZE, LFS3_MAX(16, READ_SIZE) ) \ TEST_DEFINE(RCACHE_SIZE, LFS3_MAX(16, READ_SIZE) ) \
TEST_DEFINE(PCACHE_SIZE, LFS3_MAX(16, PROG_SIZE) ) \ TEST_DEFINE(PCACHE_SIZE, LFS3_MAX(16, PROG_SIZE) ) \
TEST_DEFINE(FILE_CACHE_SIZE, 16 ) \ TEST_DEFINE(FCACHE_SIZE, 16 ) \
TEST_DEFINE(LOOKAHEAD_SIZE, 16 ) \ TEST_DEFINE(LOOKAHEAD_SIZE, 16 ) \
TEST_DEFINE(GC_FLAGS, LFS3_GC_ALL ) \ TEST_DEFINE(GC_FLAGS, LFS3_GC_ALL ) \
TEST_DEFINE(GC_STEPS, 0 ) \ TEST_DEFINE(GC_STEPS, 0 ) \
@@ -113,7 +113,7 @@ void test_permutation(size_t i, uint32_t *buffer, size_t size);
TEST_DEFINE(SHRUB_SIZE, BLOCK_SIZE/4 ) \ TEST_DEFINE(SHRUB_SIZE, BLOCK_SIZE/4 ) \
TEST_DEFINE(FRAGMENT_SIZE, LFS3_MIN(BLOCK_SIZE/8, 512) ) \ TEST_DEFINE(FRAGMENT_SIZE, LFS3_MIN(BLOCK_SIZE/8, 512) ) \
TEST_DEFINE(CRYSTAL_THRESH, BLOCK_SIZE/8 ) \ TEST_DEFINE(CRYSTAL_THRESH, BLOCK_SIZE/8 ) \
TEST_DEFINE(GBMAP_RE_THRESH, BLOCK_COUNT/4 ) \ TEST_DEFINE(REGBMAP_THRESH, BLOCK_COUNT/4 ) \
TEST_DEFINE(ERASE_VALUE, 0xff ) \ TEST_DEFINE(ERASE_VALUE, 0xff ) \
TEST_DEFINE(ERASE_CYCLES, 0 ) \ TEST_DEFINE(ERASE_CYCLES, 0 ) \
TEST_DEFINE(BADBLOCK_BEHAVIOR, LFS3_EMUBD_BADBLOCK_PROGERROR ) \ TEST_DEFINE(BADBLOCK_BEHAVIOR, LFS3_EMUBD_BADBLOCK_PROGERROR ) \
@@ -136,7 +136,7 @@ void test_permutation(size_t i, uint32_t *buffer, size_t size);
.block_recycles = BLOCK_RECYCLES, \ .block_recycles = BLOCK_RECYCLES, \
.rcache_size = RCACHE_SIZE, \ .rcache_size = RCACHE_SIZE, \
.pcache_size = PCACHE_SIZE, \ .pcache_size = PCACHE_SIZE, \
.file_cache_size = FILE_CACHE_SIZE, \ .fcache_size = FCACHE_SIZE, \
.lookahead_size = LOOKAHEAD_SIZE, \ .lookahead_size = LOOKAHEAD_SIZE, \
TEST_GBMAP_CFG \ TEST_GBMAP_CFG \
TEST_GC_CFG \ TEST_GC_CFG \
@@ -149,7 +149,7 @@ void test_permutation(size_t i, uint32_t *buffer, size_t size);
#ifdef LFS3_GBMAP #ifdef LFS3_GBMAP
#define TEST_GBMAP_CFG \ #define TEST_GBMAP_CFG \
.gc_regbmap_thresh = GC_REGBMAP_THRESH, \ .gc_regbmap_thresh = GC_REGBMAP_THRESH, \
.gbmap_re_thresh = GBMAP_RE_THRESH, .regbmap_thresh = REGBMAP_THRESH,
#else #else
#define TEST_GBMAP_CFG #define TEST_GBMAP_CFG
#endif #endif
tests/test_alloc.toml
+6 -6
View File
@@ -308,8 +308,8 @@ code = '''
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -487,8 +487,8 @@ code = '''
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -852,8 +852,8 @@ defines.COUNT = [
] ]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
tests/test_badblocks.toml
+30 -30
View File
@@ -449,8 +449,8 @@ defines.CKPROGS = 'BADBLOCK_BEHAVIOR >= LFS3_EMUBD_BADBLOCK_READERROR'
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -561,8 +561,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = '2*N' defines.OPS = '2*N'
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -809,8 +809,8 @@ defines.BADBLOCK_BEHAVIOR = [
defines.CKPROGS = 'BADBLOCK_BEHAVIOR >= LFS3_EMUBD_BADBLOCK_READERROR' defines.CKPROGS = 'BADBLOCK_BEHAVIOR >= LFS3_EMUBD_BADBLOCK_READERROR'
defines.OPS = 20 defines.OPS = 20
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -983,8 +983,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = '2*N' defines.OPS = '2*N'
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1439,8 +1439,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = '2*N' defines.OPS = '2*N'
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2410,8 +2410,8 @@ defines.MIRROR = [false, true]
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2523,8 +2523,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = '2*N' defines.OPS = '2*N'
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2772,8 +2772,8 @@ defines.CKPROGS = 'BADBLOCK_BEHAVIOR >= LFS3_EMUBD_BADBLOCK_READERROR'
defines.MIRROR = [false, true] defines.MIRROR = [false, true]
defines.OPS = 20 defines.OPS = 20
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2947,8 +2947,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = '2*N' defines.OPS = '2*N'
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -3404,8 +3404,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = '2*N' defines.OPS = '2*N'
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -4375,8 +4375,8 @@ defines.MIRROR = [false, true]
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -4488,8 +4488,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = '2*N' defines.OPS = '2*N'
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -4737,8 +4737,8 @@ defines.CKPROGS = 'BADBLOCK_BEHAVIOR >= LFS3_EMUBD_BADBLOCK_READERROR'
defines.MIRROR = [false, true] defines.MIRROR = [false, true]
defines.OPS = 20 defines.OPS = 20
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -4910,8 +4910,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = '2*N' defines.OPS = '2*N'
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -5367,8 +5367,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = '2*N' defines.OPS = '2*N'
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
tests/test_ck.toml
+26 -26
View File
@@ -128,8 +128,8 @@ code = '''
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -190,8 +190,8 @@ defines.GC_STEPS = -1
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -327,8 +327,8 @@ defines.GC_STEPS = -1
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -466,8 +466,8 @@ defines.GC_STEPS = -1
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -721,8 +721,8 @@ defines.GC_STEPS = -1
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -978,8 +978,8 @@ defines.METHOD = [0, 1, 2]
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1077,8 +1077,8 @@ defines.METHOD = [0, 1, 2]
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1179,8 +1179,8 @@ defines.METHOD = [0, 1, 2]
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1329,8 +1329,8 @@ defines.METHOD = [0, 1, 2]
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -3061,8 +3061,8 @@ defines.CKDATACKSUMS = 'METHOD == 3'
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -3446,8 +3446,8 @@ defines.CKFETCHES = 'METHOD == 2'
defines.CKMETAPARITY = false defines.CKMETAPARITY = false
defines.CKDATACKSUMS = 'METHOD == 3' defines.CKDATACKSUMS = 'METHOD == 3'
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -3751,8 +3751,8 @@ defines.FLUSH = true
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -4354,8 +4354,8 @@ defines.FLUSH = true
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
tests/test_exhaustion.toml
+8 -8
View File
@@ -242,8 +242,8 @@ defines.CKPROGS = 'BADBLOCK_BEHAVIOR >= LFS3_EMUBD_BADBLOCK_READERROR'
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -521,8 +521,8 @@ defines.BADBLOCK_BEHAVIOR = [
# we need prog checking to detect read errors # we need prog checking to detect read errors
defines.CKPROGS = 'BADBLOCK_BEHAVIOR >= LFS3_EMUBD_BADBLOCK_READERROR' defines.CKPROGS = 'BADBLOCK_BEHAVIOR >= LFS3_EMUBD_BADBLOCK_READERROR'
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -712,8 +712,8 @@ defines.FLUSH = true
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1221,8 +1221,8 @@ defines.FLUSH = true
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
tests/test_files.toml
+48 -48
View File
@@ -655,21 +655,21 @@ code = '''
# try writing larger files # try writing larger files
# #
# note: # note:
# - at 2*FILE_CACHE_SIZE we need a shrub # - at 2*FCACHE_SIZE we need a shrub
# - at BLOCK_SIZE/2 we need a block pointer # - at BLOCK_SIZE/2 we need a block pointer
# - at 2*BLOCK_SIZE we need a btree # - at 2*BLOCK_SIZE we need a btree
# #
[cases.test_files_more] [cases.test_files_more]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
'4*BLOCK_SIZE', '4*BLOCK_SIZE',
] ]
defines.FILE_CACHE_SIZE = 64 defines.FCACHE_SIZE = 64
code = ''' code = '''
lfs3_t lfs3; lfs3_t lfs3;
lfs3_format(&lfs3, LFS3_F_RDWR, CFG) => 0; lfs3_format(&lfs3, LFS3_F_RDWR, CFG) => 0;
@@ -738,8 +738,8 @@ code = '''
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -831,8 +831,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = '2*N' defines.OPS = '2*N'
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1345,15 +1345,15 @@ code = '''
[cases.test_files_rm] [cases.test_files_rm]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
'4*BLOCK_SIZE', '4*BLOCK_SIZE',
] ]
defines.REMOUNT = [false, true] defines.REMOUNT = [false, true]
defines.FILE_CACHE_SIZE = 64 defines.FCACHE_SIZE = 64
code = ''' code = '''
lfs3_t lfs3; lfs3_t lfs3;
lfs3_format(&lfs3, LFS3_F_RDWR, CFG) => 0; lfs3_format(&lfs3, LFS3_F_RDWR, CFG) => 0;
@@ -1414,8 +1414,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.REMAINING = [4, 1, 0] defines.REMAINING = [4, 1, 0]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1570,8 +1570,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = '2*N' defines.OPS = '2*N'
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1726,8 +1726,8 @@ code = '''
[cases.test_files_mv] [cases.test_files_mv]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1735,7 +1735,7 @@ defines.SIZE = [
] ]
defines.N = [0, 128] defines.N = [0, 128]
defines.REMOUNT = [false, true] defines.REMOUNT = [false, true]
defines.FILE_CACHE_SIZE = 64 defines.FCACHE_SIZE = 64
code = ''' code = '''
lfs3_t lfs3; lfs3_t lfs3;
lfs3_format(&lfs3, LFS3_F_RDWR, CFG) => 0; lfs3_format(&lfs3, LFS3_F_RDWR, CFG) => 0;
@@ -1827,8 +1827,8 @@ code = '''
[cases.test_files_mv_replace] [cases.test_files_mv_replace]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1836,7 +1836,7 @@ defines.SIZE = [
] ]
defines.N = [0, 128] defines.N = [0, 128]
defines.REMOUNT = [false, true] defines.REMOUNT = [false, true]
defines.FILE_CACHE_SIZE = 64 defines.FCACHE_SIZE = 64
code = ''' code = '''
lfs3_t lfs3; lfs3_t lfs3;
lfs3_format(&lfs3, LFS3_F_RDWR, CFG) => 0; lfs3_format(&lfs3, LFS3_F_RDWR, CFG) => 0;
@@ -1938,15 +1938,15 @@ code = '''
[cases.test_files_mv_noop] [cases.test_files_mv_noop]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
'4*BLOCK_SIZE', '4*BLOCK_SIZE',
] ]
defines.REMOUNT = [false, true] defines.REMOUNT = [false, true]
defines.FILE_CACHE_SIZE = 64 defines.FCACHE_SIZE = 64
code = ''' code = '''
lfs3_t lfs3; lfs3_t lfs3;
lfs3_format(&lfs3, LFS3_F_RDWR, CFG) => 0; lfs3_format(&lfs3, LFS3_F_RDWR, CFG) => 0;
@@ -2023,15 +2023,15 @@ code = '''
[cases.test_files_mv_not_file] [cases.test_files_mv_not_file]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
'4*BLOCK_SIZE', '4*BLOCK_SIZE',
] ]
defines.REMOUNT = [false, true] defines.REMOUNT = [false, true]
defines.FILE_CACHE_SIZE = 64 defines.FCACHE_SIZE = 64
code = ''' code = '''
lfs3_t lfs3; lfs3_t lfs3;
lfs3_format(&lfs3, LFS3_F_RDWR, CFG) => 0; lfs3_format(&lfs3, LFS3_F_RDWR, CFG) => 0;
@@ -2119,15 +2119,15 @@ code = '''
[cases.test_files_mv_not_dir] [cases.test_files_mv_not_dir]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
'4*BLOCK_SIZE', '4*BLOCK_SIZE',
] ]
defines.REMOUNT = [false, true] defines.REMOUNT = [false, true]
defines.FILE_CACHE_SIZE = 64 defines.FCACHE_SIZE = 64
code = ''' code = '''
lfs3_t lfs3; lfs3_t lfs3;
lfs3_format(&lfs3, LFS3_F_RDWR, CFG) => 0; lfs3_format(&lfs3, LFS3_F_RDWR, CFG) => 0;
@@ -2215,15 +2215,15 @@ code = '''
[cases.test_files_mv_not_root] [cases.test_files_mv_not_root]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
'4*BLOCK_SIZE', '4*BLOCK_SIZE',
] ]
defines.REMOUNT = [false, true] defines.REMOUNT = [false, true]
defines.FILE_CACHE_SIZE = 64 defines.FCACHE_SIZE = 64
code = ''' code = '''
lfs3_t lfs3; lfs3_t lfs3;
lfs3_format(&lfs3, LFS3_F_RDWR, CFG) => 0; lfs3_format(&lfs3, LFS3_F_RDWR, CFG) => 0;
@@ -2300,15 +2300,15 @@ code = '''
[cases.test_files_mv_not_noent] [cases.test_files_mv_not_noent]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
'4*BLOCK_SIZE', '4*BLOCK_SIZE',
] ]
defines.REMOUNT = [false, true] defines.REMOUNT = [false, true]
defines.FILE_CACHE_SIZE = 64 defines.FCACHE_SIZE = 64
code = ''' code = '''
lfs3_t lfs3; lfs3_t lfs3;
lfs3_format(&lfs3, LFS3_F_RDWR, CFG) => 0; lfs3_format(&lfs3, LFS3_F_RDWR, CFG) => 0;
@@ -2386,8 +2386,8 @@ code = '''
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2533,8 +2533,8 @@ code = '''
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2608,8 +2608,8 @@ code = '''
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2687,8 +2687,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = '2*N' defines.OPS = '2*N'
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2884,8 +2884,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = '2*N' defines.OPS = '2*N'
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -3105,8 +3105,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = '2*N' defines.OPS = '2*N'
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
tests/test_fsync.toml
+52 -52
View File
@@ -1037,8 +1037,8 @@ code = '''
[cases.test_fsync_rrrr] [cases.test_fsync_rrrr]
defines.R = 4 defines.R = 4
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1086,8 +1086,8 @@ code = '''
defines.R = 4 defines.R = 4
defines.N = 20 defines.N = 20
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1153,8 +1153,8 @@ defines.SYNC = [0, 1, 2, 3]
# FLUSH=3 => flush via LFS3_M_FLUSH # FLUSH=3 => flush via LFS3_M_FLUSH
defines.FLUSH = [0, 1, 2, 3] defines.FLUSH = [0, 1, 2, 3]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1248,8 +1248,8 @@ defines.SYNC = [0, 1, 2, 3]
defines.FLUSH = [0, 1, 2, 3] defines.FLUSH = [0, 1, 2, 3]
defines.N = 20 defines.N = 20
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1357,8 +1357,8 @@ defines.SYNC = [0, 1, 2, 3]
# FLUSH=3 => flush via LFS3_M_FLUSH # FLUSH=3 => flush via LFS3_M_FLUSH
defines.FLUSH = [0, 1, 2, 3] defines.FLUSH = [0, 1, 2, 3]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1447,8 +1447,8 @@ defines.SYNC = [0, 1, 2, 3]
defines.FLUSH = [0, 1, 2, 3] defines.FLUSH = [0, 1, 2, 3]
defines.N = 20 defines.N = 20
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1546,8 +1546,8 @@ defines.SYNC = [0, 1, 2, 3]
# FLUSH=3 => flush via LFS3_M_FLUSH # FLUSH=3 => flush via LFS3_M_FLUSH
defines.FLUSH = [0, 1, 2, 3] defines.FLUSH = [0, 1, 2, 3]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1653,8 +1653,8 @@ defines.SYNC = [0, 1, 2, 3]
defines.FLUSH = [0, 1, 2, 3] defines.FLUSH = [0, 1, 2, 3]
defines.N = 20 defines.N = 20
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1773,8 +1773,8 @@ defines.SYNC = [0, 1, 2, 3]
# FLUSH=3 => flush via LFS3_M_FLUSH # FLUSH=3 => flush via LFS3_M_FLUSH
defines.FLUSH = [0, 1, 2, 3] defines.FLUSH = [0, 1, 2, 3]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1879,8 +1879,8 @@ defines.SYNC = [0, 1, 2, 3]
defines.FLUSH = [0, 1, 2, 3] defines.FLUSH = [0, 1, 2, 3]
defines.N = 20 defines.N = 20
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1998,8 +1998,8 @@ defines.SYNC = [0, 1, 2, 3]
defines.FLUSH = [0, 1, 2, 3] defines.FLUSH = [0, 1, 2, 3]
defines.N = 40 defines.N = 40
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2139,8 +2139,8 @@ defines.SYNC = [0, 1, 2, 3]
defines.FLUSH = [0, 1, 2, 3] defines.FLUSH = [0, 1, 2, 3]
defines.N = 40 defines.N = 40
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -3383,8 +3383,8 @@ defines.SYNC = [0, 1, 2]
# FLUSH=2 => flush via LFS3_O_FLUSH # FLUSH=2 => flush via LFS3_O_FLUSH
defines.FLUSH = [0, 1, 2] defines.FLUSH = [0, 1, 2]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -3477,8 +3477,8 @@ defines.SYNC = [0, 1, 2]
defines.FLUSH = [0, 1, 2] defines.FLUSH = [0, 1, 2]
defines.N = 20 defines.N = 20
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -3585,8 +3585,8 @@ defines.SYNC = [0, 1, 2]
# FLUSH=2 => flush via LFS3_O_FLUSH # FLUSH=2 => flush via LFS3_O_FLUSH
defines.FLUSH = [0, 1, 2] defines.FLUSH = [0, 1, 2]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -3671,8 +3671,8 @@ defines.SYNC = [0, 1, 2]
defines.FLUSH = [0, 1, 2] defines.FLUSH = [0, 1, 2]
defines.N = 20 defines.N = 20
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -3771,8 +3771,8 @@ defines.SYNC = [0, 1, 2]
# FLUSH=2 => flush via LFS3_O_FLUSH # FLUSH=2 => flush via LFS3_O_FLUSH
defines.FLUSH = [0, 1, 2] defines.FLUSH = [0, 1, 2]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -3880,8 +3880,8 @@ defines.SYNC = [0, 1, 2]
defines.FLUSH = [0, 1, 2] defines.FLUSH = [0, 1, 2]
defines.N = 20 defines.N = 20
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -3998,8 +3998,8 @@ defines.RW = 4
defines.FLUSH = [0, 1, 2] defines.FLUSH = [0, 1, 2]
defines.N = 40 defines.N = 40
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -4148,8 +4148,8 @@ defines.RW = 4
defines.FLUSH = [0, 1, 2] defines.FLUSH = [0, 1, 2]
defines.N = 40 defines.N = 40
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -5422,8 +5422,8 @@ defines.SYNC = [0, 1, 2]
# FLUSH=2 => flush via LFS3_O_FLUSH # FLUSH=2 => flush via LFS3_O_FLUSH
defines.FLUSH = [0, 1, 2] defines.FLUSH = [0, 1, 2]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -5518,8 +5518,8 @@ defines.SYNC = [0, 1, 2]
defines.FLUSH = [0, 1, 2] defines.FLUSH = [0, 1, 2]
defines.N = 20 defines.N = 20
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -5627,8 +5627,8 @@ defines.SYNC = [0, 1, 2]
# FLUSH=2 => flush via LFS3_O_FLUSH # FLUSH=2 => flush via LFS3_O_FLUSH
defines.FLUSH = [0, 1, 2] defines.FLUSH = [0, 1, 2]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -5721,8 +5721,8 @@ defines.SYNC = [0, 1, 2]
defines.FLUSH = [0, 1, 2] defines.FLUSH = [0, 1, 2]
defines.N = 20 defines.N = 20
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -5827,8 +5827,8 @@ defines.RW = 4
defines.FLUSH = [0, 1, 2] defines.FLUSH = [0, 1, 2]
defines.N = 40 defines.N = 40
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -5986,8 +5986,8 @@ defines.RW = 4
defines.FLUSH = [0, 1, 2] defines.FLUSH = [0, 1, 2]
defines.N = 40 defines.N = 40
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
tests/test_fwrite.toml
+56 -56
View File
@@ -19,8 +19,8 @@ defines.PROG_SIZE = [1, 16]
[cases.test_fwrite_simple] [cases.test_fwrite_simple]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -400,8 +400,8 @@ code = '''
[cases.test_fwrite_incr] [cases.test_fwrite_incr]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -826,8 +826,8 @@ code = '''
# write strategies # write strategies
[cases.test_fwrite_overwrite] [cases.test_fwrite_overwrite]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1008,8 +1008,8 @@ code = '''
# similar to overwrite files, but without underlying data # similar to overwrite files, but without underlying data
[cases.test_fwrite_holes] [cases.test_fwrite_holes]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1194,8 +1194,8 @@ code = '''
[cases.test_fwrite_truncate] [cases.test_fwrite_truncate]
defines.FROM = [ defines.FROM = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1203,8 +1203,8 @@ defines.FROM = [
] ]
defines.TO = [ defines.TO = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1309,8 +1309,8 @@ code = '''
[cases.test_fwrite_truncate_truncate] [cases.test_fwrite_truncate_truncate]
defines.FROM = [ defines.FROM = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1318,8 +1318,8 @@ defines.FROM = [
] ]
defines.AND = [ defines.AND = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1327,8 +1327,8 @@ defines.AND = [
] ]
defines.TO = [ defines.TO = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1452,8 +1452,8 @@ code = '''
[cases.test_fwrite_fruncate] [cases.test_fwrite_fruncate]
defines.FROM = [ defines.FROM = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1461,8 +1461,8 @@ defines.FROM = [
] ]
defines.TO = [ defines.TO = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1571,8 +1571,8 @@ code = '''
[cases.test_fwrite_fruncate_fruncate] [cases.test_fwrite_fruncate_fruncate]
defines.FROM = [ defines.FROM = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1580,8 +1580,8 @@ defines.FROM = [
] ]
defines.AND = [ defines.AND = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1589,8 +1589,8 @@ defines.AND = [
] ]
defines.TO = [ defines.TO = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2299,8 +2299,8 @@ code = '''
# writing any data structure backwards always reveals issues # writing any data structure backwards always reveals issues
[cases.test_fwrite_reversed] [cases.test_fwrite_reversed]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2762,8 +2762,8 @@ code = '''
# with lfs3_file_fruncate, we can write to a file in true reversed order # with lfs3_file_fruncate, we can write to a file in true reversed order
[cases.test_fwrite_freversed] [cases.test_fwrite_freversed]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -3223,8 +3223,8 @@ code = '''
# trigger compaction # trigger compaction
[cases.test_fwrite_overwrite_compaction] [cases.test_fwrite_overwrite_compaction]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -3414,8 +3414,8 @@ code = '''
[cases.test_fwrite_hole_compaction] [cases.test_fwrite_hole_compaction]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -3610,8 +3610,8 @@ code = '''
[cases.test_fwrite_fuzz_aligned] [cases.test_fwrite_fuzz_aligned]
defines.N = 20 defines.N = 20
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -3753,8 +3753,8 @@ code = '''
[cases.test_fwrite_fuzz_unaligned] [cases.test_fwrite_fuzz_unaligned]
defines.N = 20 defines.N = 20
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -3903,8 +3903,8 @@ code = '''
defines.N = 20 defines.N = 20
defines.WHENCE = ['LFS3_SEEK_SET', 'LFS3_SEEK_CUR', 'LFS3_SEEK_END'] defines.WHENCE = ['LFS3_SEEK_SET', 'LFS3_SEEK_CUR', 'LFS3_SEEK_END']
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -3982,8 +3982,8 @@ code = '''
defines.N = 10 defines.N = 10
defines.WHENCE = ['LFS3_SEEK_SET', 'LFS3_SEEK_CUR', 'LFS3_SEEK_END'] defines.WHENCE = ['LFS3_SEEK_SET', 'LFS3_SEEK_CUR', 'LFS3_SEEK_END']
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -4129,8 +4129,8 @@ code = '''
defines.N = 10 defines.N = 10
defines.WHENCE = ['LFS3_SEEK_SET', 'LFS3_SEEK_CUR', 'LFS3_SEEK_END'] defines.WHENCE = ['LFS3_SEEK_SET', 'LFS3_SEEK_CUR', 'LFS3_SEEK_END']
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -4301,8 +4301,8 @@ code = '''
[cases.test_fwrite_seek_negative] [cases.test_fwrite_seek_negative]
defines.WHENCE = ['LFS3_SEEK_SET', 'LFS3_SEEK_CUR', 'LFS3_SEEK_END'] defines.WHENCE = ['LFS3_SEEK_SET', 'LFS3_SEEK_CUR', 'LFS3_SEEK_END']
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -4409,8 +4409,8 @@ code = '''
# test that write overflow errors # test that write overflow errors
[cases.test_fwrite_fbig] [cases.test_fwrite_fbig]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -4517,8 +4517,8 @@ code = '''
# test that truncate overflow errors # test that truncate overflow errors
[cases.test_fwrite_truncate_fbig] [cases.test_fwrite_truncate_fbig]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -4618,8 +4618,8 @@ code = '''
# test that fruncate overflow errors # test that fruncate overflow errors
[cases.test_fwrite_fruncate_fbig] [cases.test_fwrite_fruncate_fbig]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -4721,8 +4721,8 @@ code = '''
[cases.test_fwrite_rwtf_fuzz] [cases.test_fwrite_rwtf_fuzz]
defines.N = 20 defines.N = 20
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
tests/test_gc.toml
+41 -41
View File
@@ -24,8 +24,8 @@ defines.GC_FLAGS = '''
''' '''
defines.GC_STEPS = [-1, 1, 2, 10, 100, 1000] defines.GC_STEPS = [-1, 1, 2, 10, 100, 1000]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -92,8 +92,8 @@ defines.GC_FLAGS = '''
| ((CKDATA) ? LFS3_GC_CKDATA : 0) | ((CKDATA) ? LFS3_GC_CKDATA : 0)
''' '''
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -554,8 +554,8 @@ defines.GC_STEPS = [-1, 1, 2, 10, 100, 1000]
# set compactmeta thresh to minimum # set compactmeta thresh to minimum
defines.GC_COMPACTMETA_THRESH = 'BLOCK_SIZE/2' defines.GC_COMPACTMETA_THRESH = 'BLOCK_SIZE/2'
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -644,8 +644,8 @@ defines.GC_FLAGS = '''
# set compactmeta thresh to minimum # set compactmeta thresh to minimum
defines.GC_COMPACTMETA_THRESH = 'BLOCK_SIZE/2' defines.GC_COMPACTMETA_THRESH = 'BLOCK_SIZE/2'
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -750,7 +750,7 @@ defines.GC_FLAGS = '''
| ((CKDATA) ? LFS3_GC_CKDATA : 0) | ((CKDATA) ? LFS3_GC_CKDATA : 0)
''' '''
defines.GC_STEPS = [-1, 1, 2, 10, 100, 1000] defines.GC_STEPS = [-1, 1, 2, 10, 100, 1000]
defines.SIZE = 'FILE_CACHE_SIZE/2' defines.SIZE = 'FCACHE_SIZE/2'
# <=2 => grm-able # <=2 => grm-able
# >2 => requires orphans # >2 => requires orphans
defines.ORPHANS = [1, 2, 3, 100] defines.ORPHANS = [1, 2, 3, 100]
@@ -856,7 +856,7 @@ code = '''
# test that an explicit lfs3_fs_mkconsistent call also works, this calls # test that an explicit lfs3_fs_mkconsistent call also works, this calls
# the same logic internally # the same logic internally
[cases.test_gc_mkconsistent_explicit] [cases.test_gc_mkconsistent_explicit]
defines.SIZE = 'FILE_CACHE_SIZE/2' defines.SIZE = 'FCACHE_SIZE/2'
# <=2 => grm-able # <=2 => grm-able
# >2 => requires orphans # >2 => requires orphans
defines.ORPHANS = [1, 2, 3, 100] defines.ORPHANS = [1, 2, 3, 100]
@@ -967,7 +967,7 @@ defines.GC_FLAGS = '''
| ((CKMETA) ? LFS3_GC_CKMETA : 0) | ((CKMETA) ? LFS3_GC_CKMETA : 0)
| ((CKDATA) ? LFS3_GC_CKDATA : 0) | ((CKDATA) ? LFS3_GC_CKDATA : 0)
''' '''
defines.SIZE = 'FILE_CACHE_SIZE/2' defines.SIZE = 'FCACHE_SIZE/2'
# <=2 => grm-able # <=2 => grm-able
# >2 => requires orphans # >2 => requires orphans
defines.ORPHANS = [3, 100] defines.ORPHANS = [3, 100]
@@ -1090,8 +1090,8 @@ defines.GC_STEPS = [-1, 1, 2, 10, 100, 1000]
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1193,8 +1193,8 @@ defines.GC_STEPS = [-1, 1, 2, 10, 100, 1000]
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1299,8 +1299,8 @@ done:;
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1389,8 +1389,8 @@ done:;
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1490,8 +1490,8 @@ defines.GC_STEPS = [-1, 1, 2, 10, 100, 1000]
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1656,8 +1656,8 @@ defines.GC_STEPS = [-1, 1, 2, 10, 100, 1000]
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1839,8 +1839,8 @@ defines.GC_STEPS = -1
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2070,8 +2070,8 @@ defines.GC_STEPS = -1
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2465,8 +2465,8 @@ defines.GC_STEPS = [-1, 1, 2, 10, 100, 1000]
# set compactmeta thresh to minimum # set compactmeta thresh to minimum
defines.GC_COMPACTMETA_THRESH = 'BLOCK_SIZE/2' defines.GC_COMPACTMETA_THRESH = 'BLOCK_SIZE/2'
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2540,8 +2540,8 @@ defines.GC_STEPS = [-1, 1, 2, 10, 100, 1000]
# set compactmeta thresh to minimum # set compactmeta thresh to minimum
defines.GC_COMPACTMETA_THRESH = 'BLOCK_SIZE/2' defines.GC_COMPACTMETA_THRESH = 'BLOCK_SIZE/2'
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -3020,8 +3020,8 @@ defines.GC_COMPACTMETA_THRESH = 'BLOCK_SIZE/2'
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -3127,8 +3127,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = '2*N' defines.OPS = '2*N'
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -3370,8 +3370,8 @@ defines.GC_STEPS = [-1, 1, 2, 10, 100, 1000]
defines.GC_COMPACTMETA_THRESH = 'BLOCK_SIZE/2' defines.GC_COMPACTMETA_THRESH = 'BLOCK_SIZE/2'
defines.OPS = 20 defines.OPS = 20
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -3537,8 +3537,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = '2*N' defines.OPS = '2*N'
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -3993,8 +3993,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = '2*N' defines.OPS = '2*N'
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
tests/test_grow.toml
+12 -12
View File
@@ -826,8 +826,8 @@ defines.REMOUNT = [false, true]
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -975,8 +975,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = 1024 defines.OPS = 1024
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1273,8 +1273,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = 1024 defines.OPS = 1024
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1779,8 +1779,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = 1024 defines.OPS = 1024
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2392,8 +2392,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = 256 defines.OPS = 256
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2707,8 +2707,8 @@ defines.M = 'N'
defines.OPS = 256 defines.OPS = 256
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
tests/test_mount.toml
+7 -7
View File
@@ -274,8 +274,8 @@ defines.RELOOKAHEAD = [false, true]
defines.CKMETA = [false, true] defines.CKMETA = [false, true]
defines.CKDATA = [false, true] defines.CKDATA = [false, true]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -365,7 +365,7 @@ defines.RELOOKAHEAD = [false, true]
defines.COMPACTMETA = [false, true] defines.COMPACTMETA = [false, true]
defines.CKMETA = [false, true] defines.CKMETA = [false, true]
defines.CKDATA = [false, true] defines.CKDATA = [false, true]
defines.SIZE = 'FILE_CACHE_SIZE/2' defines.SIZE = 'FCACHE_SIZE/2'
# <=2 => grm-able # <=2 => grm-able
# >2 => requires orphans # >2 => requires orphans
defines.ORPHANS = [0, 1, 2, 3, 100] defines.ORPHANS = [0, 1, 2, 3, 100]
@@ -480,8 +480,8 @@ code = '''
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -569,8 +569,8 @@ done:;
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
tests/test_powerloss.toml
+6 -6
View File
@@ -132,8 +132,8 @@ defines.SHRUB_SIZE = ['BLOCK_SIZE/4', '0']
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -233,8 +233,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = 256 defines.OPS = 256
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -466,8 +466,8 @@ defines.M = 'N'
defines.OPS = 256 defines.OPS = 256
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
tests/test_relocations.toml
+12 -12
View File
@@ -247,8 +247,8 @@ defines.BLOCK_RECYCLES = [4, 1, 0]
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -321,8 +321,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = 1024 defines.OPS = 1024
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -536,8 +536,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = 1024 defines.OPS = 1024
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -961,8 +961,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = 1024 defines.OPS = 1024
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1490,8 +1490,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = 256 defines.OPS = 256
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1712,8 +1712,8 @@ defines.M = 'N'
defines.OPS = 256 defines.OPS = 256
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
tests/test_stickynotes.toml
+66 -66
View File
@@ -6,8 +6,8 @@ after = ['test_fwrite', 'test_fsync']
# test files don't exist until first sync/close # test files don't exist until first sync/close
[cases.test_stickynotes_uncreat] [cases.test_stickynotes_uncreat]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -220,8 +220,8 @@ code = '''
# test files don't exist until first sync/close, even under powerloss # test files don't exist until first sync/close, even under powerloss
[cases.test_stickynotes_uncreat_pl] [cases.test_stickynotes_uncreat_pl]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -298,8 +298,8 @@ code = '''
# test files don't exist until first sync/close, even under powerloss # test files don't exist until first sync/close, even under powerloss
[cases.test_stickynotes_uncreat_many_pl] [cases.test_stickynotes_uncreat_many_pl]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
] ]
defines.CHUNK = 8 defines.CHUNK = 8
defines.N = 128 defines.N = 128
@@ -386,8 +386,8 @@ code = '''
# test files only exist as stickynotes until first sync/close # test files only exist as stickynotes until first sync/close
[cases.test_stickynotes_uncreat_sync_wr] [cases.test_stickynotes_uncreat_sync_wr]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -608,8 +608,8 @@ code = '''
[cases.test_stickynotes_uncreat_sync_rw] [cases.test_stickynotes_uncreat_sync_rw]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -824,8 +824,8 @@ code = '''
[cases.test_stickynotes_uncreat_wdwr] [cases.test_stickynotes_uncreat_wdwr]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2628,8 +2628,8 @@ code = '''
# test desync files don't exist until first sync + close # test desync files don't exist until first sync + close
[cases.test_stickynotes_undesync] [cases.test_stickynotes_undesync]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2843,8 +2843,8 @@ code = '''
# test desync files don't exist until first sync + close, even under powerloss # test desync files don't exist until first sync + close, even under powerloss
[cases.test_stickynotes_undesync_pl] [cases.test_stickynotes_undesync_pl]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2923,8 +2923,8 @@ code = '''
# test desync files don't exist until first sync + close, even under powerloss # test desync files don't exist until first sync + close, even under powerloss
[cases.test_stickynotes_undesync_many_pl] [cases.test_stickynotes_undesync_many_pl]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
] ]
defines.CHUNK = 8 defines.CHUNK = 8
defines.N = 128 defines.N = 128
@@ -3019,8 +3019,8 @@ code = '''
# test desync files aren't even openable until first sync + close # test desync files aren't even openable until first sync + close
[cases.test_stickynotes_undesync_sync_wr] [cases.test_stickynotes_undesync_sync_wr]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -3230,8 +3230,8 @@ code = '''
[cases.test_stickynotes_undesync_sync_rw] [cases.test_stickynotes_undesync_sync_rw]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -3448,8 +3448,8 @@ code = '''
[cases.test_stickynotes_undesync_wdwr] [cases.test_stickynotes_undesync_wdwr]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -3989,8 +3989,8 @@ code = '''
# test that desynced, and then closed, files don't show up # test that desynced, and then closed, files don't show up
[cases.test_stickynotes_orphan] [cases.test_stickynotes_orphan]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -4116,8 +4116,8 @@ code = '''
[cases.test_stickynotes_orphan_wdwr] [cases.test_stickynotes_orphan_wdwr]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -4425,8 +4425,8 @@ code = '''
defines.N = 'range(6)' defines.N = 'range(6)'
defines.M = 'range(6)' defines.M = 'range(6)'
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -5279,8 +5279,8 @@ code = '''
# test that removed files never show up # test that removed files never show up
[cases.test_stickynotes_zombie] [cases.test_stickynotes_zombie]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -5414,8 +5414,8 @@ code = '''
[cases.test_stickynotes_zombie_posthumous] [cases.test_stickynotes_zombie_posthumous]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -5549,8 +5549,8 @@ code = '''
[cases.test_stickynotes_zombie_rwrw] [cases.test_stickynotes_zombie_rwrw]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -5810,8 +5810,8 @@ code = '''
[cases.test_stickynotes_zombie_rwrw_posthumous] [cases.test_stickynotes_zombie_rwrw_posthumous]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -6071,8 +6071,8 @@ code = '''
[cases.test_stickynotes_zombie_zombie_rwrwrw] [cases.test_stickynotes_zombie_zombie_rwrwrw]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -6389,8 +6389,8 @@ code = '''
[cases.test_stickynotes_zombie_zombie_rwrwrw_posthumous] [cases.test_stickynotes_zombie_zombie_rwrwrw_posthumous]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -7919,8 +7919,8 @@ code = '''
# test that we actually cleanup orphans correctly # test that we actually cleanup orphans correctly
[cases.test_stickynotes_cleanup] [cases.test_stickynotes_cleanup]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -8064,8 +8064,8 @@ code = '''
[cases.test_stickynotes_cleanup_open] [cases.test_stickynotes_cleanup_open]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -8219,8 +8219,8 @@ code = '''
[cases.test_stickynotes_cleanup_uncreat] [cases.test_stickynotes_cleanup_uncreat]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -8372,8 +8372,8 @@ code = '''
[cases.test_stickynotes_cleanup_zombie] [cases.test_stickynotes_cleanup_zombie]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -8517,8 +8517,8 @@ code = '''
# #
[cases.test_stickynotes_file_mv] [cases.test_stickynotes_file_mv]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -8762,8 +8762,8 @@ code = '''
[cases.test_stickynotes_file_mv_postmv] [cases.test_stickynotes_file_mv_postmv]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -9067,8 +9067,8 @@ code = '''
[cases.test_stickynotes_file_mv_file_rwrw] [cases.test_stickynotes_file_mv_file_rwrw]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -9421,8 +9421,8 @@ code = '''
[cases.test_stickynotes_file_mv_rwrw_postmv] [cases.test_stickynotes_file_mv_rwrw_postmv]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -10128,8 +10128,8 @@ code = '''
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -10475,8 +10475,8 @@ code = '''
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -10829,8 +10829,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = '2*N' defines.OPS = '2*N'
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -11253,8 +11253,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = '2*N' defines.OPS = '2*N'
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
tests/test_trvs.toml
+50 -50
View File
@@ -288,8 +288,8 @@ code = '''
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -407,8 +407,8 @@ code = '''
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -660,8 +660,8 @@ code = '''
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -788,8 +788,8 @@ code = '''
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1013,8 +1013,8 @@ done:;
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1112,8 +1112,8 @@ done:;
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1294,8 +1294,8 @@ done:;
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1391,8 +1391,8 @@ done:;
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1571,8 +1571,8 @@ done:;
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1668,8 +1668,8 @@ done:;
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2202,8 +2202,8 @@ defines.RELOOKAHEAD = [false, true]
defines.CKMETA = [false, true] defines.CKMETA = [false, true]
defines.CKDATA = [false, true] defines.CKDATA = [false, true]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2287,8 +2287,8 @@ defines.RELOOKAHEAD = [false, true]
defines.CKMETA = [false, true] defines.CKMETA = [false, true]
defines.CKDATA = [false, true] defines.CKDATA = [false, true]
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2354,16 +2354,16 @@ code = '''
lfs3_fs_stat(&lfs3, &fsinfo) => 0; lfs3_fs_stat(&lfs3, &fsinfo) => 0;
assert(fsinfo.flags == ( assert(fsinfo.flags == (
// ok we might've updated lookahead if write stayed in cache // ok we might've updated lookahead if write stayed in cache
((!RELOOKAHEAD || SIZE > FILE_CACHE_SIZE || SYNC) ((!RELOOKAHEAD || SIZE > FCACHE_SIZE || SYNC)
? LFS3_I_RELOOKAHEAD : 0) ? LFS3_I_RELOOKAHEAD : 0)
| ((GBMAP && SIZE >= BLOCK_SIZE/4) | ((GBMAP && SIZE >= BLOCK_SIZE/4)
? LFS3_IFDEF_GBMAP(LFS3_I_REGBMAP, -1) ? LFS3_IFDEF_GBMAP(LFS3_I_REGBMAP, -1)
: 0) : 0)
| LFS3_I_COMPACTMETA | LFS3_I_COMPACTMETA
// and maybe ckmeta/ckdata, note ckdata implies ckmeta // and maybe ckmeta/ckdata, note ckdata implies ckmeta
| (((!CKMETA && !CKDATA) || SIZE > FILE_CACHE_SIZE || SYNC) | (((!CKMETA && !CKDATA) || SIZE > FCACHE_SIZE || SYNC)
? LFS3_I_CKMETA : 0) ? LFS3_I_CKMETA : 0)
| ((!CKDATA || SIZE > FILE_CACHE_SIZE || SYNC) | ((!CKDATA || SIZE > FCACHE_SIZE || SYNC)
? LFS3_I_CKDATA : 0) ? LFS3_I_CKDATA : 0)
| ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_GBMAP, -1) : 0))); | ((GBMAP) ? LFS3_IFDEF_GBMAP(LFS3_I_GBMAP, -1) : 0)));
@@ -2392,7 +2392,7 @@ code = '''
defines.RELOOKAHEAD = [false, true] defines.RELOOKAHEAD = [false, true]
defines.CKMETA = [false, true] defines.CKMETA = [false, true]
defines.CKDATA = [false, true] defines.CKDATA = [false, true]
defines.SIZE = 'FILE_CACHE_SIZE/2' defines.SIZE = 'FCACHE_SIZE/2'
defines.TRUNC = [false, true] defines.TRUNC = [false, true]
code = ''' code = '''
lfs3_t lfs3; lfs3_t lfs3;
@@ -2708,7 +2708,7 @@ code = '''
defines.RELOOKAHEAD = [false, true] defines.RELOOKAHEAD = [false, true]
defines.CKMETA = [false, true] defines.CKMETA = [false, true]
defines.CKDATA = [false, true] defines.CKDATA = [false, true]
defines.SIZE = 'FILE_CACHE_SIZE/2' defines.SIZE = 'FCACHE_SIZE/2'
code = ''' code = '''
lfs3_t lfs3; lfs3_t lfs3;
lfs3_format(&lfs3, lfs3_format(&lfs3,
@@ -3030,7 +3030,7 @@ code = '''
defines.RELOOKAHEAD = [false, true] defines.RELOOKAHEAD = [false, true]
defines.CKMETA = [false, true] defines.CKMETA = [false, true]
defines.CKDATA = [false, true] defines.CKDATA = [false, true]
defines.SIZE = 'FILE_CACHE_SIZE/2' defines.SIZE = 'FCACHE_SIZE/2'
defines.DESYNC = [false, true] defines.DESYNC = [false, true]
code = ''' code = '''
lfs3_t lfs3; lfs3_t lfs3;
@@ -5872,7 +5872,7 @@ code = '''
defines.RELOOKAHEAD = [false, true] defines.RELOOKAHEAD = [false, true]
defines.CKMETA = [false, true] defines.CKMETA = [false, true]
defines.CKDATA = [false, true] defines.CKDATA = [false, true]
defines.SIZE = 'FILE_CACHE_SIZE/2' defines.SIZE = 'FCACHE_SIZE/2'
# set compactmeta thresh to minimum # set compactmeta thresh to minimum
defines.GC_COMPACTMETA_THRESH = 'BLOCK_SIZE/2' defines.GC_COMPACTMETA_THRESH = 'BLOCK_SIZE/2'
code = ''' code = '''
@@ -5993,7 +5993,7 @@ code = '''
defines.RELOOKAHEAD = [false, true] defines.RELOOKAHEAD = [false, true]
defines.CKMETA = [false, true] defines.CKMETA = [false, true]
defines.CKDATA = [false, true] defines.CKDATA = [false, true]
defines.SIZE = 'FILE_CACHE_SIZE/2' defines.SIZE = 'FCACHE_SIZE/2'
# set compactmeta thresh to minimum # set compactmeta thresh to minimum
defines.GC_COMPACTMETA_THRESH = 'BLOCK_SIZE/2' defines.GC_COMPACTMETA_THRESH = 'BLOCK_SIZE/2'
# force early relocations # force early relocations
@@ -6148,7 +6148,7 @@ code = '''
defines.RELOOKAHEAD = [false, true] defines.RELOOKAHEAD = [false, true]
defines.CKMETA = [false, true] defines.CKMETA = [false, true]
defines.CKDATA = [false, true] defines.CKDATA = [false, true]
defines.SIZE = 'FILE_CACHE_SIZE/2' defines.SIZE = 'FCACHE_SIZE/2'
# set compactmeta thresh to minimum # set compactmeta thresh to minimum
defines.GC_COMPACTMETA_THRESH = 'BLOCK_SIZE/2' defines.GC_COMPACTMETA_THRESH = 'BLOCK_SIZE/2'
# force early relocations # force early relocations
@@ -6276,7 +6276,7 @@ code = '''
defines.RELOOKAHEAD = [false, true] defines.RELOOKAHEAD = [false, true]
defines.CKMETA = [false, true] defines.CKMETA = [false, true]
defines.CKDATA = [false, true] defines.CKDATA = [false, true]
defines.SIZE = 'FILE_CACHE_SIZE/2' defines.SIZE = 'FCACHE_SIZE/2'
# set compactmeta thresh to minimum # set compactmeta thresh to minimum
defines.GC_COMPACTMETA_THRESH = 'BLOCK_SIZE/2' defines.GC_COMPACTMETA_THRESH = 'BLOCK_SIZE/2'
in = 'lfs3.c' in = 'lfs3.c'
@@ -6451,7 +6451,7 @@ code = '''
defines.RELOOKAHEAD = [false, true] defines.RELOOKAHEAD = [false, true]
defines.CKMETA = [false, true] defines.CKMETA = [false, true]
defines.CKDATA = [false, true] defines.CKDATA = [false, true]
defines.SIZE = 'FILE_CACHE_SIZE/2' defines.SIZE = 'FCACHE_SIZE/2'
# set compactmeta thresh to minimum # set compactmeta thresh to minimum
defines.GC_COMPACTMETA_THRESH = 'BLOCK_SIZE/2' defines.GC_COMPACTMETA_THRESH = 'BLOCK_SIZE/2'
defines.COMPACTSET = 'range(0x8)' defines.COMPACTSET = 'range(0x8)'
@@ -6690,7 +6690,7 @@ code = '''
defines.RELOOKAHEAD = [false, true] defines.RELOOKAHEAD = [false, true]
defines.CKMETA = [false, true] defines.CKMETA = [false, true]
defines.CKDATA = [false, true] defines.CKDATA = [false, true]
defines.SIZE = 'FILE_CACHE_SIZE/2' defines.SIZE = 'FCACHE_SIZE/2'
# set compactmeta thresh to minimum # set compactmeta thresh to minimum
defines.GC_COMPACTMETA_THRESH = 'BLOCK_SIZE/2' defines.GC_COMPACTMETA_THRESH = 'BLOCK_SIZE/2'
in = 'lfs3.c' in = 'lfs3.c'
@@ -6945,7 +6945,7 @@ code = '''
defines.RELOOKAHEAD = [false, true] defines.RELOOKAHEAD = [false, true]
defines.CKMETA = [false, true] defines.CKMETA = [false, true]
defines.CKDATA = [false, true] defines.CKDATA = [false, true]
defines.SIZE = 'FILE_CACHE_SIZE/2' defines.SIZE = 'FCACHE_SIZE/2'
# <=2 => grm-able # <=2 => grm-able
# >2 => requires orphans # >2 => requires orphans
defines.ORPHANS = [0, 1, 2, 3, 100] defines.ORPHANS = [0, 1, 2, 3, 100]
@@ -7107,7 +7107,7 @@ code = '''
defines.RELOOKAHEAD = [false, true] defines.RELOOKAHEAD = [false, true]
defines.CKMETA = [false, true] defines.CKMETA = [false, true]
defines.CKDATA = [false, true] defines.CKDATA = [false, true]
defines.SIZE = 'FILE_CACHE_SIZE/2' defines.SIZE = 'FCACHE_SIZE/2'
# <=2 => grm-able # <=2 => grm-able
# >2 => requires orphans # >2 => requires orphans
defines.ORPHANS = [0, 1, 2, 3, 100] defines.ORPHANS = [0, 1, 2, 3, 100]
@@ -7987,7 +7987,7 @@ code = '''
defines.RELOOKAHEAD = [false, true] defines.RELOOKAHEAD = [false, true]
defines.CKMETA = [false, true] defines.CKMETA = [false, true]
defines.CKDATA = [false, true] defines.CKDATA = [false, true]
defines.SIZE = 'FILE_CACHE_SIZE/2' defines.SIZE = 'FCACHE_SIZE/2'
# <=2 => grm-able # <=2 => grm-able
# >2 => requires orphans # >2 => requires orphans
defines.ORPHANS = [0, 1, 2, 3, 100] defines.ORPHANS = [0, 1, 2, 3, 100]
@@ -8203,7 +8203,7 @@ code = '''
defines.RELOOKAHEAD = [false, true] defines.RELOOKAHEAD = [false, true]
defines.CKMETA = [false, true] defines.CKMETA = [false, true]
defines.CKDATA = [false, true] defines.CKDATA = [false, true]
defines.SIZE = 'FILE_CACHE_SIZE/2' defines.SIZE = 'FCACHE_SIZE/2'
# <=2 => grm-able # <=2 => grm-able
# >2 => requires orphans # >2 => requires orphans
defines.ORPHANS = [0, 1, 2, 3, 100] defines.ORPHANS = [0, 1, 2, 3, 100]
@@ -8717,8 +8717,8 @@ defines.GC_COMPACTMETA_THRESH = 'BLOCK_SIZE/2'
defines.N = [1, 2, 4, 8, 16, 32, 64] defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -8833,8 +8833,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = '2*N' defines.OPS = '2*N'
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -9085,8 +9085,8 @@ defines.CKDATA = [true]
defines.GC_COMPACTMETA_THRESH = 'BLOCK_SIZE/2' defines.GC_COMPACTMETA_THRESH = 'BLOCK_SIZE/2'
defines.OPS = 20 defines.OPS = 20
defines.SIZE = [ defines.SIZE = [
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -9261,8 +9261,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = '2*N' defines.OPS = '2*N'
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -9726,8 +9726,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = '2*N' defines.OPS = '2*N'
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FILE_CACHE_SIZE/2', 'FCACHE_SIZE/2',
'2*FILE_CACHE_SIZE', '2*FCACHE_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',