Skip to content

Commit

Permalink
Fixed issues discovered around testing moves
Browse files Browse the repository at this point in the history 
lfs_dir_fetchwith did not recover from failed dir fetches correctly,
added a temporary dir variable to hold dir contents while being
populated, allowing us to fall back to a known good dir state if a
commit is corrupted.

There is a RAM cost, but the upside is that our lfs_dir_fetchwith
actually works.

Also added better handling of move ids during some get functions.
  • Loading branch information
@geky
geky committed Oct 13, 2018
1 parent 483d41c commit 85a9638
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 26 deletions.
61 changes: 38 additions & 23 deletions lfs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -809,10 +809,12 @@ static int lfs_dir_fetchwith(lfs_t *lfs,
lfs_crc(&crc, &dir->rev, sizeof(dir->rev));
dir->rev = lfs_fromle32(dir->rev);

lfs_dir_t temp = *dir;

while (true) {
// extract next tag
lfs_tag_t tag;
int err = lfs_bd_read(lfs, dir->pair[0], off, &tag, sizeof(tag));
int err = lfs_bd_read(lfs, temp.pair[0], off, &tag, sizeof(tag));
if (err) {
return err;
}
Expand All @@ -831,18 +833,18 @@ static int lfs_dir_fetchwith(lfs_t *lfs,
break;
}

//printf("tag r %#010x (%x:%x %03x %03x %03x)\n", tag, dir->pair[0], off+sizeof(tag), lfs_tag_type(tag), lfs_tag_id(tag), lfs_tag_size(tag));
//printf("tag r %#010x (%x:%x %03x %03x %03x)\n", tag, temp.pair[0], off+sizeof(tag), lfs_tag_type(tag), lfs_tag_id(tag), lfs_tag_size(tag));
if (lfs_tag_type(tag) == LFS_TYPE_CRC) {
// check the crc entry
uint32_t dcrc;
int err = lfs_bd_read(lfs, dir->pair[0],
int err = lfs_bd_read(lfs, temp.pair[0],
off+sizeof(tag), &dcrc, sizeof(dcrc));
if (err) {
return err;
}

if (crc != lfs_fromle32(dcrc)) {
if (off == sizeof(dir->rev)) {
if (off == sizeof(temp.rev)) {
// try other block
break;
} else {
Expand All @@ -852,49 +854,50 @@ static int lfs_dir_fetchwith(lfs_t *lfs,
}
}

dir->off = off + sizeof(tag)+lfs_tag_size(tag);
dir->etag = tag;
temp.off = off + sizeof(tag)+lfs_tag_size(tag);
temp.etag = tag;
crc = 0xffffffff;
*dir = temp;
} else {
err = lfs_bd_crc(lfs, dir->pair[0],
err = lfs_bd_crc(lfs, temp.pair[0],
off+sizeof(tag), lfs_tag_size(tag), &crc);
if (err) {
return err;
}

if (lfs_tag_type(tag) == LFS_TYPE_SOFTTAIL ||
lfs_tag_type(tag) == LFS_TYPE_HARDTAIL) {
dir->split = lfs_tag_type(tag) == LFS_TYPE_HARDTAIL;
err = lfs_bd_read(lfs, dir->pair[0], off+sizeof(tag),
dir->tail, sizeof(dir->tail));
temp.split = lfs_tag_type(tag) == LFS_TYPE_HARDTAIL;
err = lfs_bd_read(lfs, temp.pair[0], off+sizeof(tag),
temp.tail, sizeof(temp.tail));
if (err) {
return err;
}
} else if (lfs_tag_type(tag) == LFS_TYPE_MOVE) {
// TODO handle moves correctly?
dir->moveid = lfs_tag_id(tag);
temp.moveid = lfs_tag_id(tag);
} else {
if (lfs_tag_id(tag) < 0x1ff &&
lfs_tag_id(tag) >= dir->count) {
dir->count = lfs_tag_id(tag)+1;
lfs_tag_id(tag) >= temp.count) {
temp.count = lfs_tag_id(tag)+1;
}

if (lfs_tag_type(tag) == LFS_TYPE_DELETE) {
dir->count -= 1;
if (dir->moveid != -1) {
//printf("RENAME DEL %d (%d)\n", lfs_tag_id(tag), dir->moveid);
temp.count -= 1;
if (temp.moveid != -1) {
//printf("RENAME DEL %d (%d)\n", lfs_tag_id(tag), temp.moveid);
}
if (lfs_tag_id(tag) == dir->moveid) {
dir->moveid = -1;
} else if (lfs_tag_id(tag) < dir->moveid) {
dir->moveid -= 1;
if (lfs_tag_id(tag) == temp.moveid) {
temp.moveid = -1;
} else if (lfs_tag_id(tag) < temp.moveid) {
temp.moveid -= 1;
}
}

if (cb) {
err = cb(lfs, data, (lfs_entry_t){
(tag | 0x80000000),
.u.d.block=dir->pair[0],
.u.d.block=temp.pair[0],
.u.d.off=off+sizeof(tag)});
if (err) {
return err;
Expand Down Expand Up @@ -1617,6 +1620,17 @@ static int lfs_dir_getinfo(lfs_t *lfs, lfs_dir_t *dir,
return 0;
}

if (id == dir->moveid) {
int moved = lfs_moved(lfs, dir, dir->moveid);
if (moved < 0) {
return moved;
}

if (moved) {
return LFS_ERR_NOENT;
}
}

lfs_entry_t entry;
int err = lfs_dir_getentry(lfs, dir, 0x701ff000,
lfs_mktag(LFS_TYPE_REG, id, 0), &entry);
Expand Down Expand Up @@ -4680,8 +4694,9 @@ static int lfs_moved(lfs_t *lfs, lfs_dir_t *fromdir, uint16_t fromid) {
// grab entry pair we're looking for
fromdir->moveid = -1;
lfs_entry_t fromentry;
int err = lfs_dir_getentry(lfs, fromdir, 0x43dff000,
lfs_mktag(LFS_STRUCT_DIR, fromid, 0), &fromentry);
// TODO what about inline files?
int err = lfs_dir_getentry(lfs, fromdir, 0x401ff000,
lfs_mktag(LFS_TYPE_REG, fromid, 0), &fromentry);
fromdir->moveid = fromid;
if (err) {
return err;
Expand Down
6 changes: 3 additions & 3 deletions tests/test_move.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ tests/test.py << TEST
lfs_rename(&lfs, "b/hello", "c/hello") => 0;
lfs_unmount(&lfs) => 0;
TEST
rm -v blocks/7
truncate -s-7 blocks/6
tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0;
lfs_dir_open(&lfs, &dir[0], "b") => 0;
Expand All @@ -86,8 +86,8 @@ tests/test.py << TEST
lfs_rename(&lfs, "c/hello", "d/hello") => 0;
lfs_unmount(&lfs) => 0;
TEST
rm -v blocks/8
rm -v blocks/a
truncate -s-7 blocks/8
truncate -s-7 blocks/a
tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0;
lfs_dir_open(&lfs, &dir[0], "c") => 0;
Expand Down

0 comments on commit 85a9638

Please sign in to comment.