Renamed fbuffer_size -> file_buffer_size

This commit is contained in:
Christopher Haster
2024-05-30 11:52:07 -05:00
parent 50fc0ed680
commit 1ecb346cec
12 changed files with 224 additions and 224 deletions
+1 -1
View File
@@ -9896,7 +9896,7 @@ static inline lfs_size_t lfsr_file_buffersize(lfs_t *lfs,
const lfsr_file_t *file) { const lfsr_file_t *file) {
return (file->cfg->buffer_size) return (file->cfg->buffer_size)
? file->cfg->buffer_size ? file->cfg->buffer_size
: lfs->cfg->fbuffer_size; : lfs->cfg->file_buffer_size;
} }
static inline lfs_size_t lfsr_file_inlinesize(lfs_t *lfs, static inline lfs_size_t lfsr_file_inlinesize(lfs_t *lfs,
+1 -1
View File
@@ -229,7 +229,7 @@ struct lfs_config {
// Size of file buffers in bytes. In addition to filesystem-wide // Size of file buffers in bytes. In addition to filesystem-wide
// read/prog buffers, each file gets its own buffer to reduce disk // read/prog buffers, each file gets its own buffer to reduce disk
// accesses. // accesses.
lfs_size_t fbuffer_size; lfs_size_t file_buffer_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 pass. The // increases the number of blocks found during an allocation pass. The
+2 -2
View File
@@ -118,7 +118,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, LFS_MAX(16, READ_SIZE) ) \ BENCH_DEFINE(RCACHE_SIZE, LFS_MAX(16, READ_SIZE) ) \
BENCH_DEFINE(PCACHE_SIZE, LFS_MAX(16, PROG_SIZE) ) \ BENCH_DEFINE(PCACHE_SIZE, LFS_MAX(16, PROG_SIZE) ) \
BENCH_DEFINE(FBUFFER_SIZE, 16 ) \ BENCH_DEFINE(FILE_BUFFER_SIZE, 16 ) \
BENCH_DEFINE(LOOKAHEAD_SIZE, 16 ) \ BENCH_DEFINE(LOOKAHEAD_SIZE, 16 ) \
BENCH_DEFINE(INLINE_SIZE, BLOCK_SIZE/4 ) \ BENCH_DEFINE(INLINE_SIZE, BLOCK_SIZE/4 ) \
BENCH_DEFINE(SHRUB_SIZE, INLINE_SIZE ) \ BENCH_DEFINE(SHRUB_SIZE, INLINE_SIZE ) \
@@ -146,7 +146,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, \
.fbuffer_size = FBUFFER_SIZE, \ .file_buffer_size = FILE_BUFFER_SIZE, \
.lookahead_size = LOOKAHEAD_SIZE, \ .lookahead_size = LOOKAHEAD_SIZE, \
.inline_size = INLINE_SIZE, \ .inline_size = INLINE_SIZE, \
.shrub_size = SHRUB_SIZE, \ .shrub_size = SHRUB_SIZE, \
+2 -2
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, LFS_MAX(16, READ_SIZE) ) \ TEST_DEFINE(RCACHE_SIZE, LFS_MAX(16, READ_SIZE) ) \
TEST_DEFINE(PCACHE_SIZE, LFS_MAX(16, PROG_SIZE) ) \ TEST_DEFINE(PCACHE_SIZE, LFS_MAX(16, PROG_SIZE) ) \
TEST_DEFINE(FBUFFER_SIZE, 16 ) \ TEST_DEFINE(FILE_BUFFER_SIZE, 16 ) \
TEST_DEFINE(LOOKAHEAD_SIZE, 16 ) \ TEST_DEFINE(LOOKAHEAD_SIZE, 16 ) \
TEST_DEFINE(INLINE_SIZE, BLOCK_SIZE/4 ) \ TEST_DEFINE(INLINE_SIZE, BLOCK_SIZE/4 ) \
TEST_DEFINE(SHRUB_SIZE, INLINE_SIZE ) \ TEST_DEFINE(SHRUB_SIZE, INLINE_SIZE ) \
@@ -131,7 +131,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, \
.fbuffer_size = FBUFFER_SIZE, \ .file_buffer_size = FILE_BUFFER_SIZE, \
.lookahead_size = LOOKAHEAD_SIZE, \ .lookahead_size = LOOKAHEAD_SIZE, \
.inline_size = INLINE_SIZE, \ .inline_size = INLINE_SIZE, \
.shrub_size = SHRUB_SIZE, \ .shrub_size = SHRUB_SIZE, \
+6 -6
View File
@@ -264,8 +264,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',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -438,8 +438,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',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -677,8 +677,8 @@ code = '''
[cases.test_alloc_nospc_files] [cases.test_alloc_nospc_files]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
+18 -18
View File
@@ -740,8 +740,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = '2*N' defines.OPS = '2*N'
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -901,8 +901,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = '2*N' defines.OPS = '2*N'
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1063,8 +1063,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = '2*N' defines.OPS = '2*N'
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1223,8 +1223,8 @@ defines.BADBLOCK_BEHAVIOR = [
defines.CHECK_PROGS = 'BADBLOCK_BEHAVIOR >= LFS_EMUBD_BADBLOCK_READERROR' defines.CHECK_PROGS = 'BADBLOCK_BEHAVIOR >= LFS_EMUBD_BADBLOCK_READERROR'
defines.N = 20 defines.N = 20
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1398,8 +1398,8 @@ defines.CHECK_PROGS = 'BADBLOCK_BEHAVIOR >= LFS_EMUBD_BADBLOCK_READERROR'
defines.MIRROR = [false, true] defines.MIRROR = [false, true]
defines.N = 20 defines.N = 20
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1574,8 +1574,8 @@ defines.CHECK_PROGS = 'BADBLOCK_BEHAVIOR >= LFS_EMUBD_BADBLOCK_READERROR'
defines.MIRROR = [false, true] defines.MIRROR = [false, true]
defines.N = 20 defines.N = 20
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1753,8 +1753,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = '2*N' defines.OPS = '2*N'
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2196,8 +2196,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = '2*N' defines.OPS = '2*N'
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2638,8 +2638,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = '2*N' defines.OPS = '2*N'
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
+6 -6
View File
@@ -234,8 +234,8 @@ defines.CHECK_PROGS = 'BADBLOCK_BEHAVIOR >= LFS_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',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -505,8 +505,8 @@ defines.CHECK_PROGS = 'BADBLOCK_BEHAVIOR >= LFS_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',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -918,8 +918,8 @@ defines.CHECK_PROGS = 'BADBLOCK_BEHAVIOR >= LFS_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',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
+48 -48
View File
@@ -608,21 +608,21 @@ code = '''
# try writing larger files # try writing larger files
# #
# note: # note:
# - at 2*FBUFFER_SIZE we need a shrub # - at 2*FILE_BUFFER_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',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
'4*BLOCK_SIZE', '4*BLOCK_SIZE',
] ]
defines.FBUFFER_SIZE = 64 defines.FILE_BUFFER_SIZE = 64
code = ''' code = '''
lfs_t lfs; lfs_t lfs;
lfsr_format(&lfs, CFG) => 0; lfsr_format(&lfs, CFG) => 0;
@@ -691,8 +691,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',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -784,8 +784,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = '2*N' defines.OPS = '2*N'
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -922,15 +922,15 @@ code = '''
[cases.test_files_rm] [cases.test_files_rm]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_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.FBUFFER_SIZE = 64 defines.FILE_BUFFER_SIZE = 64
code = ''' code = '''
lfs_t lfs; lfs_t lfs;
lfsr_format(&lfs, CFG) => 0; lfsr_format(&lfs, CFG) => 0;
@@ -991,8 +991,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',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1147,8 +1147,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = '2*N' defines.OPS = '2*N'
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1303,8 +1303,8 @@ code = '''
[cases.test_files_mv] [cases.test_files_mv]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1312,7 +1312,7 @@ defines.SIZE = [
] ]
defines.N = [0, 128] defines.N = [0, 128]
defines.REMOUNT = [false, true] defines.REMOUNT = [false, true]
defines.FBUFFER_SIZE = 64 defines.FILE_BUFFER_SIZE = 64
code = ''' code = '''
lfs_t lfs; lfs_t lfs;
lfsr_format(&lfs, CFG) => 0; lfsr_format(&lfs, CFG) => 0;
@@ -1404,8 +1404,8 @@ code = '''
[cases.test_files_mv_replace] [cases.test_files_mv_replace]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1413,7 +1413,7 @@ defines.SIZE = [
] ]
defines.N = [0, 128] defines.N = [0, 128]
defines.REMOUNT = [false, true] defines.REMOUNT = [false, true]
defines.FBUFFER_SIZE = 64 defines.FILE_BUFFER_SIZE = 64
code = ''' code = '''
lfs_t lfs; lfs_t lfs;
lfsr_format(&lfs, CFG) => 0; lfsr_format(&lfs, CFG) => 0;
@@ -1515,15 +1515,15 @@ code = '''
[cases.test_files_mv_noop] [cases.test_files_mv_noop]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_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.FBUFFER_SIZE = 64 defines.FILE_BUFFER_SIZE = 64
code = ''' code = '''
lfs_t lfs; lfs_t lfs;
lfsr_format(&lfs, CFG) => 0; lfsr_format(&lfs, CFG) => 0;
@@ -1600,15 +1600,15 @@ code = '''
[cases.test_files_mv_not_file] [cases.test_files_mv_not_file]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_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.FBUFFER_SIZE = 64 defines.FILE_BUFFER_SIZE = 64
code = ''' code = '''
lfs_t lfs; lfs_t lfs;
lfsr_format(&lfs, CFG) => 0; lfsr_format(&lfs, CFG) => 0;
@@ -1696,15 +1696,15 @@ code = '''
[cases.test_files_mv_not_dir] [cases.test_files_mv_not_dir]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_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.FBUFFER_SIZE = 64 defines.FILE_BUFFER_SIZE = 64
code = ''' code = '''
lfs_t lfs; lfs_t lfs;
lfsr_format(&lfs, CFG) => 0; lfsr_format(&lfs, CFG) => 0;
@@ -1792,15 +1792,15 @@ code = '''
[cases.test_files_mv_not_root] [cases.test_files_mv_not_root]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_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.FBUFFER_SIZE = 64 defines.FILE_BUFFER_SIZE = 64
code = ''' code = '''
lfs_t lfs; lfs_t lfs;
lfsr_format(&lfs, CFG) => 0; lfsr_format(&lfs, CFG) => 0;
@@ -1877,15 +1877,15 @@ code = '''
[cases.test_files_mv_not_noent] [cases.test_files_mv_not_noent]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_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.FBUFFER_SIZE = 64 defines.FILE_BUFFER_SIZE = 64
code = ''' code = '''
lfs_t lfs; lfs_t lfs;
lfsr_format(&lfs, CFG) => 0; lfsr_format(&lfs, CFG) => 0;
@@ -1963,8 +1963,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',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2110,8 +2110,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',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2185,8 +2185,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',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2264,8 +2264,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = '2*N' defines.OPS = '2*N'
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2461,8 +2461,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = '2*N' defines.OPS = '2*N'
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2682,8 +2682,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = '2*N' defines.OPS = '2*N'
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
+46 -46
View File
@@ -5,8 +5,8 @@ after = ['test_fwrite', 'test_fsync']
# Some specific tests # Some specific tests
[cases.test_forphans_create] [cases.test_forphans_create]
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -205,8 +205,8 @@ code = '''
[cases.test_forphans_create_pl] [cases.test_forphans_create_pl]
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -282,8 +282,8 @@ code = '''
[cases.test_forphans_create_many_pl] [cases.test_forphans_create_many_pl]
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
] ]
defines.CHUNK = 8 defines.CHUNK = 8
defines.N = 128 defines.N = 128
@@ -369,8 +369,8 @@ code = '''
[cases.test_forphans_create_sync_wr] [cases.test_forphans_create_sync_wr]
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -559,8 +559,8 @@ code = '''
[cases.test_forphans_create_sync_rw] [cases.test_forphans_create_sync_rw]
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -748,8 +748,8 @@ code = '''
[cases.test_forphans_create_desync_wdwr] [cases.test_forphans_create_desync_wdwr]
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1066,8 +1066,8 @@ code = '''
[cases.test_forphans_orphan] [cases.test_forphans_orphan]
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1175,8 +1175,8 @@ code = '''
[cases.test_forphans_orphan_wdwr] [cases.test_forphans_orphan_wdwr]
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1454,8 +1454,8 @@ code = '''
defines.N = 'range(6)' defines.N = 'range(6)'
defines.M = 'range(6)' defines.M = 'range(6)'
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2136,8 +2136,8 @@ code = '''
[cases.test_forphans_zombie] [cases.test_forphans_zombie]
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2263,8 +2263,8 @@ code = '''
[cases.test_forphans_zombie_posthumous] [cases.test_forphans_zombie_posthumous]
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2390,8 +2390,8 @@ code = '''
[cases.test_forphans_zombie_rwrw] [cases.test_forphans_zombie_rwrw]
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2616,8 +2616,8 @@ code = '''
[cases.test_forphans_zombie_rwrw_posthumous] [cases.test_forphans_zombie_rwrw_posthumous]
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2842,8 +2842,8 @@ code = '''
[cases.test_forphans_zombie_zombie_rwrwrw] [cases.test_forphans_zombie_zombie_rwrwrw]
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -3103,8 +3103,8 @@ code = '''
[cases.test_forphans_zombie_zombie_rwrwrw_posthumous] [cases.test_forphans_zombie_zombie_rwrwrw_posthumous]
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -4396,8 +4396,8 @@ code = '''
# them here # them here
[cases.test_forphans_mv] [cases.test_forphans_mv]
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -4632,8 +4632,8 @@ code = '''
[cases.test_forphans_mv_postmv] [cases.test_forphans_mv_postmv]
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -4928,8 +4928,8 @@ code = '''
[cases.test_forphans_mv_rwrw] [cases.test_forphans_mv_rwrw]
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -5273,8 +5273,8 @@ code = '''
[cases.test_forphans_mv_rwrw_postmv] [cases.test_forphans_mv_rwrw_postmv]
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -5955,8 +5955,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',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -6302,8 +6302,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',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -6654,8 +6654,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = '2*N' defines.OPS = '2*N'
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -6993,8 +6993,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = '2*N' defines.OPS = '2*N'
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
+40 -40
View File
@@ -487,8 +487,8 @@ code = '''
[cases.test_fsync_rrrr] [cases.test_fsync_rrrr]
defines.R = 4 defines.R = 4
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -536,8 +536,8 @@ code = '''
defines.R = 4 defines.R = 4
defines.N = 20 defines.N = 20
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -601,8 +601,8 @@ defines.SYNC = [0, 1, 2]
# FLUSH=2 => flush via LFS_O_FLUSH # FLUSH=2 => flush via LFS_O_FLUSH
defines.FLUSH = [0, 1, 2] defines.FLUSH = [0, 1, 2]
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -690,8 +690,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 = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -793,8 +793,8 @@ defines.SYNC = [0, 1, 2]
# FLUSH=2 => flush via LFS_O_FLUSH # FLUSH=2 => flush via LFS_O_FLUSH
defines.FLUSH = [0, 1, 2] defines.FLUSH = [0, 1, 2]
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -877,8 +877,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 = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -970,8 +970,8 @@ defines.SYNC = [0, 1, 2]
# FLUSH=2 => flush via LFS_O_FLUSH # FLUSH=2 => flush via LFS_O_FLUSH
defines.FLUSH = [0, 1, 2] defines.FLUSH = [0, 1, 2]
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1071,8 +1071,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 = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1185,8 +1185,8 @@ defines.SYNC = [0, 1, 2]
# FLUSH=2 => flush via LFS_O_FLUSH # FLUSH=2 => flush via LFS_O_FLUSH
defines.FLUSH = [0, 1, 2] defines.FLUSH = [0, 1, 2]
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1285,8 +1285,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 = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1398,8 +1398,8 @@ defines.SYNC = [0, 1, 2]
defines.FLUSH = [0, 1, 2] defines.FLUSH = [0, 1, 2]
defines.N = 40 defines.N = 40
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1533,8 +1533,8 @@ defines.SYNC = [0, 1, 2]
defines.FLUSH = [0, 1, 2] defines.FLUSH = [0, 1, 2]
defines.N = 40 defines.N = 40
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2341,8 +2341,8 @@ defines.SYNC = [0, 1, 2]
# FLUSH=2 => flush via LFS_O_FLUSH # FLUSH=2 => flush via LFS_O_FLUSH
defines.FLUSH = [0, 1, 2] defines.FLUSH = [0, 1, 2]
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2435,8 +2435,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 = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2543,8 +2543,8 @@ defines.SYNC = [0, 1, 2]
# FLUSH=2 => flush via LFS_O_FLUSH # FLUSH=2 => flush via LFS_O_FLUSH
defines.FLUSH = [0, 1, 2] defines.FLUSH = [0, 1, 2]
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2629,8 +2629,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 = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2729,8 +2729,8 @@ defines.SYNC = [0, 1, 2]
# FLUSH=2 => flush via LFS_O_FLUSH # FLUSH=2 => flush via LFS_O_FLUSH
defines.FLUSH = [0, 1, 2] defines.FLUSH = [0, 1, 2]
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2838,8 +2838,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 = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2956,8 +2956,8 @@ defines.RW = 4
defines.FLUSH = [0, 1, 2] defines.FLUSH = [0, 1, 2]
defines.N = 40 defines.N = 40
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -3106,8 +3106,8 @@ defines.RW = 4
defines.FLUSH = [0, 1, 2] defines.FLUSH = [0, 1, 2]
defines.N = 40 defines.N = 40
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
+46 -46
View File
@@ -17,8 +17,8 @@ defines.PROG_SIZE = [1, 16]
[cases.test_fwrite_incr] [cases.test_fwrite_incr]
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -118,8 +118,8 @@ code = '''
# write strategies # write strategies
[cases.test_fwrite_overwrite] [cases.test_fwrite_overwrite]
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -298,8 +298,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 = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -482,8 +482,8 @@ code = '''
[cases.test_fwrite_truncate] [cases.test_fwrite_truncate]
defines.FROM = [ defines.FROM = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -491,8 +491,8 @@ defines.FROM = [
] ]
defines.TO = [ defines.TO = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -597,8 +597,8 @@ code = '''
[cases.test_fwrite_truncate_truncate] [cases.test_fwrite_truncate_truncate]
defines.FROM = [ defines.FROM = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -606,8 +606,8 @@ defines.FROM = [
] ]
defines.AND = [ defines.AND = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -615,8 +615,8 @@ defines.AND = [
] ]
defines.TO = [ defines.TO = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -740,8 +740,8 @@ code = '''
[cases.test_fwrite_fruncate] [cases.test_fwrite_fruncate]
defines.FROM = [ defines.FROM = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -749,8 +749,8 @@ defines.FROM = [
] ]
defines.TO = [ defines.TO = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -859,8 +859,8 @@ code = '''
[cases.test_fwrite_fruncate_fruncate] [cases.test_fwrite_fruncate_fruncate]
defines.FROM = [ defines.FROM = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -868,8 +868,8 @@ defines.FROM = [
] ]
defines.AND = [ defines.AND = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -877,8 +877,8 @@ defines.AND = [
] ]
defines.TO = [ defines.TO = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1009,8 +1009,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 = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1142,8 +1142,8 @@ code = '''
# trigger compaction # trigger compaction
[cases.test_fwrite_overwrite_compaction] [cases.test_fwrite_overwrite_compaction]
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1331,8 +1331,8 @@ code = '''
[cases.test_fwrite_hole_compaction] [cases.test_fwrite_hole_compaction]
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1525,8 +1525,8 @@ code = '''
[cases.test_fwrite_fuzz_aligned] [cases.test_fwrite_fuzz_aligned]
defines.N = 20 defines.N = 20
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1668,8 +1668,8 @@ code = '''
[cases.test_fwrite_fuzz_unaligned] [cases.test_fwrite_fuzz_unaligned]
defines.N = 20 defines.N = 20
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1820,8 +1820,8 @@ code = '''
defines.N = 20 defines.N = 20
defines.WHENCE = ['LFS_SEEK_SET', 'LFS_SEEK_CUR', 'LFS_SEEK_END'] defines.WHENCE = ['LFS_SEEK_SET', 'LFS_SEEK_CUR', 'LFS_SEEK_END']
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1899,8 +1899,8 @@ code = '''
defines.N = 10 defines.N = 10
defines.WHENCE = ['LFS_SEEK_SET', 'LFS_SEEK_CUR', 'LFS_SEEK_END'] defines.WHENCE = ['LFS_SEEK_SET', 'LFS_SEEK_CUR', 'LFS_SEEK_END']
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2048,8 +2048,8 @@ code = '''
defines.N = 10 defines.N = 10
defines.WHENCE = ['LFS_SEEK_SET', 'LFS_SEEK_CUR', 'LFS_SEEK_END'] defines.WHENCE = ['LFS_SEEK_SET', 'LFS_SEEK_CUR', 'LFS_SEEK_END']
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2220,8 +2220,8 @@ code = '''
[cases.test_fwrite_seek_negative] [cases.test_fwrite_seek_negative]
defines.WHENCE = ['LFS_SEEK_SET', 'LFS_SEEK_CUR', 'LFS_SEEK_END'] defines.WHENCE = ['LFS_SEEK_SET', 'LFS_SEEK_CUR', 'LFS_SEEK_END']
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -2328,8 +2328,8 @@ code = '''
[cases.test_fwrite_rwtf_fuzz] [cases.test_fwrite_rwtf_fuzz]
defines.N = 20 defines.N = 20
defines.SIZE = [ defines.SIZE = [
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
+8 -8
View File
@@ -168,8 +168,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = 1024 defines.OPS = 1024
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -381,8 +381,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = 1024 defines.OPS = 1024
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -721,8 +721,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = 1024 defines.OPS = 1024
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',
@@ -1146,8 +1146,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64]
defines.OPS = 256 defines.OPS = 256
defines.SIZE = [ defines.SIZE = [
'0', '0',
'FBUFFER_SIZE/2', 'FILE_BUFFER_SIZE/2',
'2*FBUFFER_SIZE', '2*FILE_BUFFER_SIZE',
'BLOCK_SIZE/2', 'BLOCK_SIZE/2',
'BLOCK_SIZE', 'BLOCK_SIZE',
'2*BLOCK_SIZE', '2*BLOCK_SIZE',