mirror of
https://github.com/eledio-devices/thirdparty-littlefs.git
synced 2025-11-01 00:38:29 +01:00
0982020fb3
This off-by-one error was caused by a slight difference between the pos argument to lfs_index_find and lfs_index_extend. When pos is on a block boundary, lfs_index_extend expects block to point before pos, as it would when writing a file linearly. But when seeking to that pos, the lfs_index_find to warm things up just supplies the block it expects pos to be in. Fixed the off-by-one error and added a test case for several of these cold seek+writes.
310 lines
10 KiB
Bash
Executable File
310 lines
10 KiB
Bash
Executable File
#!/bin/bash
|
|
set -eu
|
|
|
|
SMALLSIZE=4
|
|
MEDIUMSIZE=128
|
|
LARGESIZE=132
|
|
|
|
echo "=== Seek tests ==="
|
|
rm -rf blocks
|
|
tests/test.py << TEST
|
|
lfs_format(&lfs, &cfg) => 0;
|
|
lfs_mount(&lfs, &cfg) => 0;
|
|
lfs_mkdir(&lfs, "hello") => 0;
|
|
for (int i = 0; i < $LARGESIZE; i++) {
|
|
sprintf((char*)buffer, "hello/kitty%d", i);
|
|
lfs_file_open(&lfs, &file[0], (char*)buffer,
|
|
LFS_O_WRONLY | LFS_O_CREAT | LFS_O_APPEND) => 0;
|
|
|
|
size = strlen("kittycatcat");
|
|
memcpy(buffer, "kittycatcat", size);
|
|
for (int j = 0; j < $LARGESIZE; j++) {
|
|
lfs_file_write(&lfs, &file[0], buffer, size);
|
|
}
|
|
|
|
lfs_file_close(&lfs, &file[0]) => 0;
|
|
}
|
|
lfs_unmount(&lfs) => 0;
|
|
TEST
|
|
|
|
echo "--- Simple dir seek ---"
|
|
tests/test.py << TEST
|
|
lfs_mount(&lfs, &cfg) => 0;
|
|
lfs_dir_open(&lfs, &dir[0], "hello") => 0;
|
|
lfs_dir_read(&lfs, &dir[0], &info) => 1;
|
|
strcmp(info.name, ".") => 0;
|
|
lfs_dir_read(&lfs, &dir[0], &info) => 1;
|
|
strcmp(info.name, "..") => 0;
|
|
|
|
lfs_soff_t pos;
|
|
int i;
|
|
for (i = 0; i < $SMALLSIZE; i++) {
|
|
sprintf((char*)buffer, "kitty%d", i);
|
|
lfs_dir_read(&lfs, &dir[0], &info) => 1;
|
|
strcmp(info.name, (char*)buffer) => 0;
|
|
pos = lfs_dir_tell(&lfs, &dir[0]);
|
|
}
|
|
pos >= 0 => 1;
|
|
|
|
lfs_dir_seek(&lfs, &dir[0], pos) => 0;
|
|
sprintf((char*)buffer, "kitty%d", i);
|
|
lfs_dir_read(&lfs, &dir[0], &info) => 1;
|
|
strcmp(info.name, (char*)buffer) => 0;
|
|
|
|
lfs_dir_rewind(&lfs, &dir[0]) => 0;
|
|
sprintf((char*)buffer, "kitty%d", 0);
|
|
lfs_dir_read(&lfs, &dir[0], &info) => 1;
|
|
strcmp(info.name, ".") => 0;
|
|
lfs_dir_read(&lfs, &dir[0], &info) => 1;
|
|
strcmp(info.name, "..") => 0;
|
|
lfs_dir_read(&lfs, &dir[0], &info) => 1;
|
|
strcmp(info.name, (char*)buffer) => 0;
|
|
|
|
lfs_dir_seek(&lfs, &dir[0], pos) => 0;
|
|
sprintf((char*)buffer, "kitty%d", i);
|
|
lfs_dir_read(&lfs, &dir[0], &info) => 1;
|
|
strcmp(info.name, (char*)buffer) => 0;
|
|
|
|
lfs_dir_close(&lfs, &dir[0]) => 0;
|
|
lfs_unmount(&lfs) => 0;
|
|
TEST
|
|
|
|
echo "--- Large dir seek ---"
|
|
tests/test.py << TEST
|
|
lfs_mount(&lfs, &cfg) => 0;
|
|
lfs_dir_open(&lfs, &dir[0], "hello") => 0;
|
|
lfs_dir_read(&lfs, &dir[0], &info) => 1;
|
|
strcmp(info.name, ".") => 0;
|
|
lfs_dir_read(&lfs, &dir[0], &info) => 1;
|
|
strcmp(info.name, "..") => 0;
|
|
|
|
lfs_soff_t pos;
|
|
int i;
|
|
for (i = 0; i < $MEDIUMSIZE; i++) {
|
|
sprintf((char*)buffer, "kitty%d", i);
|
|
lfs_dir_read(&lfs, &dir[0], &info) => 1;
|
|
strcmp(info.name, (char*)buffer) => 0;
|
|
pos = lfs_dir_tell(&lfs, &dir[0]);
|
|
}
|
|
pos >= 0 => 1;
|
|
|
|
lfs_dir_seek(&lfs, &dir[0], pos) => 0;
|
|
sprintf((char*)buffer, "kitty%d", i);
|
|
lfs_dir_read(&lfs, &dir[0], &info) => 1;
|
|
strcmp(info.name, (char*)buffer) => 0;
|
|
|
|
lfs_dir_rewind(&lfs, &dir[0]) => 0;
|
|
sprintf((char*)buffer, "kitty%d", 0);
|
|
lfs_dir_read(&lfs, &dir[0], &info) => 1;
|
|
strcmp(info.name, ".") => 0;
|
|
lfs_dir_read(&lfs, &dir[0], &info) => 1;
|
|
strcmp(info.name, "..") => 0;
|
|
lfs_dir_read(&lfs, &dir[0], &info) => 1;
|
|
strcmp(info.name, (char*)buffer) => 0;
|
|
|
|
lfs_dir_seek(&lfs, &dir[0], pos) => 0;
|
|
sprintf((char*)buffer, "kitty%d", i);
|
|
lfs_dir_read(&lfs, &dir[0], &info) => 1;
|
|
strcmp(info.name, (char*)buffer) => 0;
|
|
|
|
lfs_dir_close(&lfs, &dir[0]) => 0;
|
|
lfs_unmount(&lfs) => 0;
|
|
TEST
|
|
|
|
echo "--- Simple file seek ---"
|
|
tests/test.py << TEST
|
|
lfs_mount(&lfs, &cfg) => 0;
|
|
lfs_file_open(&lfs, &file[0], "hello/kitty42", LFS_O_RDONLY) => 0;
|
|
|
|
lfs_soff_t pos;
|
|
size = strlen("kittycatcat");
|
|
for (int i = 0; i < $SMALLSIZE; i++) {
|
|
lfs_file_read(&lfs, &file[0], buffer, size) => size;
|
|
memcmp(buffer, "kittycatcat", size) => 0;
|
|
pos = lfs_file_tell(&lfs, &file[0]);
|
|
}
|
|
pos >= 0 => 1;
|
|
|
|
lfs_file_seek(&lfs, &file[0], pos, LFS_SEEK_SET) => pos;
|
|
lfs_file_read(&lfs, &file[0], buffer, size) => size;
|
|
memcmp(buffer, "kittycatcat", size) => 0;
|
|
|
|
lfs_file_rewind(&lfs, &file[0]) => 0;
|
|
lfs_file_read(&lfs, &file[0], buffer, size) => size;
|
|
memcmp(buffer, "kittycatcat", size) => 0;
|
|
|
|
lfs_file_seek(&lfs, &file[0], pos, LFS_SEEK_SET) => size;
|
|
lfs_file_read(&lfs, &file[0], buffer, size) => size;
|
|
memcmp(buffer, "kittycatcat", size) => 0;
|
|
|
|
lfs_file_seek(&lfs, &file[0], -size, LFS_SEEK_CUR) => pos+size;
|
|
lfs_file_read(&lfs, &file[0], buffer, size) => size;
|
|
memcmp(buffer, "kittycatcat", size) => 0;
|
|
|
|
lfs_file_seek(&lfs, &file[0], -size, LFS_SEEK_END) => pos+size;
|
|
lfs_file_read(&lfs, &file[0], buffer, size) => size;
|
|
memcmp(buffer, "kittycatcat", size) => 0;
|
|
|
|
lfs_size_t size = lfs_file_size(&lfs, &file[0]);
|
|
lfs_file_seek(&lfs, &file[0], 0, LFS_SEEK_CUR) => size;
|
|
|
|
lfs_file_close(&lfs, &file[0]) => 0;
|
|
lfs_unmount(&lfs) => 0;
|
|
TEST
|
|
|
|
echo "--- Large file seek ---"
|
|
tests/test.py << TEST
|
|
lfs_mount(&lfs, &cfg) => 0;
|
|
lfs_file_open(&lfs, &file[0], "hello/kitty42", LFS_O_RDONLY) => 0;
|
|
|
|
lfs_soff_t pos;
|
|
size = strlen("kittycatcat");
|
|
for (int i = 0; i < $MEDIUMSIZE; i++) {
|
|
lfs_file_read(&lfs, &file[0], buffer, size) => size;
|
|
memcmp(buffer, "kittycatcat", size) => 0;
|
|
pos = lfs_file_tell(&lfs, &file[0]);
|
|
}
|
|
pos >= 0 => 1;
|
|
|
|
lfs_file_seek(&lfs, &file[0], pos, LFS_SEEK_SET) => pos;
|
|
lfs_file_read(&lfs, &file[0], buffer, size) => size;
|
|
memcmp(buffer, "kittycatcat", size) => 0;
|
|
|
|
lfs_file_rewind(&lfs, &file[0]) => 0;
|
|
lfs_file_read(&lfs, &file[0], buffer, size) => size;
|
|
memcmp(buffer, "kittycatcat", size) => 0;
|
|
|
|
lfs_file_seek(&lfs, &file[0], pos, LFS_SEEK_SET) => size;
|
|
lfs_file_read(&lfs, &file[0], buffer, size) => size;
|
|
memcmp(buffer, "kittycatcat", size) => 0;
|
|
|
|
lfs_file_seek(&lfs, &file[0], -size, LFS_SEEK_CUR) => pos+size;
|
|
lfs_file_read(&lfs, &file[0], buffer, size) => size;
|
|
memcmp(buffer, "kittycatcat", size) => 0;
|
|
|
|
lfs_file_seek(&lfs, &file[0], -size, LFS_SEEK_END) => pos+size;
|
|
lfs_file_read(&lfs, &file[0], buffer, size) => size;
|
|
memcmp(buffer, "kittycatcat", size) => 0;
|
|
|
|
lfs_size_t size = lfs_file_size(&lfs, &file[0]);
|
|
lfs_file_seek(&lfs, &file[0], 0, LFS_SEEK_CUR) => size;
|
|
|
|
lfs_file_close(&lfs, &file[0]) => 0;
|
|
lfs_unmount(&lfs) => 0;
|
|
TEST
|
|
|
|
echo "--- Simple file seek and write ---"
|
|
tests/test.py << TEST
|
|
lfs_mount(&lfs, &cfg) => 0;
|
|
lfs_file_open(&lfs, &file[0], "hello/kitty42", LFS_O_RDWR) => 0;
|
|
|
|
lfs_soff_t pos;
|
|
size = strlen("kittycatcat");
|
|
for (int i = 0; i < $SMALLSIZE; i++) {
|
|
lfs_file_read(&lfs, &file[0], buffer, size) => size;
|
|
memcmp(buffer, "kittycatcat", size) => 0;
|
|
pos = lfs_file_tell(&lfs, &file[0]);
|
|
}
|
|
pos >= 0 => 1;
|
|
|
|
memcpy(buffer, "doggodogdog", size);
|
|
lfs_file_seek(&lfs, &file[0], pos, LFS_SEEK_SET) => pos;
|
|
lfs_file_write(&lfs, &file[0], buffer, size) => size;
|
|
|
|
lfs_file_seek(&lfs, &file[0], pos, LFS_SEEK_SET) => pos+size;
|
|
lfs_file_read(&lfs, &file[0], buffer, size) => size;
|
|
memcmp(buffer, "doggodogdog", size) => 0;
|
|
|
|
lfs_file_rewind(&lfs, &file[0]) => 0;
|
|
lfs_file_read(&lfs, &file[0], buffer, size) => size;
|
|
memcmp(buffer, "kittycatcat", size) => 0;
|
|
|
|
lfs_file_seek(&lfs, &file[0], pos, LFS_SEEK_SET) => size;
|
|
lfs_file_read(&lfs, &file[0], buffer, size) => size;
|
|
memcmp(buffer, "doggodogdog", size) => 0;
|
|
|
|
lfs_file_seek(&lfs, &file[0], -size, LFS_SEEK_END) => pos+size;
|
|
lfs_file_read(&lfs, &file[0], buffer, size) => size;
|
|
memcmp(buffer, "kittycatcat", size) => 0;
|
|
|
|
lfs_size_t size = lfs_file_size(&lfs, &file[0]);
|
|
lfs_file_seek(&lfs, &file[0], 0, LFS_SEEK_CUR) => size;
|
|
|
|
lfs_file_close(&lfs, &file[0]) => 0;
|
|
lfs_unmount(&lfs) => 0;
|
|
TEST
|
|
|
|
echo "--- Large file seek and write ---"
|
|
tests/test.py << TEST
|
|
lfs_mount(&lfs, &cfg) => 0;
|
|
lfs_file_open(&lfs, &file[0], "hello/kitty42", LFS_O_RDWR) => 0;
|
|
|
|
lfs_soff_t pos;
|
|
size = strlen("kittycatcat");
|
|
for (int i = 0; i < $MEDIUMSIZE; i++) {
|
|
lfs_file_read(&lfs, &file[0], buffer, size) => size;
|
|
if (i != $SMALLSIZE) {
|
|
memcmp(buffer, "kittycatcat", size) => 0;
|
|
}
|
|
pos = lfs_file_tell(&lfs, &file[0]);
|
|
}
|
|
pos >= 0 => 1;
|
|
|
|
memcpy(buffer, "doggodogdog", size);
|
|
lfs_file_seek(&lfs, &file[0], pos, LFS_SEEK_SET) => pos;
|
|
lfs_file_write(&lfs, &file[0], buffer, size) => size;
|
|
|
|
lfs_file_seek(&lfs, &file[0], pos, LFS_SEEK_SET) => pos+size;
|
|
lfs_file_read(&lfs, &file[0], buffer, size) => size;
|
|
memcmp(buffer, "doggodogdog", size) => 0;
|
|
|
|
lfs_file_rewind(&lfs, &file[0]) => 0;
|
|
lfs_file_read(&lfs, &file[0], buffer, size) => size;
|
|
memcmp(buffer, "kittycatcat", size) => 0;
|
|
|
|
lfs_file_seek(&lfs, &file[0], pos, LFS_SEEK_SET) => size;
|
|
lfs_file_read(&lfs, &file[0], buffer, size) => size;
|
|
memcmp(buffer, "doggodogdog", size) => 0;
|
|
|
|
lfs_file_seek(&lfs, &file[0], -size, LFS_SEEK_END) => pos+size;
|
|
lfs_file_read(&lfs, &file[0], buffer, size) => size;
|
|
memcmp(buffer, "kittycatcat", size) => 0;
|
|
|
|
lfs_size_t size = lfs_file_size(&lfs, &file[0]);
|
|
lfs_file_seek(&lfs, &file[0], 0, LFS_SEEK_CUR) => size;
|
|
|
|
lfs_file_close(&lfs, &file[0]) => 0;
|
|
lfs_unmount(&lfs) => 0;
|
|
TEST
|
|
|
|
echo "--- Boundary seek and write ---"
|
|
tests/test.py << TEST
|
|
lfs_mount(&lfs, &cfg) => 0;
|
|
lfs_file_open(&lfs, &file[0], "hello/kitty42", LFS_O_RDWR) => 0;
|
|
|
|
size = strlen("hedgehoghog");
|
|
const lfs_soff_t offsets[] = {512, 1020, 513, 1021, 511, 1019};
|
|
|
|
for (int i = 0; i < sizeof(offsets) / sizeof(offsets[0]); i++) {
|
|
lfs_soff_t off = offsets[i];
|
|
memcpy(buffer, "hedgehoghog", size);
|
|
lfs_file_seek(&lfs, &file[0], off, LFS_SEEK_SET) >= 0 => 1;
|
|
lfs_file_write(&lfs, &file[0], buffer, size) => size;
|
|
lfs_file_seek(&lfs, &file[0], off, LFS_SEEK_SET) => off+size;
|
|
lfs_file_read(&lfs, &file[0], buffer, size) => size;
|
|
memcmp(buffer, "hedgehoghog", size) => 0;
|
|
|
|
lfs_file_seek(&lfs, &file[0], 0, LFS_SEEK_SET) => off+size;
|
|
lfs_file_read(&lfs, &file[0], buffer, size) => size;
|
|
memcmp(buffer, "kittycatcat", size) => 0;
|
|
|
|
lfs_file_sync(&lfs, &file[0]) => 0;
|
|
}
|
|
|
|
lfs_file_close(&lfs, &file[0]) => 0;
|
|
lfs_unmount(&lfs) => 0;
|
|
TEST
|
|
|
|
echo "--- Results ---"
|
|
tests/stats.py
|