From 1ecb346cecf5d3e9233963e7e52c400ff4ec6381 Mon Sep 17 00:00:00 2001 From: Christopher Haster Date: Thu, 30 May 2024 11:52:07 -0500 Subject: [PATCH] Renamed fbuffer_size -> file_buffer_size --- lfs.c | 2 +- lfs.h | 2 +- runners/bench_runner.h | 4 +- runners/test_runner.h | 4 +- tests/test_alloc.toml | 12 ++--- tests/test_badblocks.toml | 36 +++++++------- tests/test_exhaustion.toml | 12 ++--- tests/test_files.toml | 96 ++++++++++++++++++------------------- tests/test_forphans.toml | 92 +++++++++++++++++------------------ tests/test_fsync.toml | 80 +++++++++++++++---------------- tests/test_fwrite.toml | 92 +++++++++++++++++------------------ tests/test_relocations.toml | 16 +++---- 12 files changed, 224 insertions(+), 224 deletions(-) diff --git a/lfs.c b/lfs.c index 0325aa15..bba39503 100644 --- a/lfs.c +++ b/lfs.c @@ -9896,7 +9896,7 @@ static inline lfs_size_t lfsr_file_buffersize(lfs_t *lfs, const lfsr_file_t *file) { return (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, diff --git a/lfs.h b/lfs.h index 17407796..26107da9 100644 --- a/lfs.h +++ b/lfs.h @@ -229,7 +229,7 @@ struct lfs_config { // Size of file buffers in bytes. In addition to filesystem-wide // read/prog buffers, each file gets its own buffer to reduce disk // accesses. - lfs_size_t fbuffer_size; + lfs_size_t file_buffer_size; // Size of the lookahead buffer in bytes. A larger lookahead buffer // increases the number of blocks found during an allocation pass. The diff --git a/runners/bench_runner.h b/runners/bench_runner.h index 99acebb0..bbc0acf3 100644 --- a/runners/bench_runner.h +++ b/runners/bench_runner.h @@ -118,7 +118,7 @@ void bench_permutation(size_t i, uint32_t *buffer, size_t size); BENCH_DEFINE(BLOCK_RECYCLES, -1 ) \ BENCH_DEFINE(RCACHE_SIZE, LFS_MAX(16, READ_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(INLINE_SIZE, BLOCK_SIZE/4 ) \ 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, \ .rcache_size = RCACHE_SIZE, \ .pcache_size = PCACHE_SIZE, \ - .fbuffer_size = FBUFFER_SIZE, \ + .file_buffer_size = FILE_BUFFER_SIZE, \ .lookahead_size = LOOKAHEAD_SIZE, \ .inline_size = INLINE_SIZE, \ .shrub_size = SHRUB_SIZE, \ diff --git a/runners/test_runner.h b/runners/test_runner.h index e06ebf81..63fc141e 100644 --- a/runners/test_runner.h +++ b/runners/test_runner.h @@ -103,7 +103,7 @@ void test_permutation(size_t i, uint32_t *buffer, size_t size); TEST_DEFINE(BLOCK_RECYCLES, -1 ) \ TEST_DEFINE(RCACHE_SIZE, LFS_MAX(16, READ_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(INLINE_SIZE, BLOCK_SIZE/4 ) \ 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, \ .rcache_size = RCACHE_SIZE, \ .pcache_size = PCACHE_SIZE, \ - .fbuffer_size = FBUFFER_SIZE, \ + .file_buffer_size = FILE_BUFFER_SIZE, \ .lookahead_size = LOOKAHEAD_SIZE, \ .inline_size = INLINE_SIZE, \ .shrub_size = SHRUB_SIZE, \ diff --git a/tests/test_alloc.toml b/tests/test_alloc.toml index b894e949..1bee6fc5 100644 --- a/tests/test_alloc.toml +++ b/tests/test_alloc.toml @@ -264,8 +264,8 @@ code = ''' defines.N = [1, 2, 4, 8, 16, 32, 64] defines.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -438,8 +438,8 @@ code = ''' defines.N = [1, 2, 4, 8, 16, 32, 64] defines.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -677,8 +677,8 @@ code = ''' [cases.test_alloc_nospc_files] defines.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', diff --git a/tests/test_badblocks.toml b/tests/test_badblocks.toml index fe159760..cb112ca1 100644 --- a/tests/test_badblocks.toml +++ b/tests/test_badblocks.toml @@ -740,8 +740,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64] defines.OPS = '2*N' defines.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_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.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_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.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_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.N = 20 defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_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.N = 20 defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_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.N = 20 defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_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.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_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.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_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.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', diff --git a/tests/test_exhaustion.toml b/tests/test_exhaustion.toml index 586cb5d7..b5efb221 100644 --- a/tests/test_exhaustion.toml +++ b/tests/test_exhaustion.toml @@ -234,8 +234,8 @@ defines.CHECK_PROGS = 'BADBLOCK_BEHAVIOR >= LFS_EMUBD_BADBLOCK_READERROR' defines.N = [1, 2, 4, 8, 16, 32, 64] defines.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_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.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_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.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', diff --git a/tests/test_files.toml b/tests/test_files.toml index 55bf10bd..815fbc07 100644 --- a/tests/test_files.toml +++ b/tests/test_files.toml @@ -608,21 +608,21 @@ code = ''' # try writing larger files # # 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 2*BLOCK_SIZE we need a btree # [cases.test_files_more] defines.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', '4*BLOCK_SIZE', ] -defines.FBUFFER_SIZE = 64 +defines.FILE_BUFFER_SIZE = 64 code = ''' lfs_t lfs; lfsr_format(&lfs, CFG) => 0; @@ -691,8 +691,8 @@ code = ''' defines.N = [1, 2, 4, 8, 16, 32, 64] defines.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_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.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -922,15 +922,15 @@ code = ''' [cases.test_files_rm] defines.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', '4*BLOCK_SIZE', ] defines.REMOUNT = [false, true] -defines.FBUFFER_SIZE = 64 +defines.FILE_BUFFER_SIZE = 64 code = ''' lfs_t lfs; lfsr_format(&lfs, CFG) => 0; @@ -991,8 +991,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64] defines.REMAINING = [4, 1, 0] defines.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_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.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -1303,8 +1303,8 @@ code = ''' [cases.test_files_mv] defines.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -1312,7 +1312,7 @@ defines.SIZE = [ ] defines.N = [0, 128] defines.REMOUNT = [false, true] -defines.FBUFFER_SIZE = 64 +defines.FILE_BUFFER_SIZE = 64 code = ''' lfs_t lfs; lfsr_format(&lfs, CFG) => 0; @@ -1404,8 +1404,8 @@ code = ''' [cases.test_files_mv_replace] defines.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -1413,7 +1413,7 @@ defines.SIZE = [ ] defines.N = [0, 128] defines.REMOUNT = [false, true] -defines.FBUFFER_SIZE = 64 +defines.FILE_BUFFER_SIZE = 64 code = ''' lfs_t lfs; lfsr_format(&lfs, CFG) => 0; @@ -1515,15 +1515,15 @@ code = ''' [cases.test_files_mv_noop] defines.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', '4*BLOCK_SIZE', ] defines.REMOUNT = [false, true] -defines.FBUFFER_SIZE = 64 +defines.FILE_BUFFER_SIZE = 64 code = ''' lfs_t lfs; lfsr_format(&lfs, CFG) => 0; @@ -1600,15 +1600,15 @@ code = ''' [cases.test_files_mv_not_file] defines.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', '4*BLOCK_SIZE', ] defines.REMOUNT = [false, true] -defines.FBUFFER_SIZE = 64 +defines.FILE_BUFFER_SIZE = 64 code = ''' lfs_t lfs; lfsr_format(&lfs, CFG) => 0; @@ -1696,15 +1696,15 @@ code = ''' [cases.test_files_mv_not_dir] defines.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', '4*BLOCK_SIZE', ] defines.REMOUNT = [false, true] -defines.FBUFFER_SIZE = 64 +defines.FILE_BUFFER_SIZE = 64 code = ''' lfs_t lfs; lfsr_format(&lfs, CFG) => 0; @@ -1792,15 +1792,15 @@ code = ''' [cases.test_files_mv_not_root] defines.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', '4*BLOCK_SIZE', ] defines.REMOUNT = [false, true] -defines.FBUFFER_SIZE = 64 +defines.FILE_BUFFER_SIZE = 64 code = ''' lfs_t lfs; lfsr_format(&lfs, CFG) => 0; @@ -1877,15 +1877,15 @@ code = ''' [cases.test_files_mv_not_noent] defines.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', '4*BLOCK_SIZE', ] defines.REMOUNT = [false, true] -defines.FBUFFER_SIZE = 64 +defines.FILE_BUFFER_SIZE = 64 code = ''' lfs_t lfs; lfsr_format(&lfs, CFG) => 0; @@ -1963,8 +1963,8 @@ code = ''' defines.N = [1, 2, 4, 8, 16, 32, 64] defines.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -2110,8 +2110,8 @@ code = ''' defines.N = [1, 2, 4, 8, 16, 32, 64] defines.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -2185,8 +2185,8 @@ code = ''' defines.N = [1, 2, 4, 8, 16, 32, 64] defines.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_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.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_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.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_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.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', diff --git a/tests/test_forphans.toml b/tests/test_forphans.toml index 8e888cc5..67291428 100644 --- a/tests/test_forphans.toml +++ b/tests/test_forphans.toml @@ -5,8 +5,8 @@ after = ['test_fwrite', 'test_fsync'] # Some specific tests [cases.test_forphans_create] defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -205,8 +205,8 @@ code = ''' [cases.test_forphans_create_pl] defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -282,8 +282,8 @@ code = ''' [cases.test_forphans_create_many_pl] defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', ] defines.CHUNK = 8 defines.N = 128 @@ -369,8 +369,8 @@ code = ''' [cases.test_forphans_create_sync_wr] defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -559,8 +559,8 @@ code = ''' [cases.test_forphans_create_sync_rw] defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -748,8 +748,8 @@ code = ''' [cases.test_forphans_create_desync_wdwr] defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -1066,8 +1066,8 @@ code = ''' [cases.test_forphans_orphan] defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -1175,8 +1175,8 @@ code = ''' [cases.test_forphans_orphan_wdwr] defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -1454,8 +1454,8 @@ code = ''' defines.N = 'range(6)' defines.M = 'range(6)' defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -2136,8 +2136,8 @@ code = ''' [cases.test_forphans_zombie] defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -2263,8 +2263,8 @@ code = ''' [cases.test_forphans_zombie_posthumous] defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -2390,8 +2390,8 @@ code = ''' [cases.test_forphans_zombie_rwrw] defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -2616,8 +2616,8 @@ code = ''' [cases.test_forphans_zombie_rwrw_posthumous] defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -2842,8 +2842,8 @@ code = ''' [cases.test_forphans_zombie_zombie_rwrwrw] defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -3103,8 +3103,8 @@ code = ''' [cases.test_forphans_zombie_zombie_rwrwrw_posthumous] defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -4396,8 +4396,8 @@ code = ''' # them here [cases.test_forphans_mv] defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -4632,8 +4632,8 @@ code = ''' [cases.test_forphans_mv_postmv] defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -4928,8 +4928,8 @@ code = ''' [cases.test_forphans_mv_rwrw] defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -5273,8 +5273,8 @@ code = ''' [cases.test_forphans_mv_rwrw_postmv] defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -5955,8 +5955,8 @@ code = ''' defines.N = [1, 2, 4, 8, 16, 32, 64] defines.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -6302,8 +6302,8 @@ code = ''' defines.N = [1, 2, 4, 8, 16, 32, 64] defines.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_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.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_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.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', diff --git a/tests/test_fsync.toml b/tests/test_fsync.toml index ba6abc5a..058866a4 100644 --- a/tests/test_fsync.toml +++ b/tests/test_fsync.toml @@ -487,8 +487,8 @@ code = ''' [cases.test_fsync_rrrr] defines.R = 4 defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -536,8 +536,8 @@ code = ''' defines.R = 4 defines.N = 20 defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_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 defines.FLUSH = [0, 1, 2] defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -690,8 +690,8 @@ defines.SYNC = [0, 1, 2] defines.FLUSH = [0, 1, 2] defines.N = 20 defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_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 defines.FLUSH = [0, 1, 2] defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -877,8 +877,8 @@ defines.SYNC = [0, 1, 2] defines.FLUSH = [0, 1, 2] defines.N = 20 defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_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 defines.FLUSH = [0, 1, 2] defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -1071,8 +1071,8 @@ defines.SYNC = [0, 1, 2] defines.FLUSH = [0, 1, 2] defines.N = 20 defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_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 defines.FLUSH = [0, 1, 2] defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -1285,8 +1285,8 @@ defines.SYNC = [0, 1, 2] defines.FLUSH = [0, 1, 2] defines.N = 20 defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -1398,8 +1398,8 @@ defines.SYNC = [0, 1, 2] defines.FLUSH = [0, 1, 2] defines.N = 40 defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -1533,8 +1533,8 @@ defines.SYNC = [0, 1, 2] defines.FLUSH = [0, 1, 2] defines.N = 40 defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_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 defines.FLUSH = [0, 1, 2] defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -2435,8 +2435,8 @@ defines.SYNC = [0, 1, 2] defines.FLUSH = [0, 1, 2] defines.N = 20 defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_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 defines.FLUSH = [0, 1, 2] defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -2629,8 +2629,8 @@ defines.SYNC = [0, 1, 2] defines.FLUSH = [0, 1, 2] defines.N = 20 defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_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 defines.FLUSH = [0, 1, 2] defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -2838,8 +2838,8 @@ defines.SYNC = [0, 1, 2] defines.FLUSH = [0, 1, 2] defines.N = 20 defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -2956,8 +2956,8 @@ defines.RW = 4 defines.FLUSH = [0, 1, 2] defines.N = 40 defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -3106,8 +3106,8 @@ defines.RW = 4 defines.FLUSH = [0, 1, 2] defines.N = 40 defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', diff --git a/tests/test_fwrite.toml b/tests/test_fwrite.toml index 673d5bf3..2c1486d6 100644 --- a/tests/test_fwrite.toml +++ b/tests/test_fwrite.toml @@ -17,8 +17,8 @@ defines.PROG_SIZE = [1, 16] [cases.test_fwrite_incr] defines.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -118,8 +118,8 @@ code = ''' # write strategies [cases.test_fwrite_overwrite] defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -298,8 +298,8 @@ code = ''' # similar to overwrite files, but without underlying data [cases.test_fwrite_holes] defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -482,8 +482,8 @@ code = ''' [cases.test_fwrite_truncate] defines.FROM = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -491,8 +491,8 @@ defines.FROM = [ ] defines.TO = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -597,8 +597,8 @@ code = ''' [cases.test_fwrite_truncate_truncate] defines.FROM = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -606,8 +606,8 @@ defines.FROM = [ ] defines.AND = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -615,8 +615,8 @@ defines.AND = [ ] defines.TO = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -740,8 +740,8 @@ code = ''' [cases.test_fwrite_fruncate] defines.FROM = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -749,8 +749,8 @@ defines.FROM = [ ] defines.TO = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -859,8 +859,8 @@ code = ''' [cases.test_fwrite_fruncate_fruncate] defines.FROM = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -868,8 +868,8 @@ defines.FROM = [ ] defines.AND = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -877,8 +877,8 @@ defines.AND = [ ] defines.TO = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -1009,8 +1009,8 @@ code = ''' # writing any data structure backwards always reveals issues [cases.test_fwrite_reversed] defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -1142,8 +1142,8 @@ code = ''' # trigger compaction [cases.test_fwrite_overwrite_compaction] defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -1331,8 +1331,8 @@ code = ''' [cases.test_fwrite_hole_compaction] defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -1525,8 +1525,8 @@ code = ''' [cases.test_fwrite_fuzz_aligned] defines.N = 20 defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -1668,8 +1668,8 @@ code = ''' [cases.test_fwrite_fuzz_unaligned] defines.N = 20 defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -1820,8 +1820,8 @@ code = ''' defines.N = 20 defines.WHENCE = ['LFS_SEEK_SET', 'LFS_SEEK_CUR', 'LFS_SEEK_END'] defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -1899,8 +1899,8 @@ code = ''' defines.N = 10 defines.WHENCE = ['LFS_SEEK_SET', 'LFS_SEEK_CUR', 'LFS_SEEK_END'] defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -2048,8 +2048,8 @@ code = ''' defines.N = 10 defines.WHENCE = ['LFS_SEEK_SET', 'LFS_SEEK_CUR', 'LFS_SEEK_END'] defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -2220,8 +2220,8 @@ code = ''' [cases.test_fwrite_seek_negative] defines.WHENCE = ['LFS_SEEK_SET', 'LFS_SEEK_CUR', 'LFS_SEEK_END'] defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', @@ -2328,8 +2328,8 @@ code = ''' [cases.test_fwrite_rwtf_fuzz] defines.N = 20 defines.SIZE = [ - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE', diff --git a/tests/test_relocations.toml b/tests/test_relocations.toml index 3b9a7806..b5b23d3e 100644 --- a/tests/test_relocations.toml +++ b/tests/test_relocations.toml @@ -168,8 +168,8 @@ defines.N = [1, 2, 4, 8, 16, 32, 64] defines.OPS = 1024 defines.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_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.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_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.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_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.SIZE = [ '0', - 'FBUFFER_SIZE/2', - '2*FBUFFER_SIZE', + 'FILE_BUFFER_SIZE/2', + '2*FILE_BUFFER_SIZE', 'BLOCK_SIZE/2', 'BLOCK_SIZE', '2*BLOCK_SIZE',