Github/littlefs
1
Fork 0
Code Actions Activity

Renamed a number of things related to shrubs/trees

Browse Source 
- -> lfsr_shrub_t
- -> lfsr_tree_t

The idea here is to adopt "shrub" as an umbrella term for the
shrub/sprout union, and "tree" as an umbrella term for the bptr/btree
union. I think this is a bit better than calling shrub/sprout "inlined"
which is a _very_ overloaded term in this codebase (inlined in the tree?
the mdir? inlined in the C struct?).
This commit is contained in:
Christopher Haster
2023-10-19 15:26:56 -05:00
parent 2940555caa
commit 907c24beeb
2 changed files with 291 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lfs.h
+19 -13
View File
@@ -520,9 +520,9 @@ typedef struct lfs_file {
const struct lfs_file_config *cfg;
} lfs_file_t;
typedef struct lfsr_inlined {
typedef struct lfsr_shrub {
union {
// note sign bit indicates if data is a single inlined data, or an
// the sign bit indicates if data is a single inlined data, or an
// inlined tree, this works because inlined data is always on disk,
// so data.size always has sign=1
lfs_soff_t weight;
@@ -534,7 +534,17 @@ typedef struct lfsr_inlined {
lfs_off_t estimate;
} shrub;
} u;
} lfsr_inlined_t;
} lfsr_shrub_t;
typedef struct lfsr_tree {
union {
// the sign bit indicates if this is a direct block pointer or
// indirect tree of block pointers/inlined datas
lfs_soff_t size;
lfsr_bptr_t bptr;
lfsr_btree_t btree;
} u;
} lfsr_tree_t;
typedef struct lfsr_file {
lfsr_openedmdir_t m;
@@ -546,17 +556,13 @@ typedef struct lfsr_file {
uint8_t *buffer;
lfs_size_t buffer_size;
// we need copies of inlined references in case of mdir compaction, this
// exists here instead of on the stack becuase we don't know how many
// inlined files may be opened
lfsr_inlined_t inlined;
lfsr_inlined_t inlined_;
// we need a staging copy of each shrubs during mdir compaction, we put
// this in the file struct directly, since we don't know how many files
// may be opened
lfsr_shrub_t shrub;
lfsr_shrub_t shrub_;
union {
lfs_soff_t size;
lfsr_bptr_t bptr;
lfsr_btree_t btree;
} u;
lfsr_tree_t tree;
const struct lfs_file_config *cfg;
} lfsr_file_t;