From 10ac6b9cf074ec165b2bf07bd412e386461ae395 Mon Sep 17 00:00:00 2001 From: Bill Gesner Date: Thu, 17 Sep 2020 23:41:20 +0000 Subject: [PATCH 1/6] add thread safe wrappers --- lfs.c | 209 ++++++++++++++++++++++++++++++++++++++++++----------- lfs.h | 183 +++++++++++++++++++++++++++++++++++++--------- lfs_util.h | 3 + 3 files changed, 316 insertions(+), 79 deletions(-) diff --git a/lfs.c b/lfs.c index eb832fa0..e17e4bda 100644 --- a/lfs.c +++ b/lfs.c @@ -1525,7 +1525,7 @@ static int lfs_dir_compact(lfs_t *lfs, if (lfs_pair_cmp(dir->pair, (const lfs_block_t[2]){0, 1}) == 0) { // oh no! we're writing too much to the superblock, // should we expand? - lfs_ssize_t res = lfs_fs_size(lfs); + lfs_ssize_t res = _lfs_fs_size(lfs); if (res < 0) { return res; } @@ -1906,7 +1906,7 @@ compact: /// Top level directory operations /// -int lfs_mkdir(lfs_t *lfs, const char *path) { +int _lfs_mkdir(lfs_t *lfs, const char *path) { LFS_TRACE("lfs_mkdir(%p, \"%s\")", (void*)lfs, path); // deorphan if we haven't yet, needed at most once after poweron int err = lfs_fs_forceconsistency(lfs); @@ -2005,7 +2005,7 @@ int lfs_mkdir(lfs_t *lfs, const char *path) { return 0; } -int lfs_dir_open(lfs_t *lfs, lfs_dir_t *dir, const char *path) { +int _lfs_dir_open(lfs_t *lfs, lfs_dir_t *dir, const char *path) { LFS_TRACE("lfs_dir_open(%p, %p, \"%s\")", (void*)lfs, (void*)dir, path); lfs_stag_t tag = lfs_dir_find(lfs, &dir->m, &path, NULL); if (tag < 0) { @@ -2056,7 +2056,7 @@ int lfs_dir_open(lfs_t *lfs, lfs_dir_t *dir, const char *path) { return 0; } -int lfs_dir_close(lfs_t *lfs, lfs_dir_t *dir) { +int _lfs_dir_close(lfs_t *lfs, lfs_dir_t *dir) { LFS_TRACE("lfs_dir_close(%p, %p)", (void*)lfs, (void*)dir); // remove from list of mdirs for (struct lfs_mlist **p = &lfs->mlist; *p; p = &(*p)->next) { @@ -2070,7 +2070,7 @@ int lfs_dir_close(lfs_t *lfs, lfs_dir_t *dir) { return 0; } -int lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info) { +int _lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info) { LFS_TRACE("lfs_dir_read(%p, %p, %p)", (void*)lfs, (void*)dir, (void*)info); memset(info, 0, sizeof(*info)); @@ -2123,11 +2123,11 @@ int lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info) { return true; } -int lfs_dir_seek(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off) { +int _lfs_dir_seek(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off) { LFS_TRACE("lfs_dir_seek(%p, %p, %"PRIu32")", (void*)lfs, (void*)dir, off); // simply walk from head dir - int err = lfs_dir_rewind(lfs, dir); + int err = _lfs_dir_rewind(lfs, dir); if (err) { LFS_TRACE("lfs_dir_seek -> %d", err); return err; @@ -2166,14 +2166,14 @@ int lfs_dir_seek(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off) { return 0; } -lfs_soff_t lfs_dir_tell(lfs_t *lfs, lfs_dir_t *dir) { +lfs_soff_t _lfs_dir_tell(lfs_t *lfs, lfs_dir_t *dir) { LFS_TRACE("lfs_dir_tell(%p, %p)", (void*)lfs, (void*)dir); (void)lfs; LFS_TRACE("lfs_dir_tell -> %"PRId32, dir->pos); return dir->pos; } -int lfs_dir_rewind(lfs_t *lfs, lfs_dir_t *dir) { +int _lfs_dir_rewind(lfs_t *lfs, lfs_dir_t *dir) { LFS_TRACE("lfs_dir_rewind(%p, %p)", (void*)lfs, (void*)dir); // reload the head dir int err = lfs_dir_fetch(lfs, &dir->m, dir->head); @@ -2380,7 +2380,7 @@ static int lfs_ctz_traverse(lfs_t *lfs, /// Top level file operations /// -int lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file, +int _lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file, const char *path, int flags, const struct lfs_file_config *cfg) { LFS_TRACE("lfs_file_opencfg(%p, %p, \"%s\", %x, %p {" @@ -2529,26 +2529,26 @@ int lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file, cleanup: // clean up lingering resources file->flags |= LFS_F_ERRED; - lfs_file_close(lfs, file); + _lfs_file_close(lfs, file); LFS_TRACE("lfs_file_opencfg -> %d", err); return err; } -int lfs_file_open(lfs_t *lfs, lfs_file_t *file, +int _lfs_file_open(lfs_t *lfs, lfs_file_t *file, const char *path, int flags) { LFS_TRACE("lfs_file_open(%p, %p, \"%s\", %x)", (void*)lfs, (void*)file, path, flags); static const struct lfs_file_config defaults = {0}; - int err = lfs_file_opencfg(lfs, file, path, flags, &defaults); + int err = _lfs_file_opencfg(lfs, file, path, flags, &defaults); LFS_TRACE("lfs_file_open -> %d", err); return err; } -int lfs_file_close(lfs_t *lfs, lfs_file_t *file) { +int _lfs_file_close(lfs_t *lfs, lfs_file_t *file) { LFS_TRACE("lfs_file_close(%p, %p)", (void*)lfs, (void*)file); LFS_ASSERT(file->flags & LFS_F_OPENED); - int err = lfs_file_sync(lfs, file); + int err = _lfs_file_sync(lfs, file); // remove from list of mdirs for (struct lfs_mlist **p = &lfs->mlist; *p; p = &(*p)->next) { @@ -2679,12 +2679,12 @@ static int lfs_file_flush(lfs_t *lfs, lfs_file_t *file) { // copy over a byte at a time, leave it up to caching // to make this efficient uint8_t data; - lfs_ssize_t res = lfs_file_read(lfs, &orig, &data, 1); + lfs_ssize_t res = _lfs_file_read(lfs, &orig, &data, 1); if (res < 0) { return res; } - res = lfs_file_write(lfs, file, &data, 1); + res = _lfs_file_write(lfs, file, &data, 1); if (res < 0) { return res; } @@ -2731,7 +2731,7 @@ relocate: return 0; } -int lfs_file_sync(lfs_t *lfs, lfs_file_t *file) { +int _lfs_file_sync(lfs_t *lfs, lfs_file_t *file) { LFS_TRACE("lfs_file_sync(%p, %p)", (void*)lfs, (void*)file); LFS_ASSERT(file->flags & LFS_F_OPENED); @@ -2788,7 +2788,7 @@ int lfs_file_sync(lfs_t *lfs, lfs_file_t *file) { return 0; } -lfs_ssize_t lfs_file_read(lfs_t *lfs, lfs_file_t *file, +lfs_ssize_t _lfs_file_read(lfs_t *lfs, lfs_file_t *file, void *buffer, lfs_size_t size) { LFS_TRACE("lfs_file_read(%p, %p, %p, %"PRIu32")", (void*)lfs, (void*)file, buffer, size); @@ -2868,7 +2868,7 @@ lfs_ssize_t lfs_file_read(lfs_t *lfs, lfs_file_t *file, return size; } -lfs_ssize_t lfs_file_write(lfs_t *lfs, lfs_file_t *file, +lfs_ssize_t _lfs_file_write(lfs_t *lfs, lfs_file_t *file, const void *buffer, lfs_size_t size) { LFS_TRACE("lfs_file_write(%p, %p, %p, %"PRIu32")", (void*)lfs, (void*)file, buffer, size); @@ -2903,7 +2903,7 @@ lfs_ssize_t lfs_file_write(lfs_t *lfs, lfs_file_t *file, file->pos = file->ctz.size; while (file->pos < pos) { - lfs_ssize_t res = lfs_file_write(lfs, file, &(uint8_t){0}, 1); + lfs_ssize_t res = _lfs_file_write(lfs, file, &(uint8_t){0}, 1); if (res < 0) { LFS_TRACE("lfs_file_write -> %"PRId32, res); return res; @@ -2999,7 +2999,7 @@ relocate: return size; } -lfs_soff_t lfs_file_seek(lfs_t *lfs, lfs_file_t *file, +lfs_soff_t _lfs_file_seek(lfs_t *lfs, lfs_file_t *file, lfs_soff_t off, int whence) { LFS_TRACE("lfs_file_seek(%p, %p, %"PRId32", %d)", (void*)lfs, (void*)file, off, whence); @@ -3034,7 +3034,7 @@ lfs_soff_t lfs_file_seek(lfs_t *lfs, lfs_file_t *file, return npos; } -int lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { +int _lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { LFS_TRACE("lfs_file_truncate(%p, %p, %"PRIu32")", (void*)lfs, (void*)file, size); LFS_ASSERT(file->flags & LFS_F_OPENED); @@ -3046,7 +3046,7 @@ int lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { } lfs_off_t pos = file->pos; - lfs_off_t oldsize = lfs_file_size(lfs, file); + lfs_off_t oldsize = _lfs_file_size(lfs, file); if (size < oldsize) { // need to flush since directly changing metadata int err = lfs_file_flush(lfs, file); @@ -3070,7 +3070,7 @@ int lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { } else if (size > oldsize) { // flush+seek if not already at end if (file->pos != oldsize) { - lfs_soff_t res = lfs_file_seek(lfs, file, 0, LFS_SEEK_END); + lfs_soff_t res = _lfs_file_seek(lfs, file, 0, LFS_SEEK_END); if (res < 0) { LFS_TRACE("lfs_file_truncate -> %"PRId32, res); return (int)res; @@ -3079,7 +3079,7 @@ int lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { // fill with zeros while (file->pos < size) { - lfs_ssize_t res = lfs_file_write(lfs, file, &(uint8_t){0}, 1); + lfs_ssize_t res = _lfs_file_write(lfs, file, &(uint8_t){0}, 1); if (res < 0) { LFS_TRACE("lfs_file_truncate -> %"PRId32, res); return (int)res; @@ -3088,7 +3088,7 @@ int lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { } // restore pos - lfs_soff_t res = lfs_file_seek(lfs, file, pos, LFS_SEEK_SET); + lfs_soff_t res = _lfs_file_seek(lfs, file, pos, LFS_SEEK_SET); if (res < 0) { LFS_TRACE("lfs_file_truncate -> %"PRId32, res); return (int)res; @@ -3098,7 +3098,7 @@ int lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { return 0; } -lfs_soff_t lfs_file_tell(lfs_t *lfs, lfs_file_t *file) { +lfs_soff_t _lfs_file_tell(lfs_t *lfs, lfs_file_t *file) { LFS_TRACE("lfs_file_tell(%p, %p)", (void*)lfs, (void*)file); LFS_ASSERT(file->flags & LFS_F_OPENED); (void)lfs; @@ -3106,9 +3106,9 @@ lfs_soff_t lfs_file_tell(lfs_t *lfs, lfs_file_t *file) { return file->pos; } -int lfs_file_rewind(lfs_t *lfs, lfs_file_t *file) { +int _lfs_file_rewind(lfs_t *lfs, lfs_file_t *file) { LFS_TRACE("lfs_file_rewind(%p, %p)", (void*)lfs, (void*)file); - lfs_soff_t res = lfs_file_seek(lfs, file, 0, LFS_SEEK_SET); + lfs_soff_t res = _lfs_file_seek(lfs, file, 0, LFS_SEEK_SET); if (res < 0) { LFS_TRACE("lfs_file_rewind -> %"PRId32, res); return (int)res; @@ -3118,7 +3118,7 @@ int lfs_file_rewind(lfs_t *lfs, lfs_file_t *file) { return 0; } -lfs_soff_t lfs_file_size(lfs_t *lfs, lfs_file_t *file) { +lfs_soff_t _lfs_file_size(lfs_t *lfs, lfs_file_t *file) { LFS_TRACE("lfs_file_size(%p, %p)", (void*)lfs, (void*)file); LFS_ASSERT(file->flags & LFS_F_OPENED); (void)lfs; @@ -3134,7 +3134,7 @@ lfs_soff_t lfs_file_size(lfs_t *lfs, lfs_file_t *file) { /// General fs operations /// -int lfs_stat(lfs_t *lfs, const char *path, struct lfs_info *info) { +int _lfs_stat(lfs_t *lfs, const char *path, struct lfs_info *info) { LFS_TRACE("lfs_stat(%p, \"%s\", %p)", (void*)lfs, path, (void*)info); lfs_mdir_t cwd; lfs_stag_t tag = lfs_dir_find(lfs, &cwd, &path, NULL); @@ -3148,7 +3148,7 @@ int lfs_stat(lfs_t *lfs, const char *path, struct lfs_info *info) { return err; } -int lfs_remove(lfs_t *lfs, const char *path) { +int _lfs_remove(lfs_t *lfs, const char *path) { LFS_TRACE("lfs_remove(%p, \"%s\")", (void*)lfs, path); // deorphan if we haven't yet, needed at most once after poweron int err = lfs_fs_forceconsistency(lfs); @@ -3229,7 +3229,7 @@ int lfs_remove(lfs_t *lfs, const char *path) { return 0; } -int lfs_rename(lfs_t *lfs, const char *oldpath, const char *newpath) { +int _lfs_rename(lfs_t *lfs, const char *oldpath, const char *newpath) { LFS_TRACE("lfs_rename(%p, \"%s\", \"%s\")", (void*)lfs, oldpath, newpath); // deorphan if we haven't yet, needed at most once after poweron @@ -3374,7 +3374,7 @@ int lfs_rename(lfs_t *lfs, const char *oldpath, const char *newpath) { return 0; } -lfs_ssize_t lfs_getattr(lfs_t *lfs, const char *path, +lfs_ssize_t _lfs_getattr(lfs_t *lfs, const char *path, uint8_t type, void *buffer, lfs_size_t size) { LFS_TRACE("lfs_getattr(%p, \"%s\", %"PRIu8", %p, %"PRIu32")", (void*)lfs, path, type, buffer, size); @@ -3437,7 +3437,7 @@ static int lfs_commitattr(lfs_t *lfs, const char *path, {LFS_MKTAG(LFS_TYPE_USERATTR + type, id, size), buffer})); } -int lfs_setattr(lfs_t *lfs, const char *path, +int _lfs_setattr(lfs_t *lfs, const char *path, uint8_t type, const void *buffer, lfs_size_t size) { LFS_TRACE("lfs_setattr(%p, \"%s\", %"PRIu8", %p, %"PRIu32")", (void*)lfs, path, type, buffer, size); @@ -3451,7 +3451,7 @@ int lfs_setattr(lfs_t *lfs, const char *path, return err; } -int lfs_removeattr(lfs_t *lfs, const char *path, uint8_t type) { +int _lfs_removeattr(lfs_t *lfs, const char *path, uint8_t type) { LFS_TRACE("lfs_removeattr(%p, \"%s\", %"PRIu8")", (void*)lfs, path, type); int err = lfs_commitattr(lfs, path, type, NULL, 0x3ff); LFS_TRACE("lfs_removeattr -> %d", err); @@ -3584,7 +3584,7 @@ static int lfs_deinit(lfs_t *lfs) { return 0; } -int lfs_format(lfs_t *lfs, const struct lfs_config *cfg) { +int _lfs_format(lfs_t *lfs, const struct lfs_config *cfg) { LFS_TRACE("lfs_format(%p, %p {.context=%p, " ".read=%p, .prog=%p, .erase=%p, .sync=%p, " ".read_size=%"PRIu32", .prog_size=%"PRIu32", " @@ -3665,7 +3665,7 @@ cleanup: return err; } -int lfs_mount(lfs_t *lfs, const struct lfs_config *cfg) { +int _lfs_mount(lfs_t *lfs, const struct lfs_config *cfg) { LFS_TRACE("lfs_mount(%p, %p {.context=%p, " ".read=%p, .prog=%p, .erase=%p, .sync=%p, " ".read_size=%"PRIu32", .prog_size=%"PRIu32", " @@ -3804,12 +3804,12 @@ int lfs_mount(lfs_t *lfs, const struct lfs_config *cfg) { return 0; cleanup: - lfs_unmount(lfs); + _lfs_unmount(lfs); LFS_TRACE("lfs_mount -> %d", err); return err; } -int lfs_unmount(lfs_t *lfs) { +int _lfs_unmount(lfs_t *lfs) { LFS_TRACE("lfs_unmount(%p)", (void*)lfs); int err = lfs_deinit(lfs); LFS_TRACE("lfs_unmount -> %d", err); @@ -3914,7 +3914,7 @@ int lfs_fs_traverseraw(lfs_t *lfs, return 0; } -int lfs_fs_traverse(lfs_t *lfs, +int _lfs_fs_traverse(lfs_t *lfs, int (*cb)(void *data, lfs_block_t block), void *data) { LFS_TRACE("lfs_fs_traverse(%p, %p, %p)", (void*)lfs, (void*)(uintptr_t)cb, data); @@ -4235,7 +4235,7 @@ static int lfs_fs_size_count(void *p, lfs_block_t block) { return 0; } -lfs_ssize_t lfs_fs_size(lfs_t *lfs) { +lfs_ssize_t _lfs_fs_size(lfs_t *lfs) { LFS_TRACE("lfs_fs_size(%p)", (void*)lfs); lfs_size_t size = 0; int err = lfs_fs_traverseraw(lfs, lfs_fs_size_count, &size, false); @@ -4669,7 +4669,7 @@ static int lfs1_unmount(lfs_t *lfs) { } /// v1 migration /// -int lfs_migrate(lfs_t *lfs, const struct lfs_config *cfg) { +int _lfs_migrate(lfs_t *lfs, const struct lfs_config *cfg) { LFS_TRACE("lfs_migrate(%p, %p {.context=%p, " ".read=%p, .prog=%p, .erase=%p, .sync=%p, " ".read_size=%"PRIu32", .prog_size=%"PRIu32", " @@ -4911,3 +4911,124 @@ cleanup: } #endif + +#if LFS_THREAD_SAFE + +#define CREATE_LFS_TS_1(ret, function, b_type, b) \ + ret _ts ## function(b_type b) \ + { \ + int err = lfs->cfg->lock(lfs->cfg); \ + if (err) \ + { \ + return err; \ + } \ + err = function(b); \ + lfs->cfg->unlock(lfs->cfg); \ + return err; \ + } +#define CREATE_LFS_TS_2(ret, function, b_type, b, c_type, c) \ + ret _ts ## function(b_type b, c_type c) \ + { \ + int err = lfs->cfg->lock(lfs->cfg); \ + if (err) \ + { \ + return err; \ + } \ + err = function(b, c); \ + lfs->cfg->unlock(lfs->cfg); \ + return err; \ + } +#define CREATE_LFS_TS_2_CFG(ret, function, b_type, b, c_type, cfg) \ + ret _ts ## function(b_type b, c_type cfg) \ + { \ + int err = cfg->lock(cfg); \ + if (err) \ + { \ + return err; \ + } \ + err = function(b, cfg); \ + cfg->unlock(cfg); \ + return err; \ + } +#define CREATE_LFS_TS_3(ret, function, b_type, b, c_type, c, d_type, d) \ + ret _ts ## function(b_type b, c_type c, d_type d) \ + { \ + int err = lfs->cfg->lock(lfs->cfg); \ + if (err) \ + { \ + return err; \ + } \ + err = function(b, c, d); \ + lfs->cfg->unlock(lfs->cfg); \ + return err; \ + } +#define CREATE_LFS_TS_4(ret, function, b_type, b, c_type, c, d_type, d, e_type, e) \ + ret _ts ## function(b_type b, c_type c, d_type d, e_type e) \ + { \ + int err = lfs->cfg->lock(lfs->cfg); \ + if (err) \ + { \ + return err; \ + } \ + err = function(b, c, d, e); \ + lfs->cfg->unlock(lfs->cfg); \ + return err; \ + } +#define CREATE_LFS_TS_5(ret, function, b_type, b, c_type, c, d_type, d, e_type, e, f_type, f) \ + ret _ts ## function(b_type b, c_type c, d_type d, e_type e, f_type f) \ + { \ + int err = lfs->cfg->lock(lfs->cfg); \ + if (err) \ + { \ + return err; \ + } \ + err = function(b, c, d, e, f); \ + lfs->cfg->unlock(lfs->cfg); \ + return err; \ + } + +int _ts_lfs_fs_traverse (lfs_t * lfs, int (* cb)(void * data, lfs_block_t block), void * data) { + int err = lfs->cfg->lock(lfs->cfg); + if (err) + { + return err; + } + + err = _lfs_fs_traverse(lfs, cb, data); + lfs->cfg->unlock(lfs->cfg); + + return err; +} + +CREATE_LFS_TS_2_CFG(int, _lfs_format,lfs_t *, lfs, const struct lfs_config *, config) +CREATE_LFS_TS_2_CFG(int, _lfs_mount,lfs_t *, lfs, const struct lfs_config *, config) +CREATE_LFS_TS_1(int, _lfs_unmount,lfs_t *, lfs) +CREATE_LFS_TS_2(int, _lfs_remove,lfs_t *, lfs, const char *, path) +CREATE_LFS_TS_3(int, _lfs_rename, lfs_t *, lfs, const char *, oldpath, const char *, newpath) +CREATE_LFS_TS_3(int, _lfs_stat, lfs_t *, lfs, const char *, path, struct lfs_info *, info) +CREATE_LFS_TS_5(lfs_ssize_t, _lfs_getattr, lfs_t *, lfs, const char *, path, uint8_t, type, void *, buffer, lfs_size_t, size) +CREATE_LFS_TS_5(int, _lfs_setattr, lfs_t *, lfs, const char *, path, uint8_t, type, const void *, buffer, lfs_size_t, size) +CREATE_LFS_TS_3(int, _lfs_removeattr, lfs_t *, lfs, const char *, path, uint8_t, type) +CREATE_LFS_TS_4(int, _lfs_file_open, lfs_t *, lfs, lfs_file_t *, file, const char *, path, int, flags) +CREATE_LFS_TS_5(int, _lfs_file_opencfg, lfs_t *, lfs, lfs_file_t *, file, const char *, path, int, flags, const struct lfs_file_config *, config) +CREATE_LFS_TS_2(int, _lfs_file_close, lfs_t *, lfs, lfs_file_t *, file) +CREATE_LFS_TS_2(int, _lfs_file_sync, lfs_t *, lfs, lfs_file_t *, file) +CREATE_LFS_TS_4(lfs_ssize_t, _lfs_file_read, lfs_t *, lfs, lfs_file_t *, file, void *, buffer, lfs_size_t, size) +CREATE_LFS_TS_4(lfs_ssize_t, _lfs_file_write, lfs_t *, lfs, lfs_file_t *, file, const void *, buffer, lfs_size_t, size) +CREATE_LFS_TS_4(lfs_soff_t, _lfs_file_seek, lfs_t *, lfs, lfs_file_t *, file, lfs_soff_t, off, int, whence) +CREATE_LFS_TS_3(int, _lfs_file_truncate, lfs_t *, lfs, lfs_file_t *, file, lfs_off_t, size) +CREATE_LFS_TS_2(lfs_soff_t, _lfs_file_tell, lfs_t *, lfs, lfs_file_t *, file) +CREATE_LFS_TS_2(int, _lfs_file_rewind, lfs_t *, lfs, lfs_file_t *, file) +CREATE_LFS_TS_2(lfs_soff_t, _lfs_file_size, lfs_t *, lfs, lfs_file_t *, file) +CREATE_LFS_TS_2(int, _lfs_mkdir, lfs_t *, lfs, const char *, path) +CREATE_LFS_TS_3(int, _lfs_dir_open, lfs_t *, lfs, lfs_dir_t *, dir, const char *, path) +CREATE_LFS_TS_2(int, _lfs_dir_close, lfs_t *, lfs, lfs_dir_t *, dir) +CREATE_LFS_TS_3(int, _lfs_dir_read, lfs_t *, lfs, lfs_dir_t *, dir, struct lfs_info *, info) +CREATE_LFS_TS_3(int, _lfs_dir_seek, lfs_t *, lfs, lfs_dir_t *, dir, lfs_off_t, off) +CREATE_LFS_TS_2(lfs_soff_t, _lfs_dir_tell, lfs_t *, lfs, lfs_dir_t *, dir) +CREATE_LFS_TS_2(int, _lfs_dir_rewind, lfs_t *, lfs, lfs_dir_t *, dir) +CREATE_LFS_TS_1(lfs_ssize_t, _lfs_fs_size, lfs_t *, lfs) +#ifdef LFS_MIGRATE +CREATE_LFS_TS_2_CFG(int, _lfs_migrate, lfs_t *, lfs, const struct lfs_config *, cfg) +#endif +#endif \ No newline at end of file diff --git a/lfs.h b/lfs.h index 35bbbabf..92f04904 100644 --- a/lfs.h +++ b/lfs.h @@ -9,6 +9,7 @@ #include #include +#include "lfs_util.h" #ifdef __cplusplus extern "C" @@ -53,7 +54,7 @@ typedef uint32_t lfs_block_t; // Maximum size of a file in bytes, may be redefined to limit to support other // drivers. Limited on disk to <= 4294967296. However, above 2147483647 the -// functions lfs_file_seek, lfs_file_size, and lfs_file_tell will return +// functions _lfs_file_seek, _lfs_file_size, and _lfs_file_tell will return // incorrect values due to using signed integers. Stored in superblock and // must be respected by other littlefs drivers. #ifndef LFS_FILE_MAX @@ -84,6 +85,9 @@ enum lfs_error { LFS_ERR_NOMEM = -12, // No more memory available LFS_ERR_NOATTR = -61, // No data/attr available LFS_ERR_NAMETOOLONG = -36, // File name too long +#if LFS_THREAD_SAFE + LFS_ERR_LOCK = -23, // Failed to aquire lock +#endif }; // File types @@ -174,6 +178,16 @@ struct lfs_config { // are propogated to the user. int (*sync)(const struct lfs_config *c); + #if LFS_THREAD_SAFE + // Lock the underlying block device. Negative error codes + // are propogated to the user. + int (*lock)(const struct lfs_config *c); + + // Unlock the underlying block device. Negative error codes + // are propogated to the user. + int (*unlock)(const struct lfs_config *c); + #endif + // Minimum size of a block read. All read operations will be a // multiple of this value. lfs_size_t read_size; @@ -406,7 +420,7 @@ typedef struct lfs { // be zeroed for defaults and backwards compatibility. // // Returns a negative error code on failure. -int lfs_format(lfs_t *lfs, const struct lfs_config *config); +int _lfs_format(lfs_t *lfs, const struct lfs_config *config); // Mounts a littlefs // @@ -416,13 +430,13 @@ int lfs_format(lfs_t *lfs, const struct lfs_config *config); // be zeroed for defaults and backwards compatibility. // // Returns a negative error code on failure. -int lfs_mount(lfs_t *lfs, const struct lfs_config *config); +int _lfs_mount(lfs_t *lfs, const struct lfs_config *config); // Unmounts a littlefs // // Does nothing besides releasing any allocated resources. // Returns a negative error code on failure. -int lfs_unmount(lfs_t *lfs); +int _lfs_unmount(lfs_t *lfs); /// General operations /// @@ -430,7 +444,7 @@ int lfs_unmount(lfs_t *lfs); // // If removing a directory, the directory must be empty. // Returns a negative error code on failure. -int lfs_remove(lfs_t *lfs, const char *path); +int _lfs_remove(lfs_t *lfs, const char *path); // Rename or move a file or directory // @@ -438,13 +452,13 @@ int lfs_remove(lfs_t *lfs, const char *path); // If the destination is a directory, the directory must be empty. // // Returns a negative error code on failure. -int lfs_rename(lfs_t *lfs, const char *oldpath, const char *newpath); +int _lfs_rename(lfs_t *lfs, const char *oldpath, const char *newpath); // Find info about a file or directory // // Fills out the info structure, based on the specified file or directory. // Returns a negative error code on failure. -int lfs_stat(lfs_t *lfs, const char *path, struct lfs_info *info); +int _lfs_stat(lfs_t *lfs, const char *path, struct lfs_info *info); // Get a custom attribute // @@ -458,7 +472,7 @@ int lfs_stat(lfs_t *lfs, const char *path, struct lfs_info *info); // Note, the returned size is the size of the attribute on disk, irrespective // of the size of the buffer. This can be used to dynamically allocate a buffer // or check for existance. -lfs_ssize_t lfs_getattr(lfs_t *lfs, const char *path, +lfs_ssize_t _lfs_getattr(lfs_t *lfs, const char *path, uint8_t type, void *buffer, lfs_size_t size); // Set custom attributes @@ -468,7 +482,7 @@ lfs_ssize_t lfs_getattr(lfs_t *lfs, const char *path, // implicitly created. // // Returns a negative error code on failure. -int lfs_setattr(lfs_t *lfs, const char *path, +int _lfs_setattr(lfs_t *lfs, const char *path, uint8_t type, const void *buffer, lfs_size_t size); // Removes a custom attribute @@ -476,7 +490,7 @@ int lfs_setattr(lfs_t *lfs, const char *path, // If an attribute is not found, nothing happens. // // Returns a negative error code on failure. -int lfs_removeattr(lfs_t *lfs, const char *path, uint8_t type); +int _lfs_removeattr(lfs_t *lfs, const char *path, uint8_t type); /// File operations /// @@ -487,7 +501,7 @@ int lfs_removeattr(lfs_t *lfs, const char *path, uint8_t type); // are values from the enum lfs_open_flags that are bitwise-ored together. // // Returns a negative error code on failure. -int lfs_file_open(lfs_t *lfs, lfs_file_t *file, +int _lfs_file_open(lfs_t *lfs, lfs_file_t *file, const char *path, int flags); // Open a file with extra configuration @@ -500,7 +514,7 @@ int lfs_file_open(lfs_t *lfs, lfs_file_t *file, // config struct must be zeroed for defaults and backwards compatibility. // // Returns a negative error code on failure. -int lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file, +int _lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file, const char *path, int flags, const struct lfs_file_config *config); @@ -510,19 +524,19 @@ int lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file, // sync had been called and releases any allocated resources. // // Returns a negative error code on failure. -int lfs_file_close(lfs_t *lfs, lfs_file_t *file); +int _lfs_file_close(lfs_t *lfs, lfs_file_t *file); // Synchronize a file on storage // // Any pending writes are written out to storage. // Returns a negative error code on failure. -int lfs_file_sync(lfs_t *lfs, lfs_file_t *file); +int _lfs_file_sync(lfs_t *lfs, lfs_file_t *file); // Read data from file // // Takes a buffer and size indicating where to store the read data. // Returns the number of bytes read, or a negative error code on failure. -lfs_ssize_t lfs_file_read(lfs_t *lfs, lfs_file_t *file, +lfs_ssize_t _lfs_file_read(lfs_t *lfs, lfs_file_t *file, void *buffer, lfs_size_t size); // Write data to file @@ -531,38 +545,38 @@ lfs_ssize_t lfs_file_read(lfs_t *lfs, lfs_file_t *file, // actually be updated on the storage until either sync or close is called. // // Returns the number of bytes written, or a negative error code on failure. -lfs_ssize_t lfs_file_write(lfs_t *lfs, lfs_file_t *file, +lfs_ssize_t _lfs_file_write(lfs_t *lfs, lfs_file_t *file, const void *buffer, lfs_size_t size); // Change the position of the file // // The change in position is determined by the offset and whence flag. // Returns the new position of the file, or a negative error code on failure. -lfs_soff_t lfs_file_seek(lfs_t *lfs, lfs_file_t *file, +lfs_soff_t _lfs_file_seek(lfs_t *lfs, lfs_file_t *file, lfs_soff_t off, int whence); // Truncates the size of the file to the specified size // // Returns a negative error code on failure. -int lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size); +int _lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size); // Return the position of the file // -// Equivalent to lfs_file_seek(lfs, file, 0, LFS_SEEK_CUR) +// Equivalent to _lfs_file_seek(lfs, file, 0, LFS_SEEK_CUR) // Returns the position of the file, or a negative error code on failure. -lfs_soff_t lfs_file_tell(lfs_t *lfs, lfs_file_t *file); +lfs_soff_t _lfs_file_tell(lfs_t *lfs, lfs_file_t *file); // Change the position of the file to the beginning of the file // -// Equivalent to lfs_file_seek(lfs, file, 0, LFS_SEEK_SET) +// Equivalent to _lfs_file_seek(lfs, file, 0, LFS_SEEK_SET) // Returns a negative error code on failure. -int lfs_file_rewind(lfs_t *lfs, lfs_file_t *file); +int _lfs_file_rewind(lfs_t *lfs, lfs_file_t *file); // Return the size of the file // -// Similar to lfs_file_seek(lfs, file, 0, LFS_SEEK_END) +// Similar to _lfs_file_seek(lfs, file, 0, LFS_SEEK_END) // Returns the size of the file, or a negative error code on failure. -lfs_soff_t lfs_file_size(lfs_t *lfs, lfs_file_t *file); +lfs_soff_t _lfs_file_size(lfs_t *lfs, lfs_file_t *file); /// Directory operations /// @@ -570,26 +584,26 @@ lfs_soff_t lfs_file_size(lfs_t *lfs, lfs_file_t *file); // Create a directory // // Returns a negative error code on failure. -int lfs_mkdir(lfs_t *lfs, const char *path); +int _lfs_mkdir(lfs_t *lfs, const char *path); // Open a directory // // Once open a directory can be used with read to iterate over files. // Returns a negative error code on failure. -int lfs_dir_open(lfs_t *lfs, lfs_dir_t *dir, const char *path); +int _lfs_dir_open(lfs_t *lfs, lfs_dir_t *dir, const char *path); // Close a directory // // Releases any allocated resources. // Returns a negative error code on failure. -int lfs_dir_close(lfs_t *lfs, lfs_dir_t *dir); +int _lfs_dir_close(lfs_t *lfs, lfs_dir_t *dir); // Read an entry in the directory // // Fills out the info structure, based on the specified file or directory. // Returns a positive value on success, 0 at the end of directory, // or a negative error code on failure. -int lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info); +int _lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info); // Change the position of the directory // @@ -597,7 +611,7 @@ int lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info); // an absolute offset in the directory seek. // // Returns a negative error code on failure. -int lfs_dir_seek(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off); +int _lfs_dir_seek(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off); // Return the position of the directory // @@ -605,12 +619,12 @@ int lfs_dir_seek(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off); // sense, but does indicate the current position in the directory iteration. // // Returns the position of the directory, or a negative error code on failure. -lfs_soff_t lfs_dir_tell(lfs_t *lfs, lfs_dir_t *dir); +lfs_soff_t _lfs_dir_tell(lfs_t *lfs, lfs_dir_t *dir); // Change the position of the directory to the beginning of the directory // // Returns a negative error code on failure. -int lfs_dir_rewind(lfs_t *lfs, lfs_dir_t *dir); +int _lfs_dir_rewind(lfs_t *lfs, lfs_dir_t *dir); /// Filesystem-level filesystem operations @@ -621,7 +635,7 @@ int lfs_dir_rewind(lfs_t *lfs, lfs_dir_t *dir); // size may be larger than the filesystem actually is. // // Returns the number of allocated blocks, or a negative error code on failure. -lfs_ssize_t lfs_fs_size(lfs_t *lfs); +lfs_ssize_t _lfs_fs_size(lfs_t *lfs); // Traverse through all blocks in use by the filesystem // @@ -630,12 +644,12 @@ lfs_ssize_t lfs_fs_size(lfs_t *lfs); // blocks are in use or how much of the storage is available. // // Returns a negative error code on failure. -int lfs_fs_traverse(lfs_t *lfs, int (*cb)(void*, lfs_block_t), void *data); +int _lfs_fs_traverse(lfs_t *lfs, int (*cb)(void*, lfs_block_t), void *data); #ifdef LFS_MIGRATE // Attempts to migrate a previous version of littlefs // -// Behaves similarly to the lfs_format function. Attempts to mount +// Behaves similarly to the _lfs_format function. Attempts to mount // the previous version of littlefs and update the filesystem so it can be // mounted with the current version of littlefs. // @@ -644,7 +658,106 @@ int lfs_fs_traverse(lfs_t *lfs, int (*cb)(void*, lfs_block_t), void *data); // be zeroed for defaults and backwards compatibility. // // Returns a negative error code on failure. -int lfs_migrate(lfs_t *lfs, const struct lfs_config *cfg); +int _lfs_migrate(lfs_t *lfs, const struct lfs_config *cfg); +#endif + +#if LFS_THREAD_SAFE + +int _ts_lfs_format(lfs_t *lfs, const struct lfs_config *config); +int _ts_lfs_mount(lfs_t *lfs, const struct lfs_config *config); +int _ts_lfs_unmount(lfs_t *lfs); +int _ts_lfs_remove(lfs_t *lfs, const char *path); +int _ts_lfs_rename(lfs_t *lfs, const char *oldpath, const char *newpath); +int _ts_lfs_stat(lfs_t *lfs, const char *path, struct lfs_info *info); +lfs_ssize_t _ts_lfs_getattr(lfs_t *lfs, const char *path, uint8_t type, void *buffer, lfs_size_t size); +int _ts_lfs_setattr(lfs_t *lfs, const char *path, uint8_t type, const void *buffer, lfs_size_t size); +int _ts_lfs_removeattr(lfs_t *lfs, const char *path, uint8_t type); +int _ts_lfs_file_open(lfs_t *lfs, lfs_file_t *file, const char *path, int flags); +int _ts_lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file, const char *path, int flags, const struct lfs_file_config *config); +int _ts_lfs_file_close(lfs_t *lfs, lfs_file_t *file); +int _ts_lfs_file_sync(lfs_t *lfs, lfs_file_t *file); +lfs_ssize_t _ts_lfs_file_read(lfs_t *lfs, lfs_file_t *file, void *buffer, lfs_size_t size); +lfs_ssize_t _ts_lfs_file_write(lfs_t *lfs, lfs_file_t *file, const void *buffer, lfs_size_t size); +lfs_soff_t _ts_lfs_file_seek(lfs_t *lfs, lfs_file_t *file, lfs_soff_t off, int whence); +int _ts_lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size); +lfs_soff_t _ts_lfs_file_tell(lfs_t *lfs, lfs_file_t *file); +int _ts_lfs_file_rewind(lfs_t *lfs, lfs_file_t *file); +lfs_soff_t _ts_lfs_file_size(lfs_t *lfs, lfs_file_t *file); +int _ts_lfs_mkdir(lfs_t *lfs, const char *path); +int _ts_lfs_dir_open(lfs_t *lfs, lfs_dir_t *dir, const char *path); +int _ts_lfs_dir_close(lfs_t *lfs, lfs_dir_t *dir); +int _ts_lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info); +int _ts_lfs_dir_seek(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off); +lfs_soff_t _ts_lfs_dir_tell(lfs_t *lfs, lfs_dir_t *dir); +int _ts_lfs_dir_rewind(lfs_t *lfs, lfs_dir_t *dir); +lfs_ssize_t _ts_lfs_fs_size(lfs_t *lfs); +int _ts_lfs_fs_traverse(lfs_t *lfs, int (*cb)(void*, lfs_block_t), void *data); +int _ts_lfs_migrate(lfs_t *lfs, const struct lfs_config *cfg); + +#define lfs_format _ts_lfs_format +#define lfs_mount _ts_lfs_mount +#define lfs_unmount _ts_lfs_unmount +#define lfs_remove _ts_lfs_remove +#define lfs_rename _ts_lfs_rename +#define lfs_stat _ts_lfs_stat +#define lfs_getattr _ts_lfs_getattr +#define lfs_setattr _ts_lfs_setattr +#define lfs_removeattr _ts_lfs_removeattr +#define lfs_file_open _ts_lfs_file_open +#define lfs_file_opencfg _ts_lfs_file_opencfg +#define lfs_file_close _ts_lfs_file_close +#define lfs_file_sync _ts_lfs_file_sync +#define lfs_file_read _ts_lfs_file_read +#define lfs_file_write _ts_lfs_file_write +#define lfs_file_seek _ts_lfs_file_seek +#define lfs_file_truncate _ts_lfs_file_truncate +#define lfs_file_tell _ts_lfs_file_tell +#define lfs_file_rewind _ts_lfs_file_rewind +#define lfs_file_size _ts_lfs_file_size +#define lfs_mkdir _ts_lfs_mkdir +#define lfs_dir_open _ts_lfs_dir_open +#define lfs_dir_close _ts_lfs_dir_close +#define lfs_dir_read _ts_lfs_dir_read +#define lfs_dir_seek _ts_lfs_dir_seek +#define lfs_dir_tell _ts_lfs_dir_tell +#define lfs_dir_rewind _ts_lfs_dir_rewind +#define lfs_fs_size _ts_lfs_fs_size +#define lfs_fs_traverse _ts_lfs_fs_traverse +#define lfs_migrate _ts_lfs_migrate + +#else + +#define lfs_format _lfs_format +#define lfs_mount _lfs_mount +#define lfs_unmount _lfs_unmount +#define lfs_remove _lfs_remove +#define lfs_rename _lfs_rename +#define lfs_stat _lfs_stat +#define lfs_getattr _lfs_getattr +#define lfs_setattr _lfs_setattr +#define lfs_removeattr _lfs_removeattr +#define lfs_file_open _lfs_file_open +#define lfs_file_opencfg _lfs_file_opencfg +#define lfs_file_close _lfs_file_close +#define lfs_file_sync _lfs_file_sync +#define lfs_file_read _lfs_file_read +#define lfs_file_write _lfs_file_write +#define lfs_file_seek _lfs_file_seek +#define lfs_file_truncate _lfs_file_truncate +#define lfs_file_tell _lfs_file_tell +#define lfs_file_rewind _lfs_file_rewind +#define lfs_file_size _lfs_file_size +#define lfs_mkdir _lfs_mkdir +#define lfs_dir_open _lfs_dir_open +#define lfs_dir_close _lfs_dir_close +#define lfs_dir_read _lfs_dir_read +#define lfs_dir_seek _lfs_dir_seek +#define lfs_dir_tell _lfs_dir_tell +#define lfs_dir_rewind _lfs_dir_rewind +#define lfs_fs_size _lfs_fs_size +#define lfs_fs_traverse _lfs_fs_traverse +#define lfs_migrate _lfs_migrate + #endif diff --git a/lfs_util.h b/lfs_util.h index dbb4c5ba..47e8a940 100644 --- a/lfs_util.h +++ b/lfs_util.h @@ -43,6 +43,9 @@ extern "C" { #endif +#ifndef LFS_THREAD_SAFE +#define LFS_THREAD_SAFE 0 +#endif // Macros, may be replaced by system specific wrappers. Arguments to these // macros must not have side-effects as the macros can be removed for a smaller From d0f055d321feaee6b846699d6bf5e9aa3f57f3b8 Mon Sep 17 00:00:00 2001 From: Bill Gesner Date: Thu, 1 Oct 2020 01:48:29 +0000 Subject: [PATCH 2/6] Squash of thread-safe PR cleanup - expand functions - add comment - rename functions - fix locking issue in format and mount - use global include - fix ac6 linker issue - use the global config file - address review comments - minor cleanup - minor cleanup - review comments --- lfs.c | 703 +++++++++++++++++++++++++++++++++++++++++------------ lfs.h | 209 ++++++---------- lfs_util.h | 5 +- 3 files changed, 621 insertions(+), 296 deletions(-) diff --git a/lfs.c b/lfs.c index e17e4bda..62efe7e4 100644 --- a/lfs.c +++ b/lfs.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ #include "lfs.h" -#include "lfs_util.h" +#include #define LFS_BLOCK_NULL ((lfs_block_t)-1) #define LFS_BLOCK_INLINE ((lfs_block_t)-2) @@ -1525,7 +1525,7 @@ static int lfs_dir_compact(lfs_t *lfs, if (lfs_pair_cmp(dir->pair, (const lfs_block_t[2]){0, 1}) == 0) { // oh no! we're writing too much to the superblock, // should we expand? - lfs_ssize_t res = _lfs_fs_size(lfs); + lfs_ssize_t res = lfs_fs_size_raw(lfs); if (res < 0) { return res; } @@ -1906,7 +1906,7 @@ compact: /// Top level directory operations /// -int _lfs_mkdir(lfs_t *lfs, const char *path) { +int lfs_mkdir_raw(lfs_t *lfs, const char *path) { LFS_TRACE("lfs_mkdir(%p, \"%s\")", (void*)lfs, path); // deorphan if we haven't yet, needed at most once after poweron int err = lfs_fs_forceconsistency(lfs); @@ -2005,7 +2005,7 @@ int _lfs_mkdir(lfs_t *lfs, const char *path) { return 0; } -int _lfs_dir_open(lfs_t *lfs, lfs_dir_t *dir, const char *path) { +int lfs_dir_open_raw(lfs_t *lfs, lfs_dir_t *dir, const char *path) { LFS_TRACE("lfs_dir_open(%p, %p, \"%s\")", (void*)lfs, (void*)dir, path); lfs_stag_t tag = lfs_dir_find(lfs, &dir->m, &path, NULL); if (tag < 0) { @@ -2056,7 +2056,7 @@ int _lfs_dir_open(lfs_t *lfs, lfs_dir_t *dir, const char *path) { return 0; } -int _lfs_dir_close(lfs_t *lfs, lfs_dir_t *dir) { +int lfs_dir_close_raw(lfs_t *lfs, lfs_dir_t *dir) { LFS_TRACE("lfs_dir_close(%p, %p)", (void*)lfs, (void*)dir); // remove from list of mdirs for (struct lfs_mlist **p = &lfs->mlist; *p; p = &(*p)->next) { @@ -2070,7 +2070,7 @@ int _lfs_dir_close(lfs_t *lfs, lfs_dir_t *dir) { return 0; } -int _lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info) { +int lfs_dir_read_raw(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info) { LFS_TRACE("lfs_dir_read(%p, %p, %p)", (void*)lfs, (void*)dir, (void*)info); memset(info, 0, sizeof(*info)); @@ -2123,11 +2123,11 @@ int _lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info) { return true; } -int _lfs_dir_seek(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off) { +int lfs_dir_seek_raw(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off) { LFS_TRACE("lfs_dir_seek(%p, %p, %"PRIu32")", (void*)lfs, (void*)dir, off); // simply walk from head dir - int err = _lfs_dir_rewind(lfs, dir); + int err = lfs_dir_rewind_raw(lfs, dir); if (err) { LFS_TRACE("lfs_dir_seek -> %d", err); return err; @@ -2166,14 +2166,14 @@ int _lfs_dir_seek(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off) { return 0; } -lfs_soff_t _lfs_dir_tell(lfs_t *lfs, lfs_dir_t *dir) { +lfs_soff_t lfs_dir_tell_raw(lfs_t *lfs, lfs_dir_t *dir) { LFS_TRACE("lfs_dir_tell(%p, %p)", (void*)lfs, (void*)dir); (void)lfs; LFS_TRACE("lfs_dir_tell -> %"PRId32, dir->pos); return dir->pos; } -int _lfs_dir_rewind(lfs_t *lfs, lfs_dir_t *dir) { +int lfs_dir_rewind_raw(lfs_t *lfs, lfs_dir_t *dir) { LFS_TRACE("lfs_dir_rewind(%p, %p)", (void*)lfs, (void*)dir); // reload the head dir int err = lfs_dir_fetch(lfs, &dir->m, dir->head); @@ -2380,7 +2380,7 @@ static int lfs_ctz_traverse(lfs_t *lfs, /// Top level file operations /// -int _lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file, +int lfs_file_opencfg_raw(lfs_t *lfs, lfs_file_t *file, const char *path, int flags, const struct lfs_file_config *cfg) { LFS_TRACE("lfs_file_opencfg(%p, %p, \"%s\", %x, %p {" @@ -2529,26 +2529,26 @@ int _lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file, cleanup: // clean up lingering resources file->flags |= LFS_F_ERRED; - _lfs_file_close(lfs, file); + lfs_file_close_raw(lfs, file); LFS_TRACE("lfs_file_opencfg -> %d", err); return err; } -int _lfs_file_open(lfs_t *lfs, lfs_file_t *file, +int lfs_file_open_raw(lfs_t *lfs, lfs_file_t *file, const char *path, int flags) { LFS_TRACE("lfs_file_open(%p, %p, \"%s\", %x)", (void*)lfs, (void*)file, path, flags); static const struct lfs_file_config defaults = {0}; - int err = _lfs_file_opencfg(lfs, file, path, flags, &defaults); + int err = lfs_file_opencfg_raw(lfs, file, path, flags, &defaults); LFS_TRACE("lfs_file_open -> %d", err); return err; } -int _lfs_file_close(lfs_t *lfs, lfs_file_t *file) { +int lfs_file_close_raw(lfs_t *lfs, lfs_file_t *file) { LFS_TRACE("lfs_file_close(%p, %p)", (void*)lfs, (void*)file); LFS_ASSERT(file->flags & LFS_F_OPENED); - int err = _lfs_file_sync(lfs, file); + int err = lfs_file_sync_raw(lfs, file); // remove from list of mdirs for (struct lfs_mlist **p = &lfs->mlist; *p; p = &(*p)->next) { @@ -2679,12 +2679,12 @@ static int lfs_file_flush(lfs_t *lfs, lfs_file_t *file) { // copy over a byte at a time, leave it up to caching // to make this efficient uint8_t data; - lfs_ssize_t res = _lfs_file_read(lfs, &orig, &data, 1); + lfs_ssize_t res = lfs_file_read_raw(lfs, &orig, &data, 1); if (res < 0) { return res; } - res = _lfs_file_write(lfs, file, &data, 1); + res = lfs_file_write_raw(lfs, file, &data, 1); if (res < 0) { return res; } @@ -2731,7 +2731,7 @@ relocate: return 0; } -int _lfs_file_sync(lfs_t *lfs, lfs_file_t *file) { +int lfs_file_sync_raw(lfs_t *lfs, lfs_file_t *file) { LFS_TRACE("lfs_file_sync(%p, %p)", (void*)lfs, (void*)file); LFS_ASSERT(file->flags & LFS_F_OPENED); @@ -2788,7 +2788,7 @@ int _lfs_file_sync(lfs_t *lfs, lfs_file_t *file) { return 0; } -lfs_ssize_t _lfs_file_read(lfs_t *lfs, lfs_file_t *file, +lfs_ssize_t lfs_file_read_raw(lfs_t *lfs, lfs_file_t *file, void *buffer, lfs_size_t size) { LFS_TRACE("lfs_file_read(%p, %p, %p, %"PRIu32")", (void*)lfs, (void*)file, buffer, size); @@ -2868,7 +2868,7 @@ lfs_ssize_t _lfs_file_read(lfs_t *lfs, lfs_file_t *file, return size; } -lfs_ssize_t _lfs_file_write(lfs_t *lfs, lfs_file_t *file, +lfs_ssize_t lfs_file_write_raw(lfs_t *lfs, lfs_file_t *file, const void *buffer, lfs_size_t size) { LFS_TRACE("lfs_file_write(%p, %p, %p, %"PRIu32")", (void*)lfs, (void*)file, buffer, size); @@ -2903,7 +2903,7 @@ lfs_ssize_t _lfs_file_write(lfs_t *lfs, lfs_file_t *file, file->pos = file->ctz.size; while (file->pos < pos) { - lfs_ssize_t res = _lfs_file_write(lfs, file, &(uint8_t){0}, 1); + lfs_ssize_t res = lfs_file_write_raw(lfs, file, &(uint8_t){0}, 1); if (res < 0) { LFS_TRACE("lfs_file_write -> %"PRId32, res); return res; @@ -2999,7 +2999,7 @@ relocate: return size; } -lfs_soff_t _lfs_file_seek(lfs_t *lfs, lfs_file_t *file, +lfs_soff_t lfs_file_seek_raw(lfs_t *lfs, lfs_file_t *file, lfs_soff_t off, int whence) { LFS_TRACE("lfs_file_seek(%p, %p, %"PRId32", %d)", (void*)lfs, (void*)file, off, whence); @@ -3034,7 +3034,7 @@ lfs_soff_t _lfs_file_seek(lfs_t *lfs, lfs_file_t *file, return npos; } -int _lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { +int lfs_file_truncate_raw(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { LFS_TRACE("lfs_file_truncate(%p, %p, %"PRIu32")", (void*)lfs, (void*)file, size); LFS_ASSERT(file->flags & LFS_F_OPENED); @@ -3046,7 +3046,7 @@ int _lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { } lfs_off_t pos = file->pos; - lfs_off_t oldsize = _lfs_file_size(lfs, file); + lfs_off_t oldsize = lfs_file_size_raw(lfs, file); if (size < oldsize) { // need to flush since directly changing metadata int err = lfs_file_flush(lfs, file); @@ -3070,7 +3070,7 @@ int _lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { } else if (size > oldsize) { // flush+seek if not already at end if (file->pos != oldsize) { - lfs_soff_t res = _lfs_file_seek(lfs, file, 0, LFS_SEEK_END); + lfs_soff_t res = lfs_file_seek_raw(lfs, file, 0, LFS_SEEK_END); if (res < 0) { LFS_TRACE("lfs_file_truncate -> %"PRId32, res); return (int)res; @@ -3079,7 +3079,7 @@ int _lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { // fill with zeros while (file->pos < size) { - lfs_ssize_t res = _lfs_file_write(lfs, file, &(uint8_t){0}, 1); + lfs_ssize_t res = lfs_file_write_raw(lfs, file, &(uint8_t){0}, 1); if (res < 0) { LFS_TRACE("lfs_file_truncate -> %"PRId32, res); return (int)res; @@ -3088,7 +3088,7 @@ int _lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { } // restore pos - lfs_soff_t res = _lfs_file_seek(lfs, file, pos, LFS_SEEK_SET); + lfs_soff_t res = lfs_file_seek_raw(lfs, file, pos, LFS_SEEK_SET); if (res < 0) { LFS_TRACE("lfs_file_truncate -> %"PRId32, res); return (int)res; @@ -3098,7 +3098,7 @@ int _lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { return 0; } -lfs_soff_t _lfs_file_tell(lfs_t *lfs, lfs_file_t *file) { +lfs_soff_t lfs_file_tell_raw(lfs_t *lfs, lfs_file_t *file) { LFS_TRACE("lfs_file_tell(%p, %p)", (void*)lfs, (void*)file); LFS_ASSERT(file->flags & LFS_F_OPENED); (void)lfs; @@ -3106,9 +3106,9 @@ lfs_soff_t _lfs_file_tell(lfs_t *lfs, lfs_file_t *file) { return file->pos; } -int _lfs_file_rewind(lfs_t *lfs, lfs_file_t *file) { +int lfs_file_rewind_raw(lfs_t *lfs, lfs_file_t *file) { LFS_TRACE("lfs_file_rewind(%p, %p)", (void*)lfs, (void*)file); - lfs_soff_t res = _lfs_file_seek(lfs, file, 0, LFS_SEEK_SET); + lfs_soff_t res = lfs_file_seek_raw(lfs, file, 0, LFS_SEEK_SET); if (res < 0) { LFS_TRACE("lfs_file_rewind -> %"PRId32, res); return (int)res; @@ -3118,7 +3118,7 @@ int _lfs_file_rewind(lfs_t *lfs, lfs_file_t *file) { return 0; } -lfs_soff_t _lfs_file_size(lfs_t *lfs, lfs_file_t *file) { +lfs_soff_t lfs_file_size_raw(lfs_t *lfs, lfs_file_t *file) { LFS_TRACE("lfs_file_size(%p, %p)", (void*)lfs, (void*)file); LFS_ASSERT(file->flags & LFS_F_OPENED); (void)lfs; @@ -3134,7 +3134,7 @@ lfs_soff_t _lfs_file_size(lfs_t *lfs, lfs_file_t *file) { /// General fs operations /// -int _lfs_stat(lfs_t *lfs, const char *path, struct lfs_info *info) { +int lfs_stat_raw(lfs_t *lfs, const char *path, struct lfs_info *info) { LFS_TRACE("lfs_stat(%p, \"%s\", %p)", (void*)lfs, path, (void*)info); lfs_mdir_t cwd; lfs_stag_t tag = lfs_dir_find(lfs, &cwd, &path, NULL); @@ -3148,7 +3148,7 @@ int _lfs_stat(lfs_t *lfs, const char *path, struct lfs_info *info) { return err; } -int _lfs_remove(lfs_t *lfs, const char *path) { +int lfs_remove_raw(lfs_t *lfs, const char *path) { LFS_TRACE("lfs_remove(%p, \"%s\")", (void*)lfs, path); // deorphan if we haven't yet, needed at most once after poweron int err = lfs_fs_forceconsistency(lfs); @@ -3229,7 +3229,7 @@ int _lfs_remove(lfs_t *lfs, const char *path) { return 0; } -int _lfs_rename(lfs_t *lfs, const char *oldpath, const char *newpath) { +int lfs_rename_raw(lfs_t *lfs, const char *oldpath, const char *newpath) { LFS_TRACE("lfs_rename(%p, \"%s\", \"%s\")", (void*)lfs, oldpath, newpath); // deorphan if we haven't yet, needed at most once after poweron @@ -3374,7 +3374,7 @@ int _lfs_rename(lfs_t *lfs, const char *oldpath, const char *newpath) { return 0; } -lfs_ssize_t _lfs_getattr(lfs_t *lfs, const char *path, +lfs_ssize_t lfs_getattr_raw(lfs_t *lfs, const char *path, uint8_t type, void *buffer, lfs_size_t size) { LFS_TRACE("lfs_getattr(%p, \"%s\", %"PRIu8", %p, %"PRIu32")", (void*)lfs, path, type, buffer, size); @@ -3437,7 +3437,7 @@ static int lfs_commitattr(lfs_t *lfs, const char *path, {LFS_MKTAG(LFS_TYPE_USERATTR + type, id, size), buffer})); } -int _lfs_setattr(lfs_t *lfs, const char *path, +int lfs_setattr_raw(lfs_t *lfs, const char *path, uint8_t type, const void *buffer, lfs_size_t size) { LFS_TRACE("lfs_setattr(%p, \"%s\", %"PRIu8", %p, %"PRIu32")", (void*)lfs, path, type, buffer, size); @@ -3451,7 +3451,7 @@ int _lfs_setattr(lfs_t *lfs, const char *path, return err; } -int _lfs_removeattr(lfs_t *lfs, const char *path, uint8_t type) { +int lfs_removeattr_raw(lfs_t *lfs, const char *path, uint8_t type) { LFS_TRACE("lfs_removeattr(%p, \"%s\", %"PRIu8")", (void*)lfs, path, type); int err = lfs_commitattr(lfs, path, type, NULL, 0x3ff); LFS_TRACE("lfs_removeattr -> %d", err); @@ -3584,7 +3584,7 @@ static int lfs_deinit(lfs_t *lfs) { return 0; } -int _lfs_format(lfs_t *lfs, const struct lfs_config *cfg) { +int lfs_format_raw(lfs_t *lfs, const struct lfs_config *cfg) { LFS_TRACE("lfs_format(%p, %p {.context=%p, " ".read=%p, .prog=%p, .erase=%p, .sync=%p, " ".read_size=%"PRIu32", .prog_size=%"PRIu32", " @@ -3665,7 +3665,7 @@ cleanup: return err; } -int _lfs_mount(lfs_t *lfs, const struct lfs_config *cfg) { +int lfs_mount_raw(lfs_t *lfs, const struct lfs_config *cfg) { LFS_TRACE("lfs_mount(%p, %p {.context=%p, " ".read=%p, .prog=%p, .erase=%p, .sync=%p, " ".read_size=%"PRIu32", .prog_size=%"PRIu32", " @@ -3804,12 +3804,12 @@ int _lfs_mount(lfs_t *lfs, const struct lfs_config *cfg) { return 0; cleanup: - _lfs_unmount(lfs); + lfs_unmount_raw(lfs); LFS_TRACE("lfs_mount -> %d", err); return err; } -int _lfs_unmount(lfs_t *lfs) { +int lfs_unmount_raw(lfs_t *lfs) { LFS_TRACE("lfs_unmount(%p)", (void*)lfs); int err = lfs_deinit(lfs); LFS_TRACE("lfs_unmount -> %d", err); @@ -3914,7 +3914,7 @@ int lfs_fs_traverseraw(lfs_t *lfs, return 0; } -int _lfs_fs_traverse(lfs_t *lfs, +int lfs_fs_traverse_raw(lfs_t *lfs, int (*cb)(void *data, lfs_block_t block), void *data) { LFS_TRACE("lfs_fs_traverse(%p, %p, %p)", (void*)lfs, (void*)(uintptr_t)cb, data); @@ -4235,7 +4235,7 @@ static int lfs_fs_size_count(void *p, lfs_block_t block) { return 0; } -lfs_ssize_t _lfs_fs_size(lfs_t *lfs) { +lfs_ssize_t lfs_fs_size_raw(lfs_t *lfs) { LFS_TRACE("lfs_fs_size(%p)", (void*)lfs); lfs_size_t size = 0; int err = lfs_fs_traverseraw(lfs, lfs_fs_size_count, &size, false); @@ -4669,7 +4669,7 @@ static int lfs1_unmount(lfs_t *lfs) { } /// v1 migration /// -int _lfs_migrate(lfs_t *lfs, const struct lfs_config *cfg) { +int lfs_migrate_raw(lfs_t *lfs, const struct lfs_config *cfg) { LFS_TRACE("lfs_migrate(%p, %p {.context=%p, " ".read=%p, .prog=%p, .erase=%p, .sync=%p, " ".read_size=%"PRIu32", .prog_size=%"PRIu32", " @@ -4912,123 +4912,520 @@ cleanup: #endif -#if LFS_THREAD_SAFE +#if LFS_THREADSAFE -#define CREATE_LFS_TS_1(ret, function, b_type, b) \ - ret _ts ## function(b_type b) \ - { \ - int err = lfs->cfg->lock(lfs->cfg); \ - if (err) \ - { \ - return err; \ - } \ - err = function(b); \ - lfs->cfg->unlock(lfs->cfg); \ - return err; \ - } -#define CREATE_LFS_TS_2(ret, function, b_type, b, c_type, c) \ - ret _ts ## function(b_type b, c_type c) \ - { \ - int err = lfs->cfg->lock(lfs->cfg); \ - if (err) \ - { \ - return err; \ - } \ - err = function(b, c); \ - lfs->cfg->unlock(lfs->cfg); \ - return err; \ - } -#define CREATE_LFS_TS_2_CFG(ret, function, b_type, b, c_type, cfg) \ - ret _ts ## function(b_type b, c_type cfg) \ - { \ - int err = cfg->lock(cfg); \ - if (err) \ - { \ - return err; \ - } \ - err = function(b, cfg); \ - cfg->unlock(cfg); \ - return err; \ - } -#define CREATE_LFS_TS_3(ret, function, b_type, b, c_type, c, d_type, d) \ - ret _ts ## function(b_type b, c_type c, d_type d) \ - { \ - int err = lfs->cfg->lock(lfs->cfg); \ - if (err) \ - { \ - return err; \ - } \ - err = function(b, c, d); \ - lfs->cfg->unlock(lfs->cfg); \ - return err; \ - } -#define CREATE_LFS_TS_4(ret, function, b_type, b, c_type, c, d_type, d, e_type, e) \ - ret _ts ## function(b_type b, c_type c, d_type d, e_type e) \ - { \ - int err = lfs->cfg->lock(lfs->cfg); \ - if (err) \ - { \ - return err; \ - } \ - err = function(b, c, d, e); \ - lfs->cfg->unlock(lfs->cfg); \ - return err; \ - } -#define CREATE_LFS_TS_5(ret, function, b_type, b, c_type, c, d_type, d, e_type, e, f_type, f) \ - ret _ts ## function(b_type b, c_type c, d_type d, e_type e, f_type f) \ - { \ - int err = lfs->cfg->lock(lfs->cfg); \ - if (err) \ - { \ - return err; \ - } \ - err = function(b, c, d, e, f); \ - lfs->cfg->unlock(lfs->cfg); \ - return err; \ - } - -int _ts_lfs_fs_traverse (lfs_t * lfs, int (* cb)(void * data, lfs_block_t block), void * data) { - int err = lfs->cfg->lock(lfs->cfg); - if (err) - { +int lfs_format (lfs_t * lfs, const struct lfs_config * config) { + int err = config->lock(config); + if (err) { return err; } - err = _lfs_fs_traverse(lfs, cb, data); + err = lfs_format_raw(lfs, config); + config->unlock(config); + + return err; +} + +int lfs_mount (lfs_t * lfs, const struct lfs_config * config) { + int err = config->lock(config); + if (err) { + return err; + } + + err = lfs_mount_raw(lfs, config); + config->unlock(config); + + return err; +} + +int lfs_unmount (lfs_t * lfs) { + int err = lfs->cfg->lock(lfs->cfg); + if (err) { + return err; + } + + err = lfs_unmount_raw(lfs); + lfs->cfg->unlock(lfs->cfg); + + return err; +} + +int lfs_remove (lfs_t * lfs, const char * path) { + int err = lfs->cfg->lock(lfs->cfg); + if (err) { + return err; + } + + err = lfs_remove_raw(lfs, path); + lfs->cfg->unlock(lfs->cfg); + + return err; +} + +int lfs_rename (lfs_t * lfs, const char * oldpath, const char * newpath) { + int err = lfs->cfg->lock(lfs->cfg); + if (err) { + return err; + } + + err = lfs_rename_raw(lfs, oldpath, newpath); + + lfs->cfg->unlock(lfs->cfg); + + return err; +} + +int lfs_stat (lfs_t * lfs, const char * path, struct lfs_info * info) { + int err = lfs->cfg->lock(lfs->cfg); + if (err) { + return err; + } + + err = lfs_stat_raw(lfs, path, info); + + lfs->cfg->unlock(lfs->cfg); + + return err; +} + +lfs_ssize_t lfs_getattr (lfs_t * lfs, const char * path, uint8_t type, void * buffer, lfs_size_t size) { + int err = lfs->cfg->lock(lfs->cfg); + if (err) { + return err; + } + + err = lfs_getattr_raw(lfs, path, type, buffer, size); + + lfs->cfg->unlock(lfs->cfg); + + return err; +} + +int lfs_setattr (lfs_t * lfs, const char * path, uint8_t type, const void * buffer, lfs_size_t size) { + int err = lfs->cfg->lock(lfs->cfg); + if (err) { + return err; + } + + err = lfs_setattr_raw(lfs, path, type, buffer, size); + + lfs->cfg->unlock(lfs->cfg); + + return err; +} + +int lfs_removeattr (lfs_t * lfs, const char * path, uint8_t type) { + int err = lfs->cfg->lock(lfs->cfg); + if (err) { + return err; + } + + err = lfs_removeattr_raw(lfs, path, type); + + lfs->cfg->unlock(lfs->cfg); + + return err; +} + +int lfs_file_open (lfs_t * lfs, lfs_file_t * file, const char * path, int flags) { + int err = lfs->cfg->lock(lfs->cfg); + if (err) { + return err; + } + + err = lfs_file_open_raw(lfs, file, path, flags); + + lfs->cfg->unlock(lfs->cfg); + + return err; +} + +int lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file, const char *path, int flags, const struct lfs_file_config *config) { + int err = lfs->cfg->lock(lfs->cfg); + if (err) { + return err; + } + + err = lfs_file_opencfg_raw(lfs, file, path, flags, config); + + lfs->cfg->unlock(lfs->cfg); + + return err; +} + +int lfs_file_close (lfs_t * lfs, lfs_file_t * file) { + int err = lfs->cfg->lock(lfs->cfg); + if (err) { + return err; + } + + err = lfs_file_close_raw(lfs, file); + + lfs->cfg->unlock(lfs->cfg); + + return err; +} + +int lfs_file_sync (lfs_t * lfs, lfs_file_t * file) { + int err = lfs->cfg->lock(lfs->cfg); + if (err) { + return err; + } + + err = lfs_file_sync_raw(lfs, file); + + lfs->cfg->unlock(lfs->cfg); + + return err; +} + +lfs_ssize_t lfs_file_read (lfs_t * lfs, lfs_file_t * file, void * buffer, lfs_size_t size) { + int err = lfs->cfg->lock(lfs->cfg); + if (err) { + return err; + } + + err = lfs_file_read_raw(lfs, file, buffer, size); + + lfs->cfg->unlock(lfs->cfg); + + return err; +} + +lfs_ssize_t lfs_file_write (lfs_t * lfs, lfs_file_t * file, const void * buffer, lfs_size_t size) { + int err = lfs->cfg->lock(lfs->cfg); + if (err) { + return err; + } + + err = lfs_file_write_raw(lfs, file, buffer, size); + + lfs->cfg->unlock(lfs->cfg); + + return err; +} + +lfs_soff_t lfs_file_seek (lfs_t * lfs, lfs_file_t * file, lfs_soff_t off, int whence) { + int err = lfs->cfg->lock(lfs->cfg); + if (err) { + return err; + } + + err = lfs_file_seek_raw(lfs, file, off, whence); + + lfs->cfg->unlock(lfs->cfg); + + return err; +} + +int lfs_file_truncate (lfs_t * lfs, lfs_file_t * file, lfs_off_t size) { + int err = lfs->cfg->lock(lfs->cfg); + if (err) { + return err; + } + + err = lfs_file_truncate_raw(lfs, file, size); + + lfs->cfg->unlock(lfs->cfg); + + return err; +} + +lfs_soff_t lfs_file_tell (lfs_t * lfs, lfs_file_t * file) { + int err = lfs->cfg->lock(lfs->cfg); + if (err) { + return err; + } + + err = lfs_file_tell_raw(lfs, file); + + lfs->cfg->unlock(lfs->cfg); + + return err; +} + +int lfs_file_rewind (lfs_t * lfs, lfs_file_t * file) { + int err = lfs->cfg->lock(lfs->cfg); + if (err) { + return err; + } + + err = lfs_file_rewind_raw(lfs, file); + + lfs->cfg->unlock(lfs->cfg); + + return err; +} + +lfs_soff_t lfs_file_size (lfs_t * lfs, lfs_file_t * file) { + int err = lfs->cfg->lock(lfs->cfg); + if (err) { + return err; + } + + err = lfs_file_size_raw(lfs, file); + + lfs->cfg->unlock(lfs->cfg); + + return err; +} + +int lfs_mkdir (lfs_t * lfs, const char * path) { + int err = lfs->cfg->lock(lfs->cfg); + if (err) { + return err; + } + + err = lfs_mkdir_raw(lfs, path); + + lfs->cfg->unlock(lfs->cfg); + + return err; +} + +int lfs_dir_open (lfs_t * lfs, lfs_dir_t * dir, const char * path) { + int err = lfs->cfg->lock(lfs->cfg); + if (err) { + return err; + } + + err = lfs_dir_open_raw(lfs, dir, path); + + lfs->cfg->unlock(lfs->cfg); + + return err; +} + +int lfs_dir_close (lfs_t * lfs, lfs_dir_t * dir) { + int err = lfs->cfg->lock(lfs->cfg); + if (err) { + return err; + } + + err = lfs_dir_close_raw(lfs, dir); + + lfs->cfg->unlock(lfs->cfg); + + return err; +} + +int lfs_dir_read (lfs_t * lfs, lfs_dir_t * dir, struct lfs_info * info) { + int err = lfs->cfg->lock(lfs->cfg); + if (err) { + return err; + } + + err = lfs_dir_read_raw(lfs, dir, info); + + lfs->cfg->unlock(lfs->cfg); + + return err; +} + +int lfs_dir_seek (lfs_t * lfs, lfs_dir_t * dir, lfs_off_t off) { + int err = lfs->cfg->lock(lfs->cfg); + if (err) { + return err; + } + + err = lfs_dir_seek_raw(lfs, dir, off); + + lfs->cfg->unlock(lfs->cfg); + + return err; +} + +lfs_soff_t lfs_dir_tell (lfs_t * lfs, lfs_dir_t * dir) { + int err = lfs->cfg->lock(lfs->cfg); + if (err) { + return err; + } + + err = lfs_dir_tell_raw(lfs, dir); + + lfs->cfg->unlock(lfs->cfg); + + return err; +} + +int lfs_dir_rewind (lfs_t * lfs, lfs_dir_t * dir) { + int err = lfs->cfg->lock(lfs->cfg); + if (err) { + return err; + } + + err = lfs_dir_rewind_raw(lfs, dir); + + lfs->cfg->unlock(lfs->cfg); + + return err; +} + +lfs_ssize_t lfs_fs_size (lfs_t * lfs) { + int err = lfs->cfg->lock(lfs->cfg); + if (err) { + return err; + } + + err = lfs_fs_size_raw(lfs); + + lfs->cfg->unlock(lfs->cfg); + + return err; +} + +int lfs_fs_traverse (lfs_t * lfs, int (* cb)(void *, lfs_block_t), void * data) { + int err = lfs->cfg->lock(lfs->cfg); + if (err) { + return err; + } + + err = lfs_fs_traverse_raw(lfs, cb, data); + lfs->cfg->unlock(lfs->cfg); return err; } -CREATE_LFS_TS_2_CFG(int, _lfs_format,lfs_t *, lfs, const struct lfs_config *, config) -CREATE_LFS_TS_2_CFG(int, _lfs_mount,lfs_t *, lfs, const struct lfs_config *, config) -CREATE_LFS_TS_1(int, _lfs_unmount,lfs_t *, lfs) -CREATE_LFS_TS_2(int, _lfs_remove,lfs_t *, lfs, const char *, path) -CREATE_LFS_TS_3(int, _lfs_rename, lfs_t *, lfs, const char *, oldpath, const char *, newpath) -CREATE_LFS_TS_3(int, _lfs_stat, lfs_t *, lfs, const char *, path, struct lfs_info *, info) -CREATE_LFS_TS_5(lfs_ssize_t, _lfs_getattr, lfs_t *, lfs, const char *, path, uint8_t, type, void *, buffer, lfs_size_t, size) -CREATE_LFS_TS_5(int, _lfs_setattr, lfs_t *, lfs, const char *, path, uint8_t, type, const void *, buffer, lfs_size_t, size) -CREATE_LFS_TS_3(int, _lfs_removeattr, lfs_t *, lfs, const char *, path, uint8_t, type) -CREATE_LFS_TS_4(int, _lfs_file_open, lfs_t *, lfs, lfs_file_t *, file, const char *, path, int, flags) -CREATE_LFS_TS_5(int, _lfs_file_opencfg, lfs_t *, lfs, lfs_file_t *, file, const char *, path, int, flags, const struct lfs_file_config *, config) -CREATE_LFS_TS_2(int, _lfs_file_close, lfs_t *, lfs, lfs_file_t *, file) -CREATE_LFS_TS_2(int, _lfs_file_sync, lfs_t *, lfs, lfs_file_t *, file) -CREATE_LFS_TS_4(lfs_ssize_t, _lfs_file_read, lfs_t *, lfs, lfs_file_t *, file, void *, buffer, lfs_size_t, size) -CREATE_LFS_TS_4(lfs_ssize_t, _lfs_file_write, lfs_t *, lfs, lfs_file_t *, file, const void *, buffer, lfs_size_t, size) -CREATE_LFS_TS_4(lfs_soff_t, _lfs_file_seek, lfs_t *, lfs, lfs_file_t *, file, lfs_soff_t, off, int, whence) -CREATE_LFS_TS_3(int, _lfs_file_truncate, lfs_t *, lfs, lfs_file_t *, file, lfs_off_t, size) -CREATE_LFS_TS_2(lfs_soff_t, _lfs_file_tell, lfs_t *, lfs, lfs_file_t *, file) -CREATE_LFS_TS_2(int, _lfs_file_rewind, lfs_t *, lfs, lfs_file_t *, file) -CREATE_LFS_TS_2(lfs_soff_t, _lfs_file_size, lfs_t *, lfs, lfs_file_t *, file) -CREATE_LFS_TS_2(int, _lfs_mkdir, lfs_t *, lfs, const char *, path) -CREATE_LFS_TS_3(int, _lfs_dir_open, lfs_t *, lfs, lfs_dir_t *, dir, const char *, path) -CREATE_LFS_TS_2(int, _lfs_dir_close, lfs_t *, lfs, lfs_dir_t *, dir) -CREATE_LFS_TS_3(int, _lfs_dir_read, lfs_t *, lfs, lfs_dir_t *, dir, struct lfs_info *, info) -CREATE_LFS_TS_3(int, _lfs_dir_seek, lfs_t *, lfs, lfs_dir_t *, dir, lfs_off_t, off) -CREATE_LFS_TS_2(lfs_soff_t, _lfs_dir_tell, lfs_t *, lfs, lfs_dir_t *, dir) -CREATE_LFS_TS_2(int, _lfs_dir_rewind, lfs_t *, lfs, lfs_dir_t *, dir) -CREATE_LFS_TS_1(lfs_ssize_t, _lfs_fs_size, lfs_t *, lfs) #ifdef LFS_MIGRATE -CREATE_LFS_TS_2_CFG(int, _lfs_migrate, lfs_t *, lfs, const struct lfs_config *, cfg) + +int lfs_migrate (lfs_t * lfs, const struct lfs_config * cfg) { + int err = lfs->cfg->lock(lfs->cfg); + if (err) { + return err; + } + + err = lfs_migrate_raw(lfs, cfg); + + lfs->cfg->unlock(lfs->cfg); + + return err; +} + +#endif +#else + +int lfs_format (lfs_t * lfs, const struct lfs_config * config) { + return lfs_format_raw(lfs, config); +} + +int lfs_mount (lfs_t * lfs, const struct lfs_config * config) { + return lfs_mount_raw(lfs, config); +} + +int lfs_unmount (lfs_t * lfs) { + return lfs_unmount_raw(lfs); +} + +int lfs_remove (lfs_t * lfs, const char * path) { + return lfs_remove_raw(lfs, path); +} + +int lfs_rename (lfs_t * lfs, const char * oldpath, const char * newpath) { + return lfs_rename_raw(lfs, oldpath, newpath); +} + +int lfs_stat (lfs_t * lfs, const char * path, struct lfs_info * info) { + return lfs_stat_raw(lfs, path, info); +} + +lfs_ssize_t lfs_getattr (lfs_t * lfs, const char * path, uint8_t type, void * buffer, lfs_size_t size) { + return lfs_getattr_raw(lfs, path, type, buffer, size); +} + +int lfs_setattr (lfs_t * lfs, const char * path, uint8_t type, const void * buffer, lfs_size_t size) { + return lfs_setattr_raw(lfs, path, type, buffer, size); +} + +int lfs_removeattr (lfs_t * lfs, const char * path, uint8_t type) { + return lfs_removeattr_raw(lfs, path, type); +} + +int lfs_file_open (lfs_t * lfs, lfs_file_t * file, const char * path, int flags) { + return lfs_file_open_raw(lfs, file, path, flags); +} + +int lfs_file_opencfg_ts(lfs_t *lfs, lfs_file_t *file, const char *path, int flags, const struct lfs_file_config *config) { + return lfs_file_opencfg_raw(lfs, file, path, flags, config); +} + +int lfs_file_close (lfs_t * lfs, lfs_file_t * file) { + return lfs_file_close_raw(lfs, file); +} + +int lfs_file_sync (lfs_t * lfs, lfs_file_t * file) { + return lfs_file_sync_raw(lfs, file); +} + +lfs_ssize_t lfs_file_read (lfs_t * lfs, lfs_file_t * file, void * buffer, lfs_size_t size) { + return lfs_file_read_raw(lfs, file, buffer, size); +} + +lfs_ssize_t lfs_file_write (lfs_t * lfs, lfs_file_t * file, const void * buffer, lfs_size_t size) { + return lfs_file_write_raw(lfs, file, buffer, size); +} + +lfs_soff_t lfs_file_seek (lfs_t * lfs, lfs_file_t * file, lfs_soff_t off, int whence) { + return lfs_file_seek_raw(lfs, file, off, whence); +} + +int lfs_file_truncate (lfs_t * lfs, lfs_file_t * file, lfs_off_t size) { + return lfs_file_truncate_raw(lfs, file, size); +} + +lfs_soff_t lfs_file_tell (lfs_t * lfs, lfs_file_t * file) { + return lfs_file_tell_raw(lfs, file); +} + +int lfs_file_rewind (lfs_t * lfs, lfs_file_t * file) { + return lfs_file_rewind_raw(lfs, file); +} + +lfs_soff_t lfs_file_size (lfs_t * lfs, lfs_file_t * file) { + return lfs_file_size_raw(lfs, file); +} + +int lfs_mkdir (lfs_t * lfs, const char * path) { + return lfs_mkdir_raw(lfs, path); +} + +int lfs_dir_open (lfs_t * lfs, lfs_dir_t * dir, const char * path) { + return lfs_dir_open_raw(lfs, dir, path); +} + +int lfs_dir_close (lfs_t * lfs, lfs_dir_t * dir) { + return lfs_dir_close_raw(lfs, dir); +} + +int lfs_dir_read (lfs_t * lfs, lfs_dir_t * dir, struct lfs_info * info) { + return lfs_dir_read_raw(lfs, dir, info); +} + +int lfs_dir_seek (lfs_t * lfs, lfs_dir_t * dir, lfs_off_t off) { + return lfs_dir_seek_raw(lfs, dir, off); +} + +lfs_soff_t lfs_dir_tell (lfs_t * lfs, lfs_dir_t * dir) { + return lfs_dir_tell_raw(lfs, dir); +} + +int lfs_dir_rewind (lfs_t * lfs, lfs_dir_t * dir) { + return lfs_dir_rewind_raw(lfs, dir); +} + +lfs_ssize_t lfs_fs_size (lfs_t * lfs) { + return lfs_fs_size_raw(lfs); +} + +int lfs_fs_traverse (lfs_t * lfs, int (* cb)(void *, lfs_block_t), void * data) { + return lfs_fs_traverse_raw(lfs, cb, data); +} + +#ifdef LFS_MIGRATE + +int lfs_migrate (lfs_t * lfs, const struct lfs_config * cfg) { + return lfs_migrate_raw(lfs, cfg); +} + #endif #endif \ No newline at end of file diff --git a/lfs.h b/lfs.h index 92f04904..19f9f678 100644 --- a/lfs.h +++ b/lfs.h @@ -9,14 +9,13 @@ #include #include -#include "lfs_util.h" +#include #ifdef __cplusplus extern "C" { #endif - /// Version info /// // Software library version @@ -54,7 +53,7 @@ typedef uint32_t lfs_block_t; // Maximum size of a file in bytes, may be redefined to limit to support other // drivers. Limited on disk to <= 4294967296. However, above 2147483647 the -// functions _lfs_file_seek, _lfs_file_size, and _lfs_file_tell will return +// functions lfs_file_seek, lfs_file_size, and lfs_file_tell will return // incorrect values due to using signed integers. Stored in superblock and // must be respected by other littlefs drivers. #ifndef LFS_FILE_MAX @@ -85,9 +84,6 @@ enum lfs_error { LFS_ERR_NOMEM = -12, // No more memory available LFS_ERR_NOATTR = -61, // No data/attr available LFS_ERR_NAMETOOLONG = -36, // File name too long -#if LFS_THREAD_SAFE - LFS_ERR_LOCK = -23, // Failed to aquire lock -#endif }; // File types @@ -178,7 +174,7 @@ struct lfs_config { // are propogated to the user. int (*sync)(const struct lfs_config *c); - #if LFS_THREAD_SAFE +#if LFS_THREADSAFE // Lock the underlying block device. Negative error codes // are propogated to the user. int (*lock)(const struct lfs_config *c); @@ -186,7 +182,7 @@ struct lfs_config { // Unlock the underlying block device. Negative error codes // are propogated to the user. int (*unlock)(const struct lfs_config *c); - #endif +#endif // Minimum size of a block read. All read operations will be a // multiple of this value. @@ -420,7 +416,7 @@ typedef struct lfs { // be zeroed for defaults and backwards compatibility. // // Returns a negative error code on failure. -int _lfs_format(lfs_t *lfs, const struct lfs_config *config); +int lfs_format(lfs_t *lfs, const struct lfs_config *config); // Mounts a littlefs // @@ -430,13 +426,13 @@ int _lfs_format(lfs_t *lfs, const struct lfs_config *config); // be zeroed for defaults and backwards compatibility. // // Returns a negative error code on failure. -int _lfs_mount(lfs_t *lfs, const struct lfs_config *config); +int lfs_mount(lfs_t *lfs, const struct lfs_config *config); // Unmounts a littlefs // // Does nothing besides releasing any allocated resources. // Returns a negative error code on failure. -int _lfs_unmount(lfs_t *lfs); +int lfs_unmount(lfs_t *lfs); /// General operations /// @@ -444,7 +440,7 @@ int _lfs_unmount(lfs_t *lfs); // // If removing a directory, the directory must be empty. // Returns a negative error code on failure. -int _lfs_remove(lfs_t *lfs, const char *path); +int lfs_remove(lfs_t *lfs, const char *path); // Rename or move a file or directory // @@ -452,13 +448,13 @@ int _lfs_remove(lfs_t *lfs, const char *path); // If the destination is a directory, the directory must be empty. // // Returns a negative error code on failure. -int _lfs_rename(lfs_t *lfs, const char *oldpath, const char *newpath); +int lfs_rename(lfs_t *lfs, const char *oldpath, const char *newpath); // Find info about a file or directory // // Fills out the info structure, based on the specified file or directory. // Returns a negative error code on failure. -int _lfs_stat(lfs_t *lfs, const char *path, struct lfs_info *info); +int lfs_stat(lfs_t *lfs, const char *path, struct lfs_info *info); // Get a custom attribute // @@ -472,7 +468,7 @@ int _lfs_stat(lfs_t *lfs, const char *path, struct lfs_info *info); // Note, the returned size is the size of the attribute on disk, irrespective // of the size of the buffer. This can be used to dynamically allocate a buffer // or check for existance. -lfs_ssize_t _lfs_getattr(lfs_t *lfs, const char *path, +lfs_ssize_t lfs_getattr(lfs_t *lfs, const char *path, uint8_t type, void *buffer, lfs_size_t size); // Set custom attributes @@ -482,7 +478,7 @@ lfs_ssize_t _lfs_getattr(lfs_t *lfs, const char *path, // implicitly created. // // Returns a negative error code on failure. -int _lfs_setattr(lfs_t *lfs, const char *path, +int lfs_setattr(lfs_t *lfs, const char *path, uint8_t type, const void *buffer, lfs_size_t size); // Removes a custom attribute @@ -490,7 +486,7 @@ int _lfs_setattr(lfs_t *lfs, const char *path, // If an attribute is not found, nothing happens. // // Returns a negative error code on failure. -int _lfs_removeattr(lfs_t *lfs, const char *path, uint8_t type); +int lfs_removeattr(lfs_t *lfs, const char *path, uint8_t type); /// File operations /// @@ -501,7 +497,7 @@ int _lfs_removeattr(lfs_t *lfs, const char *path, uint8_t type); // are values from the enum lfs_open_flags that are bitwise-ored together. // // Returns a negative error code on failure. -int _lfs_file_open(lfs_t *lfs, lfs_file_t *file, +int lfs_file_open(lfs_t *lfs, lfs_file_t *file, const char *path, int flags); // Open a file with extra configuration @@ -514,7 +510,7 @@ int _lfs_file_open(lfs_t *lfs, lfs_file_t *file, // config struct must be zeroed for defaults and backwards compatibility. // // Returns a negative error code on failure. -int _lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file, +int lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file, const char *path, int flags, const struct lfs_file_config *config); @@ -524,19 +520,19 @@ int _lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file, // sync had been called and releases any allocated resources. // // Returns a negative error code on failure. -int _lfs_file_close(lfs_t *lfs, lfs_file_t *file); +int lfs_file_close(lfs_t *lfs, lfs_file_t *file); // Synchronize a file on storage // // Any pending writes are written out to storage. // Returns a negative error code on failure. -int _lfs_file_sync(lfs_t *lfs, lfs_file_t *file); +int lfs_file_sync(lfs_t *lfs, lfs_file_t *file); // Read data from file // // Takes a buffer and size indicating where to store the read data. // Returns the number of bytes read, or a negative error code on failure. -lfs_ssize_t _lfs_file_read(lfs_t *lfs, lfs_file_t *file, +lfs_ssize_t lfs_file_read(lfs_t *lfs, lfs_file_t *file, void *buffer, lfs_size_t size); // Write data to file @@ -545,38 +541,38 @@ lfs_ssize_t _lfs_file_read(lfs_t *lfs, lfs_file_t *file, // actually be updated on the storage until either sync or close is called. // // Returns the number of bytes written, or a negative error code on failure. -lfs_ssize_t _lfs_file_write(lfs_t *lfs, lfs_file_t *file, +lfs_ssize_t lfs_file_write(lfs_t *lfs, lfs_file_t *file, const void *buffer, lfs_size_t size); // Change the position of the file // // The change in position is determined by the offset and whence flag. // Returns the new position of the file, or a negative error code on failure. -lfs_soff_t _lfs_file_seek(lfs_t *lfs, lfs_file_t *file, +lfs_soff_t lfs_file_seek(lfs_t *lfs, lfs_file_t *file, lfs_soff_t off, int whence); // Truncates the size of the file to the specified size // // Returns a negative error code on failure. -int _lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size); +int lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size); // Return the position of the file // -// Equivalent to _lfs_file_seek(lfs, file, 0, LFS_SEEK_CUR) +// Equivalent to lfs_file_seek(lfs, file, 0, LFS_SEEK_CUR) // Returns the position of the file, or a negative error code on failure. -lfs_soff_t _lfs_file_tell(lfs_t *lfs, lfs_file_t *file); +lfs_soff_t lfs_file_tell(lfs_t *lfs, lfs_file_t *file); // Change the position of the file to the beginning of the file // -// Equivalent to _lfs_file_seek(lfs, file, 0, LFS_SEEK_SET) +// Equivalent to lfs_file_seek(lfs, file, 0, LFS_SEEK_SET) // Returns a negative error code on failure. -int _lfs_file_rewind(lfs_t *lfs, lfs_file_t *file); +int lfs_file_rewind(lfs_t *lfs, lfs_file_t *file); // Return the size of the file // -// Similar to _lfs_file_seek(lfs, file, 0, LFS_SEEK_END) +// Similar to lfs_file_seek(lfs, file, 0, LFS_SEEK_END) // Returns the size of the file, or a negative error code on failure. -lfs_soff_t _lfs_file_size(lfs_t *lfs, lfs_file_t *file); +lfs_soff_t lfs_file_size(lfs_t *lfs, lfs_file_t *file); /// Directory operations /// @@ -584,26 +580,26 @@ lfs_soff_t _lfs_file_size(lfs_t *lfs, lfs_file_t *file); // Create a directory // // Returns a negative error code on failure. -int _lfs_mkdir(lfs_t *lfs, const char *path); +int lfs_mkdir(lfs_t *lfs, const char *path); // Open a directory // // Once open a directory can be used with read to iterate over files. // Returns a negative error code on failure. -int _lfs_dir_open(lfs_t *lfs, lfs_dir_t *dir, const char *path); +int lfs_dir_open(lfs_t *lfs, lfs_dir_t *dir, const char *path); // Close a directory // // Releases any allocated resources. // Returns a negative error code on failure. -int _lfs_dir_close(lfs_t *lfs, lfs_dir_t *dir); +int lfs_dir_close(lfs_t *lfs, lfs_dir_t *dir); // Read an entry in the directory // // Fills out the info structure, based on the specified file or directory. // Returns a positive value on success, 0 at the end of directory, // or a negative error code on failure. -int _lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info); +int lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info); // Change the position of the directory // @@ -611,7 +607,7 @@ int _lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info); // an absolute offset in the directory seek. // // Returns a negative error code on failure. -int _lfs_dir_seek(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off); +int lfs_dir_seek(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off); // Return the position of the directory // @@ -619,12 +615,12 @@ int _lfs_dir_seek(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off); // sense, but does indicate the current position in the directory iteration. // // Returns the position of the directory, or a negative error code on failure. -lfs_soff_t _lfs_dir_tell(lfs_t *lfs, lfs_dir_t *dir); +lfs_soff_t lfs_dir_tell(lfs_t *lfs, lfs_dir_t *dir); // Change the position of the directory to the beginning of the directory // // Returns a negative error code on failure. -int _lfs_dir_rewind(lfs_t *lfs, lfs_dir_t *dir); +int lfs_dir_rewind(lfs_t *lfs, lfs_dir_t *dir); /// Filesystem-level filesystem operations @@ -635,7 +631,7 @@ int _lfs_dir_rewind(lfs_t *lfs, lfs_dir_t *dir); // size may be larger than the filesystem actually is. // // Returns the number of allocated blocks, or a negative error code on failure. -lfs_ssize_t _lfs_fs_size(lfs_t *lfs); +lfs_ssize_t lfs_fs_size(lfs_t *lfs); // Traverse through all blocks in use by the filesystem // @@ -644,12 +640,12 @@ lfs_ssize_t _lfs_fs_size(lfs_t *lfs); // blocks are in use or how much of the storage is available. // // Returns a negative error code on failure. -int _lfs_fs_traverse(lfs_t *lfs, int (*cb)(void*, lfs_block_t), void *data); +int lfs_fs_traverse(lfs_t *lfs, int (*cb)(void*, lfs_block_t), void *data); #ifdef LFS_MIGRATE // Attempts to migrate a previous version of littlefs // -// Behaves similarly to the _lfs_format function. Attempts to mount +// Behaves similarly to the lfs_format function. Attempts to mount // the previous version of littlefs and update the filesystem so it can be // mounted with the current version of littlefs. // @@ -658,108 +654,39 @@ int _lfs_fs_traverse(lfs_t *lfs, int (*cb)(void*, lfs_block_t), void *data); // be zeroed for defaults and backwards compatibility. // // Returns a negative error code on failure. -int _lfs_migrate(lfs_t *lfs, const struct lfs_config *cfg); -#endif - -#if LFS_THREAD_SAFE - -int _ts_lfs_format(lfs_t *lfs, const struct lfs_config *config); -int _ts_lfs_mount(lfs_t *lfs, const struct lfs_config *config); -int _ts_lfs_unmount(lfs_t *lfs); -int _ts_lfs_remove(lfs_t *lfs, const char *path); -int _ts_lfs_rename(lfs_t *lfs, const char *oldpath, const char *newpath); -int _ts_lfs_stat(lfs_t *lfs, const char *path, struct lfs_info *info); -lfs_ssize_t _ts_lfs_getattr(lfs_t *lfs, const char *path, uint8_t type, void *buffer, lfs_size_t size); -int _ts_lfs_setattr(lfs_t *lfs, const char *path, uint8_t type, const void *buffer, lfs_size_t size); -int _ts_lfs_removeattr(lfs_t *lfs, const char *path, uint8_t type); -int _ts_lfs_file_open(lfs_t *lfs, lfs_file_t *file, const char *path, int flags); -int _ts_lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file, const char *path, int flags, const struct lfs_file_config *config); -int _ts_lfs_file_close(lfs_t *lfs, lfs_file_t *file); -int _ts_lfs_file_sync(lfs_t *lfs, lfs_file_t *file); -lfs_ssize_t _ts_lfs_file_read(lfs_t *lfs, lfs_file_t *file, void *buffer, lfs_size_t size); -lfs_ssize_t _ts_lfs_file_write(lfs_t *lfs, lfs_file_t *file, const void *buffer, lfs_size_t size); -lfs_soff_t _ts_lfs_file_seek(lfs_t *lfs, lfs_file_t *file, lfs_soff_t off, int whence); -int _ts_lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size); -lfs_soff_t _ts_lfs_file_tell(lfs_t *lfs, lfs_file_t *file); -int _ts_lfs_file_rewind(lfs_t *lfs, lfs_file_t *file); -lfs_soff_t _ts_lfs_file_size(lfs_t *lfs, lfs_file_t *file); -int _ts_lfs_mkdir(lfs_t *lfs, const char *path); -int _ts_lfs_dir_open(lfs_t *lfs, lfs_dir_t *dir, const char *path); -int _ts_lfs_dir_close(lfs_t *lfs, lfs_dir_t *dir); -int _ts_lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info); -int _ts_lfs_dir_seek(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off); -lfs_soff_t _ts_lfs_dir_tell(lfs_t *lfs, lfs_dir_t *dir); -int _ts_lfs_dir_rewind(lfs_t *lfs, lfs_dir_t *dir); -lfs_ssize_t _ts_lfs_fs_size(lfs_t *lfs); -int _ts_lfs_fs_traverse(lfs_t *lfs, int (*cb)(void*, lfs_block_t), void *data); -int _ts_lfs_migrate(lfs_t *lfs, const struct lfs_config *cfg); - -#define lfs_format _ts_lfs_format -#define lfs_mount _ts_lfs_mount -#define lfs_unmount _ts_lfs_unmount -#define lfs_remove _ts_lfs_remove -#define lfs_rename _ts_lfs_rename -#define lfs_stat _ts_lfs_stat -#define lfs_getattr _ts_lfs_getattr -#define lfs_setattr _ts_lfs_setattr -#define lfs_removeattr _ts_lfs_removeattr -#define lfs_file_open _ts_lfs_file_open -#define lfs_file_opencfg _ts_lfs_file_opencfg -#define lfs_file_close _ts_lfs_file_close -#define lfs_file_sync _ts_lfs_file_sync -#define lfs_file_read _ts_lfs_file_read -#define lfs_file_write _ts_lfs_file_write -#define lfs_file_seek _ts_lfs_file_seek -#define lfs_file_truncate _ts_lfs_file_truncate -#define lfs_file_tell _ts_lfs_file_tell -#define lfs_file_rewind _ts_lfs_file_rewind -#define lfs_file_size _ts_lfs_file_size -#define lfs_mkdir _ts_lfs_mkdir -#define lfs_dir_open _ts_lfs_dir_open -#define lfs_dir_close _ts_lfs_dir_close -#define lfs_dir_read _ts_lfs_dir_read -#define lfs_dir_seek _ts_lfs_dir_seek -#define lfs_dir_tell _ts_lfs_dir_tell -#define lfs_dir_rewind _ts_lfs_dir_rewind -#define lfs_fs_size _ts_lfs_fs_size -#define lfs_fs_traverse _ts_lfs_fs_traverse -#define lfs_migrate _ts_lfs_migrate - -#else - -#define lfs_format _lfs_format -#define lfs_mount _lfs_mount -#define lfs_unmount _lfs_unmount -#define lfs_remove _lfs_remove -#define lfs_rename _lfs_rename -#define lfs_stat _lfs_stat -#define lfs_getattr _lfs_getattr -#define lfs_setattr _lfs_setattr -#define lfs_removeattr _lfs_removeattr -#define lfs_file_open _lfs_file_open -#define lfs_file_opencfg _lfs_file_opencfg -#define lfs_file_close _lfs_file_close -#define lfs_file_sync _lfs_file_sync -#define lfs_file_read _lfs_file_read -#define lfs_file_write _lfs_file_write -#define lfs_file_seek _lfs_file_seek -#define lfs_file_truncate _lfs_file_truncate -#define lfs_file_tell _lfs_file_tell -#define lfs_file_rewind _lfs_file_rewind -#define lfs_file_size _lfs_file_size -#define lfs_mkdir _lfs_mkdir -#define lfs_dir_open _lfs_dir_open -#define lfs_dir_close _lfs_dir_close -#define lfs_dir_read _lfs_dir_read -#define lfs_dir_seek _lfs_dir_seek -#define lfs_dir_tell _lfs_dir_tell -#define lfs_dir_rewind _lfs_dir_rewind -#define lfs_fs_size _lfs_fs_size -#define lfs_fs_traverse _lfs_fs_traverse -#define lfs_migrate _lfs_migrate - +int lfs_migrate(lfs_t *lfs, const struct lfs_config *cfg); #endif +int lfs_format_raw(lfs_t *lfs, const struct lfs_config *config); +int lfs_mount_raw(lfs_t *lfs, const struct lfs_config *config); +int lfs_unmount_raw(lfs_t *lfs); +int lfs_remove_raw(lfs_t *lfs, const char *path); +int lfs_rename_raw(lfs_t *lfs, const char *oldpath, const char *newpath); +int lfs_stat_raw(lfs_t *lfs, const char *path, struct lfs_info *info); +lfs_ssize_t lfs_getattr_raw(lfs_t *lfs, const char *path, uint8_t type, void *buffer, lfs_size_t size); +int lfs_setattr_raw(lfs_t *lfs, const char *path, uint8_t type, const void *buffer, lfs_size_t size); +int lfs_removeattr_raw(lfs_t *lfs, const char *path, uint8_t type); +int lfs_file_open_raw(lfs_t *lfs, lfs_file_t *file, const char *path, int flags); +int lfs_file_opencfg_raw(lfs_t *lfs, lfs_file_t *file, const char *path, int flags, const struct lfs_file_config *config); +int lfs_file_close_raw(lfs_t *lfs, lfs_file_t *file); +int lfs_file_sync_raw(lfs_t *lfs, lfs_file_t *file); +lfs_ssize_t lfs_file_read_raw(lfs_t *lfs, lfs_file_t *file, void *buffer, lfs_size_t size); +lfs_ssize_t lfs_file_write_raw(lfs_t *lfs, lfs_file_t *file, const void *buffer, lfs_size_t size); +lfs_soff_t lfs_file_seek_raw(lfs_t *lfs, lfs_file_t *file, lfs_soff_t off, int whence); +int lfs_file_truncate_raw(lfs_t *lfs, lfs_file_t *file, lfs_off_t size); +lfs_soff_t lfs_file_tell_raw(lfs_t *lfs, lfs_file_t *file); +int lfs_file_rewind_raw(lfs_t *lfs, lfs_file_t *file); +lfs_soff_t lfs_file_size_raw(lfs_t *lfs, lfs_file_t *file); +int lfs_mkdir_raw(lfs_t *lfs, const char *path); +int lfs_dir_open_raw(lfs_t *lfs, lfs_dir_t *dir, const char *path); +int lfs_dir_close_raw(lfs_t *lfs, lfs_dir_t *dir); +int lfs_dir_read_raw(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info); +int lfs_dir_seek_raw(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off); +lfs_soff_t lfs_dir_tell_raw(lfs_t *lfs, lfs_dir_t *dir); +int lfs_dir_rewind_raw(lfs_t *lfs, lfs_dir_t *dir); +lfs_ssize_t lfs_fs_size_raw(lfs_t *lfs); +int lfs_fs_traverse_raw(lfs_t *lfs, int (*cb)(void*, lfs_block_t), void *data); +int lfs_migrate_raw(lfs_t *lfs, const struct lfs_config *cfg); #ifdef __cplusplus } /* extern "C" */ diff --git a/lfs_util.h b/lfs_util.h index 47e8a940..84bab118 100644 --- a/lfs_util.h +++ b/lfs_util.h @@ -43,8 +43,9 @@ extern "C" { #endif -#ifndef LFS_THREAD_SAFE -#define LFS_THREAD_SAFE 0 +// Enables thread-safe wrappers using the lock/unlock callbacks in lfs_config +#ifndef LFS_THREADSAFE +#define LFS_THREADSAFE 0 #endif // Macros, may be replaced by system specific wrappers. Arguments to these From fc6988c7c3c796ffcb7973e5022321f87ede44fc Mon Sep 17 00:00:00 2001 From: Bill Gesner Date: Fri, 20 Nov 2020 17:01:04 +0000 Subject: [PATCH 3/6] make raw functions static. formatting tweaks --- lfs.c | 187 ++++++++++++++++++++++++++++++---------------------------- lfs.h | 31 ---------- 2 files changed, 98 insertions(+), 120 deletions(-) diff --git a/lfs.c b/lfs.c index 62efe7e4..b472ba5b 100644 --- a/lfs.c +++ b/lfs.c @@ -10,6 +10,15 @@ #define LFS_BLOCK_NULL ((lfs_block_t)-1) #define LFS_BLOCK_INLINE ((lfs_block_t)-2) +static int lfs_dir_rewind_raw(lfs_t *lfs, lfs_dir_t *dir); +static int lfs_file_close_raw(lfs_t *lfs, lfs_file_t *file); +static lfs_ssize_t lfs_file_read_raw(lfs_t *lfs, lfs_file_t *file, void *buffer, lfs_size_t size); +static lfs_soff_t lfs_file_size_raw(lfs_t *lfs, lfs_file_t *file); +static int lfs_file_sync_raw(lfs_t *lfs, lfs_file_t *file); +static lfs_ssize_t lfs_file_write_raw(lfs_t *lfs, lfs_file_t *file, const void *buffer, lfs_size_t size); +static lfs_ssize_t lfs_fs_size_raw(lfs_t *lfs); +static int lfs_unmount_raw(lfs_t *lfs); + /// Caching block device operations /// static inline void lfs_cache_drop(lfs_t *lfs, lfs_cache_t *rcache) { // do not zero, cheaper if cache is readonly or only going to be @@ -1906,7 +1915,7 @@ compact: /// Top level directory operations /// -int lfs_mkdir_raw(lfs_t *lfs, const char *path) { +static int lfs_mkdir_raw(lfs_t *lfs, const char *path) { LFS_TRACE("lfs_mkdir(%p, \"%s\")", (void*)lfs, path); // deorphan if we haven't yet, needed at most once after poweron int err = lfs_fs_forceconsistency(lfs); @@ -2005,7 +2014,7 @@ int lfs_mkdir_raw(lfs_t *lfs, const char *path) { return 0; } -int lfs_dir_open_raw(lfs_t *lfs, lfs_dir_t *dir, const char *path) { +static int lfs_dir_open_raw(lfs_t *lfs, lfs_dir_t *dir, const char *path) { LFS_TRACE("lfs_dir_open(%p, %p, \"%s\")", (void*)lfs, (void*)dir, path); lfs_stag_t tag = lfs_dir_find(lfs, &dir->m, &path, NULL); if (tag < 0) { @@ -2056,7 +2065,7 @@ int lfs_dir_open_raw(lfs_t *lfs, lfs_dir_t *dir, const char *path) { return 0; } -int lfs_dir_close_raw(lfs_t *lfs, lfs_dir_t *dir) { +static int lfs_dir_close_raw(lfs_t *lfs, lfs_dir_t *dir) { LFS_TRACE("lfs_dir_close(%p, %p)", (void*)lfs, (void*)dir); // remove from list of mdirs for (struct lfs_mlist **p = &lfs->mlist; *p; p = &(*p)->next) { @@ -2070,7 +2079,7 @@ int lfs_dir_close_raw(lfs_t *lfs, lfs_dir_t *dir) { return 0; } -int lfs_dir_read_raw(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info) { +static int lfs_dir_read_raw(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info) { LFS_TRACE("lfs_dir_read(%p, %p, %p)", (void*)lfs, (void*)dir, (void*)info); memset(info, 0, sizeof(*info)); @@ -2123,7 +2132,7 @@ int lfs_dir_read_raw(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info) { return true; } -int lfs_dir_seek_raw(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off) { +static int lfs_dir_seek_raw(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off) { LFS_TRACE("lfs_dir_seek(%p, %p, %"PRIu32")", (void*)lfs, (void*)dir, off); // simply walk from head dir @@ -2166,14 +2175,14 @@ int lfs_dir_seek_raw(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off) { return 0; } -lfs_soff_t lfs_dir_tell_raw(lfs_t *lfs, lfs_dir_t *dir) { +static lfs_soff_t lfs_dir_tell_raw(lfs_t *lfs, lfs_dir_t *dir) { LFS_TRACE("lfs_dir_tell(%p, %p)", (void*)lfs, (void*)dir); (void)lfs; LFS_TRACE("lfs_dir_tell -> %"PRId32, dir->pos); return dir->pos; } -int lfs_dir_rewind_raw(lfs_t *lfs, lfs_dir_t *dir) { +static int lfs_dir_rewind_raw(lfs_t *lfs, lfs_dir_t *dir) { LFS_TRACE("lfs_dir_rewind(%p, %p)", (void*)lfs, (void*)dir); // reload the head dir int err = lfs_dir_fetch(lfs, &dir->m, dir->head); @@ -2380,7 +2389,7 @@ static int lfs_ctz_traverse(lfs_t *lfs, /// Top level file operations /// -int lfs_file_opencfg_raw(lfs_t *lfs, lfs_file_t *file, +static int lfs_file_opencfg_raw(lfs_t *lfs, lfs_file_t *file, const char *path, int flags, const struct lfs_file_config *cfg) { LFS_TRACE("lfs_file_opencfg(%p, %p, \"%s\", %x, %p {" @@ -2534,7 +2543,7 @@ cleanup: return err; } -int lfs_file_open_raw(lfs_t *lfs, lfs_file_t *file, +static int lfs_file_open_raw(lfs_t *lfs, lfs_file_t *file, const char *path, int flags) { LFS_TRACE("lfs_file_open(%p, %p, \"%s\", %x)", (void*)lfs, (void*)file, path, flags); @@ -2544,7 +2553,7 @@ int lfs_file_open_raw(lfs_t *lfs, lfs_file_t *file, return err; } -int lfs_file_close_raw(lfs_t *lfs, lfs_file_t *file) { +static int lfs_file_close_raw(lfs_t *lfs, lfs_file_t *file) { LFS_TRACE("lfs_file_close(%p, %p)", (void*)lfs, (void*)file); LFS_ASSERT(file->flags & LFS_F_OPENED); @@ -2731,7 +2740,7 @@ relocate: return 0; } -int lfs_file_sync_raw(lfs_t *lfs, lfs_file_t *file) { +static int lfs_file_sync_raw(lfs_t *lfs, lfs_file_t *file) { LFS_TRACE("lfs_file_sync(%p, %p)", (void*)lfs, (void*)file); LFS_ASSERT(file->flags & LFS_F_OPENED); @@ -2788,7 +2797,7 @@ int lfs_file_sync_raw(lfs_t *lfs, lfs_file_t *file) { return 0; } -lfs_ssize_t lfs_file_read_raw(lfs_t *lfs, lfs_file_t *file, +static lfs_ssize_t lfs_file_read_raw(lfs_t *lfs, lfs_file_t *file, void *buffer, lfs_size_t size) { LFS_TRACE("lfs_file_read(%p, %p, %p, %"PRIu32")", (void*)lfs, (void*)file, buffer, size); @@ -2868,7 +2877,7 @@ lfs_ssize_t lfs_file_read_raw(lfs_t *lfs, lfs_file_t *file, return size; } -lfs_ssize_t lfs_file_write_raw(lfs_t *lfs, lfs_file_t *file, +static lfs_ssize_t lfs_file_write_raw(lfs_t *lfs, lfs_file_t *file, const void *buffer, lfs_size_t size) { LFS_TRACE("lfs_file_write(%p, %p, %p, %"PRIu32")", (void*)lfs, (void*)file, buffer, size); @@ -2999,7 +3008,7 @@ relocate: return size; } -lfs_soff_t lfs_file_seek_raw(lfs_t *lfs, lfs_file_t *file, +static lfs_soff_t lfs_file_seek_raw(lfs_t *lfs, lfs_file_t *file, lfs_soff_t off, int whence) { LFS_TRACE("lfs_file_seek(%p, %p, %"PRId32", %d)", (void*)lfs, (void*)file, off, whence); @@ -3034,7 +3043,7 @@ lfs_soff_t lfs_file_seek_raw(lfs_t *lfs, lfs_file_t *file, return npos; } -int lfs_file_truncate_raw(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { +static int lfs_file_truncate_raw(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { LFS_TRACE("lfs_file_truncate(%p, %p, %"PRIu32")", (void*)lfs, (void*)file, size); LFS_ASSERT(file->flags & LFS_F_OPENED); @@ -3098,7 +3107,7 @@ int lfs_file_truncate_raw(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { return 0; } -lfs_soff_t lfs_file_tell_raw(lfs_t *lfs, lfs_file_t *file) { +static lfs_soff_t lfs_file_tell_raw(lfs_t *lfs, lfs_file_t *file) { LFS_TRACE("lfs_file_tell(%p, %p)", (void*)lfs, (void*)file); LFS_ASSERT(file->flags & LFS_F_OPENED); (void)lfs; @@ -3106,7 +3115,7 @@ lfs_soff_t lfs_file_tell_raw(lfs_t *lfs, lfs_file_t *file) { return file->pos; } -int lfs_file_rewind_raw(lfs_t *lfs, lfs_file_t *file) { +static int lfs_file_rewind_raw(lfs_t *lfs, lfs_file_t *file) { LFS_TRACE("lfs_file_rewind(%p, %p)", (void*)lfs, (void*)file); lfs_soff_t res = lfs_file_seek_raw(lfs, file, 0, LFS_SEEK_SET); if (res < 0) { @@ -3118,7 +3127,7 @@ int lfs_file_rewind_raw(lfs_t *lfs, lfs_file_t *file) { return 0; } -lfs_soff_t lfs_file_size_raw(lfs_t *lfs, lfs_file_t *file) { +static lfs_soff_t lfs_file_size_raw(lfs_t *lfs, lfs_file_t *file) { LFS_TRACE("lfs_file_size(%p, %p)", (void*)lfs, (void*)file); LFS_ASSERT(file->flags & LFS_F_OPENED); (void)lfs; @@ -3134,7 +3143,7 @@ lfs_soff_t lfs_file_size_raw(lfs_t *lfs, lfs_file_t *file) { /// General fs operations /// -int lfs_stat_raw(lfs_t *lfs, const char *path, struct lfs_info *info) { +static int lfs_stat_raw(lfs_t *lfs, const char *path, struct lfs_info *info) { LFS_TRACE("lfs_stat(%p, \"%s\", %p)", (void*)lfs, path, (void*)info); lfs_mdir_t cwd; lfs_stag_t tag = lfs_dir_find(lfs, &cwd, &path, NULL); @@ -3148,7 +3157,7 @@ int lfs_stat_raw(lfs_t *lfs, const char *path, struct lfs_info *info) { return err; } -int lfs_remove_raw(lfs_t *lfs, const char *path) { +static int lfs_remove_raw(lfs_t *lfs, const char *path) { LFS_TRACE("lfs_remove(%p, \"%s\")", (void*)lfs, path); // deorphan if we haven't yet, needed at most once after poweron int err = lfs_fs_forceconsistency(lfs); @@ -3229,7 +3238,7 @@ int lfs_remove_raw(lfs_t *lfs, const char *path) { return 0; } -int lfs_rename_raw(lfs_t *lfs, const char *oldpath, const char *newpath) { +static int lfs_rename_raw(lfs_t *lfs, const char *oldpath, const char *newpath) { LFS_TRACE("lfs_rename(%p, \"%s\", \"%s\")", (void*)lfs, oldpath, newpath); // deorphan if we haven't yet, needed at most once after poweron @@ -3374,7 +3383,7 @@ int lfs_rename_raw(lfs_t *lfs, const char *oldpath, const char *newpath) { return 0; } -lfs_ssize_t lfs_getattr_raw(lfs_t *lfs, const char *path, +static lfs_ssize_t lfs_getattr_raw(lfs_t *lfs, const char *path, uint8_t type, void *buffer, lfs_size_t size) { LFS_TRACE("lfs_getattr(%p, \"%s\", %"PRIu8", %p, %"PRIu32")", (void*)lfs, path, type, buffer, size); @@ -3437,7 +3446,7 @@ static int lfs_commitattr(lfs_t *lfs, const char *path, {LFS_MKTAG(LFS_TYPE_USERATTR + type, id, size), buffer})); } -int lfs_setattr_raw(lfs_t *lfs, const char *path, +static int lfs_setattr_raw(lfs_t *lfs, const char *path, uint8_t type, const void *buffer, lfs_size_t size) { LFS_TRACE("lfs_setattr(%p, \"%s\", %"PRIu8", %p, %"PRIu32")", (void*)lfs, path, type, buffer, size); @@ -3451,7 +3460,7 @@ int lfs_setattr_raw(lfs_t *lfs, const char *path, return err; } -int lfs_removeattr_raw(lfs_t *lfs, const char *path, uint8_t type) { +static int lfs_removeattr_raw(lfs_t *lfs, const char *path, uint8_t type) { LFS_TRACE("lfs_removeattr(%p, \"%s\", %"PRIu8")", (void*)lfs, path, type); int err = lfs_commitattr(lfs, path, type, NULL, 0x3ff); LFS_TRACE("lfs_removeattr -> %d", err); @@ -3584,7 +3593,7 @@ static int lfs_deinit(lfs_t *lfs) { return 0; } -int lfs_format_raw(lfs_t *lfs, const struct lfs_config *cfg) { +static int lfs_format_raw(lfs_t *lfs, const struct lfs_config *cfg) { LFS_TRACE("lfs_format(%p, %p {.context=%p, " ".read=%p, .prog=%p, .erase=%p, .sync=%p, " ".read_size=%"PRIu32", .prog_size=%"PRIu32", " @@ -3665,7 +3674,7 @@ cleanup: return err; } -int lfs_mount_raw(lfs_t *lfs, const struct lfs_config *cfg) { +static int lfs_mount_raw(lfs_t *lfs, const struct lfs_config *cfg) { LFS_TRACE("lfs_mount(%p, %p {.context=%p, " ".read=%p, .prog=%p, .erase=%p, .sync=%p, " ".read_size=%"PRIu32", .prog_size=%"PRIu32", " @@ -3809,7 +3818,7 @@ cleanup: return err; } -int lfs_unmount_raw(lfs_t *lfs) { +static int lfs_unmount_raw(lfs_t *lfs) { LFS_TRACE("lfs_unmount(%p)", (void*)lfs); int err = lfs_deinit(lfs); LFS_TRACE("lfs_unmount -> %d", err); @@ -3914,7 +3923,7 @@ int lfs_fs_traverseraw(lfs_t *lfs, return 0; } -int lfs_fs_traverse_raw(lfs_t *lfs, +static int lfs_fs_traverse_raw(lfs_t *lfs, int (*cb)(void *data, lfs_block_t block), void *data) { LFS_TRACE("lfs_fs_traverse(%p, %p, %p)", (void*)lfs, (void*)(uintptr_t)cb, data); @@ -4235,7 +4244,7 @@ static int lfs_fs_size_count(void *p, lfs_block_t block) { return 0; } -lfs_ssize_t lfs_fs_size_raw(lfs_t *lfs) { +static lfs_ssize_t lfs_fs_size_raw(lfs_t *lfs) { LFS_TRACE("lfs_fs_size(%p)", (void*)lfs); lfs_size_t size = 0; int err = lfs_fs_traverseraw(lfs, lfs_fs_size_count, &size, false); @@ -4669,7 +4678,7 @@ static int lfs1_unmount(lfs_t *lfs) { } /// v1 migration /// -int lfs_migrate_raw(lfs_t *lfs, const struct lfs_config *cfg) { +static int lfs_migrate_raw(lfs_t *lfs, const struct lfs_config *cfg) { LFS_TRACE("lfs_migrate(%p, %p {.context=%p, " ".read=%p, .prog=%p, .erase=%p, .sync=%p, " ".read_size=%"PRIu32", .prog_size=%"PRIu32", " @@ -4914,7 +4923,7 @@ cleanup: #if LFS_THREADSAFE -int lfs_format (lfs_t * lfs, const struct lfs_config * config) { +int lfs_format(lfs_t *lfs, const struct lfs_config *config) { int err = config->lock(config); if (err) { return err; @@ -4926,7 +4935,7 @@ int lfs_format (lfs_t * lfs, const struct lfs_config * config) { return err; } -int lfs_mount (lfs_t * lfs, const struct lfs_config * config) { +int lfs_mount(lfs_t *lfs, const struct lfs_config *config) { int err = config->lock(config); if (err) { return err; @@ -4938,7 +4947,7 @@ int lfs_mount (lfs_t * lfs, const struct lfs_config * config) { return err; } -int lfs_unmount (lfs_t * lfs) { +int lfs_unmount(lfs_t *lfs) { int err = lfs->cfg->lock(lfs->cfg); if (err) { return err; @@ -4950,7 +4959,7 @@ int lfs_unmount (lfs_t * lfs) { return err; } -int lfs_remove (lfs_t * lfs, const char * path) { +int lfs_remove(lfs_t *lfs, const char *path) { int err = lfs->cfg->lock(lfs->cfg); if (err) { return err; @@ -4962,7 +4971,7 @@ int lfs_remove (lfs_t * lfs, const char * path) { return err; } -int lfs_rename (lfs_t * lfs, const char * oldpath, const char * newpath) { +int lfs_rename(lfs_t *lfs, const char *oldpath, const char *newpath) { int err = lfs->cfg->lock(lfs->cfg); if (err) { return err; @@ -4975,7 +4984,7 @@ int lfs_rename (lfs_t * lfs, const char * oldpath, const char * newpath) { return err; } -int lfs_stat (lfs_t * lfs, const char * path, struct lfs_info * info) { +int lfs_stat(lfs_t *lfs, const char *path, struct lfs_info *info) { int err = lfs->cfg->lock(lfs->cfg); if (err) { return err; @@ -4988,7 +4997,7 @@ int lfs_stat (lfs_t * lfs, const char * path, struct lfs_info * info) { return err; } -lfs_ssize_t lfs_getattr (lfs_t * lfs, const char * path, uint8_t type, void * buffer, lfs_size_t size) { +lfs_ssize_t lfs_getattr(lfs_t *lfs, const char *path, uint8_t type, void *buffer, lfs_size_t size) { int err = lfs->cfg->lock(lfs->cfg); if (err) { return err; @@ -5001,7 +5010,7 @@ lfs_ssize_t lfs_getattr (lfs_t * lfs, const char * path, uint8_t type, void * bu return err; } -int lfs_setattr (lfs_t * lfs, const char * path, uint8_t type, const void * buffer, lfs_size_t size) { +int lfs_setattr(lfs_t *lfs, const char *path, uint8_t type, const void *buffer, lfs_size_t size) { int err = lfs->cfg->lock(lfs->cfg); if (err) { return err; @@ -5014,7 +5023,7 @@ int lfs_setattr (lfs_t * lfs, const char * path, uint8_t type, const void * buff return err; } -int lfs_removeattr (lfs_t * lfs, const char * path, uint8_t type) { +int lfs_removeattr(lfs_t *lfs, const char *path, uint8_t type) { int err = lfs->cfg->lock(lfs->cfg); if (err) { return err; @@ -5027,7 +5036,7 @@ int lfs_removeattr (lfs_t * lfs, const char * path, uint8_t type) { return err; } -int lfs_file_open (lfs_t * lfs, lfs_file_t * file, const char * path, int flags) { +int lfs_file_open(lfs_t *lfs, lfs_file_t *file, const char *path, int flags) { int err = lfs->cfg->lock(lfs->cfg); if (err) { return err; @@ -5053,7 +5062,7 @@ int lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file, const char *path, int flags, return err; } -int lfs_file_close (lfs_t * lfs, lfs_file_t * file) { +int lfs_file_close(lfs_t *lfs, lfs_file_t *file) { int err = lfs->cfg->lock(lfs->cfg); if (err) { return err; @@ -5066,7 +5075,7 @@ int lfs_file_close (lfs_t * lfs, lfs_file_t * file) { return err; } -int lfs_file_sync (lfs_t * lfs, lfs_file_t * file) { +int lfs_file_sync(lfs_t *lfs, lfs_file_t *file) { int err = lfs->cfg->lock(lfs->cfg); if (err) { return err; @@ -5079,7 +5088,7 @@ int lfs_file_sync (lfs_t * lfs, lfs_file_t * file) { return err; } -lfs_ssize_t lfs_file_read (lfs_t * lfs, lfs_file_t * file, void * buffer, lfs_size_t size) { +lfs_ssize_t lfs_file_read(lfs_t *lfs, lfs_file_t *file, void *buffer, lfs_size_t size) { int err = lfs->cfg->lock(lfs->cfg); if (err) { return err; @@ -5092,7 +5101,7 @@ lfs_ssize_t lfs_file_read (lfs_t * lfs, lfs_file_t * file, void * buffer, lfs_si return err; } -lfs_ssize_t lfs_file_write (lfs_t * lfs, lfs_file_t * file, const void * buffer, lfs_size_t size) { +lfs_ssize_t lfs_file_write(lfs_t *lfs, lfs_file_t *file, const void *buffer, lfs_size_t size) { int err = lfs->cfg->lock(lfs->cfg); if (err) { return err; @@ -5105,7 +5114,7 @@ lfs_ssize_t lfs_file_write (lfs_t * lfs, lfs_file_t * file, const void * buffer, return err; } -lfs_soff_t lfs_file_seek (lfs_t * lfs, lfs_file_t * file, lfs_soff_t off, int whence) { +lfs_soff_t lfs_file_seek(lfs_t *lfs, lfs_file_t *file, lfs_soff_t off, int whence) { int err = lfs->cfg->lock(lfs->cfg); if (err) { return err; @@ -5118,7 +5127,7 @@ lfs_soff_t lfs_file_seek (lfs_t * lfs, lfs_file_t * file, lfs_soff_t off, int wh return err; } -int lfs_file_truncate (lfs_t * lfs, lfs_file_t * file, lfs_off_t size) { +int lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { int err = lfs->cfg->lock(lfs->cfg); if (err) { return err; @@ -5131,7 +5140,7 @@ int lfs_file_truncate (lfs_t * lfs, lfs_file_t * file, lfs_off_t size) { return err; } -lfs_soff_t lfs_file_tell (lfs_t * lfs, lfs_file_t * file) { +lfs_soff_t lfs_file_tell(lfs_t *lfs, lfs_file_t *file) { int err = lfs->cfg->lock(lfs->cfg); if (err) { return err; @@ -5144,7 +5153,7 @@ lfs_soff_t lfs_file_tell (lfs_t * lfs, lfs_file_t * file) { return err; } -int lfs_file_rewind (lfs_t * lfs, lfs_file_t * file) { +int lfs_file_rewind(lfs_t *lfs, lfs_file_t *file) { int err = lfs->cfg->lock(lfs->cfg); if (err) { return err; @@ -5157,7 +5166,7 @@ int lfs_file_rewind (lfs_t * lfs, lfs_file_t * file) { return err; } -lfs_soff_t lfs_file_size (lfs_t * lfs, lfs_file_t * file) { +lfs_soff_t lfs_file_size(lfs_t *lfs, lfs_file_t *file) { int err = lfs->cfg->lock(lfs->cfg); if (err) { return err; @@ -5170,7 +5179,7 @@ lfs_soff_t lfs_file_size (lfs_t * lfs, lfs_file_t * file) { return err; } -int lfs_mkdir (lfs_t * lfs, const char * path) { +int lfs_mkdir(lfs_t *lfs, const char *path) { int err = lfs->cfg->lock(lfs->cfg); if (err) { return err; @@ -5183,7 +5192,7 @@ int lfs_mkdir (lfs_t * lfs, const char * path) { return err; } -int lfs_dir_open (lfs_t * lfs, lfs_dir_t * dir, const char * path) { +int lfs_dir_open(lfs_t *lfs, lfs_dir_t *dir, const char *path) { int err = lfs->cfg->lock(lfs->cfg); if (err) { return err; @@ -5196,7 +5205,7 @@ int lfs_dir_open (lfs_t * lfs, lfs_dir_t * dir, const char * path) { return err; } -int lfs_dir_close (lfs_t * lfs, lfs_dir_t * dir) { +int lfs_dir_close(lfs_t *lfs, lfs_dir_t *dir) { int err = lfs->cfg->lock(lfs->cfg); if (err) { return err; @@ -5209,7 +5218,7 @@ int lfs_dir_close (lfs_t * lfs, lfs_dir_t * dir) { return err; } -int lfs_dir_read (lfs_t * lfs, lfs_dir_t * dir, struct lfs_info * info) { +int lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info) { int err = lfs->cfg->lock(lfs->cfg); if (err) { return err; @@ -5222,7 +5231,7 @@ int lfs_dir_read (lfs_t * lfs, lfs_dir_t * dir, struct lfs_info * info) { return err; } -int lfs_dir_seek (lfs_t * lfs, lfs_dir_t * dir, lfs_off_t off) { +int lfs_dir_seek(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off) { int err = lfs->cfg->lock(lfs->cfg); if (err) { return err; @@ -5235,7 +5244,7 @@ int lfs_dir_seek (lfs_t * lfs, lfs_dir_t * dir, lfs_off_t off) { return err; } -lfs_soff_t lfs_dir_tell (lfs_t * lfs, lfs_dir_t * dir) { +lfs_soff_t lfs_dir_tell(lfs_t *lfs, lfs_dir_t *dir) { int err = lfs->cfg->lock(lfs->cfg); if (err) { return err; @@ -5248,7 +5257,7 @@ lfs_soff_t lfs_dir_tell (lfs_t * lfs, lfs_dir_t * dir) { return err; } -int lfs_dir_rewind (lfs_t * lfs, lfs_dir_t * dir) { +int lfs_dir_rewind(lfs_t *lfs, lfs_dir_t *dir) { int err = lfs->cfg->lock(lfs->cfg); if (err) { return err; @@ -5261,7 +5270,7 @@ int lfs_dir_rewind (lfs_t * lfs, lfs_dir_t * dir) { return err; } -lfs_ssize_t lfs_fs_size (lfs_t * lfs) { +lfs_ssize_t lfs_fs_size(lfs_t *lfs) { int err = lfs->cfg->lock(lfs->cfg); if (err) { return err; @@ -5274,7 +5283,7 @@ lfs_ssize_t lfs_fs_size (lfs_t * lfs) { return err; } -int lfs_fs_traverse (lfs_t * lfs, int (* cb)(void *, lfs_block_t), void * data) { +int lfs_fs_traverse(lfs_t *lfs, int (*cb)(void *, lfs_block_t), void *data) { int err = lfs->cfg->lock(lfs->cfg); if (err) { return err; @@ -5289,7 +5298,7 @@ int lfs_fs_traverse (lfs_t * lfs, int (* cb)(void *, lfs_block_t), void * data) #ifdef LFS_MIGRATE -int lfs_migrate (lfs_t * lfs, const struct lfs_config * cfg) { +int lfs_migrate(lfs_t *lfs, const struct lfs_config *cfg) { int err = lfs->cfg->lock(lfs->cfg); if (err) { return err; @@ -5305,125 +5314,125 @@ int lfs_migrate (lfs_t * lfs, const struct lfs_config * cfg) { #endif #else -int lfs_format (lfs_t * lfs, const struct lfs_config * config) { +int lfs_format(lfs_t *lfs, const struct lfs_config *config) { return lfs_format_raw(lfs, config); } -int lfs_mount (lfs_t * lfs, const struct lfs_config * config) { +int lfs_mount(lfs_t *lfs, const struct lfs_config *config) { return lfs_mount_raw(lfs, config); } -int lfs_unmount (lfs_t * lfs) { +int lfs_unmount(lfs_t *lfs) { return lfs_unmount_raw(lfs); } -int lfs_remove (lfs_t * lfs, const char * path) { +int lfs_remove(lfs_t *lfs, const char *path) { return lfs_remove_raw(lfs, path); } -int lfs_rename (lfs_t * lfs, const char * oldpath, const char * newpath) { +int lfs_rename(lfs_t *lfs, const char *oldpath, const char *newpath) { return lfs_rename_raw(lfs, oldpath, newpath); } -int lfs_stat (lfs_t * lfs, const char * path, struct lfs_info * info) { +int lfs_stat(lfs_t *lfs, const char *path, struct lfs_info *info) { return lfs_stat_raw(lfs, path, info); } -lfs_ssize_t lfs_getattr (lfs_t * lfs, const char * path, uint8_t type, void * buffer, lfs_size_t size) { +lfs_ssize_t lfs_getattr(lfs_t *lfs, const char *path, uint8_t type, void *buffer, lfs_size_t size) { return lfs_getattr_raw(lfs, path, type, buffer, size); } -int lfs_setattr (lfs_t * lfs, const char * path, uint8_t type, const void * buffer, lfs_size_t size) { +int lfs_setattr(lfs_t *lfs, const char *path, uint8_t type, const void *buffer, lfs_size_t size) { return lfs_setattr_raw(lfs, path, type, buffer, size); } -int lfs_removeattr (lfs_t * lfs, const char * path, uint8_t type) { +int lfs_removeattr(lfs_t *lfs, const char *path, uint8_t type) { return lfs_removeattr_raw(lfs, path, type); } -int lfs_file_open (lfs_t * lfs, lfs_file_t * file, const char * path, int flags) { +int lfs_file_open(lfs_t *lfs, lfs_file_t *file, const char *path, int flags) { return lfs_file_open_raw(lfs, file, path, flags); } -int lfs_file_opencfg_ts(lfs_t *lfs, lfs_file_t *file, const char *path, int flags, const struct lfs_file_config *config) { +int lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file, const char *path, int flags, const struct lfs_file_config *config) { return lfs_file_opencfg_raw(lfs, file, path, flags, config); } -int lfs_file_close (lfs_t * lfs, lfs_file_t * file) { +int lfs_file_close(lfs_t *lfs, lfs_file_t *file) { return lfs_file_close_raw(lfs, file); } -int lfs_file_sync (lfs_t * lfs, lfs_file_t * file) { +int lfs_file_sync(lfs_t *lfs, lfs_file_t *file) { return lfs_file_sync_raw(lfs, file); } -lfs_ssize_t lfs_file_read (lfs_t * lfs, lfs_file_t * file, void * buffer, lfs_size_t size) { +lfs_ssize_t lfs_file_read(lfs_t *lfs, lfs_file_t *file, void *buffer, lfs_size_t size) { return lfs_file_read_raw(lfs, file, buffer, size); } -lfs_ssize_t lfs_file_write (lfs_t * lfs, lfs_file_t * file, const void * buffer, lfs_size_t size) { +lfs_ssize_t lfs_file_write(lfs_t *lfs, lfs_file_t *file, const void *buffer, lfs_size_t size) { return lfs_file_write_raw(lfs, file, buffer, size); } -lfs_soff_t lfs_file_seek (lfs_t * lfs, lfs_file_t * file, lfs_soff_t off, int whence) { +lfs_soff_t lfs_file_seek(lfs_t *lfs, lfs_file_t *file, lfs_soff_t off, int whence) { return lfs_file_seek_raw(lfs, file, off, whence); } -int lfs_file_truncate (lfs_t * lfs, lfs_file_t * file, lfs_off_t size) { +int lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { return lfs_file_truncate_raw(lfs, file, size); } -lfs_soff_t lfs_file_tell (lfs_t * lfs, lfs_file_t * file) { +lfs_soff_t lfs_file_tell(lfs_t *lfs, lfs_file_t *file) { return lfs_file_tell_raw(lfs, file); } -int lfs_file_rewind (lfs_t * lfs, lfs_file_t * file) { +int lfs_file_rewind(lfs_t *lfs, lfs_file_t *file) { return lfs_file_rewind_raw(lfs, file); } -lfs_soff_t lfs_file_size (lfs_t * lfs, lfs_file_t * file) { +lfs_soff_t lfs_file_size(lfs_t *lfs, lfs_file_t *file) { return lfs_file_size_raw(lfs, file); } -int lfs_mkdir (lfs_t * lfs, const char * path) { +int lfs_mkdir(lfs_t *lfs, const char *path) { return lfs_mkdir_raw(lfs, path); } -int lfs_dir_open (lfs_t * lfs, lfs_dir_t * dir, const char * path) { +int lfs_dir_open(lfs_t *lfs, lfs_dir_t *dir, const char *path) { return lfs_dir_open_raw(lfs, dir, path); } -int lfs_dir_close (lfs_t * lfs, lfs_dir_t * dir) { +int lfs_dir_close(lfs_t *lfs, lfs_dir_t *dir) { return lfs_dir_close_raw(lfs, dir); } -int lfs_dir_read (lfs_t * lfs, lfs_dir_t * dir, struct lfs_info * info) { +int lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info) { return lfs_dir_read_raw(lfs, dir, info); } -int lfs_dir_seek (lfs_t * lfs, lfs_dir_t * dir, lfs_off_t off) { +int lfs_dir_seek(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off) { return lfs_dir_seek_raw(lfs, dir, off); } -lfs_soff_t lfs_dir_tell (lfs_t * lfs, lfs_dir_t * dir) { +lfs_soff_t lfs_dir_tell(lfs_t *lfs, lfs_dir_t *dir) { return lfs_dir_tell_raw(lfs, dir); } -int lfs_dir_rewind (lfs_t * lfs, lfs_dir_t * dir) { +int lfs_dir_rewind(lfs_t *lfs, lfs_dir_t *dir) { return lfs_dir_rewind_raw(lfs, dir); } -lfs_ssize_t lfs_fs_size (lfs_t * lfs) { +lfs_ssize_t lfs_fs_size(lfs_t *lfs) { return lfs_fs_size_raw(lfs); } -int lfs_fs_traverse (lfs_t * lfs, int (* cb)(void *, lfs_block_t), void * data) { +int lfs_fs_traverse(lfs_t *lfs, int (*cb)(void *, lfs_block_t), void *data) { return lfs_fs_traverse_raw(lfs, cb, data); } #ifdef LFS_MIGRATE -int lfs_migrate (lfs_t * lfs, const struct lfs_config * cfg) { +int lfs_migrate(lfs_t *lfs, const struct lfs_config *cfg) { return lfs_migrate_raw(lfs, cfg); } diff --git a/lfs.h b/lfs.h index 19f9f678..4f7eea58 100644 --- a/lfs.h +++ b/lfs.h @@ -657,37 +657,6 @@ int lfs_fs_traverse(lfs_t *lfs, int (*cb)(void*, lfs_block_t), void *data); int lfs_migrate(lfs_t *lfs, const struct lfs_config *cfg); #endif -int lfs_format_raw(lfs_t *lfs, const struct lfs_config *config); -int lfs_mount_raw(lfs_t *lfs, const struct lfs_config *config); -int lfs_unmount_raw(lfs_t *lfs); -int lfs_remove_raw(lfs_t *lfs, const char *path); -int lfs_rename_raw(lfs_t *lfs, const char *oldpath, const char *newpath); -int lfs_stat_raw(lfs_t *lfs, const char *path, struct lfs_info *info); -lfs_ssize_t lfs_getattr_raw(lfs_t *lfs, const char *path, uint8_t type, void *buffer, lfs_size_t size); -int lfs_setattr_raw(lfs_t *lfs, const char *path, uint8_t type, const void *buffer, lfs_size_t size); -int lfs_removeattr_raw(lfs_t *lfs, const char *path, uint8_t type); -int lfs_file_open_raw(lfs_t *lfs, lfs_file_t *file, const char *path, int flags); -int lfs_file_opencfg_raw(lfs_t *lfs, lfs_file_t *file, const char *path, int flags, const struct lfs_file_config *config); -int lfs_file_close_raw(lfs_t *lfs, lfs_file_t *file); -int lfs_file_sync_raw(lfs_t *lfs, lfs_file_t *file); -lfs_ssize_t lfs_file_read_raw(lfs_t *lfs, lfs_file_t *file, void *buffer, lfs_size_t size); -lfs_ssize_t lfs_file_write_raw(lfs_t *lfs, lfs_file_t *file, const void *buffer, lfs_size_t size); -lfs_soff_t lfs_file_seek_raw(lfs_t *lfs, lfs_file_t *file, lfs_soff_t off, int whence); -int lfs_file_truncate_raw(lfs_t *lfs, lfs_file_t *file, lfs_off_t size); -lfs_soff_t lfs_file_tell_raw(lfs_t *lfs, lfs_file_t *file); -int lfs_file_rewind_raw(lfs_t *lfs, lfs_file_t *file); -lfs_soff_t lfs_file_size_raw(lfs_t *lfs, lfs_file_t *file); -int lfs_mkdir_raw(lfs_t *lfs, const char *path); -int lfs_dir_open_raw(lfs_t *lfs, lfs_dir_t *dir, const char *path); -int lfs_dir_close_raw(lfs_t *lfs, lfs_dir_t *dir); -int lfs_dir_read_raw(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info); -int lfs_dir_seek_raw(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off); -lfs_soff_t lfs_dir_tell_raw(lfs_t *lfs, lfs_dir_t *dir); -int lfs_dir_rewind_raw(lfs_t *lfs, lfs_dir_t *dir); -lfs_ssize_t lfs_fs_size_raw(lfs_t *lfs); -int lfs_fs_traverse_raw(lfs_t *lfs, int (*cb)(void*, lfs_block_t), void *data); -int lfs_migrate_raw(lfs_t *lfs, const struct lfs_config *cfg); - #ifdef __cplusplus } /* extern "C" */ #endif From 00a9ba7826318408d280aafe5dc527a43b2c965d Mon Sep 17 00:00:00 2001 From: Christopher Haster Date: Sat, 28 Nov 2020 11:15:23 -0600 Subject: [PATCH 4/6] Tweaked thread-safe implementation - Stayed on non-system include for lfs_util.h for now - Named internal functions "lfs_functionraw" - Merged lfs_fs_traverseraw - Added LFS_LOCK/UNLOCK macros - Changed LFS_THREADSAFE from 1/0 to defined/undefined to match LFS_READONLY --- lfs.c | 849 ++++++++++++++++++++++------------------------------- lfs.h | 4 +- lfs_util.h | 5 - 3 files changed, 360 insertions(+), 498 deletions(-) diff --git a/lfs.c b/lfs.c index b472ba5b..edcbb6ac 100644 --- a/lfs.c +++ b/lfs.c @@ -5,20 +5,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ #include "lfs.h" -#include +#include "lfs_util.h" #define LFS_BLOCK_NULL ((lfs_block_t)-1) #define LFS_BLOCK_INLINE ((lfs_block_t)-2) -static int lfs_dir_rewind_raw(lfs_t *lfs, lfs_dir_t *dir); -static int lfs_file_close_raw(lfs_t *lfs, lfs_file_t *file); -static lfs_ssize_t lfs_file_read_raw(lfs_t *lfs, lfs_file_t *file, void *buffer, lfs_size_t size); -static lfs_soff_t lfs_file_size_raw(lfs_t *lfs, lfs_file_t *file); -static int lfs_file_sync_raw(lfs_t *lfs, lfs_file_t *file); -static lfs_ssize_t lfs_file_write_raw(lfs_t *lfs, lfs_file_t *file, const void *buffer, lfs_size_t size); -static lfs_ssize_t lfs_fs_size_raw(lfs_t *lfs); -static int lfs_unmount_raw(lfs_t *lfs); - /// Caching block device operations /// static inline void lfs_cache_drop(lfs_t *lfs, lfs_cache_t *rcache) { // do not zero, cheaper if cache is readonly or only going to be @@ -427,8 +418,19 @@ static int lfs_dir_commit(lfs_t *lfs, lfs_mdir_t *dir, static int lfs_dir_compact(lfs_t *lfs, lfs_mdir_t *dir, const struct lfs_mattr *attrs, int attrcount, lfs_mdir_t *source, uint16_t begin, uint16_t end); +static int lfs_dir_rewindraw(lfs_t *lfs, lfs_dir_t *dir); + +static lfs_ssize_t lfs_file_readraw(lfs_t *lfs, lfs_file_t *file, + void *buffer, lfs_size_t size); +static lfs_ssize_t lfs_file_writeraw(lfs_t *lfs, lfs_file_t *file, + const void *buffer, lfs_size_t size); +static int lfs_file_closeraw(lfs_t *lfs, lfs_file_t *file); +static lfs_soff_t lfs_file_sizeraw(lfs_t *lfs, lfs_file_t *file); +static int lfs_file_syncraw(lfs_t *lfs, lfs_file_t *file); static int lfs_file_outline(lfs_t *lfs, lfs_file_t *file); static int lfs_file_flush(lfs_t *lfs, lfs_file_t *file); + +static lfs_ssize_t lfs_fs_sizeraw(lfs_t *lfs); static void lfs_fs_preporphans(lfs_t *lfs, int8_t orphans); static void lfs_fs_prepmove(lfs_t *lfs, uint16_t id, const lfs_block_t pair[2]); @@ -442,12 +444,16 @@ int lfs_fs_traverseraw(lfs_t *lfs, int (*cb)(void *data, lfs_block_t block), void *data, bool includeorphans); static int lfs_fs_forceconsistency(lfs_t *lfs); + static int lfs_deinit(lfs_t *lfs); +static int lfs_unmountraw(lfs_t *lfs); + #ifdef LFS_MIGRATE static int lfs1_traverse(lfs_t *lfs, int (*cb)(void*, lfs_block_t), void *data); #endif + /// Block allocator /// static int lfs_alloc_lookahead(void *p, lfs_block_t block) { lfs_t *lfs = (lfs_t*)p; @@ -1534,7 +1540,7 @@ static int lfs_dir_compact(lfs_t *lfs, if (lfs_pair_cmp(dir->pair, (const lfs_block_t[2]){0, 1}) == 0) { // oh no! we're writing too much to the superblock, // should we expand? - lfs_ssize_t res = lfs_fs_size_raw(lfs); + lfs_ssize_t res = lfs_fs_sizeraw(lfs); if (res < 0) { return res; } @@ -1915,7 +1921,7 @@ compact: /// Top level directory operations /// -static int lfs_mkdir_raw(lfs_t *lfs, const char *path) { +static int lfs_mkdirraw(lfs_t *lfs, const char *path) { LFS_TRACE("lfs_mkdir(%p, \"%s\")", (void*)lfs, path); // deorphan if we haven't yet, needed at most once after poweron int err = lfs_fs_forceconsistency(lfs); @@ -2014,7 +2020,7 @@ static int lfs_mkdir_raw(lfs_t *lfs, const char *path) { return 0; } -static int lfs_dir_open_raw(lfs_t *lfs, lfs_dir_t *dir, const char *path) { +static int lfs_dir_openraw(lfs_t *lfs, lfs_dir_t *dir, const char *path) { LFS_TRACE("lfs_dir_open(%p, %p, \"%s\")", (void*)lfs, (void*)dir, path); lfs_stag_t tag = lfs_dir_find(lfs, &dir->m, &path, NULL); if (tag < 0) { @@ -2065,7 +2071,7 @@ static int lfs_dir_open_raw(lfs_t *lfs, lfs_dir_t *dir, const char *path) { return 0; } -static int lfs_dir_close_raw(lfs_t *lfs, lfs_dir_t *dir) { +static int lfs_dir_closeraw(lfs_t *lfs, lfs_dir_t *dir) { LFS_TRACE("lfs_dir_close(%p, %p)", (void*)lfs, (void*)dir); // remove from list of mdirs for (struct lfs_mlist **p = &lfs->mlist; *p; p = &(*p)->next) { @@ -2079,7 +2085,7 @@ static int lfs_dir_close_raw(lfs_t *lfs, lfs_dir_t *dir) { return 0; } -static int lfs_dir_read_raw(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info) { +static int lfs_dir_readraw(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info) { LFS_TRACE("lfs_dir_read(%p, %p, %p)", (void*)lfs, (void*)dir, (void*)info); memset(info, 0, sizeof(*info)); @@ -2132,11 +2138,11 @@ static int lfs_dir_read_raw(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info) { return true; } -static int lfs_dir_seek_raw(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off) { +static int lfs_dir_seekraw(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off) { LFS_TRACE("lfs_dir_seek(%p, %p, %"PRIu32")", (void*)lfs, (void*)dir, off); // simply walk from head dir - int err = lfs_dir_rewind_raw(lfs, dir); + int err = lfs_dir_rewindraw(lfs, dir); if (err) { LFS_TRACE("lfs_dir_seek -> %d", err); return err; @@ -2175,14 +2181,14 @@ static int lfs_dir_seek_raw(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off) { return 0; } -static lfs_soff_t lfs_dir_tell_raw(lfs_t *lfs, lfs_dir_t *dir) { +static lfs_soff_t lfs_dir_tellraw(lfs_t *lfs, lfs_dir_t *dir) { LFS_TRACE("lfs_dir_tell(%p, %p)", (void*)lfs, (void*)dir); (void)lfs; LFS_TRACE("lfs_dir_tell -> %"PRId32, dir->pos); return dir->pos; } -static int lfs_dir_rewind_raw(lfs_t *lfs, lfs_dir_t *dir) { +static int lfs_dir_rewindraw(lfs_t *lfs, lfs_dir_t *dir) { LFS_TRACE("lfs_dir_rewind(%p, %p)", (void*)lfs, (void*)dir); // reload the head dir int err = lfs_dir_fetch(lfs, &dir->m, dir->head); @@ -2389,7 +2395,7 @@ static int lfs_ctz_traverse(lfs_t *lfs, /// Top level file operations /// -static int lfs_file_opencfg_raw(lfs_t *lfs, lfs_file_t *file, +static int lfs_file_opencfgraw(lfs_t *lfs, lfs_file_t *file, const char *path, int flags, const struct lfs_file_config *cfg) { LFS_TRACE("lfs_file_opencfg(%p, %p, \"%s\", %x, %p {" @@ -2538,26 +2544,26 @@ static int lfs_file_opencfg_raw(lfs_t *lfs, lfs_file_t *file, cleanup: // clean up lingering resources file->flags |= LFS_F_ERRED; - lfs_file_close_raw(lfs, file); + lfs_file_closeraw(lfs, file); LFS_TRACE("lfs_file_opencfg -> %d", err); return err; } -static int lfs_file_open_raw(lfs_t *lfs, lfs_file_t *file, +static int lfs_file_openraw(lfs_t *lfs, lfs_file_t *file, const char *path, int flags) { LFS_TRACE("lfs_file_open(%p, %p, \"%s\", %x)", (void*)lfs, (void*)file, path, flags); static const struct lfs_file_config defaults = {0}; - int err = lfs_file_opencfg_raw(lfs, file, path, flags, &defaults); + int err = lfs_file_opencfgraw(lfs, file, path, flags, &defaults); LFS_TRACE("lfs_file_open -> %d", err); return err; } -static int lfs_file_close_raw(lfs_t *lfs, lfs_file_t *file) { +static int lfs_file_closeraw(lfs_t *lfs, lfs_file_t *file) { LFS_TRACE("lfs_file_close(%p, %p)", (void*)lfs, (void*)file); LFS_ASSERT(file->flags & LFS_F_OPENED); - int err = lfs_file_sync_raw(lfs, file); + int err = lfs_file_syncraw(lfs, file); // remove from list of mdirs for (struct lfs_mlist **p = &lfs->mlist; *p; p = &(*p)->next) { @@ -2688,12 +2694,12 @@ static int lfs_file_flush(lfs_t *lfs, lfs_file_t *file) { // copy over a byte at a time, leave it up to caching // to make this efficient uint8_t data; - lfs_ssize_t res = lfs_file_read_raw(lfs, &orig, &data, 1); + lfs_ssize_t res = lfs_file_readraw(lfs, &orig, &data, 1); if (res < 0) { return res; } - res = lfs_file_write_raw(lfs, file, &data, 1); + res = lfs_file_writeraw(lfs, file, &data, 1); if (res < 0) { return res; } @@ -2740,7 +2746,7 @@ relocate: return 0; } -static int lfs_file_sync_raw(lfs_t *lfs, lfs_file_t *file) { +static int lfs_file_syncraw(lfs_t *lfs, lfs_file_t *file) { LFS_TRACE("lfs_file_sync(%p, %p)", (void*)lfs, (void*)file); LFS_ASSERT(file->flags & LFS_F_OPENED); @@ -2797,7 +2803,7 @@ static int lfs_file_sync_raw(lfs_t *lfs, lfs_file_t *file) { return 0; } -static lfs_ssize_t lfs_file_read_raw(lfs_t *lfs, lfs_file_t *file, +static lfs_ssize_t lfs_file_readraw(lfs_t *lfs, lfs_file_t *file, void *buffer, lfs_size_t size) { LFS_TRACE("lfs_file_read(%p, %p, %p, %"PRIu32")", (void*)lfs, (void*)file, buffer, size); @@ -2877,7 +2883,7 @@ static lfs_ssize_t lfs_file_read_raw(lfs_t *lfs, lfs_file_t *file, return size; } -static lfs_ssize_t lfs_file_write_raw(lfs_t *lfs, lfs_file_t *file, +static lfs_ssize_t lfs_file_writeraw(lfs_t *lfs, lfs_file_t *file, const void *buffer, lfs_size_t size) { LFS_TRACE("lfs_file_write(%p, %p, %p, %"PRIu32")", (void*)lfs, (void*)file, buffer, size); @@ -2912,7 +2918,7 @@ static lfs_ssize_t lfs_file_write_raw(lfs_t *lfs, lfs_file_t *file, file->pos = file->ctz.size; while (file->pos < pos) { - lfs_ssize_t res = lfs_file_write_raw(lfs, file, &(uint8_t){0}, 1); + lfs_ssize_t res = lfs_file_writeraw(lfs, file, &(uint8_t){0}, 1); if (res < 0) { LFS_TRACE("lfs_file_write -> %"PRId32, res); return res; @@ -3008,7 +3014,7 @@ relocate: return size; } -static lfs_soff_t lfs_file_seek_raw(lfs_t *lfs, lfs_file_t *file, +static lfs_soff_t lfs_file_seekraw(lfs_t *lfs, lfs_file_t *file, lfs_soff_t off, int whence) { LFS_TRACE("lfs_file_seek(%p, %p, %"PRId32", %d)", (void*)lfs, (void*)file, off, whence); @@ -3043,7 +3049,7 @@ static lfs_soff_t lfs_file_seek_raw(lfs_t *lfs, lfs_file_t *file, return npos; } -static int lfs_file_truncate_raw(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { +static int lfs_file_truncateraw(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { LFS_TRACE("lfs_file_truncate(%p, %p, %"PRIu32")", (void*)lfs, (void*)file, size); LFS_ASSERT(file->flags & LFS_F_OPENED); @@ -3055,7 +3061,7 @@ static int lfs_file_truncate_raw(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { } lfs_off_t pos = file->pos; - lfs_off_t oldsize = lfs_file_size_raw(lfs, file); + lfs_off_t oldsize = lfs_file_sizeraw(lfs, file); if (size < oldsize) { // need to flush since directly changing metadata int err = lfs_file_flush(lfs, file); @@ -3079,7 +3085,7 @@ static int lfs_file_truncate_raw(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { } else if (size > oldsize) { // flush+seek if not already at end if (file->pos != oldsize) { - lfs_soff_t res = lfs_file_seek_raw(lfs, file, 0, LFS_SEEK_END); + lfs_soff_t res = lfs_file_seekraw(lfs, file, 0, LFS_SEEK_END); if (res < 0) { LFS_TRACE("lfs_file_truncate -> %"PRId32, res); return (int)res; @@ -3088,7 +3094,7 @@ static int lfs_file_truncate_raw(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { // fill with zeros while (file->pos < size) { - lfs_ssize_t res = lfs_file_write_raw(lfs, file, &(uint8_t){0}, 1); + lfs_ssize_t res = lfs_file_writeraw(lfs, file, &(uint8_t){0}, 1); if (res < 0) { LFS_TRACE("lfs_file_truncate -> %"PRId32, res); return (int)res; @@ -3097,7 +3103,7 @@ static int lfs_file_truncate_raw(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { } // restore pos - lfs_soff_t res = lfs_file_seek_raw(lfs, file, pos, LFS_SEEK_SET); + lfs_soff_t res = lfs_file_seekraw(lfs, file, pos, LFS_SEEK_SET); if (res < 0) { LFS_TRACE("lfs_file_truncate -> %"PRId32, res); return (int)res; @@ -3107,7 +3113,7 @@ static int lfs_file_truncate_raw(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { return 0; } -static lfs_soff_t lfs_file_tell_raw(lfs_t *lfs, lfs_file_t *file) { +static lfs_soff_t lfs_file_tellraw(lfs_t *lfs, lfs_file_t *file) { LFS_TRACE("lfs_file_tell(%p, %p)", (void*)lfs, (void*)file); LFS_ASSERT(file->flags & LFS_F_OPENED); (void)lfs; @@ -3115,9 +3121,9 @@ static lfs_soff_t lfs_file_tell_raw(lfs_t *lfs, lfs_file_t *file) { return file->pos; } -static int lfs_file_rewind_raw(lfs_t *lfs, lfs_file_t *file) { +static int lfs_file_rewindraw(lfs_t *lfs, lfs_file_t *file) { LFS_TRACE("lfs_file_rewind(%p, %p)", (void*)lfs, (void*)file); - lfs_soff_t res = lfs_file_seek_raw(lfs, file, 0, LFS_SEEK_SET); + lfs_soff_t res = lfs_file_seekraw(lfs, file, 0, LFS_SEEK_SET); if (res < 0) { LFS_TRACE("lfs_file_rewind -> %"PRId32, res); return (int)res; @@ -3127,7 +3133,7 @@ static int lfs_file_rewind_raw(lfs_t *lfs, lfs_file_t *file) { return 0; } -static lfs_soff_t lfs_file_size_raw(lfs_t *lfs, lfs_file_t *file) { +static lfs_soff_t lfs_file_sizeraw(lfs_t *lfs, lfs_file_t *file) { LFS_TRACE("lfs_file_size(%p, %p)", (void*)lfs, (void*)file); LFS_ASSERT(file->flags & LFS_F_OPENED); (void)lfs; @@ -3143,7 +3149,7 @@ static lfs_soff_t lfs_file_size_raw(lfs_t *lfs, lfs_file_t *file) { /// General fs operations /// -static int lfs_stat_raw(lfs_t *lfs, const char *path, struct lfs_info *info) { +static int lfs_statraw(lfs_t *lfs, const char *path, struct lfs_info *info) { LFS_TRACE("lfs_stat(%p, \"%s\", %p)", (void*)lfs, path, (void*)info); lfs_mdir_t cwd; lfs_stag_t tag = lfs_dir_find(lfs, &cwd, &path, NULL); @@ -3157,7 +3163,7 @@ static int lfs_stat_raw(lfs_t *lfs, const char *path, struct lfs_info *info) { return err; } -static int lfs_remove_raw(lfs_t *lfs, const char *path) { +static int lfs_removeraw(lfs_t *lfs, const char *path) { LFS_TRACE("lfs_remove(%p, \"%s\")", (void*)lfs, path); // deorphan if we haven't yet, needed at most once after poweron int err = lfs_fs_forceconsistency(lfs); @@ -3238,7 +3244,7 @@ static int lfs_remove_raw(lfs_t *lfs, const char *path) { return 0; } -static int lfs_rename_raw(lfs_t *lfs, const char *oldpath, const char *newpath) { +static int lfs_renameraw(lfs_t *lfs, const char *oldpath, const char *newpath) { LFS_TRACE("lfs_rename(%p, \"%s\", \"%s\")", (void*)lfs, oldpath, newpath); // deorphan if we haven't yet, needed at most once after poweron @@ -3383,7 +3389,7 @@ static int lfs_rename_raw(lfs_t *lfs, const char *oldpath, const char *newpath) return 0; } -static lfs_ssize_t lfs_getattr_raw(lfs_t *lfs, const char *path, +static lfs_ssize_t lfs_getattrraw(lfs_t *lfs, const char *path, uint8_t type, void *buffer, lfs_size_t size) { LFS_TRACE("lfs_getattr(%p, \"%s\", %"PRIu8", %p, %"PRIu32")", (void*)lfs, path, type, buffer, size); @@ -3446,7 +3452,7 @@ static int lfs_commitattr(lfs_t *lfs, const char *path, {LFS_MKTAG(LFS_TYPE_USERATTR + type, id, size), buffer})); } -static int lfs_setattr_raw(lfs_t *lfs, const char *path, +static int lfs_setattrraw(lfs_t *lfs, const char *path, uint8_t type, const void *buffer, lfs_size_t size) { LFS_TRACE("lfs_setattr(%p, \"%s\", %"PRIu8", %p, %"PRIu32")", (void*)lfs, path, type, buffer, size); @@ -3460,7 +3466,7 @@ static int lfs_setattr_raw(lfs_t *lfs, const char *path, return err; } -static int lfs_removeattr_raw(lfs_t *lfs, const char *path, uint8_t type) { +static int lfs_removeattrraw(lfs_t *lfs, const char *path, uint8_t type) { LFS_TRACE("lfs_removeattr(%p, \"%s\", %"PRIu8")", (void*)lfs, path, type); int err = lfs_commitattr(lfs, path, type, NULL, 0x3ff); LFS_TRACE("lfs_removeattr -> %d", err); @@ -3593,7 +3599,7 @@ static int lfs_deinit(lfs_t *lfs) { return 0; } -static int lfs_format_raw(lfs_t *lfs, const struct lfs_config *cfg) { +static int lfs_formatraw(lfs_t *lfs, const struct lfs_config *cfg) { LFS_TRACE("lfs_format(%p, %p {.context=%p, " ".read=%p, .prog=%p, .erase=%p, .sync=%p, " ".read_size=%"PRIu32", .prog_size=%"PRIu32", " @@ -3674,7 +3680,7 @@ cleanup: return err; } -static int lfs_mount_raw(lfs_t *lfs, const struct lfs_config *cfg) { +static int lfs_mountraw(lfs_t *lfs, const struct lfs_config *cfg) { LFS_TRACE("lfs_mount(%p, %p {.context=%p, " ".read=%p, .prog=%p, .erase=%p, .sync=%p, " ".read_size=%"PRIu32", .prog_size=%"PRIu32", " @@ -3813,12 +3819,12 @@ static int lfs_mount_raw(lfs_t *lfs, const struct lfs_config *cfg) { return 0; cleanup: - lfs_unmount_raw(lfs); + lfs_unmountraw(lfs); LFS_TRACE("lfs_mount -> %d", err); return err; } -static int lfs_unmount_raw(lfs_t *lfs) { +static int lfs_unmountraw(lfs_t *lfs) { LFS_TRACE("lfs_unmount(%p)", (void*)lfs); int err = lfs_deinit(lfs); LFS_TRACE("lfs_unmount -> %d", err); @@ -3923,15 +3929,6 @@ int lfs_fs_traverseraw(lfs_t *lfs, return 0; } -static int lfs_fs_traverse_raw(lfs_t *lfs, - int (*cb)(void *data, lfs_block_t block), void *data) { - LFS_TRACE("lfs_fs_traverse(%p, %p, %p)", - (void*)lfs, (void*)(uintptr_t)cb, data); - int err = lfs_fs_traverseraw(lfs, cb, data, true); - LFS_TRACE("lfs_fs_traverse -> %d", 0); - return err; -} - static int lfs_fs_pred(lfs_t *lfs, const lfs_block_t pair[2], lfs_mdir_t *pdir) { // iterate over all directory directory entries @@ -4244,7 +4241,7 @@ static int lfs_fs_size_count(void *p, lfs_block_t block) { return 0; } -static lfs_ssize_t lfs_fs_size_raw(lfs_t *lfs) { +static lfs_ssize_t lfs_fs_sizeraw(lfs_t *lfs) { LFS_TRACE("lfs_fs_size(%p)", (void*)lfs); lfs_size_t size = 0; int err = lfs_fs_traverseraw(lfs, lfs_fs_size_count, &size, false); @@ -4678,7 +4675,7 @@ static int lfs1_unmount(lfs_t *lfs) { } /// v1 migration /// -static int lfs_migrate_raw(lfs_t *lfs, const struct lfs_config *cfg) { +static int lfs_migrateraw(lfs_t *lfs, const struct lfs_config *cfg) { LFS_TRACE("lfs_migrate(%p, %p {.context=%p, " ".read=%p, .prog=%p, .erase=%p, .sync=%p, " ".read_size=%"PRIu32", .prog_size=%"PRIu32", " @@ -4921,520 +4918,390 @@ cleanup: #endif -#if LFS_THREADSAFE -int lfs_format(lfs_t *lfs, const struct lfs_config *config) { - int err = config->lock(config); - if (err) { - return err; - } +/// Public API wrappers /// - err = lfs_format_raw(lfs, config); - config->unlock(config); +// Here we can add tracing/thread safety easily - return err; -} - -int lfs_mount(lfs_t *lfs, const struct lfs_config *config) { - int err = config->lock(config); - if (err) { - return err; - } - - err = lfs_mount_raw(lfs, config); - config->unlock(config); - - return err; -} - -int lfs_unmount(lfs_t *lfs) { - int err = lfs->cfg->lock(lfs->cfg); - if (err) { - return err; - } - - err = lfs_unmount_raw(lfs); - lfs->cfg->unlock(lfs->cfg); - - return err; -} - -int lfs_remove(lfs_t *lfs, const char *path) { - int err = lfs->cfg->lock(lfs->cfg); - if (err) { - return err; - } - - err = lfs_remove_raw(lfs, path); - lfs->cfg->unlock(lfs->cfg); - - return err; -} - -int lfs_rename(lfs_t *lfs, const char *oldpath, const char *newpath) { - int err = lfs->cfg->lock(lfs->cfg); - if (err) { - return err; - } - - err = lfs_rename_raw(lfs, oldpath, newpath); - - lfs->cfg->unlock(lfs->cfg); - - return err; -} - -int lfs_stat(lfs_t *lfs, const char *path, struct lfs_info *info) { - int err = lfs->cfg->lock(lfs->cfg); - if (err) { - return err; - } - - err = lfs_stat_raw(lfs, path, info); - - lfs->cfg->unlock(lfs->cfg); - - return err; -} - -lfs_ssize_t lfs_getattr(lfs_t *lfs, const char *path, uint8_t type, void *buffer, lfs_size_t size) { - int err = lfs->cfg->lock(lfs->cfg); - if (err) { - return err; - } - - err = lfs_getattr_raw(lfs, path, type, buffer, size); - - lfs->cfg->unlock(lfs->cfg); - - return err; -} - -int lfs_setattr(lfs_t *lfs, const char *path, uint8_t type, const void *buffer, lfs_size_t size) { - int err = lfs->cfg->lock(lfs->cfg); - if (err) { - return err; - } - - err = lfs_setattr_raw(lfs, path, type, buffer, size); - - lfs->cfg->unlock(lfs->cfg); - - return err; -} - -int lfs_removeattr(lfs_t *lfs, const char *path, uint8_t type) { - int err = lfs->cfg->lock(lfs->cfg); - if (err) { - return err; - } - - err = lfs_removeattr_raw(lfs, path, type); - - lfs->cfg->unlock(lfs->cfg); - - return err; -} - -int lfs_file_open(lfs_t *lfs, lfs_file_t *file, const char *path, int flags) { - int err = lfs->cfg->lock(lfs->cfg); - if (err) { - return err; - } - - err = lfs_file_open_raw(lfs, file, path, flags); - - lfs->cfg->unlock(lfs->cfg); - - return err; -} - -int lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file, const char *path, int flags, const struct lfs_file_config *config) { - int err = lfs->cfg->lock(lfs->cfg); - if (err) { - return err; - } - - err = lfs_file_opencfg_raw(lfs, file, path, flags, config); - - lfs->cfg->unlock(lfs->cfg); - - return err; -} - -int lfs_file_close(lfs_t *lfs, lfs_file_t *file) { - int err = lfs->cfg->lock(lfs->cfg); - if (err) { - return err; - } - - err = lfs_file_close_raw(lfs, file); - - lfs->cfg->unlock(lfs->cfg); - - return err; -} - -int lfs_file_sync(lfs_t *lfs, lfs_file_t *file) { - int err = lfs->cfg->lock(lfs->cfg); - if (err) { - return err; - } - - err = lfs_file_sync_raw(lfs, file); - - lfs->cfg->unlock(lfs->cfg); - - return err; -} - -lfs_ssize_t lfs_file_read(lfs_t *lfs, lfs_file_t *file, void *buffer, lfs_size_t size) { - int err = lfs->cfg->lock(lfs->cfg); - if (err) { - return err; - } - - err = lfs_file_read_raw(lfs, file, buffer, size); - - lfs->cfg->unlock(lfs->cfg); - - return err; -} - -lfs_ssize_t lfs_file_write(lfs_t *lfs, lfs_file_t *file, const void *buffer, lfs_size_t size) { - int err = lfs->cfg->lock(lfs->cfg); - if (err) { - return err; - } - - err = lfs_file_write_raw(lfs, file, buffer, size); - - lfs->cfg->unlock(lfs->cfg); - - return err; -} - -lfs_soff_t lfs_file_seek(lfs_t *lfs, lfs_file_t *file, lfs_soff_t off, int whence) { - int err = lfs->cfg->lock(lfs->cfg); - if (err) { - return err; - } - - err = lfs_file_seek_raw(lfs, file, off, whence); - - lfs->cfg->unlock(lfs->cfg); - - return err; -} - -int lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { - int err = lfs->cfg->lock(lfs->cfg); - if (err) { - return err; - } - - err = lfs_file_truncate_raw(lfs, file, size); - - lfs->cfg->unlock(lfs->cfg); - - return err; -} - -lfs_soff_t lfs_file_tell(lfs_t *lfs, lfs_file_t *file) { - int err = lfs->cfg->lock(lfs->cfg); - if (err) { - return err; - } - - err = lfs_file_tell_raw(lfs, file); - - lfs->cfg->unlock(lfs->cfg); - - return err; -} - -int lfs_file_rewind(lfs_t *lfs, lfs_file_t *file) { - int err = lfs->cfg->lock(lfs->cfg); - if (err) { - return err; - } - - err = lfs_file_rewind_raw(lfs, file); - - lfs->cfg->unlock(lfs->cfg); - - return err; -} - -lfs_soff_t lfs_file_size(lfs_t *lfs, lfs_file_t *file) { - int err = lfs->cfg->lock(lfs->cfg); - if (err) { - return err; - } - - err = lfs_file_size_raw(lfs, file); - - lfs->cfg->unlock(lfs->cfg); - - return err; -} - -int lfs_mkdir(lfs_t *lfs, const char *path) { - int err = lfs->cfg->lock(lfs->cfg); - if (err) { - return err; - } - - err = lfs_mkdir_raw(lfs, path); - - lfs->cfg->unlock(lfs->cfg); - - return err; -} - -int lfs_dir_open(lfs_t *lfs, lfs_dir_t *dir, const char *path) { - int err = lfs->cfg->lock(lfs->cfg); - if (err) { - return err; - } - - err = lfs_dir_open_raw(lfs, dir, path); - - lfs->cfg->unlock(lfs->cfg); - - return err; -} - -int lfs_dir_close(lfs_t *lfs, lfs_dir_t *dir) { - int err = lfs->cfg->lock(lfs->cfg); - if (err) { - return err; - } - - err = lfs_dir_close_raw(lfs, dir); - - lfs->cfg->unlock(lfs->cfg); - - return err; -} - -int lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info) { - int err = lfs->cfg->lock(lfs->cfg); - if (err) { - return err; - } - - err = lfs_dir_read_raw(lfs, dir, info); - - lfs->cfg->unlock(lfs->cfg); - - return err; -} - -int lfs_dir_seek(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off) { - int err = lfs->cfg->lock(lfs->cfg); - if (err) { - return err; - } - - err = lfs_dir_seek_raw(lfs, dir, off); - - lfs->cfg->unlock(lfs->cfg); - - return err; -} - -lfs_soff_t lfs_dir_tell(lfs_t *lfs, lfs_dir_t *dir) { - int err = lfs->cfg->lock(lfs->cfg); - if (err) { - return err; - } - - err = lfs_dir_tell_raw(lfs, dir); - - lfs->cfg->unlock(lfs->cfg); - - return err; -} - -int lfs_dir_rewind(lfs_t *lfs, lfs_dir_t *dir) { - int err = lfs->cfg->lock(lfs->cfg); - if (err) { - return err; - } - - err = lfs_dir_rewind_raw(lfs, dir); - - lfs->cfg->unlock(lfs->cfg); - - return err; -} - -lfs_ssize_t lfs_fs_size(lfs_t *lfs) { - int err = lfs->cfg->lock(lfs->cfg); - if (err) { - return err; - } - - err = lfs_fs_size_raw(lfs); - - lfs->cfg->unlock(lfs->cfg); - - return err; -} - -int lfs_fs_traverse(lfs_t *lfs, int (*cb)(void *, lfs_block_t), void *data) { - int err = lfs->cfg->lock(lfs->cfg); - if (err) { - return err; - } - - err = lfs_fs_traverse_raw(lfs, cb, data); - - lfs->cfg->unlock(lfs->cfg); - - return err; -} - -#ifdef LFS_MIGRATE - -int lfs_migrate(lfs_t *lfs, const struct lfs_config *cfg) { - int err = lfs->cfg->lock(lfs->cfg); - if (err) { - return err; - } - - err = lfs_migrate_raw(lfs, cfg); - - lfs->cfg->unlock(lfs->cfg); - - return err; -} - -#endif +// Thread-safe wrappers if enabled +#ifdef LFS_THREADSAFE +#define LFS_LOCK(cfg) cfg->lock(cfg) +#define LFS_UNLOCK(cfg) cfg->unlock(cfg) #else +#define LFS_LOCK(cfg) ((void)cfg, 0) +#define LFS_UNLOCK(cfg) ((void)cfg) +#endif -int lfs_format(lfs_t *lfs, const struct lfs_config *config) { - return lfs_format_raw(lfs, config); +// Public API +int lfs_format(lfs_t *lfs, const struct lfs_config *cfg) { + int err = LFS_LOCK(cfg); + if (err) { + return err; + } + + err = lfs_formatraw(lfs, cfg); + + LFS_UNLOCK(cfg); + return err; } -int lfs_mount(lfs_t *lfs, const struct lfs_config *config) { - return lfs_mount_raw(lfs, config); +int lfs_mount(lfs_t *lfs, const struct lfs_config *cfg) { + int err = LFS_LOCK(cfg); + if (err) { + return err; + } + + err = lfs_mountraw(lfs, cfg); + + LFS_UNLOCK(cfg); + return err; } int lfs_unmount(lfs_t *lfs) { - return lfs_unmount_raw(lfs); + int err = LFS_LOCK(lfs->cfg); + if (err) { + return err; + } + + err = lfs_unmountraw(lfs); + + LFS_UNLOCK(lfs->cfg); + return err; } int lfs_remove(lfs_t *lfs, const char *path) { - return lfs_remove_raw(lfs, path); + int err = LFS_LOCK(lfs->cfg); + if (err) { + return err; + } + + err = lfs_removeraw(lfs, path); + + LFS_UNLOCK(lfs->cfg); + return err; } int lfs_rename(lfs_t *lfs, const char *oldpath, const char *newpath) { - return lfs_rename_raw(lfs, oldpath, newpath); + int err = LFS_LOCK(lfs->cfg); + if (err) { + return err; + } + + err = lfs_renameraw(lfs, oldpath, newpath); + + LFS_UNLOCK(lfs->cfg); + return err; } int lfs_stat(lfs_t *lfs, const char *path, struct lfs_info *info) { - return lfs_stat_raw(lfs, path, info); + int err = LFS_LOCK(lfs->cfg); + if (err) { + return err; + } + + err = lfs_statraw(lfs, path, info); + + LFS_UNLOCK(lfs->cfg); + return err; } -lfs_ssize_t lfs_getattr(lfs_t *lfs, const char *path, uint8_t type, void *buffer, lfs_size_t size) { - return lfs_getattr_raw(lfs, path, type, buffer, size); +lfs_ssize_t lfs_getattr(lfs_t *lfs, const char *path, + uint8_t type, void *buffer, lfs_size_t size) { + int err = LFS_LOCK(lfs->cfg); + if (err) { + return err; + } + + err = lfs_getattrraw(lfs, path, type, buffer, size); + + LFS_UNLOCK(lfs->cfg); + return err; } -int lfs_setattr(lfs_t *lfs, const char *path, uint8_t type, const void *buffer, lfs_size_t size) { - return lfs_setattr_raw(lfs, path, type, buffer, size); +int lfs_setattr(lfs_t *lfs, const char *path, + uint8_t type, const void *buffer, lfs_size_t size) { + int err = LFS_LOCK(lfs->cfg); + if (err) { + return err; + } + + err = lfs_setattrraw(lfs, path, type, buffer, size); + + LFS_UNLOCK(lfs->cfg); + return err; } int lfs_removeattr(lfs_t *lfs, const char *path, uint8_t type) { - return lfs_removeattr_raw(lfs, path, type); + int err = LFS_LOCK(lfs->cfg); + if (err) { + return err; + } + + err = lfs_removeattrraw(lfs, path, type); + + LFS_UNLOCK(lfs->cfg); + return err; } int lfs_file_open(lfs_t *lfs, lfs_file_t *file, const char *path, int flags) { - return lfs_file_open_raw(lfs, file, path, flags); + int err = LFS_LOCK(lfs->cfg); + if (err) { + return err; + } + + err = lfs_file_openraw(lfs, file, path, flags); + + LFS_UNLOCK(lfs->cfg); + return err; } -int lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file, const char *path, int flags, const struct lfs_file_config *config) { - return lfs_file_opencfg_raw(lfs, file, path, flags, config); +int lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file, + const char *path, int flags, + const struct lfs_file_config *config) { + int err = LFS_LOCK(lfs->cfg); + if (err) { + return err; + } + + err = lfs_file_opencfgraw(lfs, file, path, flags, config); + + LFS_UNLOCK(lfs->cfg); + return err; } int lfs_file_close(lfs_t *lfs, lfs_file_t *file) { - return lfs_file_close_raw(lfs, file); + int err = LFS_LOCK(lfs->cfg); + if (err) { + return err; + } + + err = lfs_file_closeraw(lfs, file); + + LFS_UNLOCK(lfs->cfg); + return err; } int lfs_file_sync(lfs_t *lfs, lfs_file_t *file) { - return lfs_file_sync_raw(lfs, file); + int err = LFS_LOCK(lfs->cfg); + if (err) { + return err; + } + + err = lfs_file_syncraw(lfs, file); + + LFS_UNLOCK(lfs->cfg); + return err; } -lfs_ssize_t lfs_file_read(lfs_t *lfs, lfs_file_t *file, void *buffer, lfs_size_t size) { - return lfs_file_read_raw(lfs, file, buffer, size); +lfs_ssize_t lfs_file_read(lfs_t *lfs, lfs_file_t *file, + void *buffer, lfs_size_t size) { + int err = LFS_LOCK(lfs->cfg); + if (err) { + return err; + } + + err = lfs_file_readraw(lfs, file, buffer, size); + + LFS_UNLOCK(lfs->cfg); + return err; } -lfs_ssize_t lfs_file_write(lfs_t *lfs, lfs_file_t *file, const void *buffer, lfs_size_t size) { - return lfs_file_write_raw(lfs, file, buffer, size); +lfs_ssize_t lfs_file_write(lfs_t *lfs, lfs_file_t *file, + const void *buffer, lfs_size_t size) { + int err = LFS_LOCK(lfs->cfg); + if (err) { + return err; + } + + err = lfs_file_writeraw(lfs, file, buffer, size); + + LFS_UNLOCK(lfs->cfg); + return err; } -lfs_soff_t lfs_file_seek(lfs_t *lfs, lfs_file_t *file, lfs_soff_t off, int whence) { - return lfs_file_seek_raw(lfs, file, off, whence); +lfs_soff_t lfs_file_seek(lfs_t *lfs, lfs_file_t *file, + lfs_soff_t off, int whence) { + int err = LFS_LOCK(lfs->cfg); + if (err) { + return err; + } + + err = lfs_file_seekraw(lfs, file, off, whence); + + LFS_UNLOCK(lfs->cfg); + return err; } int lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { - return lfs_file_truncate_raw(lfs, file, size); + int err = LFS_LOCK(lfs->cfg); + if (err) { + return err; + } + + err = lfs_file_truncateraw(lfs, file, size); + + LFS_UNLOCK(lfs->cfg); + return err; } lfs_soff_t lfs_file_tell(lfs_t *lfs, lfs_file_t *file) { - return lfs_file_tell_raw(lfs, file); + int err = LFS_LOCK(lfs->cfg); + if (err) { + return err; + } + + err = lfs_file_tellraw(lfs, file); + + LFS_UNLOCK(lfs->cfg); + return err; } int lfs_file_rewind(lfs_t *lfs, lfs_file_t *file) { - return lfs_file_rewind_raw(lfs, file); + int err = LFS_LOCK(lfs->cfg); + if (err) { + return err; + } + + err = lfs_file_rewindraw(lfs, file); + + LFS_UNLOCK(lfs->cfg); + return err; } lfs_soff_t lfs_file_size(lfs_t *lfs, lfs_file_t *file) { - return lfs_file_size_raw(lfs, file); + int err = LFS_LOCK(lfs->cfg); + if (err) { + return err; + } + + err = lfs_file_sizeraw(lfs, file); + + LFS_UNLOCK(lfs->cfg); + return err; } int lfs_mkdir(lfs_t *lfs, const char *path) { - return lfs_mkdir_raw(lfs, path); + int err = LFS_LOCK(lfs->cfg); + if (err) { + return err; + } + + err = lfs_mkdirraw(lfs, path); + + LFS_UNLOCK(lfs->cfg); + return err; } int lfs_dir_open(lfs_t *lfs, lfs_dir_t *dir, const char *path) { - return lfs_dir_open_raw(lfs, dir, path); + int err = LFS_LOCK(lfs->cfg); + if (err) { + return err; + } + + err = lfs_dir_openraw(lfs, dir, path); + + LFS_UNLOCK(lfs->cfg); + return err; } int lfs_dir_close(lfs_t *lfs, lfs_dir_t *dir) { - return lfs_dir_close_raw(lfs, dir); + int err = LFS_LOCK(lfs->cfg); + if (err) { + return err; + } + + err = lfs_dir_closeraw(lfs, dir); + + LFS_UNLOCK(lfs->cfg); + return err; } int lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info) { - return lfs_dir_read_raw(lfs, dir, info); + int err = LFS_LOCK(lfs->cfg); + if (err) { + return err; + } + + err = lfs_dir_readraw(lfs, dir, info); + + LFS_UNLOCK(lfs->cfg); + return err; } int lfs_dir_seek(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off) { - return lfs_dir_seek_raw(lfs, dir, off); + int err = LFS_LOCK(lfs->cfg); + if (err) { + return err; + } + + err = lfs_dir_seekraw(lfs, dir, off); + + LFS_UNLOCK(lfs->cfg); + return err; } lfs_soff_t lfs_dir_tell(lfs_t *lfs, lfs_dir_t *dir) { - return lfs_dir_tell_raw(lfs, dir); + int err = LFS_LOCK(lfs->cfg); + if (err) { + return err; + } + + err = lfs_dir_tellraw(lfs, dir); + + LFS_UNLOCK(lfs->cfg); + return err; } int lfs_dir_rewind(lfs_t *lfs, lfs_dir_t *dir) { - return lfs_dir_rewind_raw(lfs, dir); + int err = LFS_LOCK(lfs->cfg); + if (err) { + return err; + } + + err = lfs_dir_rewindraw(lfs, dir); + + LFS_UNLOCK(lfs->cfg); + return err; } lfs_ssize_t lfs_fs_size(lfs_t *lfs) { - return lfs_fs_size_raw(lfs); + int err = LFS_LOCK(lfs->cfg); + if (err) { + return err; + } + + err = lfs_fs_sizeraw(lfs); + + LFS_UNLOCK(lfs->cfg); + return err; } int lfs_fs_traverse(lfs_t *lfs, int (*cb)(void *, lfs_block_t), void *data) { - return lfs_fs_traverse_raw(lfs, cb, data); + int err = LFS_LOCK(lfs->cfg); + if (err) { + return err; + } + + LFS_TRACE("lfs_fs_traverse(%p, %p, %p)", + (void*)lfs, (void*)(uintptr_t)cb, data); + err = lfs_fs_traverseraw(lfs, cb, data, true); + LFS_TRACE("lfs_fs_traverse -> %d", err); + + LFS_UNLOCK(lfs->cfg); + return err; } #ifdef LFS_MIGRATE - int lfs_migrate(lfs_t *lfs, const struct lfs_config *cfg) { - return lfs_migrate_raw(lfs, cfg); -} + int err = LFS_LOCK(cfg); + if (err) { + return err; + } + err = lfs_migrateraw(lfs, cfg); + + LFS_UNLOCK(cfg); + return err; +} #endif -#endif \ No newline at end of file + diff --git a/lfs.h b/lfs.h index 4f7eea58..3fec4df6 100644 --- a/lfs.h +++ b/lfs.h @@ -9,7 +9,7 @@ #include #include -#include +#include "lfs_util.h" #ifdef __cplusplus extern "C" @@ -174,7 +174,7 @@ struct lfs_config { // are propogated to the user. int (*sync)(const struct lfs_config *c); -#if LFS_THREADSAFE +#ifdef LFS_THREADSAFE // Lock the underlying block device. Negative error codes // are propogated to the user. int (*lock)(const struct lfs_config *c); diff --git a/lfs_util.h b/lfs_util.h index 84bab118..d3baffdb 100644 --- a/lfs_util.h +++ b/lfs_util.h @@ -43,11 +43,6 @@ extern "C" { #endif -// Enables thread-safe wrappers using the lock/unlock callbacks in lfs_config -#ifndef LFS_THREADSAFE -#define LFS_THREADSAFE 0 -#endif - // Macros, may be replaced by system specific wrappers. Arguments to these // macros must not have side-effects as the macros can be removed for a smaller // code footprint From 45afded784dfb6ad8cc92adbf9e3570686d7ecf5 Mon Sep 17 00:00:00 2001 From: Christopher Haster Date: Sat, 28 Nov 2020 12:37:01 -0600 Subject: [PATCH 5/6] Moved LFS_TRACE calls to API wrapper functions This removes quite a bit of extra code needed to entertwine the LFS_TRACE calls into the original funcions. Also changed temporary return type to match API declaration where necessary. --- lfs.c | 367 ++++++++++++++++++++--------------------------------- lfs.h | 2 + lfs_util.h | 1 + 3 files changed, 141 insertions(+), 229 deletions(-) diff --git a/lfs.c b/lfs.c index edcbb6ac..b2e6c208 100644 --- a/lfs.c +++ b/lfs.c @@ -1922,11 +1922,9 @@ compact: /// Top level directory operations /// static int lfs_mkdirraw(lfs_t *lfs, const char *path) { - LFS_TRACE("lfs_mkdir(%p, \"%s\")", (void*)lfs, path); // deorphan if we haven't yet, needed at most once after poweron int err = lfs_fs_forceconsistency(lfs); if (err) { - LFS_TRACE("lfs_mkdir -> %d", err); return err; } @@ -1935,14 +1933,12 @@ static int lfs_mkdirraw(lfs_t *lfs, const char *path) { uint16_t id; err = lfs_dir_find(lfs, &cwd.m, &path, &id); if (!(err == LFS_ERR_NOENT && id != 0x3ff)) { - LFS_TRACE("lfs_mkdir -> %d", (err < 0) ? err : LFS_ERR_EXIST); return (err < 0) ? err : LFS_ERR_EXIST; } // check that name fits lfs_size_t nlen = strlen(path); if (nlen > lfs->name_max) { - LFS_TRACE("lfs_mkdir -> %d", LFS_ERR_NAMETOOLONG); return LFS_ERR_NAMETOOLONG; } @@ -1951,7 +1947,6 @@ static int lfs_mkdirraw(lfs_t *lfs, const char *path) { lfs_mdir_t dir; err = lfs_dir_alloc(lfs, &dir); if (err) { - LFS_TRACE("lfs_mkdir -> %d", err); return err; } @@ -1960,7 +1955,6 @@ static int lfs_mkdirraw(lfs_t *lfs, const char *path) { while (pred.split) { err = lfs_dir_fetch(lfs, &pred, pred.tail); if (err) { - LFS_TRACE("lfs_mkdir -> %d", err); return err; } } @@ -1971,7 +1965,6 @@ static int lfs_mkdirraw(lfs_t *lfs, const char *path) { {LFS_MKTAG(LFS_TYPE_SOFTTAIL, 0x3ff, 8), pred.tail})); lfs_pair_fromle32(pred.tail); if (err) { - LFS_TRACE("lfs_mkdir -> %d", err); return err; } @@ -1994,7 +1987,6 @@ static int lfs_mkdirraw(lfs_t *lfs, const char *path) { lfs_pair_fromle32(dir.pair); if (err) { lfs->mlist = cwd.next; - LFS_TRACE("lfs_mkdir -> %d", err); return err; } @@ -2012,24 +2004,19 @@ static int lfs_mkdirraw(lfs_t *lfs, const char *path) { LFS_TYPE_SOFTTAIL, 0x3ff, 8), dir.pair})); lfs_pair_fromle32(dir.pair); if (err) { - LFS_TRACE("lfs_mkdir -> %d", err); return err; } - LFS_TRACE("lfs_mkdir -> %d", 0); return 0; } static int lfs_dir_openraw(lfs_t *lfs, lfs_dir_t *dir, const char *path) { - LFS_TRACE("lfs_dir_open(%p, %p, \"%s\")", (void*)lfs, (void*)dir, path); lfs_stag_t tag = lfs_dir_find(lfs, &dir->m, &path, NULL); if (tag < 0) { - LFS_TRACE("lfs_dir_open -> %"PRId32, tag); return tag; } if (lfs_tag_type3(tag) != LFS_TYPE_DIR) { - LFS_TRACE("lfs_dir_open -> %d", LFS_ERR_NOTDIR); return LFS_ERR_NOTDIR; } @@ -2043,7 +2030,6 @@ static int lfs_dir_openraw(lfs_t *lfs, lfs_dir_t *dir, const char *path) { lfs_stag_t res = lfs_dir_get(lfs, &dir->m, LFS_MKTAG(0x700, 0x3ff, 0), LFS_MKTAG(LFS_TYPE_STRUCT, lfs_tag_id(tag), 8), pair); if (res < 0) { - LFS_TRACE("lfs_dir_open -> %"PRId32, res); return res; } lfs_pair_fromle32(pair); @@ -2052,7 +2038,6 @@ static int lfs_dir_openraw(lfs_t *lfs, lfs_dir_t *dir, const char *path) { // fetch first pair int err = lfs_dir_fetch(lfs, &dir->m, pair); if (err) { - LFS_TRACE("lfs_dir_open -> %d", err); return err; } @@ -2067,12 +2052,10 @@ static int lfs_dir_openraw(lfs_t *lfs, lfs_dir_t *dir, const char *path) { dir->next = (lfs_dir_t*)lfs->mlist; lfs->mlist = (struct lfs_mlist*)dir; - LFS_TRACE("lfs_dir_open -> %d", 0); return 0; } static int lfs_dir_closeraw(lfs_t *lfs, lfs_dir_t *dir) { - LFS_TRACE("lfs_dir_close(%p, %p)", (void*)lfs, (void*)dir); // remove from list of mdirs for (struct lfs_mlist **p = &lfs->mlist; *p; p = &(*p)->next) { if (*p == (struct lfs_mlist*)dir) { @@ -2081,13 +2064,10 @@ static int lfs_dir_closeraw(lfs_t *lfs, lfs_dir_t *dir) { } } - LFS_TRACE("lfs_dir_close -> %d", 0); return 0; } static int lfs_dir_readraw(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info) { - LFS_TRACE("lfs_dir_read(%p, %p, %p)", - (void*)lfs, (void*)dir, (void*)info); memset(info, 0, sizeof(*info)); // special offset for '.' and '..' @@ -2095,26 +2075,22 @@ static int lfs_dir_readraw(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info) { info->type = LFS_TYPE_DIR; strcpy(info->name, "."); dir->pos += 1; - LFS_TRACE("lfs_dir_read -> %d", true); return true; } else if (dir->pos == 1) { info->type = LFS_TYPE_DIR; strcpy(info->name, ".."); dir->pos += 1; - LFS_TRACE("lfs_dir_read -> %d", true); return true; } while (true) { if (dir->id == dir->m.count) { if (!dir->m.split) { - LFS_TRACE("lfs_dir_read -> %d", false); return false; } int err = lfs_dir_fetch(lfs, &dir->m, dir->m.tail); if (err) { - LFS_TRACE("lfs_dir_read -> %d", err); return err; } @@ -2123,7 +2099,6 @@ static int lfs_dir_readraw(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info) { int err = lfs_dir_getinfo(lfs, &dir->m, dir->id, info); if (err && err != LFS_ERR_NOENT) { - LFS_TRACE("lfs_dir_read -> %d", err); return err; } @@ -2134,17 +2109,13 @@ static int lfs_dir_readraw(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info) { } dir->pos += 1; - LFS_TRACE("lfs_dir_read -> %d", true); return true; } static int lfs_dir_seekraw(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off) { - LFS_TRACE("lfs_dir_seek(%p, %p, %"PRIu32")", - (void*)lfs, (void*)dir, off); // simply walk from head dir int err = lfs_dir_rewindraw(lfs, dir); if (err) { - LFS_TRACE("lfs_dir_seek -> %d", err); return err; } @@ -2163,13 +2134,11 @@ static int lfs_dir_seekraw(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off) { if (dir->id == dir->m.count) { if (!dir->m.split) { - LFS_TRACE("lfs_dir_seek -> %d", LFS_ERR_INVAL); return LFS_ERR_INVAL; } err = lfs_dir_fetch(lfs, &dir->m, dir->m.tail); if (err) { - LFS_TRACE("lfs_dir_seek -> %d", err); return err; } @@ -2177,29 +2146,23 @@ static int lfs_dir_seekraw(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off) { } } - LFS_TRACE("lfs_dir_seek -> %d", 0); return 0; } static lfs_soff_t lfs_dir_tellraw(lfs_t *lfs, lfs_dir_t *dir) { - LFS_TRACE("lfs_dir_tell(%p, %p)", (void*)lfs, (void*)dir); (void)lfs; - LFS_TRACE("lfs_dir_tell -> %"PRId32, dir->pos); return dir->pos; } static int lfs_dir_rewindraw(lfs_t *lfs, lfs_dir_t *dir) { - LFS_TRACE("lfs_dir_rewind(%p, %p)", (void*)lfs, (void*)dir); // reload the head dir int err = lfs_dir_fetch(lfs, &dir->m, dir->head); if (err) { - LFS_TRACE("lfs_dir_rewind -> %d", err); return err; } dir->id = 0; dir->pos = 0; - LFS_TRACE("lfs_dir_rewind -> %d", 0); return 0; } @@ -2398,16 +2361,10 @@ static int lfs_ctz_traverse(lfs_t *lfs, static int lfs_file_opencfgraw(lfs_t *lfs, lfs_file_t *file, const char *path, int flags, const struct lfs_file_config *cfg) { - LFS_TRACE("lfs_file_opencfg(%p, %p, \"%s\", %x, %p {" - ".buffer=%p, .attrs=%p, .attr_count=%"PRIu32"})", - (void*)lfs, (void*)file, path, flags, - (void*)cfg, cfg->buffer, (void*)cfg->attrs, cfg->attr_count); - // deorphan if we haven't yet, needed at most once after poweron if ((flags & 3) != LFS_O_RDONLY) { int err = lfs_fs_forceconsistency(lfs); if (err) { - LFS_TRACE("lfs_file_opencfg -> %d", err); return err; } } @@ -2538,29 +2495,23 @@ static int lfs_file_opencfgraw(lfs_t *lfs, lfs_file_t *file, } } - LFS_TRACE("lfs_file_opencfg -> %d", 0); return 0; cleanup: // clean up lingering resources file->flags |= LFS_F_ERRED; lfs_file_closeraw(lfs, file); - LFS_TRACE("lfs_file_opencfg -> %d", err); return err; } static int lfs_file_openraw(lfs_t *lfs, lfs_file_t *file, const char *path, int flags) { - LFS_TRACE("lfs_file_open(%p, %p, \"%s\", %x)", - (void*)lfs, (void*)file, path, flags); static const struct lfs_file_config defaults = {0}; int err = lfs_file_opencfgraw(lfs, file, path, flags, &defaults); - LFS_TRACE("lfs_file_open -> %d", err); return err; } static int lfs_file_closeraw(lfs_t *lfs, lfs_file_t *file) { - LFS_TRACE("lfs_file_close(%p, %p)", (void*)lfs, (void*)file); LFS_ASSERT(file->flags & LFS_F_OPENED); int err = lfs_file_syncraw(lfs, file); @@ -2579,7 +2530,6 @@ static int lfs_file_closeraw(lfs_t *lfs, lfs_file_t *file) { } file->flags &= ~LFS_F_OPENED; - LFS_TRACE("lfs_file_close -> %d", err); return err; } @@ -2747,19 +2697,16 @@ relocate: } static int lfs_file_syncraw(lfs_t *lfs, lfs_file_t *file) { - LFS_TRACE("lfs_file_sync(%p, %p)", (void*)lfs, (void*)file); LFS_ASSERT(file->flags & LFS_F_OPENED); if (file->flags & LFS_F_ERRED) { // it's not safe to do anything if our file errored - LFS_TRACE("lfs_file_sync -> %d", 0); return 0; } int err = lfs_file_flush(lfs, file); if (err) { file->flags |= LFS_F_ERRED; - LFS_TRACE("lfs_file_sync -> %d", err); return err; } @@ -2792,21 +2739,17 @@ static int lfs_file_syncraw(lfs_t *lfs, lfs_file_t *file) { file->cfg->attr_count), file->cfg->attrs})); if (err) { file->flags |= LFS_F_ERRED; - LFS_TRACE("lfs_file_sync -> %d", err); return err; } file->flags &= ~LFS_F_DIRTY; } - LFS_TRACE("lfs_file_sync -> %d", 0); return 0; } static lfs_ssize_t lfs_file_readraw(lfs_t *lfs, lfs_file_t *file, void *buffer, lfs_size_t size) { - LFS_TRACE("lfs_file_read(%p, %p, %p, %"PRIu32")", - (void*)lfs, (void*)file, buffer, size); LFS_ASSERT(file->flags & LFS_F_OPENED); LFS_ASSERT((file->flags & 3) != LFS_O_WRONLY); @@ -2817,14 +2760,12 @@ static lfs_ssize_t lfs_file_readraw(lfs_t *lfs, lfs_file_t *file, // flush out any writes int err = lfs_file_flush(lfs, file); if (err) { - LFS_TRACE("lfs_file_read -> %d", err); return err; } } if (file->pos >= file->ctz.size) { // eof if past end - LFS_TRACE("lfs_file_read -> %d", 0); return 0; } @@ -2840,7 +2781,6 @@ static lfs_ssize_t lfs_file_readraw(lfs_t *lfs, lfs_file_t *file, file->ctz.head, file->ctz.size, file->pos, &file->block, &file->off); if (err) { - LFS_TRACE("lfs_file_read -> %d", err); return err; } } else { @@ -2860,7 +2800,6 @@ static lfs_ssize_t lfs_file_readraw(lfs_t *lfs, lfs_file_t *file, LFS_MKTAG(LFS_TYPE_INLINESTRUCT, file->id, 0), file->off, data, diff); if (err) { - LFS_TRACE("lfs_file_read -> %d", err); return err; } } else { @@ -2868,7 +2807,6 @@ static lfs_ssize_t lfs_file_readraw(lfs_t *lfs, lfs_file_t *file, NULL, &file->cache, lfs->cfg->block_size, file->block, file->off, data, diff); if (err) { - LFS_TRACE("lfs_file_read -> %d", err); return err; } } @@ -2879,14 +2817,11 @@ static lfs_ssize_t lfs_file_readraw(lfs_t *lfs, lfs_file_t *file, nsize -= diff; } - LFS_TRACE("lfs_file_read -> %"PRId32, size); return size; } static lfs_ssize_t lfs_file_writeraw(lfs_t *lfs, lfs_file_t *file, const void *buffer, lfs_size_t size) { - LFS_TRACE("lfs_file_write(%p, %p, %p, %"PRIu32")", - (void*)lfs, (void*)file, buffer, size); LFS_ASSERT(file->flags & LFS_F_OPENED); LFS_ASSERT((file->flags & 3) != LFS_O_RDONLY); @@ -2897,7 +2832,6 @@ static lfs_ssize_t lfs_file_writeraw(lfs_t *lfs, lfs_file_t *file, // drop any reads int err = lfs_file_flush(lfs, file); if (err) { - LFS_TRACE("lfs_file_write -> %d", err); return err; } } @@ -2908,7 +2842,6 @@ static lfs_ssize_t lfs_file_writeraw(lfs_t *lfs, lfs_file_t *file, if (file->pos + size > lfs->file_max) { // Larger than file limit? - LFS_TRACE("lfs_file_write -> %d", LFS_ERR_FBIG); return LFS_ERR_FBIG; } @@ -2920,7 +2853,6 @@ static lfs_ssize_t lfs_file_writeraw(lfs_t *lfs, lfs_file_t *file, while (file->pos < pos) { lfs_ssize_t res = lfs_file_writeraw(lfs, file, &(uint8_t){0}, 1); if (res < 0) { - LFS_TRACE("lfs_file_write -> %"PRId32, res); return res; } } @@ -2934,7 +2866,6 @@ static lfs_ssize_t lfs_file_writeraw(lfs_t *lfs, lfs_file_t *file, int err = lfs_file_outline(lfs, file); if (err) { file->flags |= LFS_F_ERRED; - LFS_TRACE("lfs_file_write -> %d", err); return err; } } @@ -2951,7 +2882,6 @@ static lfs_ssize_t lfs_file_writeraw(lfs_t *lfs, lfs_file_t *file, file->pos-1, &file->block, &file->off); if (err) { file->flags |= LFS_F_ERRED; - LFS_TRACE("lfs_file_write -> %d", err); return err; } @@ -2966,7 +2896,6 @@ static lfs_ssize_t lfs_file_writeraw(lfs_t *lfs, lfs_file_t *file, &file->block, &file->off); if (err) { file->flags |= LFS_F_ERRED; - LFS_TRACE("lfs_file_write -> %d", err); return err; } } else { @@ -2987,7 +2916,6 @@ static lfs_ssize_t lfs_file_writeraw(lfs_t *lfs, lfs_file_t *file, goto relocate; } file->flags |= LFS_F_ERRED; - LFS_TRACE("lfs_file_write -> %d", err); return err; } @@ -2996,7 +2924,6 @@ relocate: err = lfs_file_relocate(lfs, file); if (err) { file->flags |= LFS_F_ERRED; - LFS_TRACE("lfs_file_write -> %d", err); return err; } } @@ -3010,20 +2937,16 @@ relocate: } file->flags &= ~LFS_F_ERRED; - LFS_TRACE("lfs_file_write -> %"PRId32, size); return size; } static lfs_soff_t lfs_file_seekraw(lfs_t *lfs, lfs_file_t *file, lfs_soff_t off, int whence) { - LFS_TRACE("lfs_file_seek(%p, %p, %"PRId32", %d)", - (void*)lfs, (void*)file, off, whence); LFS_ASSERT(file->flags & LFS_F_OPENED); // write out everything beforehand, may be noop if rdonly int err = lfs_file_flush(lfs, file); if (err) { - LFS_TRACE("lfs_file_seek -> %d", err); return err; } @@ -3039,24 +2962,19 @@ static lfs_soff_t lfs_file_seekraw(lfs_t *lfs, lfs_file_t *file, if (npos > lfs->file_max) { // file position out of range - LFS_TRACE("lfs_file_seek -> %d", LFS_ERR_INVAL); return LFS_ERR_INVAL; } // update pos file->pos = npos; - LFS_TRACE("lfs_file_seek -> %"PRId32, npos); return npos; } static int lfs_file_truncateraw(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { - LFS_TRACE("lfs_file_truncate(%p, %p, %"PRIu32")", - (void*)lfs, (void*)file, size); LFS_ASSERT(file->flags & LFS_F_OPENED); LFS_ASSERT((file->flags & 3) != LFS_O_RDONLY); if (size > LFS_FILE_MAX) { - LFS_TRACE("lfs_file_truncate -> %d", LFS_ERR_INVAL); return LFS_ERR_INVAL; } @@ -3066,7 +2984,6 @@ static int lfs_file_truncateraw(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { // need to flush since directly changing metadata int err = lfs_file_flush(lfs, file); if (err) { - LFS_TRACE("lfs_file_truncate -> %d", err); return err; } @@ -3075,7 +2992,6 @@ static int lfs_file_truncateraw(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { file->ctz.head, file->ctz.size, size, &file->block, &file->off); if (err) { - LFS_TRACE("lfs_file_truncate -> %d", err); return err; } @@ -3087,7 +3003,6 @@ static int lfs_file_truncateraw(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { if (file->pos != oldsize) { lfs_soff_t res = lfs_file_seekraw(lfs, file, 0, LFS_SEEK_END); if (res < 0) { - LFS_TRACE("lfs_file_truncate -> %"PRId32, res); return (int)res; } } @@ -3096,7 +3011,6 @@ static int lfs_file_truncateraw(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { while (file->pos < size) { lfs_ssize_t res = lfs_file_writeraw(lfs, file, &(uint8_t){0}, 1); if (res < 0) { - LFS_TRACE("lfs_file_truncate -> %"PRId32, res); return (int)res; } } @@ -3105,44 +3019,33 @@ static int lfs_file_truncateraw(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { // restore pos lfs_soff_t res = lfs_file_seekraw(lfs, file, pos, LFS_SEEK_SET); if (res < 0) { - LFS_TRACE("lfs_file_truncate -> %"PRId32, res); return (int)res; } - LFS_TRACE("lfs_file_truncate -> %d", 0); return 0; } static lfs_soff_t lfs_file_tellraw(lfs_t *lfs, lfs_file_t *file) { - LFS_TRACE("lfs_file_tell(%p, %p)", (void*)lfs, (void*)file); LFS_ASSERT(file->flags & LFS_F_OPENED); (void)lfs; - LFS_TRACE("lfs_file_tell -> %"PRId32, file->pos); return file->pos; } static int lfs_file_rewindraw(lfs_t *lfs, lfs_file_t *file) { - LFS_TRACE("lfs_file_rewind(%p, %p)", (void*)lfs, (void*)file); lfs_soff_t res = lfs_file_seekraw(lfs, file, 0, LFS_SEEK_SET); if (res < 0) { - LFS_TRACE("lfs_file_rewind -> %"PRId32, res); return (int)res; } - LFS_TRACE("lfs_file_rewind -> %d", 0); return 0; } static lfs_soff_t lfs_file_sizeraw(lfs_t *lfs, lfs_file_t *file) { - LFS_TRACE("lfs_file_size(%p, %p)", (void*)lfs, (void*)file); LFS_ASSERT(file->flags & LFS_F_OPENED); (void)lfs; if (file->flags & LFS_F_WRITING) { - LFS_TRACE("lfs_file_size -> %"PRId32, - lfs_max(file->pos, file->ctz.size)); return lfs_max(file->pos, file->ctz.size); } else { - LFS_TRACE("lfs_file_size -> %"PRId32, file->ctz.size); return file->ctz.size; } } @@ -3150,32 +3053,25 @@ static lfs_soff_t lfs_file_sizeraw(lfs_t *lfs, lfs_file_t *file) { /// General fs operations /// static int lfs_statraw(lfs_t *lfs, const char *path, struct lfs_info *info) { - LFS_TRACE("lfs_stat(%p, \"%s\", %p)", (void*)lfs, path, (void*)info); lfs_mdir_t cwd; lfs_stag_t tag = lfs_dir_find(lfs, &cwd, &path, NULL); if (tag < 0) { - LFS_TRACE("lfs_stat -> %"PRId32, tag); return (int)tag; } - int err = lfs_dir_getinfo(lfs, &cwd, lfs_tag_id(tag), info); - LFS_TRACE("lfs_stat -> %d", err); - return err; + return lfs_dir_getinfo(lfs, &cwd, lfs_tag_id(tag), info); } static int lfs_removeraw(lfs_t *lfs, const char *path) { - LFS_TRACE("lfs_remove(%p, \"%s\")", (void*)lfs, path); // deorphan if we haven't yet, needed at most once after poweron int err = lfs_fs_forceconsistency(lfs); if (err) { - LFS_TRACE("lfs_remove -> %d", err); return err; } lfs_mdir_t cwd; lfs_stag_t tag = lfs_dir_find(lfs, &cwd, &path, NULL); if (tag < 0 || lfs_tag_id(tag) == 0x3ff) { - LFS_TRACE("lfs_remove -> %"PRId32, (tag < 0) ? tag : LFS_ERR_INVAL); return (tag < 0) ? (int)tag : LFS_ERR_INVAL; } @@ -3187,19 +3083,16 @@ static int lfs_removeraw(lfs_t *lfs, const char *path) { lfs_stag_t res = lfs_dir_get(lfs, &cwd, LFS_MKTAG(0x700, 0x3ff, 0), LFS_MKTAG(LFS_TYPE_STRUCT, lfs_tag_id(tag), 8), pair); if (res < 0) { - LFS_TRACE("lfs_remove -> %"PRId32, res); return (int)res; } lfs_pair_fromle32(pair); err = lfs_dir_fetch(lfs, &dir.m, pair); if (err) { - LFS_TRACE("lfs_remove -> %d", err); return err; } if (dir.m.count > 0 || dir.m.split) { - LFS_TRACE("lfs_remove -> %d", LFS_ERR_NOTEMPTY); return LFS_ERR_NOTEMPTY; } @@ -3218,7 +3111,6 @@ static int lfs_removeraw(lfs_t *lfs, const char *path) { {LFS_MKTAG(LFS_TYPE_DELETE, lfs_tag_id(tag), 0), NULL})); if (err) { lfs->mlist = dir.next; - LFS_TRACE("lfs_remove -> %d", err); return err; } @@ -3229,28 +3121,22 @@ static int lfs_removeraw(lfs_t *lfs, const char *path) { err = lfs_fs_pred(lfs, dir.m.pair, &cwd); if (err) { - LFS_TRACE("lfs_remove -> %d", err); return err; } err = lfs_dir_drop(lfs, &cwd, &dir.m); if (err) { - LFS_TRACE("lfs_remove -> %d", err); return err; } } - LFS_TRACE("lfs_remove -> %d", 0); return 0; } static int lfs_renameraw(lfs_t *lfs, const char *oldpath, const char *newpath) { - LFS_TRACE("lfs_rename(%p, \"%s\", \"%s\")", (void*)lfs, oldpath, newpath); - // deorphan if we haven't yet, needed at most once after poweron int err = lfs_fs_forceconsistency(lfs); if (err) { - LFS_TRACE("lfs_rename -> %d", err); return err; } @@ -3258,8 +3144,6 @@ static int lfs_renameraw(lfs_t *lfs, const char *oldpath, const char *newpath) { lfs_mdir_t oldcwd; lfs_stag_t oldtag = lfs_dir_find(lfs, &oldcwd, &oldpath, NULL); if (oldtag < 0 || lfs_tag_id(oldtag) == 0x3ff) { - LFS_TRACE("lfs_rename -> %"PRId32, - (oldtag < 0) ? oldtag : LFS_ERR_INVAL); return (oldtag < 0) ? (int)oldtag : LFS_ERR_INVAL; } @@ -3269,8 +3153,6 @@ static int lfs_renameraw(lfs_t *lfs, const char *oldpath, const char *newpath) { lfs_stag_t prevtag = lfs_dir_find(lfs, &newcwd, &newpath, &newid); if ((prevtag < 0 || lfs_tag_id(prevtag) == 0x3ff) && !(prevtag == LFS_ERR_NOENT && newid != 0x3ff)) { - LFS_TRACE("lfs_rename -> %"PRId32, - (prevtag < 0) ? prevtag : LFS_ERR_INVAL); return (prevtag < 0) ? (int)prevtag : LFS_ERR_INVAL; } @@ -3284,7 +3166,6 @@ static int lfs_renameraw(lfs_t *lfs, const char *oldpath, const char *newpath) { // check that name fits lfs_size_t nlen = strlen(newpath); if (nlen > lfs->name_max) { - LFS_TRACE("lfs_rename -> %d", LFS_ERR_NAMETOOLONG); return LFS_ERR_NAMETOOLONG; } @@ -3295,11 +3176,9 @@ static int lfs_renameraw(lfs_t *lfs, const char *oldpath, const char *newpath) { newoldid += 1; } } else if (lfs_tag_type3(prevtag) != lfs_tag_type3(oldtag)) { - LFS_TRACE("lfs_rename -> %d", LFS_ERR_ISDIR); return LFS_ERR_ISDIR; } else if (samepair && newid == newoldid) { // we're renaming to ourselves?? - LFS_TRACE("lfs_rename -> %d", 0); return 0; } else if (lfs_tag_type3(prevtag) == LFS_TYPE_DIR) { // must be empty before removal @@ -3307,7 +3186,6 @@ static int lfs_renameraw(lfs_t *lfs, const char *oldpath, const char *newpath) { lfs_stag_t res = lfs_dir_get(lfs, &newcwd, LFS_MKTAG(0x700, 0x3ff, 0), LFS_MKTAG(LFS_TYPE_STRUCT, newid, 8), prevpair); if (res < 0) { - LFS_TRACE("lfs_rename -> %"PRId32, res); return (int)res; } lfs_pair_fromle32(prevpair); @@ -3315,12 +3193,10 @@ static int lfs_renameraw(lfs_t *lfs, const char *oldpath, const char *newpath) { // must be empty before removal err = lfs_dir_fetch(lfs, &prevdir.m, prevpair); if (err) { - LFS_TRACE("lfs_rename -> %d", err); return err; } if (prevdir.m.count > 0 || prevdir.m.split) { - LFS_TRACE("lfs_rename -> %d", LFS_ERR_NOTEMPTY); return LFS_ERR_NOTEMPTY; } @@ -3349,7 +3225,6 @@ static int lfs_renameraw(lfs_t *lfs, const char *oldpath, const char *newpath) { LFS_TYPE_DELETE, newoldid, 0), NULL})); if (err) { lfs->mlist = prevdir.next; - LFS_TRACE("lfs_rename -> %d", err); return err; } @@ -3362,7 +3237,6 @@ static int lfs_renameraw(lfs_t *lfs, const char *oldpath, const char *newpath) { {LFS_MKTAG(LFS_TYPE_DELETE, lfs_tag_id(oldtag), 0), NULL})); if (err) { lfs->mlist = prevdir.next; - LFS_TRACE("lfs_rename -> %d", err); return err; } } @@ -3374,29 +3248,23 @@ static int lfs_renameraw(lfs_t *lfs, const char *oldpath, const char *newpath) { err = lfs_fs_pred(lfs, prevdir.m.pair, &newcwd); if (err) { - LFS_TRACE("lfs_rename -> %d", err); return err; } err = lfs_dir_drop(lfs, &newcwd, &prevdir.m); if (err) { - LFS_TRACE("lfs_rename -> %d", err); return err; } } - LFS_TRACE("lfs_rename -> %d", 0); return 0; } static lfs_ssize_t lfs_getattrraw(lfs_t *lfs, const char *path, uint8_t type, void *buffer, lfs_size_t size) { - LFS_TRACE("lfs_getattr(%p, \"%s\", %"PRIu8", %p, %"PRIu32")", - (void*)lfs, path, type, buffer, size); lfs_mdir_t cwd; lfs_stag_t tag = lfs_dir_find(lfs, &cwd, &path, NULL); if (tag < 0) { - LFS_TRACE("lfs_getattr -> %"PRId32, tag); return tag; } @@ -3406,7 +3274,6 @@ static lfs_ssize_t lfs_getattrraw(lfs_t *lfs, const char *path, id = 0; int err = lfs_dir_fetch(lfs, &cwd, lfs->root); if (err) { - LFS_TRACE("lfs_getattr -> %d", err); return err; } } @@ -3417,17 +3284,13 @@ static lfs_ssize_t lfs_getattrraw(lfs_t *lfs, const char *path, buffer); if (tag < 0) { if (tag == LFS_ERR_NOENT) { - LFS_TRACE("lfs_getattr -> %d", LFS_ERR_NOATTR); return LFS_ERR_NOATTR; } - LFS_TRACE("lfs_getattr -> %"PRId32, tag); return tag; } - size = lfs_tag_size(tag); - LFS_TRACE("lfs_getattr -> %"PRId32, size); - return size; + return lfs_tag_size(tag); } static int lfs_commitattr(lfs_t *lfs, const char *path, @@ -3454,23 +3317,15 @@ static int lfs_commitattr(lfs_t *lfs, const char *path, static int lfs_setattrraw(lfs_t *lfs, const char *path, uint8_t type, const void *buffer, lfs_size_t size) { - LFS_TRACE("lfs_setattr(%p, \"%s\", %"PRIu8", %p, %"PRIu32")", - (void*)lfs, path, type, buffer, size); if (size > lfs->attr_max) { - LFS_TRACE("lfs_setattr -> %d", LFS_ERR_NOSPC); return LFS_ERR_NOSPC; } - int err = lfs_commitattr(lfs, path, type, buffer, size); - LFS_TRACE("lfs_setattr -> %d", err); - return err; + return lfs_commitattr(lfs, path, type, buffer, size); } static int lfs_removeattrraw(lfs_t *lfs, const char *path, uint8_t type) { - LFS_TRACE("lfs_removeattr(%p, \"%s\", %"PRIu8")", (void*)lfs, path, type); - int err = lfs_commitattr(lfs, path, type, NULL, 0x3ff); - LFS_TRACE("lfs_removeattr -> %d", err); - return err; + return lfs_commitattr(lfs, path, type, NULL, 0x3ff); } @@ -3600,27 +3455,10 @@ static int lfs_deinit(lfs_t *lfs) { } static int lfs_formatraw(lfs_t *lfs, const struct lfs_config *cfg) { - LFS_TRACE("lfs_format(%p, %p {.context=%p, " - ".read=%p, .prog=%p, .erase=%p, .sync=%p, " - ".read_size=%"PRIu32", .prog_size=%"PRIu32", " - ".block_size=%"PRIu32", .block_count=%"PRIu32", " - ".block_cycles=%"PRIu32", .cache_size=%"PRIu32", " - ".lookahead_size=%"PRIu32", .read_buffer=%p, " - ".prog_buffer=%p, .lookahead_buffer=%p, " - ".name_max=%"PRIu32", .file_max=%"PRIu32", " - ".attr_max=%"PRIu32"})", - (void*)lfs, (void*)cfg, cfg->context, - (void*)(uintptr_t)cfg->read, (void*)(uintptr_t)cfg->prog, - (void*)(uintptr_t)cfg->erase, (void*)(uintptr_t)cfg->sync, - cfg->read_size, cfg->prog_size, cfg->block_size, cfg->block_count, - cfg->block_cycles, cfg->cache_size, cfg->lookahead_size, - cfg->read_buffer, cfg->prog_buffer, cfg->lookahead_buffer, - cfg->name_max, cfg->file_max, cfg->attr_max); int err = 0; { err = lfs_init(lfs, cfg); if (err) { - LFS_TRACE("lfs_format -> %d", err); return err; } @@ -3676,30 +3514,12 @@ static int lfs_formatraw(lfs_t *lfs, const struct lfs_config *cfg) { cleanup: lfs_deinit(lfs); - LFS_TRACE("lfs_format -> %d", err); return err; } static int lfs_mountraw(lfs_t *lfs, const struct lfs_config *cfg) { - LFS_TRACE("lfs_mount(%p, %p {.context=%p, " - ".read=%p, .prog=%p, .erase=%p, .sync=%p, " - ".read_size=%"PRIu32", .prog_size=%"PRIu32", " - ".block_size=%"PRIu32", .block_count=%"PRIu32", " - ".block_cycles=%"PRIu32", .cache_size=%"PRIu32", " - ".lookahead_size=%"PRIu32", .read_buffer=%p, " - ".prog_buffer=%p, .lookahead_buffer=%p, " - ".name_max=%"PRIu32", .file_max=%"PRIu32", " - ".attr_max=%"PRIu32"})", - (void*)lfs, (void*)cfg, cfg->context, - (void*)(uintptr_t)cfg->read, (void*)(uintptr_t)cfg->prog, - (void*)(uintptr_t)cfg->erase, (void*)(uintptr_t)cfg->sync, - cfg->read_size, cfg->prog_size, cfg->block_size, cfg->block_count, - cfg->block_cycles, cfg->cache_size, cfg->lookahead_size, - cfg->read_buffer, cfg->prog_buffer, cfg->lookahead_buffer, - cfg->name_max, cfg->file_max, cfg->attr_max); int err = lfs_init(lfs, cfg); if (err) { - LFS_TRACE("lfs_mount -> %d", err); return err; } @@ -3815,20 +3635,15 @@ static int lfs_mountraw(lfs_t *lfs, const struct lfs_config *cfg) { // setup free lookahead lfs_alloc_reset(lfs); - LFS_TRACE("lfs_mount -> %d", 0); return 0; cleanup: lfs_unmountraw(lfs); - LFS_TRACE("lfs_mount -> %d", err); return err; } static int lfs_unmountraw(lfs_t *lfs) { - LFS_TRACE("lfs_unmount(%p)", (void*)lfs); - int err = lfs_deinit(lfs); - LFS_TRACE("lfs_unmount -> %d", err); - return err; + return lfs_deinit(lfs); } @@ -4242,15 +4057,12 @@ static int lfs_fs_size_count(void *p, lfs_block_t block) { } static lfs_ssize_t lfs_fs_sizeraw(lfs_t *lfs) { - LFS_TRACE("lfs_fs_size(%p)", (void*)lfs); lfs_size_t size = 0; int err = lfs_fs_traverseraw(lfs, lfs_fs_size_count, &size, false); if (err) { - LFS_TRACE("lfs_fs_size -> %d", err); return err; } - LFS_TRACE("lfs_fs_size -> %d", err); return size; } @@ -4676,26 +4488,9 @@ static int lfs1_unmount(lfs_t *lfs) { /// v1 migration /// static int lfs_migrateraw(lfs_t *lfs, const struct lfs_config *cfg) { - LFS_TRACE("lfs_migrate(%p, %p {.context=%p, " - ".read=%p, .prog=%p, .erase=%p, .sync=%p, " - ".read_size=%"PRIu32", .prog_size=%"PRIu32", " - ".block_size=%"PRIu32", .block_count=%"PRIu32", " - ".block_cycles=%"PRIu32", .cache_size=%"PRIu32", " - ".lookahead_size=%"PRIu32", .read_buffer=%p, " - ".prog_buffer=%p, .lookahead_buffer=%p, " - ".name_max=%"PRIu32", .file_max=%"PRIu32", " - ".attr_max=%"PRIu32"})", - (void*)lfs, (void*)cfg, cfg->context, - (void*)(uintptr_t)cfg->read, (void*)(uintptr_t)cfg->prog, - (void*)(uintptr_t)cfg->erase, (void*)(uintptr_t)cfg->sync, - cfg->read_size, cfg->prog_size, cfg->block_size, cfg->block_count, - cfg->block_cycles, cfg->cache_size, cfg->lookahead_size, - cfg->read_buffer, cfg->prog_buffer, cfg->lookahead_buffer, - cfg->name_max, cfg->file_max, cfg->attr_max); struct lfs1 lfs1; int err = lfs1_mount(lfs, &lfs1, cfg); if (err) { - LFS_TRACE("lfs_migrate -> %d", err); return err; } @@ -4912,7 +4707,6 @@ static int lfs_migrateraw(lfs_t *lfs, const struct lfs_config *cfg) { cleanup: lfs1_unmount(lfs); - LFS_TRACE("lfs_migrate -> %d", err); return err; } @@ -4939,7 +4733,24 @@ int lfs_format(lfs_t *lfs, const struct lfs_config *cfg) { return err; } + LFS_TRACE("lfs_format(%p, %p {.context=%p, " + ".read=%p, .prog=%p, .erase=%p, .sync=%p, " + ".read_size=%"PRIu32", .prog_size=%"PRIu32", " + ".block_size=%"PRIu32", .block_count=%"PRIu32", " + ".block_cycles=%"PRIu32", .cache_size=%"PRIu32", " + ".lookahead_size=%"PRIu32", .read_buffer=%p, " + ".prog_buffer=%p, .lookahead_buffer=%p, " + ".name_max=%"PRIu32", .file_max=%"PRIu32", " + ".attr_max=%"PRIu32"})", + (void*)lfs, (void*)cfg, cfg->context, + (void*)(uintptr_t)cfg->read, (void*)(uintptr_t)cfg->prog, + (void*)(uintptr_t)cfg->erase, (void*)(uintptr_t)cfg->sync, + cfg->read_size, cfg->prog_size, cfg->block_size, cfg->block_count, + cfg->block_cycles, cfg->cache_size, cfg->lookahead_size, + cfg->read_buffer, cfg->prog_buffer, cfg->lookahead_buffer, + cfg->name_max, cfg->file_max, cfg->attr_max); err = lfs_formatraw(lfs, cfg); + LFS_TRACE("lfs_format -> %d", err); LFS_UNLOCK(cfg); return err; @@ -4951,7 +4762,24 @@ int lfs_mount(lfs_t *lfs, const struct lfs_config *cfg) { return err; } + LFS_TRACE("lfs_mount(%p, %p {.context=%p, " + ".read=%p, .prog=%p, .erase=%p, .sync=%p, " + ".read_size=%"PRIu32", .prog_size=%"PRIu32", " + ".block_size=%"PRIu32", .block_count=%"PRIu32", " + ".block_cycles=%"PRIu32", .cache_size=%"PRIu32", " + ".lookahead_size=%"PRIu32", .read_buffer=%p, " + ".prog_buffer=%p, .lookahead_buffer=%p, " + ".name_max=%"PRIu32", .file_max=%"PRIu32", " + ".attr_max=%"PRIu32"})", + (void*)lfs, (void*)cfg, cfg->context, + (void*)(uintptr_t)cfg->read, (void*)(uintptr_t)cfg->prog, + (void*)(uintptr_t)cfg->erase, (void*)(uintptr_t)cfg->sync, + cfg->read_size, cfg->prog_size, cfg->block_size, cfg->block_count, + cfg->block_cycles, cfg->cache_size, cfg->lookahead_size, + cfg->read_buffer, cfg->prog_buffer, cfg->lookahead_buffer, + cfg->name_max, cfg->file_max, cfg->attr_max); err = lfs_mountraw(lfs, cfg); + LFS_TRACE("lfs_mount -> %d", err); LFS_UNLOCK(cfg); return err; @@ -4963,7 +4791,9 @@ int lfs_unmount(lfs_t *lfs) { return err; } + LFS_TRACE("lfs_unmount(%p)", (void*)lfs); err = lfs_unmountraw(lfs); + LFS_TRACE("lfs_unmount -> %d", err); LFS_UNLOCK(lfs->cfg); return err; @@ -4975,7 +4805,9 @@ int lfs_remove(lfs_t *lfs, const char *path) { return err; } + LFS_TRACE("lfs_remove(%p, \"%s\")", (void*)lfs, path); err = lfs_removeraw(lfs, path); + LFS_TRACE("lfs_remove -> %d", err); LFS_UNLOCK(lfs->cfg); return err; @@ -4987,7 +4819,9 @@ int lfs_rename(lfs_t *lfs, const char *oldpath, const char *newpath) { return err; } + LFS_TRACE("lfs_rename(%p, \"%s\", \"%s\")", (void*)lfs, oldpath, newpath); err = lfs_renameraw(lfs, oldpath, newpath); + LFS_TRACE("lfs_rename -> %d", err); LFS_UNLOCK(lfs->cfg); return err; @@ -4999,7 +4833,9 @@ int lfs_stat(lfs_t *lfs, const char *path, struct lfs_info *info) { return err; } + LFS_TRACE("lfs_stat(%p, \"%s\", %p)", (void*)lfs, path, (void*)info); err = lfs_statraw(lfs, path, info); + LFS_TRACE("lfs_stat -> %d", err); LFS_UNLOCK(lfs->cfg); return err; @@ -5012,10 +4848,13 @@ lfs_ssize_t lfs_getattr(lfs_t *lfs, const char *path, return err; } - err = lfs_getattrraw(lfs, path, type, buffer, size); + LFS_TRACE("lfs_getattr(%p, \"%s\", %"PRIu8", %p, %"PRIu32")", + (void*)lfs, path, type, buffer, size); + lfs_ssize_t res = lfs_getattrraw(lfs, path, type, buffer, size); + LFS_TRACE("lfs_getattr -> %"PRId32, res); LFS_UNLOCK(lfs->cfg); - return err; + return res; } int lfs_setattr(lfs_t *lfs, const char *path, @@ -5025,7 +4864,10 @@ int lfs_setattr(lfs_t *lfs, const char *path, return err; } + LFS_TRACE("lfs_setattr(%p, \"%s\", %"PRIu8", %p, %"PRIu32")", + (void*)lfs, path, type, buffer, size); err = lfs_setattrraw(lfs, path, type, buffer, size); + LFS_TRACE("lfs_setattr -> %d", err); LFS_UNLOCK(lfs->cfg); return err; @@ -5037,7 +4879,9 @@ int lfs_removeattr(lfs_t *lfs, const char *path, uint8_t type) { return err; } + LFS_TRACE("lfs_removeattr(%p, \"%s\", %"PRIu8")", (void*)lfs, path, type); err = lfs_removeattrraw(lfs, path, type); + LFS_TRACE("lfs_removeattr -> %d", err); LFS_UNLOCK(lfs->cfg); return err; @@ -5049,7 +4893,10 @@ int lfs_file_open(lfs_t *lfs, lfs_file_t *file, const char *path, int flags) { return err; } + LFS_TRACE("lfs_file_open(%p, %p, \"%s\", %x)", + (void*)lfs, (void*)file, path, flags); err = lfs_file_openraw(lfs, file, path, flags); + LFS_TRACE("lfs_file_open -> %d", err); LFS_UNLOCK(lfs->cfg); return err; @@ -5057,13 +4904,18 @@ int lfs_file_open(lfs_t *lfs, lfs_file_t *file, const char *path, int flags) { int lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file, const char *path, int flags, - const struct lfs_file_config *config) { + const struct lfs_file_config *cfg) { int err = LFS_LOCK(lfs->cfg); if (err) { return err; } - err = lfs_file_opencfgraw(lfs, file, path, flags, config); + LFS_TRACE("lfs_file_opencfg(%p, %p, \"%s\", %x, %p {" + ".buffer=%p, .attrs=%p, .attr_count=%"PRIu32"})", + (void*)lfs, (void*)file, path, flags, + (void*)cfg, cfg->buffer, (void*)cfg->attrs, cfg->attr_count); + err = lfs_file_opencfgraw(lfs, file, path, flags, cfg); + LFS_TRACE("lfs_file_opencfg -> %d", err); LFS_UNLOCK(lfs->cfg); return err; @@ -5075,7 +4927,9 @@ int lfs_file_close(lfs_t *lfs, lfs_file_t *file) { return err; } + LFS_TRACE("lfs_file_close(%p, %p)", (void*)lfs, (void*)file); err = lfs_file_closeraw(lfs, file); + LFS_TRACE("lfs_file_close -> %d", err); LFS_UNLOCK(lfs->cfg); return err; @@ -5087,7 +4941,9 @@ int lfs_file_sync(lfs_t *lfs, lfs_file_t *file) { return err; } + LFS_TRACE("lfs_file_sync(%p, %p)", (void*)lfs, (void*)file); err = lfs_file_syncraw(lfs, file); + LFS_TRACE("lfs_file_sync -> %d", err); LFS_UNLOCK(lfs->cfg); return err; @@ -5100,10 +4956,13 @@ lfs_ssize_t lfs_file_read(lfs_t *lfs, lfs_file_t *file, return err; } - err = lfs_file_readraw(lfs, file, buffer, size); + LFS_TRACE("lfs_file_read(%p, %p, %p, %"PRIu32")", + (void*)lfs, (void*)file, buffer, size); + lfs_ssize_t res = lfs_file_readraw(lfs, file, buffer, size); + LFS_TRACE("lfs_file_read -> %"PRId32, res); LFS_UNLOCK(lfs->cfg); - return err; + return res; } lfs_ssize_t lfs_file_write(lfs_t *lfs, lfs_file_t *file, @@ -5113,10 +4972,13 @@ lfs_ssize_t lfs_file_write(lfs_t *lfs, lfs_file_t *file, return err; } - err = lfs_file_writeraw(lfs, file, buffer, size); + LFS_TRACE("lfs_file_write(%p, %p, %p, %"PRIu32")", + (void*)lfs, (void*)file, buffer, size); + lfs_ssize_t res = lfs_file_writeraw(lfs, file, buffer, size); + LFS_TRACE("lfs_file_write -> %"PRId32, res); LFS_UNLOCK(lfs->cfg); - return err; + return res; } lfs_soff_t lfs_file_seek(lfs_t *lfs, lfs_file_t *file, @@ -5126,10 +4988,13 @@ lfs_soff_t lfs_file_seek(lfs_t *lfs, lfs_file_t *file, return err; } - err = lfs_file_seekraw(lfs, file, off, whence); + LFS_TRACE("lfs_file_seek(%p, %p, %"PRId32", %d)", + (void*)lfs, (void*)file, off, whence); + lfs_soff_t res = lfs_file_seekraw(lfs, file, off, whence); + LFS_TRACE("lfs_file_seek -> %"PRId32, res); LFS_UNLOCK(lfs->cfg); - return err; + return res; } int lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { @@ -5138,7 +5003,10 @@ int lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) { return err; } + LFS_TRACE("lfs_file_truncate(%p, %p, %"PRIu32")", + (void*)lfs, (void*)file, size); err = lfs_file_truncateraw(lfs, file, size); + LFS_TRACE("lfs_file_truncate -> %d", err); LFS_UNLOCK(lfs->cfg); return err; @@ -5150,10 +5018,12 @@ lfs_soff_t lfs_file_tell(lfs_t *lfs, lfs_file_t *file) { return err; } - err = lfs_file_tellraw(lfs, file); + LFS_TRACE("lfs_file_tell(%p, %p)", (void*)lfs, (void*)file); + lfs_soff_t res = lfs_file_tellraw(lfs, file); + LFS_TRACE("lfs_file_tell -> %"PRId32, res); LFS_UNLOCK(lfs->cfg); - return err; + return res; } int lfs_file_rewind(lfs_t *lfs, lfs_file_t *file) { @@ -5162,7 +5032,9 @@ int lfs_file_rewind(lfs_t *lfs, lfs_file_t *file) { return err; } + LFS_TRACE("lfs_file_rewind(%p, %p)", (void*)lfs, (void*)file); err = lfs_file_rewindraw(lfs, file); + LFS_TRACE("lfs_file_rewind -> %d", err); LFS_UNLOCK(lfs->cfg); return err; @@ -5174,10 +5046,12 @@ lfs_soff_t lfs_file_size(lfs_t *lfs, lfs_file_t *file) { return err; } - err = lfs_file_sizeraw(lfs, file); + LFS_TRACE("lfs_file_size(%p, %p)", (void*)lfs, (void*)file); + lfs_soff_t res = lfs_file_sizeraw(lfs, file); + LFS_TRACE("lfs_file_size -> %"PRId32, res); LFS_UNLOCK(lfs->cfg); - return err; + return res; } int lfs_mkdir(lfs_t *lfs, const char *path) { @@ -5186,7 +5060,9 @@ int lfs_mkdir(lfs_t *lfs, const char *path) { return err; } + LFS_TRACE("lfs_mkdir(%p, \"%s\")", (void*)lfs, path); err = lfs_mkdirraw(lfs, path); + LFS_TRACE("lfs_mkdir -> %d", err); LFS_UNLOCK(lfs->cfg); return err; @@ -5198,7 +5074,9 @@ int lfs_dir_open(lfs_t *lfs, lfs_dir_t *dir, const char *path) { return err; } + LFS_TRACE("lfs_dir_open(%p, %p, \"%s\")", (void*)lfs, (void*)dir, path); err = lfs_dir_openraw(lfs, dir, path); + LFS_TRACE("lfs_dir_open -> %d", err); LFS_UNLOCK(lfs->cfg); return err; @@ -5210,7 +5088,9 @@ int lfs_dir_close(lfs_t *lfs, lfs_dir_t *dir) { return err; } + LFS_TRACE("lfs_dir_close(%p, %p)", (void*)lfs, (void*)dir); err = lfs_dir_closeraw(lfs, dir); + LFS_TRACE("lfs_dir_close -> %d", err); LFS_UNLOCK(lfs->cfg); return err; @@ -5222,7 +5102,10 @@ int lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info) { return err; } + LFS_TRACE("lfs_dir_read(%p, %p, %p)", + (void*)lfs, (void*)dir, (void*)info); err = lfs_dir_readraw(lfs, dir, info); + LFS_TRACE("lfs_dir_read -> %d", err); LFS_UNLOCK(lfs->cfg); return err; @@ -5234,7 +5117,10 @@ int lfs_dir_seek(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off) { return err; } + LFS_TRACE("lfs_dir_seek(%p, %p, %"PRIu32")", + (void*)lfs, (void*)dir, off); err = lfs_dir_seekraw(lfs, dir, off); + LFS_TRACE("lfs_dir_seek -> %d", err); LFS_UNLOCK(lfs->cfg); return err; @@ -5246,10 +5132,12 @@ lfs_soff_t lfs_dir_tell(lfs_t *lfs, lfs_dir_t *dir) { return err; } - err = lfs_dir_tellraw(lfs, dir); + LFS_TRACE("lfs_dir_tell(%p, %p)", (void*)lfs, (void*)dir); + lfs_soff_t res = lfs_dir_tellraw(lfs, dir); + LFS_TRACE("lfs_dir_tell -> %"PRId32, res); LFS_UNLOCK(lfs->cfg); - return err; + return res; } int lfs_dir_rewind(lfs_t *lfs, lfs_dir_t *dir) { @@ -5258,7 +5146,9 @@ int lfs_dir_rewind(lfs_t *lfs, lfs_dir_t *dir) { return err; } + LFS_TRACE("lfs_dir_rewind(%p, %p)", (void*)lfs, (void*)dir); err = lfs_dir_rewindraw(lfs, dir); + LFS_TRACE("lfs_dir_rewind -> %d", err); LFS_UNLOCK(lfs->cfg); return err; @@ -5270,10 +5160,12 @@ lfs_ssize_t lfs_fs_size(lfs_t *lfs) { return err; } - err = lfs_fs_sizeraw(lfs); + LFS_TRACE("lfs_fs_size(%p)", (void*)lfs); + lfs_ssize_t res = lfs_fs_sizeraw(lfs); + LFS_TRACE("lfs_fs_size -> %"PRId32, res); LFS_UNLOCK(lfs->cfg); - return err; + return res; } int lfs_fs_traverse(lfs_t *lfs, int (*cb)(void *, lfs_block_t), void *data) { @@ -5298,7 +5190,24 @@ int lfs_migrate(lfs_t *lfs, const struct lfs_config *cfg) { return err; } + LFS_TRACE("lfs_migrate(%p, %p {.context=%p, " + ".read=%p, .prog=%p, .erase=%p, .sync=%p, " + ".read_size=%"PRIu32", .prog_size=%"PRIu32", " + ".block_size=%"PRIu32", .block_count=%"PRIu32", " + ".block_cycles=%"PRIu32", .cache_size=%"PRIu32", " + ".lookahead_size=%"PRIu32", .read_buffer=%p, " + ".prog_buffer=%p, .lookahead_buffer=%p, " + ".name_max=%"PRIu32", .file_max=%"PRIu32", " + ".attr_max=%"PRIu32"})", + (void*)lfs, (void*)cfg, cfg->context, + (void*)(uintptr_t)cfg->read, (void*)(uintptr_t)cfg->prog, + (void*)(uintptr_t)cfg->erase, (void*)(uintptr_t)cfg->sync, + cfg->read_size, cfg->prog_size, cfg->block_size, cfg->block_count, + cfg->block_cycles, cfg->cache_size, cfg->lookahead_size, + cfg->read_buffer, cfg->prog_buffer, cfg->lookahead_buffer, + cfg->name_max, cfg->file_max, cfg->attr_max); err = lfs_migrateraw(lfs, cfg); + LFS_TRACE("lfs_migrate -> %d", err); LFS_UNLOCK(cfg); return err; diff --git a/lfs.h b/lfs.h index 3fec4df6..0ac06394 100644 --- a/lfs.h +++ b/lfs.h @@ -16,6 +16,7 @@ extern "C" { #endif + /// Version info /// // Software library version @@ -657,6 +658,7 @@ int lfs_fs_traverse(lfs_t *lfs, int (*cb)(void*, lfs_block_t), void *data); int lfs_migrate(lfs_t *lfs, const struct lfs_config *cfg); #endif + #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/lfs_util.h b/lfs_util.h index d3baffdb..dbb4c5ba 100644 --- a/lfs_util.h +++ b/lfs_util.h @@ -43,6 +43,7 @@ extern "C" { #endif + // Macros, may be replaced by system specific wrappers. Arguments to these // macros must not have side-effects as the macros can be removed for a smaller // code footprint From a99a93fb2704b0a3ea6904b5676e9e13c66556ce Mon Sep 17 00:00:00 2001 From: Christopher Haster Date: Sat, 28 Nov 2020 12:41:36 -0600 Subject: [PATCH 6/6] Added thread-safe build+size reporting to CI --- .travis.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.travis.yml b/.travis.yml index 78d964a4..0d357815 100644 --- a/.travis.yml +++ b/.travis.yml @@ -208,6 +208,22 @@ jobs: script: - make test TFLAGS+="-k --valgrind" + # test compilation in thread-safe mode + - stage: test + env: + - NAME=littlefs-threadsafe + - CC="arm-linux-gnueabi-gcc --static -mthumb" + - CFLAGS="-Werror -DLFS_THREADSAFE" + if: branch !~ -prefix$ + install: + - *install-common + - sudo apt-get install + gcc-arm-linux-gnueabi + libc6-dev-armel-cross + - arm-linux-gnueabi-gcc --version + # report-size will compile littlefs and report the size + script: [*report-size] + # self-host with littlefs-fuse for fuzz test - stage: test env: