Renamed file_cache -> fcache and gbmap_re -> regbmap

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
+9 -9
View File
@@ -463,7 +463,7 @@ struct lfs3_cfg {
// Size of file caches in bytes. In addition to filesystem-wide
// read/prog caches, each file gets its own cache to reduce disk
// accesses.
lfs3_size_t file_cache_size;
lfs3_size_t fcache_size;
// Size of the lookahead buffer in bytes. A larger lookahead buffer
// 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
// operations gbmap repopulations are controlled by
// gbmap_re_thresh.
// regbmap_thresh.
//
// Any value <= gbmap_re_thresh repopulates the gbmap when below
// gbmap_re_thresh, while -1 or any value >= block_count
// Any value <= regbmap_thresh repopulates the gbmap when below
// regbmap_thresh, while -1 or any value >= block_count
// repopulates the lookahead buffer after any block allocation.
#if !defined(LFS3_RDONLY) && defined(LFS3_GBMAP)
lfs3_block_t gc_regbmap_thresh;
@@ -614,7 +614,7 @@ struct lfs3_cfg {
// 0 only repopulates the gbmap when empty, minimizing gbmap
// repops at the risk of large latency spikes.
#ifdef LFS3_GBMAP
lfs3_block_t gbmap_re_thresh;
lfs3_block_t regbmap_thresh;
#endif
};
@@ -689,14 +689,14 @@ struct lfs3_attr {
// Optional configuration provided during lfs3_file_opencfg
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.
void *cache_buffer;
void *fcache_buffer;
// Size of the file cache in bytes. In addition to filesystem-wide
// read/prog caches, each file gets its own cache to reduce disk
// accesses. Defaults to file_cache_size if cache_buffer is NULL.
lfs3_size_t cache_size;
// accesses. Defaults to fcache_size if fcache_buffer is NULL.
lfs3_size_t fcache_size;
// Optional list of custom attributes attached to the file. If readable,
// these attributes will be kept up to date with the attributes on-disk.