TBM/tbm-mcu
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

mufs: use a buffer to operate on data in-place to reduce the amount of I/O in read_dirent()/write_dirent()

Browse source
This commit is contained in:
S.J.R. van Schaik 2017-06-12 13:15:28 +02:00
parent a20c1a8ed4
commit bd5120f8d0
1 changed files with 27 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
source/fs/mufs/dir.c
View file

@ -178,55 +178,53 @@ size_t read_dirent(struct mufs *fs, struct mufs_tree *tree,
struct mufs_dirent *dirent, uint32_t va) struct mufs_dirent *dirent, uint32_t va)
{ {
struct flash_dev *dev = fs->dev; struct flash_dev *dev = fs->dev;
struct mufs_dentry entry; char data[1 << dev->log2_block_size];
size_t ret = 0; struct mufs_dentry *entry;
size_t len; uint32_t offset;
uint32_t base, offset;
offset = va & ((UINT32_C(1) << dev->log2_block_size) - 1); offset = va & ((UINT32_C(1) << dev->log2_block_size) - 1);
base = align(va, dev->log2_block_size); va = align(va, dev->log2_block_size);
if (va + sizeof(entry) > tree->file_size) if (mufs_tree_read(tree, data, va, 1 << dev->log2_block_size) == 0)
return 0; return 0;
if (mufs_tree_read(tree, &entry, va, sizeof entry) == 0) if (offset + sizeof entry > (UINT32_C(1) << dev->log2_block_size))
return 0; return 0;
if (!entry.type) entry = (struct mufs_dentry *)(data + offset);
if (!entry->type)
return 0; return 0;
ret += sizeof entry; if (offset + sizeof *entry + entry->path_len >
va += sizeof entry; (UINT32_C(1) << dev->log2_block_size))
len = min(entry.path_len, sizeof(dirent->path - 1));
if (va + len > tree->file_size)
return 0; return 0;
if (mufs_tree_read(tree, dirent->path, va, len) == 0) memcpy(dirent->path, data + offset + sizeof *entry, entry->path_len);
return 0; dirent->path[entry->path_len] = '\0';
dirent->type = entry->type;
dirent->path[len] = '\0'; if (mufs_lookup_page(tree, &dirent->tree.va, va) < 0)
ret += len;
dirent->type = entry.type;
if (mufs_lookup_page(tree, &dirent->tree.va, base) < 0)
return 0; return 0;
dirent->tree.fs = fs; dirent->tree.fs = fs;
dirent->tree.va = (dirent->tree.va << dev->log2_block_size) + offset + dirent->tree.va = (dirent->tree.va << dev->log2_block_size) + offset +
offsetof(struct mufs_dentry, tree); offsetof(struct mufs_dentry, tree);
dirent->tree.file_size = entry.tree.file_size; dirent->tree.file_size = entry->tree.file_size;
dirent->tree.root = entry.tree.root; dirent->tree.root = entry->tree.root;
dirent->tree.depth = entry.tree.depth; dirent->tree.depth = entry->tree.depth;
return ret; return sizeof *entry + entry->path_len;
} }
size_t write_dirent(struct mufs_tree *tree, size_t write_dirent(struct mufs_tree *tree,
uint32_t va, struct mufs_dirent *dirent) uint32_t va, struct mufs_dirent *dirent)
{ {
struct mufs *fs = tree->fs;
struct flash_dev *dev = fs->dev;
char data[1 << dev->log2_block_size];
struct mufs_dentry entry; struct mufs_dentry entry;
size_t size;
entry.type = dirent->type; entry.type = dirent->type;
entry.tree.file_size = dirent->tree.file_size; entry.tree.file_size = dirent->tree.file_size;
@ -234,11 +232,11 @@ size_t write_dirent(struct mufs_tree *tree,
entry.tree.depth = dirent->tree.depth; entry.tree.depth = dirent->tree.depth;
entry.path_len = strlen(dirent->path); entry.path_len = strlen(dirent->path);
if (mufs_tree_write(tree, dirent->path, va + sizeof entry, memcpy(data, &entry, sizeof entry);
entry.path_len) == 0) memcpy(data + sizeof entry, dirent->path, entry.path_len);
return 0; size = sizeof entry + entry.path_len;
if (mufs_tree_write(tree, &entry, va, sizeof entry) == 0) if (mufs_tree_write(tree, data, va, size) == 0)
return 0; return 0;
va += sizeof entry + entry.path_len; va += sizeof entry + entry.path_len;