Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[issue 551] Optimized lfs_bd_cmp() and lfs_file_relocate() for bad block reloction. #686

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

[issue 551] Optimized lfs_bd_cmp() and lfs_file_relocate() for bad block reloction. #686

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1159cce
Modified lfs_bd_cmp() and lfs_file_relocate() to specify a bulk compa…
dgendreau-casana May 24, 2022
68385d7
rewrite test debugging
dgendreau-casana May 25, 2022
9d3ccbd
Testing lfs_file_relocate() with transferring 1 byte at a time and a …
dgendreau-casana May 25, 2022
cde63b3
fixed typo
dgendreau-casana May 25, 2022
f6bb128
fix valgrind scope warning
dgendreau-casana May 25, 2022
a6d891c
Testing bulk relocate on non-inline files only
dgendreau-casana May 25, 2022
a1c61d3
Testing bulk relocate size of 32.
dgendreau-casana May 25, 2022
3a51e46
Testing larger bulk cmp size in lfs_bd_cmp().
dgendreau-casana May 25, 2022
c531fb4
Fixed unit test failures: test-odd-block-size
dgendreau-casana May 25, 2022
c284b0a
Fixed typo
dgendreau-casana May 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions lfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
#define LFS_BLOCK_NULL ((lfs_block_t)-1)
#define LFS_BLOCK_INLINE ((lfs_block_t)-2)

#define LFS_BULK_RELOC_SIZE 32
#define LFS_BULK_CMP_SIZE 8

enum {
LFS_OK_RELOCATED = 1,
LFS_OK_DROPPED = 2,
Expand Down Expand Up @@ -132,7 +135,7 @@ static int lfs_bd_cmp(lfs_t *lfs,
lfs_size_t diff = 0;

for (lfs_off_t i = 0; i < size; i += diff) {
uint8_t dat[8];
uint8_t dat[LFS_BULK_CMP_SIZE];

diff = lfs_min(size-i, sizeof(dat));
int res = lfs_bd_read(lfs,
Expand Down Expand Up @@ -3026,6 +3029,8 @@ static int lfs_file_rawclose(lfs_t *lfs, lfs_file_t *file) {

#ifndef LFS_READONLY
static int lfs_file_relocate(lfs_t *lfs, lfs_file_t *file) {
lfs_size_t diff = 0;

while (true) {
// just relocate what exists into new block
lfs_block_t nblock;
Expand All @@ -3043,30 +3048,33 @@ static int lfs_file_relocate(lfs_t *lfs, lfs_file_t *file) {
}

// either read from dirty cache or disk
for (lfs_off_t i = 0; i < file->off; i++) {
uint8_t data;
for (lfs_off_t i = 0; i < file->off; i += diff) {
uint8_t dat[LFS_BULK_RELOC_SIZE];

if (file->flags & LFS_F_INLINE) {
diff = 1;
err = lfs_dir_getread(lfs, &file->m,
// note we evict inline files before they can be dirty
NULL, &file->cache, file->off-i,
LFS_MKTAG(0xfff, 0x1ff, 0),
LFS_MKTAG(LFS_TYPE_INLINESTRUCT, file->id, 0),
i, &data, 1);
i, &dat, diff);
if (err) {
return err;
}
} else {
diff = lfs_min(sizeof(dat), file->off-i);
err = lfs_bd_read(lfs,
&file->cache, &lfs->rcache, file->off-i,
file->block, i, &data, 1);
file->block, i, &dat, diff);
if (err) {
return err;
}
}

err = lfs_bd_prog(lfs,
&lfs->pcache, &lfs->rcache, true,
nblock, i, &data, 1);
nblock, i, dat, diff);
if (err) {
if (err == LFS_ERR_CORRUPT) {
goto relocate;
Expand Down