Skip to content

make esp_littlefs_info thread-safe, and a few corrections from upstream #54

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

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

make esp_littlefs_info thread-safe, and a few corrections from upstream #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
01819f3
multithreading problem in esp_littlefs_info
tbaust Dec 12, 2021
e25e5bf
fixed small bug
tonyrewin May 24, 2022
227964d
Update README.md
softhack007 May 26, 2022
53aed50
Merge pull request #2 from tonyrewin/master
softhack007 May 26, 2022
e33dfed
Merge pull request #1 from tbaust/master
softhack007 May 26, 2022
f92b84e
two more fixes from joltwallet/esp_littlefs
softhack007 May 26, 2022
4830f8b
revert pull request #2 from tonyrewin/master
softhack007 May 26, 2022
8789977
typo
softhack007 May 26, 2022
d7930d9
Added define so WLED can recognise the patch
softhack007 May 26, 2022
8c4bfac
support for newer IDF versions
softhack007 Jul 7, 2022
a9aa0d1
removed WLED-specific define
softhack007 Jul 7, 2022
4f22112
removed a private comment
softhack007 Jul 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/LITTLEFS.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,11 @@ LITTLEFSImpl::LITTLEFSImpl()

bool LITTLEFSImpl::exists(const char* path)
{
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 3, 0)
File f = open(path, "r", false);
#else
File f = open(path, "r");
#endif
return (f == true);
}

Expand Down
13 changes: 10 additions & 3 deletions src/esp_littlefs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,11 +182,18 @@ esp_err_t esp_littlefs_info(const char* partition_label, size_t *total_bytes, si
esp_littlefs_t *efs = NULL;

err = esp_littlefs_by_label(partition_label, &index);
if(err != ESP_OK) return false;
if(err != ESP_OK) return err;
efs = _efs[index];

if(total_bytes) *total_bytes = efs->cfg.block_size * efs->cfg.block_count;
if(used_bytes) *used_bytes = efs->cfg.block_size * lfs_fs_size(efs->fs);
sem_take(efs);
size_t total_bytes_local = efs->cfg.block_size * efs->cfg.block_count;
if(total_bytes) *total_bytes = total_bytes_local;

/* lfs_fs_size may return a size larger than the actual filesystem size.
* https://github.com/littlefs-project/littlefs/blob/9c7e232086f865cff0bb96fe753deb66431d91fd/lfs.h#L658
*/
if(used_bytes) *used_bytes = MIN(total_bytes_local, efs->cfg.block_size * lfs_fs_size(efs->fs));
sem_give(efs);

return ESP_OK;
}
Expand Down