github-mirrors/thirdparty-littlefs
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-littlefs.git synced 2025-10-31 00:32:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Generated v2 prefixes

Browse Source
This commit is contained in:
geky bot
2019-04-11 02:08:05 +00:00
parent 0907ba7813
commit 8d4fd46a4c
28 changed files with 6298 additions and 6298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -5,5 +5,5 @@
# Testing things # Testing things
blocks/ blocks/
lfs lfs2
test.c test.c

64
.travis.yml
View File

@@ -18,17 +18,17 @@ script:
- make test QUIET=1 - make test QUIET=1
# run tests with a few different configurations # run tests with a few different configurations
- make test QUIET=1 CFLAGS+="-DLFS_READ_SIZE=1 -DLFS_CACHE_SIZE=4" - make test QUIET=1 CFLAGS+="-DLFS2_READ_SIZE=1 -DLFS2_CACHE_SIZE=4"
- make test QUIET=1 CFLAGS+="-DLFS_READ_SIZE=512 -DLFS_CACHE_SIZE=512 -DLFS_BLOCK_CYCLES=16" - make test QUIET=1 CFLAGS+="-DLFS2_READ_SIZE=512 -DLFS2_CACHE_SIZE=512 -DLFS2_BLOCK_CYCLES=16"
- make test QUIET=1 CFLAGS+="-DLFS_BLOCK_COUNT=1023 -DLFS_LOOKAHEAD_SIZE=256" - make test QUIET=1 CFLAGS+="-DLFS2_BLOCK_COUNT=1023 -DLFS2_LOOKAHEAD_SIZE=256"
- make clean test QUIET=1 CFLAGS+="-DLFS_INLINE_MAX=0" - make clean test QUIET=1 CFLAGS+="-DLFS2_INLINE_MAX=0"
- make clean test QUIET=1 CFLAGS+="-DLFS_NO_INTRINSICS" - make clean test QUIET=1 CFLAGS+="-DLFS2_NO_INTRINSICS"
# compile and find the code size with the smallest configuration # compile and find the code size with the smallest configuration
- make clean size - make clean size
OBJ="$(ls lfs*.o | tr '\n' ' ')" OBJ="$(ls lfs2*.o | tr '\n' ' ')"
CFLAGS+="-DLFS_NO_ASSERT -DLFS_NO_DEBUG -DLFS_NO_WARN -DLFS_NO_ERROR" CFLAGS+="-DLFS2_NO_ASSERT -DLFS2_NO_DEBUG -DLFS2_NO_WARN -DLFS2_NO_ERROR"
| tee sizes | tee sizes
# update status if we succeeded, compare with master if possible # update status if we succeeded, compare with master if possible
@@ -120,8 +120,8 @@ jobs:
# self-host test # self-host test
- make -C littlefs-fuse - make -C littlefs-fuse
- littlefs-fuse/lfs --format /dev/loop0 - littlefs-fuse/lfs2 --format /dev/loop0
- littlefs-fuse/lfs /dev/loop0 mount - littlefs-fuse/lfs2 /dev/loop0 mount
- ls mount - ls mount
- mkdir mount/littlefs - mkdir mount/littlefs
@@ -157,8 +157,8 @@ jobs:
- make -C v2 - make -C v2
# run self-host test with v1 # run self-host test with v1
- v1/lfs --format /dev/loop0 - v1/lfs2 --format /dev/loop0
- v1/lfs /dev/loop0 mount - v1/lfs2 /dev/loop0 mount
- ls mount - ls mount
- mkdir mount/littlefs - mkdir mount/littlefs
@@ -172,8 +172,8 @@ jobs:
- cd ../.. - cd ../..
- fusermount -u mount - fusermount -u mount
- v2/lfs --migrate /dev/loop0 - v2/lfs2 --migrate /dev/loop0
- v2/lfs /dev/loop0 mount - v2/lfs2 /dev/loop0 mount
# run self-host test with v2 right where we left off # run self-host test with v2 right where we left off
- ls mount - ls mount
@@ -191,55 +191,55 @@ jobs:
- | - |
bash << 'SCRIPT' bash << 'SCRIPT'
set -ev set -ev
# Find version defined in lfs.h # Find version defined in lfs2.h
LFS_VERSION=$(grep -ox '#define LFS_VERSION .*' lfs.h | cut -d ' ' -f3) LFS2_VERSION=$(grep -ox '#define LFS2_VERSION .*' lfs2.h | cut -d ' ' -f3)
LFS_VERSION_MAJOR=$((0xffff & ($LFS_VERSION >> 16))) LFS2_VERSION_MAJOR=$((0xffff & ($LFS2_VERSION >> 16)))
LFS_VERSION_MINOR=$((0xffff & ($LFS_VERSION >> 0))) LFS2_VERSION_MINOR=$((0xffff & ($LFS2_VERSION >> 0)))
# Grab latests patch from repo tags, default to 0, needs finagling # Grab latests patch from repo tags, default to 0, needs finagling
# to get past github's pagination api # to get past github's pagination api
PREV_URL=https://api.github.com/repos/$TRAVIS_REPO_SLUG/git/refs/tags/v$LFS_VERSION_MAJOR.$LFS_VERSION_MINOR. PREV_URL=https://api.github.com/repos/$TRAVIS_REPO_SLUG/git/refs/tags/v$LFS2_VERSION_MAJOR.$LFS2_VERSION_MINOR.
PREV_URL=$(curl -u "$GEKY_BOT_RELEASES" "$PREV_URL" -I \ PREV_URL=$(curl -u "$GEKY_BOT_RELEASES" "$PREV_URL" -I \
| sed -n '/^Link/{s/.*<\(.*\)>; rel="last"/\1/;p;q0};$q1' \ | sed -n '/^Link/{s/.*<\(.*\)>; rel="last"/\1/;p;q0};$q1' \
|| echo $PREV_URL) || echo $PREV_URL)
LFS_VERSION_PATCH=$(curl -u "$GEKY_BOT_RELEASES" "$PREV_URL" \ LFS2_VERSION_PATCH=$(curl -u "$GEKY_BOT_RELEASES" "$PREV_URL" \
| jq 'map(.ref | match("\\bv.*\\..*\\.(.*)$";"g") | jq 'map(.ref | match("\\bv.*\\..*\\.(.*)$";"g")
.captures[].string | tonumber) | max + 1' \ .captures[].string | tonumber) | max + 1' \
|| echo 0) || echo 0)
# We have our new version # We have our new version
LFS_VERSION="v$LFS_VERSION_MAJOR.$LFS_VERSION_MINOR.$LFS_VERSION_PATCH" LFS2_VERSION="v$LFS2_VERSION_MAJOR.$LFS2_VERSION_MINOR.$LFS2_VERSION_PATCH"
echo "VERSION $LFS_VERSION" echo "VERSION $LFS2_VERSION"
# Check that we're the most recent commit # Check that we're the most recent commit
CURRENT_COMMIT=$(curl -f -u "$GEKY_BOT_RELEASES" \ CURRENT_COMMIT=$(curl -f -u "$GEKY_BOT_RELEASES" \
https://api.github.com/repos/$TRAVIS_REPO_SLUG/commits/master \ https://api.github.com/repos/$TRAVIS_REPO_SLUG/commits/master \
| jq -re '.sha') | jq -re '.sha')
[ "$TRAVIS_COMMIT" == "$CURRENT_COMMIT" ] || exit 0 [ "$TRAVIS_COMMIT" == "$CURRENT_COMMIT" ] || exit 0
# Create major branch # Create major branch
git branch v$LFS_VERSION_MAJOR HEAD git branch v$LFS2_VERSION_MAJOR HEAD
# Create major prefix branch # Create major prefix branch
git config user.name "geky bot" git config user.name "geky bot"
git config user.email "bot@geky.net" git config user.email "bot@geky.net"
git fetch https://github.com/$TRAVIS_REPO_SLUG.git \ git fetch https://github.com/$TRAVIS_REPO_SLUG.git \
--depth=50 v$LFS_VERSION_MAJOR-prefix || true --depth=50 v$LFS2_VERSION_MAJOR-prefix || true
./scripts/prefix.py lfs$LFS_VERSION_MAJOR ./scripts/prefix.py lfs2$LFS2_VERSION_MAJOR
git branch v$LFS_VERSION_MAJOR-prefix $( \ git branch v$LFS2_VERSION_MAJOR-prefix $( \
git commit-tree $(git write-tree) \ git commit-tree $(git write-tree) \
$(git rev-parse --verify -q FETCH_HEAD | sed -e 's/^/-p /') \ $(git rev-parse --verify -q FETCH_HEAD | sed -e 's/^/-p /') \
-p HEAD \ -p HEAD \
-m "Generated v$LFS_VERSION_MAJOR prefixes") -m "Generated v$LFS2_VERSION_MAJOR prefixes")
git reset --hard git reset --hard
# Update major version branches (vN and vN-prefix) # Update major version branches (vN and vN-prefix)
git push https://$GEKY_BOT_RELEASES@github.com/$TRAVIS_REPO_SLUG.git \ git push https://$GEKY_BOT_RELEASES@github.com/$TRAVIS_REPO_SLUG.git \
v$LFS_VERSION_MAJOR \ v$LFS2_VERSION_MAJOR \
v$LFS_VERSION_MAJOR-prefix v$LFS2_VERSION_MAJOR-prefix
# Create patch version tag (vN.N.N) # Create patch version tag (vN.N.N)
curl -f -u "$GEKY_BOT_RELEASES" -X POST \ curl -f -u "$GEKY_BOT_RELEASES" -X POST \
https://api.github.com/repos/$TRAVIS_REPO_SLUG/git/refs \ https://api.github.com/repos/$TRAVIS_REPO_SLUG/git/refs \
-d "{ -d "{
\"ref\": \"refs/tags/$LFS_VERSION\", \"ref\": \"refs/tags/$LFS2_VERSION\",
\"sha\": \"$TRAVIS_COMMIT\" \"sha\": \"$TRAVIS_COMMIT\"
}" }"
# Create minor release? # Create minor release?
[[ "$LFS_VERSION" == *.0 ]] || exit 0 [[ "$LFS2_VERSION" == *.0 ]] || exit 0
# Build release notes # Build release notes
PREV=$(git tag --sort=-v:refname -l "v*.0" | head -1) PREV=$(git tag --sort=-v:refname -l "v*.0" | head -1)
if [ ! -z "$PREV" ] if [ ! -z "$PREV" ]
@@ -253,8 +253,8 @@ jobs:
curl -f -u "$GEKY_BOT_RELEASES" -X POST \ curl -f -u "$GEKY_BOT_RELEASES" -X POST \
https://api.github.com/repos/$TRAVIS_REPO_SLUG/releases \ https://api.github.com/repos/$TRAVIS_REPO_SLUG/releases \
-d "{ -d "{
\"tag_name\": \"$LFS_VERSION\", \"tag_name\": \"$LFS2_VERSION\",
\"name\": \"${LFS_VERSION%.0}\", \"name\": \"${LFS2_VERSION%.0}\",
\"draft\": true, \"draft\": true,
\"body\": $(jq -sR '.' <<< "$CHANGES") \"body\": $(jq -sR '.' <<< "$CHANGES")
}" #" }" #"

6
Makefile
View File

@@ -1,6 +1,6 @@
TARGET = lfs.a TARGET = lfs2.a
ifneq ($(wildcard test.c main.c),) ifneq ($(wildcard test.c main.c),)
override TARGET = lfs override TARGET = lfs2
endif endif
CC ?= gcc CC ?= gcc
@@ -53,7 +53,7 @@ endif
-include $(DEP) -include $(DEP)
lfs: $(OBJ) lfs2: $(OBJ)
$(CC) $(CFLAGS) $^ $(LFLAGS) -o $@ $(CC) $(CFLAGS) $^ $(LFLAGS) -o $@
%.a: $(OBJ) %.a: $(OBJ)

40
README.md
View File

@@ -32,14 +32,14 @@ main runs. The program can be interrupted at any time without losing track
of how many times it has been booted and without corrupting the filesystem: of how many times it has been booted and without corrupting the filesystem:
``` c ``` c
#include "lfs.h" #include "lfs2.h"
// variables used by the filesystem // variables used by the filesystem
lfs_t lfs; lfs2_t lfs2;
lfs_file_t file; lfs2_file_t file;
// configuration of the filesystem is provided by this struct // configuration of the filesystem is provided by this struct
const struct lfs_config cfg = { const struct lfs2_config cfg = {
// block device operations // block device operations
.read = user_provided_block_device_read, .read = user_provided_block_device_read,
.prog = user_provided_block_device_prog, .prog = user_provided_block_device_prog,
@@ -58,30 +58,30 @@ const struct lfs_config cfg = {
// entry point // entry point
int main(void) { int main(void) {
// mount the filesystem // mount the filesystem
int err = lfs_mount(&lfs, &cfg); int err = lfs2_mount(&lfs2, &cfg);
// reformat if we can't mount the filesystem // reformat if we can't mount the filesystem
// this should only happen on the first boot // this should only happen on the first boot
if (err) { if (err) {
lfs_format(&lfs, &cfg); lfs2_format(&lfs2, &cfg);
lfs_mount(&lfs, &cfg); lfs2_mount(&lfs2, &cfg);
} }
// read current count // read current count
uint32_t boot_count = 0; uint32_t boot_count = 0;
lfs_file_open(&lfs, &file, "boot_count", LFS_O_RDWR | LFS_O_CREAT); lfs2_file_open(&lfs2, &file, "boot_count", LFS2_O_RDWR | LFS2_O_CREAT);
lfs_file_read(&lfs, &file, &boot_count, sizeof(boot_count)); lfs2_file_read(&lfs2, &file, &boot_count, sizeof(boot_count));
// update boot count // update boot count
boot_count += 1; boot_count += 1;
lfs_file_rewind(&lfs, &file); lfs2_file_rewind(&lfs2, &file);
lfs_file_write(&lfs, &file, &boot_count, sizeof(boot_count)); lfs2_file_write(&lfs2, &file, &boot_count, sizeof(boot_count));
// remember the storage is not updated until the file is closed successfully // remember the storage is not updated until the file is closed successfully
lfs_file_close(&lfs, &file); lfs2_file_close(&lfs2, &file);
// release any resources we were using // release any resources we were using
lfs_unmount(&lfs); lfs2_unmount(&lfs2);
// print the boot count // print the boot count
printf("boot_count: %d\n", boot_count); printf("boot_count: %d\n", boot_count);
@@ -91,7 +91,7 @@ int main(void) {
## Usage ## Usage
Detailed documentation (or at least as much detail as is currently available) Detailed documentation (or at least as much detail as is currently available)
can be found in the comments in [lfs.h](lfs.h). can be found in the comments in [lfs2.h](lfs2.h).
littlefs takes in a configuration structure that defines how the filesystem littlefs takes in a configuration structure that defines how the filesystem
operates. The configuration struct provides the filesystem with the block operates. The configuration struct provides the filesystem with the block
@@ -99,9 +99,9 @@ device operations and dimensions, tweakable parameters that tradeoff memory
usage for performance, and optional static buffers if the user wants to avoid usage for performance, and optional static buffers if the user wants to avoid
dynamic memory. dynamic memory.
The state of the littlefs is stored in the `lfs_t` type which is left up The state of the littlefs is stored in the `lfs2_t` type which is left up
to the user to allocate, allowing multiple filesystems to be in use to the user to allocate, allowing multiple filesystems to be in use
simultaneously. With the `lfs_t` and configuration struct, a user can simultaneously. With the `lfs2_t` and configuration struct, a user can
format a block device or mount the filesystem. format a block device or mount the filesystem.
Once mounted, the littlefs provides a full set of POSIX-like file and Once mounted, the littlefs provides a full set of POSIX-like file and
@@ -115,11 +115,11 @@ the filesystem until sync or close is called on the file.
## Other notes ## Other notes
All littlefs calls have the potential to return a negative error code. The All littlefs calls have the potential to return a negative error code. The
errors can be either one of those found in the `enum lfs_error` in errors can be either one of those found in the `enum lfs2_error` in
[lfs.h](lfs.h), or an error returned by the user's block device operations. [lfs2.h](lfs2.h), or an error returned by the user's block device operations.
In the configuration struct, the `prog` and `erase` function provided by the In the configuration struct, the `prog` and `erase` function provided by the
user may return a `LFS_ERR_CORRUPT` error if the implementation already can user may return a `LFS2_ERR_CORRUPT` error if the implementation already can
detect corrupt blocks. However, the wear leveling does not depend on the return detect corrupt blocks. However, the wear leveling does not depend on the return
code of these functions, instead all data is read back and checked for code of these functions, instead all data is read back and checked for
integrity. integrity.
@@ -188,7 +188,7 @@ More details on how littlefs works can be found in [DESIGN.md](DESIGN.md) and
## Testing ## Testing
The littlefs comes with a test suite designed to run on a PC using the The littlefs comes with a test suite designed to run on a PC using the
[emulated block device](emubd/lfs_emubd.h) found in the emubd directory. [emulated block device](emubd/lfs2_emubd.h) found in the emubd directory.
The tests assume a Linux environment and can be started with make: The tests assume a Linux environment and can be started with make:
``` bash ``` bash

34
SPEC.md
View File

@@ -253,7 +253,7 @@ Metadata tag fields:
What follows is an exhaustive list of metadata in littlefs. What follows is an exhaustive list of metadata in littlefs.
--- ---
#### `0x401` LFS_TYPE_CREATE #### `0x401` LFS2_TYPE_CREATE
Creates a new file with this id. Note that files in a metadata block Creates a new file with this id. Note that files in a metadata block
don't necessarily need a create tag. All a create does is move over any don't necessarily need a create tag. All a create does is move over any
@@ -264,14 +264,14 @@ The create and delete tags allow littlefs to keep files in a directory
ordered alphabetically by filename. ordered alphabetically by filename.
--- ---
#### `0x4ff` LFS_TYPE_DELETE #### `0x4ff` LFS2_TYPE_DELETE
Deletes the file with this id. An inverse to create, this tag moves over Deletes the file with this id. An inverse to create, this tag moves over
any files neighboring this id similar to a deletion from an imaginary any files neighboring this id similar to a deletion from an imaginary
array of files. array of files.
--- ---
#### `0x0xx` LFS_TYPE_NAME #### `0x0xx` LFS2_TYPE_NAME
Associates the id with a file name and file type. Associates the id with a file name and file type.
@@ -304,14 +304,14 @@ Name fields:
2. **file name** - File name stored as an ASCII string. 2. **file name** - File name stored as an ASCII string.
--- ---
#### `0x001` LFS_TYPE_REG #### `0x001` LFS2_TYPE_REG
Initializes the id + name as a regular file. Initializes the id + name as a regular file.
How each file is stored depends on its struct tag, which is described below. How each file is stored depends on its struct tag, which is described below.
--- ---
#### `0x002` LFS_TYPE_DIR #### `0x002` LFS2_TYPE_DIR
Initializes the id + name as a directory. Initializes the id + name as a directory.
@@ -320,7 +320,7 @@ each pair containing any number of files in alphabetical order. A pointer to
the directory is stored in the struct tag, which is described below. the directory is stored in the struct tag, which is described below.
--- ---
#### `0x0ff` LFS_TYPE_SUPERBLOCK #### `0x0ff` LFS2_TYPE_SUPERBLOCK
Initializes the id as a superblock entry. Initializes the id as a superblock entry.
@@ -405,7 +405,7 @@ as be the first entry written to the block. This means that the superblock
entry can be read from a device using offsets alone. entry can be read from a device using offsets alone.
--- ---
#### `0x2xx` LFS_TYPE_STRUCT #### `0x2xx` LFS2_TYPE_STRUCT
Associates the id with an on-disk data structure. Associates the id with an on-disk data structure.
@@ -416,7 +416,7 @@ Any type of struct supersedes all other structs associated with the id. For
example, appending a ctz-struct replaces an inline-struct on the same file. example, appending a ctz-struct replaces an inline-struct on the same file.
--- ---
#### `0x200` LFS_TYPE_DIRSTRUCT #### `0x200` LFS2_TYPE_DIRSTRUCT
Gives the id a directory data structure. Gives the id a directory data structure.
@@ -458,7 +458,7 @@ Dir-struct fields:
in the directory. in the directory.
--- ---
#### `0x201` LFS_TYPE_INLINESTRUCT #### `0x201` LFS2_TYPE_INLINESTRUCT
Gives the id an inline data structure. Gives the id an inline data structure.
@@ -482,7 +482,7 @@ Inline-struct fields:
1. **Inline data** - File data stored directly in the metadata-pair. 1. **Inline data** - File data stored directly in the metadata-pair.
--- ---
#### `0x202` LFS_TYPE_CTZSTRUCT #### `0x202` LFS2_TYPE_CTZSTRUCT
Gives the id a CTZ skip-list data structure. Gives the id a CTZ skip-list data structure.
@@ -537,7 +537,7 @@ CTZ-struct fields:
2. **File size (32-bits)** - Size of the file in bytes. 2. **File size (32-bits)** - Size of the file in bytes.
--- ---
#### `0x3xx` LFS_TYPE_USERATTR #### `0x3xx` LFS2_TYPE_USERATTR
Attaches a user attribute to an id. Attaches a user attribute to an id.
@@ -571,7 +571,7 @@ User-attr fields:
2. **Attr data** - The data associated with the user attribute. 2. **Attr data** - The data associated with the user attribute.
--- ---
#### `0x6xx` LFS_TYPE_TAIL #### `0x6xx` LFS2_TYPE_TAIL
Provides the tail pointer for the metadata pair itself. Provides the tail pointer for the metadata pair itself.
@@ -637,7 +637,7 @@ Tail fields:
2. **Metadata pair (8-bytes)** - Pointer to the next metadata-pair. 2. **Metadata pair (8-bytes)** - Pointer to the next metadata-pair.
--- ---
#### `0x600` LFS_TYPE_SOFTTAIL #### `0x600` LFS2_TYPE_SOFTTAIL
Provides a tail pointer that points to the next metadata pair in the Provides a tail pointer that points to the next metadata pair in the
filesystem. filesystem.
@@ -646,7 +646,7 @@ In this case, the next metadata pair is not a part of our current directory
and should only be followed when traversing the entire filesystem. and should only be followed when traversing the entire filesystem.
--- ---
#### `0x601` LFS_TYPE_HARDTAIL #### `0x601` LFS2_TYPE_HARDTAIL
Provides a tail pointer that points to the next metadata pair in the Provides a tail pointer that points to the next metadata pair in the
directory. directory.
@@ -657,7 +657,7 @@ metadata pair should only contain filenames greater than any filename in the
current pair. current pair.
--- ---
#### `0x7xx` LFS_TYPE_GSTATE #### `0x7xx` LFS2_TYPE_GSTATE
Provides delta bits for global state entries. Provides delta bits for global state entries.
@@ -687,7 +687,7 @@ is stored in the chunk field. Currently, the only global state is move state,
which is outlined below. which is outlined below.
--- ---
#### `0x7ff` LFS_TYPE_MOVESTATE #### `0x7ff` LFS2_TYPE_MOVESTATE
Provides delta bits for the global move state. Provides delta bits for the global move state.
@@ -740,7 +740,7 @@ Move state fields:
the move. the move.
--- ---
#### `0x5xx` LFS_TYPE_CRC #### `0x5xx` LFS2_TYPE_CRC
Last but not least, the CRC tag marks the end of a commit and provides a Last but not least, the CRC tag marks the end of a commit and provides a
checksum for any commits to the metadata block. checksum for any commits to the metadata block.

104
emubd/lfs_emubd.c → emubd/lfs2_emubd.c
View File

@@ -4,7 +4,7 @@
* Copyright (c) 2017, Arm Limited. All rights reserved. * Copyright (c) 2017, Arm Limited. All rights reserved.
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#include "emubd/lfs_emubd.h" #include "emubd/lfs2_emubd.h"
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
@@ -20,42 +20,42 @@
// Emulated block device utils // Emulated block device utils
static inline void lfs_emubd_tole32(lfs_emubd_t *emu) { static inline void lfs2_emubd_tole32(lfs2_emubd_t *emu) {
emu->cfg.read_size = lfs_tole32(emu->cfg.read_size); emu->cfg.read_size = lfs2_tole32(emu->cfg.read_size);
emu->cfg.prog_size = lfs_tole32(emu->cfg.prog_size); emu->cfg.prog_size = lfs2_tole32(emu->cfg.prog_size);
emu->cfg.block_size = lfs_tole32(emu->cfg.block_size); emu->cfg.block_size = lfs2_tole32(emu->cfg.block_size);
emu->cfg.block_count = lfs_tole32(emu->cfg.block_count); emu->cfg.block_count = lfs2_tole32(emu->cfg.block_count);
emu->stats.read_count = lfs_tole32(emu->stats.read_count); emu->stats.read_count = lfs2_tole32(emu->stats.read_count);
emu->stats.prog_count = lfs_tole32(emu->stats.prog_count); emu->stats.prog_count = lfs2_tole32(emu->stats.prog_count);
emu->stats.erase_count = lfs_tole32(emu->stats.erase_count); emu->stats.erase_count = lfs2_tole32(emu->stats.erase_count);
for (unsigned i = 0; i < sizeof(emu->history.blocks) / for (unsigned i = 0; i < sizeof(emu->history.blocks) /
sizeof(emu->history.blocks[0]); i++) { sizeof(emu->history.blocks[0]); i++) {
emu->history.blocks[i] = lfs_tole32(emu->history.blocks[i]); emu->history.blocks[i] = lfs2_tole32(emu->history.blocks[i]);
} }
} }
static inline void lfs_emubd_fromle32(lfs_emubd_t *emu) { static inline void lfs2_emubd_fromle32(lfs2_emubd_t *emu) {
emu->cfg.read_size = lfs_fromle32(emu->cfg.read_size); emu->cfg.read_size = lfs2_fromle32(emu->cfg.read_size);
emu->cfg.prog_size = lfs_fromle32(emu->cfg.prog_size); emu->cfg.prog_size = lfs2_fromle32(emu->cfg.prog_size);
emu->cfg.block_size = lfs_fromle32(emu->cfg.block_size); emu->cfg.block_size = lfs2_fromle32(emu->cfg.block_size);
emu->cfg.block_count = lfs_fromle32(emu->cfg.block_count); emu->cfg.block_count = lfs2_fromle32(emu->cfg.block_count);
emu->stats.read_count = lfs_fromle32(emu->stats.read_count); emu->stats.read_count = lfs2_fromle32(emu->stats.read_count);
emu->stats.prog_count = lfs_fromle32(emu->stats.prog_count); emu->stats.prog_count = lfs2_fromle32(emu->stats.prog_count);
emu->stats.erase_count = lfs_fromle32(emu->stats.erase_count); emu->stats.erase_count = lfs2_fromle32(emu->stats.erase_count);
for (unsigned i = 0; i < sizeof(emu->history.blocks) / for (unsigned i = 0; i < sizeof(emu->history.blocks) /
sizeof(emu->history.blocks[0]); i++) { sizeof(emu->history.blocks[0]); i++) {
emu->history.blocks[i] = lfs_fromle32(emu->history.blocks[i]); emu->history.blocks[i] = lfs2_fromle32(emu->history.blocks[i]);
} }
} }
// Block device emulated on existing filesystem // Block device emulated on existing filesystem
int lfs_emubd_create(const struct lfs_config *cfg, const char *path) { int lfs2_emubd_create(const struct lfs2_config *cfg, const char *path) {
lfs_emubd_t *emu = cfg->context; lfs2_emubd_t *emu = cfg->context;
emu->cfg.read_size = cfg->read_size; emu->cfg.read_size = cfg->read_size;
emu->cfg.prog_size = cfg->prog_size; emu->cfg.prog_size = cfg->prog_size;
emu->cfg.block_size = cfg->block_size; emu->cfg.block_size = cfg->block_size;
@@ -63,7 +63,7 @@ int lfs_emubd_create(const struct lfs_config *cfg, const char *path) {
// Allocate buffer for creating children files // Allocate buffer for creating children files
size_t pathlen = strlen(path); size_t pathlen = strlen(path);
emu->path = malloc(pathlen + 1 + LFS_NAME_MAX + 1); emu->path = malloc(pathlen + 1 + LFS2_NAME_MAX + 1);
if (!emu->path) { if (!emu->path) {
return -ENOMEM; return -ENOMEM;
} }
@@ -71,7 +71,7 @@ int lfs_emubd_create(const struct lfs_config *cfg, const char *path) {
strcpy(emu->path, path); strcpy(emu->path, path);
emu->path[pathlen] = '/'; emu->path[pathlen] = '/';
emu->child = &emu->path[pathlen+1]; emu->child = &emu->path[pathlen+1];
memset(emu->child, '\0', LFS_NAME_MAX+1); memset(emu->child, '\0', LFS2_NAME_MAX+1);
// Create directory if it doesn't exist // Create directory if it doesn't exist
int err = mkdir(path, 0777); int err = mkdir(path, 0777);
@@ -80,13 +80,13 @@ int lfs_emubd_create(const struct lfs_config *cfg, const char *path) {
} }
// Load stats to continue incrementing // Load stats to continue incrementing
snprintf(emu->child, LFS_NAME_MAX, ".stats"); snprintf(emu->child, LFS2_NAME_MAX, ".stats");
FILE *f = fopen(emu->path, "r"); FILE *f = fopen(emu->path, "r");
if (!f) { if (!f) {
memset(&emu->stats, 0, sizeof(emu->stats)); memset(&emu->stats, 0, sizeof(emu->stats));
} else { } else {
size_t res = fread(&emu->stats, sizeof(emu->stats), 1, f); size_t res = fread(&emu->stats, sizeof(emu->stats), 1, f);
lfs_emubd_fromle32(emu); lfs2_emubd_fromle32(emu);
if (res < 1) { if (res < 1) {
return -errno; return -errno;
} }
@@ -98,13 +98,13 @@ int lfs_emubd_create(const struct lfs_config *cfg, const char *path) {
} }
// Load history // Load history
snprintf(emu->child, LFS_NAME_MAX, ".history"); snprintf(emu->child, LFS2_NAME_MAX, ".history");
f = fopen(emu->path, "r"); f = fopen(emu->path, "r");
if (!f) { if (!f) {
memset(&emu->history, 0, sizeof(emu->history)); memset(&emu->history, 0, sizeof(emu->history));
} else { } else {
size_t res = fread(&emu->history, sizeof(emu->history), 1, f); size_t res = fread(&emu->history, sizeof(emu->history), 1, f);
lfs_emubd_fromle32(emu); lfs2_emubd_fromle32(emu);
if (res < 1) { if (res < 1) {
return -errno; return -errno;
} }
@@ -118,16 +118,16 @@ int lfs_emubd_create(const struct lfs_config *cfg, const char *path) {
return 0; return 0;
} }
void lfs_emubd_destroy(const struct lfs_config *cfg) { void lfs2_emubd_destroy(const struct lfs2_config *cfg) {
lfs_emubd_sync(cfg); lfs2_emubd_sync(cfg);
lfs_emubd_t *emu = cfg->context; lfs2_emubd_t *emu = cfg->context;
free(emu->path); free(emu->path);
} }
int lfs_emubd_read(const struct lfs_config *cfg, lfs_block_t block, int lfs2_emubd_read(const struct lfs2_config *cfg, lfs2_block_t block,
lfs_off_t off, void *buffer, lfs_size_t size) { lfs2_off_t off, void *buffer, lfs2_size_t size) {
lfs_emubd_t *emu = cfg->context; lfs2_emubd_t *emu = cfg->context;
uint8_t *data = buffer; uint8_t *data = buffer;
// Check if read is valid // Check if read is valid
@@ -139,7 +139,7 @@ int lfs_emubd_read(const struct lfs_config *cfg, lfs_block_t block,
memset(data, 0, size); memset(data, 0, size);
// Read data // Read data
snprintf(emu->child, LFS_NAME_MAX, "%" PRIx32, block); snprintf(emu->child, LFS2_NAME_MAX, "%" PRIx32, block);
FILE *f = fopen(emu->path, "rb"); FILE *f = fopen(emu->path, "rb");
if (!f && errno != ENOENT) { if (!f && errno != ENOENT) {
@@ -167,9 +167,9 @@ int lfs_emubd_read(const struct lfs_config *cfg, lfs_block_t block,
return 0; return 0;
} }
int lfs_emubd_prog(const struct lfs_config *cfg, lfs_block_t block, int lfs2_emubd_prog(const struct lfs2_config *cfg, lfs2_block_t block,
lfs_off_t off, const void *buffer, lfs_size_t size) { lfs2_off_t off, const void *buffer, lfs2_size_t size) {
lfs_emubd_t *emu = cfg->context; lfs2_emubd_t *emu = cfg->context;
const uint8_t *data = buffer; const uint8_t *data = buffer;
// Check if write is valid // Check if write is valid
@@ -178,7 +178,7 @@ int lfs_emubd_prog(const struct lfs_config *cfg, lfs_block_t block,
assert(block < cfg->block_count); assert(block < cfg->block_count);
// Program data // Program data
snprintf(emu->child, LFS_NAME_MAX, "%" PRIx32, block); snprintf(emu->child, LFS2_NAME_MAX, "%" PRIx32, block);
FILE *f = fopen(emu->path, "r+b"); FILE *f = fopen(emu->path, "r+b");
if (!f) { if (!f) {
@@ -225,14 +225,14 @@ int lfs_emubd_prog(const struct lfs_config *cfg, lfs_block_t block,
return 0; return 0;
} }
int lfs_emubd_erase(const struct lfs_config *cfg, lfs_block_t block) { int lfs2_emubd_erase(const struct lfs2_config *cfg, lfs2_block_t block) {
lfs_emubd_t *emu = cfg->context; lfs2_emubd_t *emu = cfg->context;
// Check if erase is valid // Check if erase is valid
assert(block < cfg->block_count); assert(block < cfg->block_count);
// Erase the block // Erase the block
snprintf(emu->child, LFS_NAME_MAX, "%" PRIx32, block); snprintf(emu->child, LFS2_NAME_MAX, "%" PRIx32, block);
struct stat st; struct stat st;
int err = stat(emu->path, &st); int err = stat(emu->path, &st);
if (err && errno != ENOENT) { if (err && errno != ENOENT) {
@@ -262,19 +262,19 @@ int lfs_emubd_erase(const struct lfs_config *cfg, lfs_block_t block) {
return 0; return 0;
} }
int lfs_emubd_sync(const struct lfs_config *cfg) { int lfs2_emubd_sync(const struct lfs2_config *cfg) {
lfs_emubd_t *emu = cfg->context; lfs2_emubd_t *emu = cfg->context;
// Just write out info/stats for later lookup // Just write out info/stats for later lookup
snprintf(emu->child, LFS_NAME_MAX, ".config"); snprintf(emu->child, LFS2_NAME_MAX, ".config");
FILE *f = fopen(emu->path, "w"); FILE *f = fopen(emu->path, "w");
if (!f) { if (!f) {
return -errno; return -errno;
} }
lfs_emubd_tole32(emu); lfs2_emubd_tole32(emu);
size_t res = fwrite(&emu->cfg, sizeof(emu->cfg), 1, f); size_t res = fwrite(&emu->cfg, sizeof(emu->cfg), 1, f);
lfs_emubd_fromle32(emu); lfs2_emubd_fromle32(emu);
if (res < 1) { if (res < 1) {
return -errno; return -errno;
} }
@@ -284,15 +284,15 @@ int lfs_emubd_sync(const struct lfs_config *cfg) {
return -errno; return -errno;
} }
snprintf(emu->child, LFS_NAME_MAX, ".stats"); snprintf(emu->child, LFS2_NAME_MAX, ".stats");
f = fopen(emu->path, "w"); f = fopen(emu->path, "w");
if (!f) { if (!f) {
return -errno; return -errno;
} }
lfs_emubd_tole32(emu); lfs2_emubd_tole32(emu);
res = fwrite(&emu->stats, sizeof(emu->stats), 1, f); res = fwrite(&emu->stats, sizeof(emu->stats), 1, f);
lfs_emubd_fromle32(emu); lfs2_emubd_fromle32(emu);
if (res < 1) { if (res < 1) {
return -errno; return -errno;
} }
@@ -302,15 +302,15 @@ int lfs_emubd_sync(const struct lfs_config *cfg) {
return -errno; return -errno;
} }
snprintf(emu->child, LFS_NAME_MAX, ".history"); snprintf(emu->child, LFS2_NAME_MAX, ".history");
f = fopen(emu->path, "w"); f = fopen(emu->path, "w");
if (!f) { if (!f) {
return -errno; return -errno;
} }
lfs_emubd_tole32(emu); lfs2_emubd_tole32(emu);
res = fwrite(&emu->history, sizeof(emu->history), 1, f); res = fwrite(&emu->history, sizeof(emu->history), 1, f);
lfs_emubd_fromle32(emu); lfs2_emubd_fromle32(emu);
if (res < 1) { if (res < 1) {
return -errno; return -errno;
} }

46
emubd/lfs_emubd.h → emubd/lfs2_emubd.h
View File

@@ -4,11 +4,11 @@
* Copyright (c) 2017, Arm Limited. All rights reserved. * Copyright (c) 2017, Arm Limited. All rights reserved.
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#ifndef LFS_EMUBD_H #ifndef LFS2_EMUBD_H
#define LFS_EMUBD_H #define LFS2_EMUBD_H
#include "lfs.h" #include "lfs2.h"
#include "lfs_util.h" #include "lfs2_util.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
@@ -17,25 +17,25 @@ extern "C"
// Config options // Config options
#ifndef LFS_EMUBD_READ_SIZE #ifndef LFS2_EMUBD_READ_SIZE
#define LFS_EMUBD_READ_SIZE 1 #define LFS2_EMUBD_READ_SIZE 1
#endif #endif
#ifndef LFS_EMUBD_PROG_SIZE #ifndef LFS2_EMUBD_PROG_SIZE
#define LFS_EMUBD_PROG_SIZE 1 #define LFS2_EMUBD_PROG_SIZE 1
#endif #endif
#ifndef LFS_EMUBD_ERASE_SIZE #ifndef LFS2_EMUBD_ERASE_SIZE
#define LFS_EMUBD_ERASE_SIZE 512 #define LFS2_EMUBD_ERASE_SIZE 512
#endif #endif
#ifndef LFS_EMUBD_TOTAL_SIZE #ifndef LFS2_EMUBD_TOTAL_SIZE
#define LFS_EMUBD_TOTAL_SIZE 524288 #define LFS2_EMUBD_TOTAL_SIZE 524288
#endif #endif
// The emu bd state // The emu bd state
typedef struct lfs_emubd { typedef struct lfs2_emubd {
char *path; char *path;
char *child; char *child;
@@ -46,7 +46,7 @@ typedef struct lfs_emubd {
} stats; } stats;
struct { struct {
lfs_block_t blocks[4]; lfs2_block_t blocks[4];
} history; } history;
struct { struct {
@@ -55,33 +55,33 @@ typedef struct lfs_emubd {
uint32_t block_size; uint32_t block_size;
uint32_t block_count; uint32_t block_count;
} cfg; } cfg;
} lfs_emubd_t; } lfs2_emubd_t;
// Create a block device using path for the directory to store blocks // Create a block device using path for the directory to store blocks
int lfs_emubd_create(const struct lfs_config *cfg, const char *path); int lfs2_emubd_create(const struct lfs2_config *cfg, const char *path);
// Clean up memory associated with emu block device // Clean up memory associated with emu block device
void lfs_emubd_destroy(const struct lfs_config *cfg); void lfs2_emubd_destroy(const struct lfs2_config *cfg);
// Read a block // Read a block
int lfs_emubd_read(const struct lfs_config *cfg, lfs_block_t block, int lfs2_emubd_read(const struct lfs2_config *cfg, lfs2_block_t block,
lfs_off_t off, void *buffer, lfs_size_t size); lfs2_off_t off, void *buffer, lfs2_size_t size);
// Program a block // Program a block
// //
// The block must have previously been erased. // The block must have previously been erased.
int lfs_emubd_prog(const struct lfs_config *cfg, lfs_block_t block, int lfs2_emubd_prog(const struct lfs2_config *cfg, lfs2_block_t block,
lfs_off_t off, const void *buffer, lfs_size_t size); lfs2_off_t off, const void *buffer, lfs2_size_t size);
// Erase a block // Erase a block
// //
// A block must be erased before being programmed. The // A block must be erased before being programmed. The
// state of an erased block is undefined. // state of an erased block is undefined.
int lfs_emubd_erase(const struct lfs_config *cfg, lfs_block_t block); int lfs2_emubd_erase(const struct lfs2_config *cfg, lfs2_block_t block);
// Sync the block device // Sync the block device
int lfs_emubd_sync(const struct lfs_config *cfg); int lfs2_emubd_sync(const struct lfs2_config *cfg);
#ifdef __cplusplus #ifdef __cplusplus

4459
lfs.c
View File

File diff suppressed because it is too large Load Diff

4459
lfs2.c Normal file
View File

File diff suppressed because it is too large Load Diff

440
lfs.h → lfs2.h
View File

@@ -4,8 +4,8 @@
* Copyright (c) 2017, Arm Limited. All rights reserved. * Copyright (c) 2017, Arm Limited. All rights reserved.
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#ifndef LFS_H #ifndef LFS2_H
#define LFS_H #define LFS2_H
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
@@ -21,174 +21,174 @@ extern "C"
// Software library version // Software library version
// Major (top-nibble), incremented on backwards incompatible changes // Major (top-nibble), incremented on backwards incompatible changes
// Minor (bottom-nibble), incremented on feature additions // Minor (bottom-nibble), incremented on feature additions
#define LFS_VERSION 0x00020000 #define LFS2_VERSION 0x00020000
#define LFS_VERSION_MAJOR (0xffff & (LFS_VERSION >> 16)) #define LFS2_VERSION_MAJOR (0xffff & (LFS2_VERSION >> 16))
#define LFS_VERSION_MINOR (0xffff & (LFS_VERSION >> 0)) #define LFS2_VERSION_MINOR (0xffff & (LFS2_VERSION >> 0))
// Version of On-disk data structures // Version of On-disk data structures
// Major (top-nibble), incremented on backwards incompatible changes // Major (top-nibble), incremented on backwards incompatible changes
// Minor (bottom-nibble), incremented on feature additions // Minor (bottom-nibble), incremented on feature additions
#define LFS_DISK_VERSION 0x00020000 #define LFS2_DISK_VERSION 0x00020000
#define LFS_DISK_VERSION_MAJOR (0xffff & (LFS_DISK_VERSION >> 16)) #define LFS2_DISK_VERSION_MAJOR (0xffff & (LFS2_DISK_VERSION >> 16))
#define LFS_DISK_VERSION_MINOR (0xffff & (LFS_DISK_VERSION >> 0)) #define LFS2_DISK_VERSION_MINOR (0xffff & (LFS2_DISK_VERSION >> 0))
/// Definitions /// /// Definitions ///
// Type definitions // Type definitions
typedef uint32_t lfs_size_t; typedef uint32_t lfs2_size_t;
typedef uint32_t lfs_off_t; typedef uint32_t lfs2_off_t;
typedef int32_t lfs_ssize_t; typedef int32_t lfs2_ssize_t;
typedef int32_t lfs_soff_t; typedef int32_t lfs2_soff_t;
typedef uint32_t lfs_block_t; typedef uint32_t lfs2_block_t;
// Maximum name size in bytes, may be redefined to reduce the size of the // Maximum name size in bytes, may be redefined to reduce the size of the
// info struct. Limited to <= 1022. Stored in superblock and must be // info struct. Limited to <= 1022. Stored in superblock and must be
// respected by other littlefs drivers. // respected by other littlefs drivers.
#ifndef LFS_NAME_MAX #ifndef LFS2_NAME_MAX
#define LFS_NAME_MAX 255 #define LFS2_NAME_MAX 255
#endif #endif
// Maximum size of a file in bytes, may be redefined to limit to support other // 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 // drivers. Limited on disk to <= 4294967296. However, above 2147483647 the
// functions lfs_file_seek, lfs_file_size, and lfs_file_tell will return // functions lfs2_file_seek, lfs2_file_size, and lfs2_file_tell will return
// incorrect values due to using signed integers. Stored in superblock and // incorrect values due to using signed integers. Stored in superblock and
// must be respected by other littlefs drivers. // must be respected by other littlefs drivers.
#ifndef LFS_FILE_MAX #ifndef LFS2_FILE_MAX
#define LFS_FILE_MAX 2147483647 #define LFS2_FILE_MAX 2147483647
#endif #endif
// Maximum size of custom attributes in bytes, may be redefined, but there is // Maximum size of custom attributes in bytes, may be redefined, but there is
// no real benefit to using a smaller LFS_ATTR_MAX. Limited to <= 1022. // no real benefit to using a smaller LFS2_ATTR_MAX. Limited to <= 1022.
#ifndef LFS_ATTR_MAX #ifndef LFS2_ATTR_MAX
#define LFS_ATTR_MAX 1022 #define LFS2_ATTR_MAX 1022
#endif #endif
// Possible error codes, these are negative to allow // Possible error codes, these are negative to allow
// valid positive return values // valid positive return values
enum lfs_error { enum lfs2_error {
LFS_ERR_OK = 0, // No error LFS2_ERR_OK = 0, // No error
LFS_ERR_IO = -5, // Error during device operation LFS2_ERR_IO = -5, // Error during device operation
LFS_ERR_CORRUPT = -84, // Corrupted LFS2_ERR_CORRUPT = -84, // Corrupted
LFS_ERR_NOENT = -2, // No directory entry LFS2_ERR_NOENT = -2, // No directory entry
LFS_ERR_EXIST = -17, // Entry already exists LFS2_ERR_EXIST = -17, // Entry already exists
LFS_ERR_NOTDIR = -20, // Entry is not a dir LFS2_ERR_NOTDIR = -20, // Entry is not a dir
LFS_ERR_ISDIR = -21, // Entry is a dir LFS2_ERR_ISDIR = -21, // Entry is a dir
LFS_ERR_NOTEMPTY = -39, // Dir is not empty LFS2_ERR_NOTEMPTY = -39, // Dir is not empty
LFS_ERR_BADF = -9, // Bad file number LFS2_ERR_BADF = -9, // Bad file number
LFS_ERR_FBIG = -27, // File too large LFS2_ERR_FBIG = -27, // File too large
LFS_ERR_INVAL = -22, // Invalid parameter LFS2_ERR_INVAL = -22, // Invalid parameter
LFS_ERR_NOSPC = -28, // No space left on device LFS2_ERR_NOSPC = -28, // No space left on device
LFS_ERR_NOMEM = -12, // No more memory available LFS2_ERR_NOMEM = -12, // No more memory available
LFS_ERR_NOATTR = -61, // No data/attr available LFS2_ERR_NOATTR = -61, // No data/attr available
LFS_ERR_NAMETOOLONG = -36, // File name too long LFS2_ERR_NAMETOOLONG = -36, // File name too long
}; };
// File types // File types
enum lfs_type { enum lfs2_type {
// file types // file types
LFS_TYPE_REG = 0x001, LFS2_TYPE_REG = 0x001,
LFS_TYPE_DIR = 0x002, LFS2_TYPE_DIR = 0x002,
// internally used types // internally used types
LFS_TYPE_SPLICE = 0x400, LFS2_TYPE_SPLICE = 0x400,
LFS_TYPE_NAME = 0x000, LFS2_TYPE_NAME = 0x000,
LFS_TYPE_STRUCT = 0x200, LFS2_TYPE_STRUCT = 0x200,
LFS_TYPE_USERATTR = 0x300, LFS2_TYPE_USERATTR = 0x300,
LFS_TYPE_FROM = 0x100, LFS2_TYPE_FROM = 0x100,
LFS_TYPE_TAIL = 0x600, LFS2_TYPE_TAIL = 0x600,
LFS_TYPE_GLOBALS = 0x700, LFS2_TYPE_GLOBALS = 0x700,
LFS_TYPE_CRC = 0x500, LFS2_TYPE_CRC = 0x500,
// internally used type specializations // internally used type specializations
LFS_TYPE_CREATE = 0x401, LFS2_TYPE_CREATE = 0x401,
LFS_TYPE_DELETE = 0x4ff, LFS2_TYPE_DELETE = 0x4ff,
LFS_TYPE_SUPERBLOCK = 0x0ff, LFS2_TYPE_SUPERBLOCK = 0x0ff,
LFS_TYPE_DIRSTRUCT = 0x200, LFS2_TYPE_DIRSTRUCT = 0x200,
LFS_TYPE_CTZSTRUCT = 0x202, LFS2_TYPE_CTZSTRUCT = 0x202,
LFS_TYPE_INLINESTRUCT = 0x201, LFS2_TYPE_INLINESTRUCT = 0x201,
LFS_TYPE_SOFTTAIL = 0x600, LFS2_TYPE_SOFTTAIL = 0x600,
LFS_TYPE_HARDTAIL = 0x601, LFS2_TYPE_HARDTAIL = 0x601,
LFS_TYPE_MOVESTATE = 0x7ff, LFS2_TYPE_MOVESTATE = 0x7ff,
// internal chip sources // internal chip sources
LFS_FROM_NOOP = 0x000, LFS2_FROM_NOOP = 0x000,
LFS_FROM_MOVE = 0x101, LFS2_FROM_MOVE = 0x101,
LFS_FROM_USERATTRS = 0x102, LFS2_FROM_USERATTRS = 0x102,
}; };
// File open flags // File open flags
enum lfs_open_flags { enum lfs2_open_flags {
// open flags // open flags
LFS_O_RDONLY = 1, // Open a file as read only LFS2_O_RDONLY = 1, // Open a file as read only
LFS_O_WRONLY = 2, // Open a file as write only LFS2_O_WRONLY = 2, // Open a file as write only
LFS_O_RDWR = 3, // Open a file as read and write LFS2_O_RDWR = 3, // Open a file as read and write
LFS_O_CREAT = 0x0100, // Create a file if it does not exist LFS2_O_CREAT = 0x0100, // Create a file if it does not exist
LFS_O_EXCL = 0x0200, // Fail if a file already exists LFS2_O_EXCL = 0x0200, // Fail if a file already exists
LFS_O_TRUNC = 0x0400, // Truncate the existing file to zero size LFS2_O_TRUNC = 0x0400, // Truncate the existing file to zero size
LFS_O_APPEND = 0x0800, // Move to end of file on every write LFS2_O_APPEND = 0x0800, // Move to end of file on every write
// internally used flags // internally used flags
LFS_F_DIRTY = 0x010000, // File does not match storage LFS2_F_DIRTY = 0x010000, // File does not match storage
LFS_F_WRITING = 0x020000, // File has been written since last flush LFS2_F_WRITING = 0x020000, // File has been written since last flush
LFS_F_READING = 0x040000, // File has been read since last flush LFS2_F_READING = 0x040000, // File has been read since last flush
LFS_F_ERRED = 0x080000, // An error occured during write LFS2_F_ERRED = 0x080000, // An error occured during write
LFS_F_INLINE = 0x100000, // Currently inlined in directory entry LFS2_F_INLINE = 0x100000, // Currently inlined in directory entry
}; };
// File seek flags // File seek flags
enum lfs_whence_flags { enum lfs2_whence_flags {
LFS_SEEK_SET = 0, // Seek relative to an absolute position LFS2_SEEK_SET = 0, // Seek relative to an absolute position
LFS_SEEK_CUR = 1, // Seek relative to the current file position LFS2_SEEK_CUR = 1, // Seek relative to the current file position
LFS_SEEK_END = 2, // Seek relative to the end of the file LFS2_SEEK_END = 2, // Seek relative to the end of the file
}; };
// Configuration provided during initialization of the littlefs // Configuration provided during initialization of the littlefs
struct lfs_config { struct lfs2_config {
// Opaque user provided context that can be used to pass // Opaque user provided context that can be used to pass
// information to the block device operations // information to the block device operations
void *context; void *context;
// Read a region in a block. Negative error codes are propogated // Read a region in a block. Negative error codes are propogated
// to the user. // to the user.
int (*read)(const struct lfs_config *c, lfs_block_t block, int (*read)(const struct lfs2_config *c, lfs2_block_t block,
lfs_off_t off, void *buffer, lfs_size_t size); lfs2_off_t off, void *buffer, lfs2_size_t size);
// Program a region in a block. The block must have previously // Program a region in a block. The block must have previously
// been erased. Negative error codes are propogated to the user. // been erased. Negative error codes are propogated to the user.
// May return LFS_ERR_CORRUPT if the block should be considered bad. // May return LFS2_ERR_CORRUPT if the block should be considered bad.
int (*prog)(const struct lfs_config *c, lfs_block_t block, int (*prog)(const struct lfs2_config *c, lfs2_block_t block,
lfs_off_t off, const void *buffer, lfs_size_t size); lfs2_off_t off, const void *buffer, lfs2_size_t size);
// Erase a block. A block must be erased before being programmed. // Erase a block. A block must be erased before being programmed.
// The state of an erased block is undefined. Negative error codes // The state of an erased block is undefined. Negative error codes
// are propogated to the user. // are propogated to the user.
// May return LFS_ERR_CORRUPT if the block should be considered bad. // May return LFS2_ERR_CORRUPT if the block should be considered bad.
int (*erase)(const struct lfs_config *c, lfs_block_t block); int (*erase)(const struct lfs2_config *c, lfs2_block_t block);
// Sync the state of the underlying block device. Negative error codes // Sync the state of the underlying block device. Negative error codes
// are propogated to the user. // are propogated to the user.
int (*sync)(const struct lfs_config *c); int (*sync)(const struct lfs2_config *c);
// Minimum size of a block read. All read operations will be a // Minimum size of a block read. All read operations will be a
// multiple of this value. // multiple of this value.
lfs_size_t read_size; lfs2_size_t read_size;
// Minimum size of a block program. All program operations will be a // Minimum size of a block program. All program operations will be a
// multiple of this value. // multiple of this value.
lfs_size_t prog_size; lfs2_size_t prog_size;
// Size of an erasable block. This does not impact ram consumption and // Size of an erasable block. This does not impact ram consumption and
// may be larger than the physical erase size. However, non-inlined files // may be larger than the physical erase size. However, non-inlined files
// take up at minimum one block. Must be a multiple of the read // take up at minimum one block. Must be a multiple of the read
// and program sizes. // and program sizes.
lfs_size_t block_size; lfs2_size_t block_size;
// Number of erasable blocks on the device. // Number of erasable blocks on the device.
lfs_size_t block_count; lfs2_size_t block_count;
// Number of erase cycles before we should move data to another block. // Number of erase cycles before we should move data to another block.
// May be zero, in which case no block-level wear-leveling is performed. // May be zero, in which case no block-level wear-leveling is performed.
@@ -199,62 +199,62 @@ struct lfs_config {
// cache per file. Larger caches can improve performance by storing more // cache per file. Larger caches can improve performance by storing more
// data and reducing the number of disk accesses. Must be a multiple of // data and reducing the number of disk accesses. Must be a multiple of
// the read and program sizes, and a factor of the block size. // the read and program sizes, and a factor of the block size.
lfs_size_t cache_size; lfs2_size_t cache_size;
// Size of the lookahead buffer in bytes. A larger lookahead buffer // Size of the lookahead buffer in bytes. A larger lookahead buffer
// increases the number of blocks found during an allocation pass. The // increases the number of blocks found during an allocation pass. The
// lookahead buffer is stored as a compact bitmap, so each byte of RAM // lookahead buffer is stored as a compact bitmap, so each byte of RAM
// can track 8 blocks. Must be a multiple of 4. // can track 8 blocks. Must be a multiple of 4.
lfs_size_t lookahead_size; lfs2_size_t lookahead_size;
// Optional statically allocated read buffer. Must be cache_size. // Optional statically allocated read buffer. Must be cache_size.
// By default lfs_malloc is used to allocate this buffer. // By default lfs2_malloc is used to allocate this buffer.
void *read_buffer; void *read_buffer;
// Optional statically allocated program buffer. Must be cache_size. // Optional statically allocated program buffer. Must be cache_size.
// By default lfs_malloc is used to allocate this buffer. // By default lfs2_malloc is used to allocate this buffer.
void *prog_buffer; void *prog_buffer;
// Optional statically allocated lookahead buffer. Must be lookahead_size // Optional statically allocated lookahead buffer. Must be lookahead_size
// and aligned to a 64-bit boundary. By default lfs_malloc is used to // and aligned to a 64-bit boundary. By default lfs2_malloc is used to
// allocate this buffer. // allocate this buffer.
void *lookahead_buffer; void *lookahead_buffer;
// Optional upper limit on length of file names in bytes. No downside for // Optional upper limit on length of file names in bytes. No downside for
// larger names except the size of the info struct which is controlled by // larger names except the size of the info struct which is controlled by
// the LFS_NAME_MAX define. Defaults to LFS_NAME_MAX when zero. Stored in // the LFS2_NAME_MAX define. Defaults to LFS2_NAME_MAX when zero. Stored in
// superblock and must be respected by other littlefs drivers. // superblock and must be respected by other littlefs drivers.
lfs_size_t name_max; lfs2_size_t name_max;
// Optional upper limit on files in bytes. No downside for larger files // Optional upper limit on files in bytes. No downside for larger files
// but must be <= LFS_FILE_MAX. Defaults to LFS_FILE_MAX when zero. Stored // but must be <= LFS2_FILE_MAX. Defaults to LFS2_FILE_MAX when zero. Stored
// in superblock and must be respected by other littlefs drivers. // in superblock and must be respected by other littlefs drivers.
lfs_size_t file_max; lfs2_size_t file_max;
// Optional upper limit on custom attributes in bytes. No downside for // Optional upper limit on custom attributes in bytes. No downside for
// larger attributes size but must be <= LFS_ATTR_MAX. Defaults to // larger attributes size but must be <= LFS2_ATTR_MAX. Defaults to
// LFS_ATTR_MAX when zero. // LFS2_ATTR_MAX when zero.
lfs_size_t attr_max; lfs2_size_t attr_max;
}; };
// File info structure // File info structure
struct lfs_info { struct lfs2_info {
// Type of the file, either LFS_TYPE_REG or LFS_TYPE_DIR // Type of the file, either LFS2_TYPE_REG or LFS2_TYPE_DIR
uint8_t type; uint8_t type;
// Size of the file, only valid for REG files. Limited to 32-bits. // Size of the file, only valid for REG files. Limited to 32-bits.
lfs_size_t size; lfs2_size_t size;
// Name of the file stored as a null-terminated string. Limited to // Name of the file stored as a null-terminated string. Limited to
// LFS_NAME_MAX+1, which can be changed by redefining LFS_NAME_MAX to // LFS2_NAME_MAX+1, which can be changed by redefining LFS2_NAME_MAX to
// reduce RAM. LFS_NAME_MAX is stored in superblock and must be // reduce RAM. LFS2_NAME_MAX is stored in superblock and must be
// respected by other littlefs drivers. // respected by other littlefs drivers.
char name[LFS_NAME_MAX+1]; char name[LFS2_NAME_MAX+1];
}; };
// Custom attribute structure, used to describe custom attributes // Custom attribute structure, used to describe custom attributes
// committed atomically during file writes. // committed atomically during file writes.
struct lfs_attr { struct lfs2_attr {
// 8-bit type of attribute, provided by user and used to // 8-bit type of attribute, provided by user and used to
// identify the attribute // identify the attribute
uint8_t type; uint8_t type;
@@ -262,14 +262,14 @@ struct lfs_attr {
// Pointer to buffer containing the attribute // Pointer to buffer containing the attribute
void *buffer; void *buffer;
// Size of attribute in bytes, limited to LFS_ATTR_MAX // Size of attribute in bytes, limited to LFS2_ATTR_MAX
lfs_size_t size; lfs2_size_t size;
}; };
// Optional configuration provided during lfs_file_opencfg // Optional configuration provided during lfs2_file_opencfg
struct lfs_file_config { struct lfs2_file_config {
// Optional statically allocated file buffer. Must be cache_size. // Optional statically allocated file buffer. Must be cache_size.
// By default lfs_malloc is used to allocate this buffer. // By default lfs2_malloc is used to allocate this buffer.
void *buffer; void *buffer;
// Optional list of custom attributes related to the file. If the file // Optional list of custom attributes related to the file. If the file
@@ -279,113 +279,113 @@ struct lfs_file_config {
// write occurs atomically with update to the file's contents. // write occurs atomically with update to the file's contents.
// //
// Custom attributes are uniquely identified by an 8-bit type and limited // Custom attributes are uniquely identified by an 8-bit type and limited
// to LFS_ATTR_MAX bytes. When read, if the stored attribute is smaller // to LFS2_ATTR_MAX bytes. When read, if the stored attribute is smaller
// than the buffer, it will be padded with zeros. If the stored attribute // than the buffer, it will be padded with zeros. If the stored attribute
// is larger, then it will be silently truncated. If the attribute is not // is larger, then it will be silently truncated. If the attribute is not
// found, it will be created implicitly. // found, it will be created implicitly.
struct lfs_attr *attrs; struct lfs2_attr *attrs;
// Number of custom attributes in the list // Number of custom attributes in the list
lfs_size_t attr_count; lfs2_size_t attr_count;
}; };
/// internal littlefs data structures /// /// internal littlefs data structures ///
typedef struct lfs_cache { typedef struct lfs2_cache {
lfs_block_t block; lfs2_block_t block;
lfs_off_t off; lfs2_off_t off;
lfs_size_t size; lfs2_size_t size;
uint8_t *buffer; uint8_t *buffer;
} lfs_cache_t; } lfs2_cache_t;
typedef struct lfs_mdir { typedef struct lfs2_mdir {
lfs_block_t pair[2]; lfs2_block_t pair[2];
uint32_t rev; uint32_t rev;
lfs_off_t off; lfs2_off_t off;
uint32_t etag; uint32_t etag;
uint16_t count; uint16_t count;
bool erased; bool erased;
bool split; bool split;
lfs_block_t tail[2]; lfs2_block_t tail[2];
} lfs_mdir_t; } lfs2_mdir_t;
// littlefs directory type // littlefs directory type
typedef struct lfs_dir { typedef struct lfs2_dir {
struct lfs_dir *next; struct lfs2_dir *next;
uint16_t id; uint16_t id;
uint8_t type; uint8_t type;
lfs_mdir_t m; lfs2_mdir_t m;
lfs_off_t pos; lfs2_off_t pos;
lfs_block_t head[2]; lfs2_block_t head[2];
} lfs_dir_t; } lfs2_dir_t;
// littlefs file type // littlefs file type
typedef struct lfs_file { typedef struct lfs2_file {
struct lfs_file *next; struct lfs2_file *next;
uint16_t id; uint16_t id;
uint8_t type; uint8_t type;
lfs_mdir_t m; lfs2_mdir_t m;
struct lfs_ctz { struct lfs2_ctz {
lfs_block_t head; lfs2_block_t head;
lfs_size_t size; lfs2_size_t size;
} ctz; } ctz;
uint32_t flags; uint32_t flags;
lfs_off_t pos; lfs2_off_t pos;
lfs_block_t block; lfs2_block_t block;
lfs_off_t off; lfs2_off_t off;
lfs_cache_t cache; lfs2_cache_t cache;
const struct lfs_file_config *cfg; const struct lfs2_file_config *cfg;
} lfs_file_t; } lfs2_file_t;
typedef struct lfs_superblock { typedef struct lfs2_superblock {
uint32_t version; uint32_t version;
lfs_size_t block_size; lfs2_size_t block_size;
lfs_size_t block_count; lfs2_size_t block_count;
lfs_size_t name_max; lfs2_size_t name_max;
lfs_size_t file_max; lfs2_size_t file_max;
lfs_size_t attr_max; lfs2_size_t attr_max;
} lfs_superblock_t; } lfs2_superblock_t;
// The littlefs filesystem type // The littlefs filesystem type
typedef struct lfs { typedef struct lfs2 {
lfs_cache_t rcache; lfs2_cache_t rcache;
lfs_cache_t pcache; lfs2_cache_t pcache;
lfs_block_t root[2]; lfs2_block_t root[2];
struct lfs_mlist { struct lfs2_mlist {
struct lfs_mlist *next; struct lfs2_mlist *next;
uint16_t id; uint16_t id;
uint8_t type; uint8_t type;
lfs_mdir_t m; lfs2_mdir_t m;
} *mlist; } *mlist;
uint32_t seed; uint32_t seed;
struct lfs_gstate { struct lfs2_gstate {
uint32_t tag; uint32_t tag;
lfs_block_t pair[2]; lfs2_block_t pair[2];
} gstate, gpending, gdelta; } gstate, gpending, gdelta;
struct lfs_free { struct lfs2_free {
lfs_block_t off; lfs2_block_t off;
lfs_block_t size; lfs2_block_t size;
lfs_block_t i; lfs2_block_t i;
lfs_block_t ack; lfs2_block_t ack;
uint32_t *buffer; uint32_t *buffer;
} free; } free;
const struct lfs_config *cfg; const struct lfs2_config *cfg;
lfs_size_t name_max; lfs2_size_t name_max;
lfs_size_t file_max; lfs2_size_t file_max;
lfs_size_t attr_max; lfs2_size_t attr_max;
#ifdef LFS_MIGRATE #ifdef LFS2_MIGRATE
struct lfs1 *lfs1; struct lfs21 *lfs21;
#endif #endif
} lfs_t; } lfs2_t;
/// Filesystem functions /// /// Filesystem functions ///
@@ -397,23 +397,23 @@ typedef struct lfs {
// be zeroed for defaults and backwards compatibility. // be zeroed for defaults and backwards compatibility.
// //
// Returns a negative error code on failure. // Returns a negative error code on failure.
int lfs_format(lfs_t *lfs, const struct lfs_config *config); int lfs2_format(lfs2_t *lfs2, const struct lfs2_config *config);
// Mounts a littlefs // Mounts a littlefs
// //
// Requires a littlefs object and config struct. Multiple filesystems // Requires a littlefs object and config struct. Multiple filesystems
// may be mounted simultaneously with multiple littlefs objects. Both // may be mounted simultaneously with multiple littlefs objects. Both
// lfs and config must be allocated while mounted. The config struct must // lfs2 and config must be allocated while mounted. The config struct must
// be zeroed for defaults and backwards compatibility. // be zeroed for defaults and backwards compatibility.
// //
// Returns a negative error code on failure. // Returns a negative error code on failure.
int lfs_mount(lfs_t *lfs, const struct lfs_config *config); int lfs2_mount(lfs2_t *lfs2, const struct lfs2_config *config);
// Unmounts a littlefs // Unmounts a littlefs
// //
// Does nothing besides releasing any allocated resources. // Does nothing besides releasing any allocated resources.
// Returns a negative error code on failure. // Returns a negative error code on failure.
int lfs_unmount(lfs_t *lfs); int lfs2_unmount(lfs2_t *lfs2);
/// General operations /// /// General operations ///
@@ -421,7 +421,7 @@ int lfs_unmount(lfs_t *lfs);
// //
// If removing a directory, the directory must be empty. // If removing a directory, the directory must be empty.
// Returns a negative error code on failure. // Returns a negative error code on failure.
int lfs_remove(lfs_t *lfs, const char *path); int lfs2_remove(lfs2_t *lfs2, const char *path);
// Rename or move a file or directory // Rename or move a file or directory
// //
@@ -429,45 +429,45 @@ int lfs_remove(lfs_t *lfs, const char *path);
// If the destination is a directory, the directory must be empty. // If the destination is a directory, the directory must be empty.
// //
// Returns a negative error code on failure. // Returns a negative error code on failure.
int lfs_rename(lfs_t *lfs, const char *oldpath, const char *newpath); int lfs2_rename(lfs2_t *lfs2, const char *oldpath, const char *newpath);
// Find info about a file or directory // Find info about a file or directory
// //
// Fills out the info structure, based on the specified file or directory. // Fills out the info structure, based on the specified file or directory.
// Returns a negative error code on failure. // Returns a negative error code on failure.
int lfs_stat(lfs_t *lfs, const char *path, struct lfs_info *info); int lfs2_stat(lfs2_t *lfs2, const char *path, struct lfs2_info *info);
// Get a custom attribute // Get a custom attribute
// //
// Custom attributes are uniquely identified by an 8-bit type and limited // Custom attributes are uniquely identified by an 8-bit type and limited
// to LFS_ATTR_MAX bytes. When read, if the stored attribute is smaller than // to LFS2_ATTR_MAX bytes. When read, if the stored attribute is smaller than
// the buffer, it will be padded with zeros. If the stored attribute is larger, // the buffer, it will be padded with zeros. If the stored attribute is larger,
// then it will be silently truncated. If no attribute is found, the error // then it will be silently truncated. If no attribute is found, the error
// LFS_ERR_NOATTR is returned and the buffer is filled with zeros. // LFS2_ERR_NOATTR is returned and the buffer is filled with zeros.
// //
// Returns the size of the attribute, or a negative error code on failure. // Returns the size of the attribute, or a negative error code on failure.
// Note, the returned size is the size of the attribute on disk, irrespective // 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 // of the size of the buffer. This can be used to dynamically allocate a buffer
// or check for existance. // or check for existance.
lfs_ssize_t lfs_getattr(lfs_t *lfs, const char *path, lfs2_ssize_t lfs2_getattr(lfs2_t *lfs2, const char *path,
uint8_t type, void *buffer, lfs_size_t size); uint8_t type, void *buffer, lfs2_size_t size);
// Set custom attributes // Set custom attributes
// //
// Custom attributes are uniquely identified by an 8-bit type and limited // Custom attributes are uniquely identified by an 8-bit type and limited
// to LFS_ATTR_MAX bytes. If an attribute is not found, it will be // to LFS2_ATTR_MAX bytes. If an attribute is not found, it will be
// implicitly created. // implicitly created.
// //
// Returns a negative error code on failure. // Returns a negative error code on failure.
int lfs_setattr(lfs_t *lfs, const char *path, int lfs2_setattr(lfs2_t *lfs2, const char *path,
uint8_t type, const void *buffer, lfs_size_t size); uint8_t type, const void *buffer, lfs2_size_t size);
// Removes a custom attribute // Removes a custom attribute
// //
// If an attribute is not found, nothing happens. // If an attribute is not found, nothing happens.
// //
// Returns a negative error code on failure. // Returns a negative error code on failure.
int lfs_removeattr(lfs_t *lfs, const char *path, uint8_t type); int lfs2_removeattr(lfs2_t *lfs2, const char *path, uint8_t type);
/// File operations /// /// File operations ///
@@ -475,25 +475,25 @@ int lfs_removeattr(lfs_t *lfs, const char *path, uint8_t type);
// Open a file // Open a file
// //
// The mode that the file is opened in is determined by the flags, which // The mode that the file is opened in is determined by the flags, which
// are values from the enum lfs_open_flags that are bitwise-ored together. // are values from the enum lfs2_open_flags that are bitwise-ored together.
// //
// Returns a negative error code on failure. // Returns a negative error code on failure.
int lfs_file_open(lfs_t *lfs, lfs_file_t *file, int lfs2_file_open(lfs2_t *lfs2, lfs2_file_t *file,
const char *path, int flags); const char *path, int flags);
// Open a file with extra configuration // Open a file with extra configuration
// //
// The mode that the file is opened in is determined by the flags, which // The mode that the file is opened in is determined by the flags, which
// are values from the enum lfs_open_flags that are bitwise-ored together. // are values from the enum lfs2_open_flags that are bitwise-ored together.
// //
// The config struct provides additional config options per file as described // The config struct provides additional config options per file as described
// above. The config struct must be allocated while the file is open, and the // above. The config struct must be allocated while the file is open, and the
// config struct must be zeroed for defaults and backwards compatibility. // config struct must be zeroed for defaults and backwards compatibility.
// //
// Returns a negative error code on failure. // Returns a negative error code on failure.
int lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file, int lfs2_file_opencfg(lfs2_t *lfs2, lfs2_file_t *file,
const char *path, int flags, const char *path, int flags,
const struct lfs_file_config *config); const struct lfs2_file_config *config);
// Close a file // Close a file
// //
@@ -501,20 +501,20 @@ int lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file,
// sync had been called and releases any allocated resources. // sync had been called and releases any allocated resources.
// //
// Returns a negative error code on failure. // Returns a negative error code on failure.
int lfs_file_close(lfs_t *lfs, lfs_file_t *file); int lfs2_file_close(lfs2_t *lfs2, lfs2_file_t *file);
// Synchronize a file on storage // Synchronize a file on storage
// //
// Any pending writes are written out to storage. // Any pending writes are written out to storage.
// Returns a negative error code on failure. // Returns a negative error code on failure.
int lfs_file_sync(lfs_t *lfs, lfs_file_t *file); int lfs2_file_sync(lfs2_t *lfs2, lfs2_file_t *file);
// Read data from file // Read data from file
// //
// Takes a buffer and size indicating where to store the read data. // 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. // 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, lfs2_ssize_t lfs2_file_read(lfs2_t *lfs2, lfs2_file_t *file,
void *buffer, lfs_size_t size); void *buffer, lfs2_size_t size);
// Write data to file // Write data to file
// //
@@ -522,38 +522,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. // 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. // 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, lfs2_ssize_t lfs2_file_write(lfs2_t *lfs2, lfs2_file_t *file,
const void *buffer, lfs_size_t size); const void *buffer, lfs2_size_t size);
// Change the position of the file // Change the position of the file
// //
// The change in position is determined by the offset and whence flag. // The change in position is determined by the offset and whence flag.
// Returns the old position of the file, or a negative error code on failure. // Returns the old position of the file, or a negative error code on failure.
lfs_soff_t lfs_file_seek(lfs_t *lfs, lfs_file_t *file, lfs2_soff_t lfs2_file_seek(lfs2_t *lfs2, lfs2_file_t *file,
lfs_soff_t off, int whence); lfs2_soff_t off, int whence);
// Truncates the size of the file to the specified size // Truncates the size of the file to the specified size
// //
// Returns a negative error code on failure. // Returns a negative error code on failure.
int lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size); int lfs2_file_truncate(lfs2_t *lfs2, lfs2_file_t *file, lfs2_off_t size);
// Return the position of the file // Return the position of the file
// //
// Equivalent to lfs_file_seek(lfs, file, 0, LFS_SEEK_CUR) // Equivalent to lfs2_file_seek(lfs2, file, 0, LFS2_SEEK_CUR)
// Returns the position of the file, or a negative error code on failure. // 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); lfs2_soff_t lfs2_file_tell(lfs2_t *lfs2, lfs2_file_t *file);
// Change the position of the file to the beginning of the file // Change the position of the file to the beginning of the file
// //
// Equivalent to lfs_file_seek(lfs, file, 0, LFS_SEEK_CUR) // Equivalent to lfs2_file_seek(lfs2, file, 0, LFS2_SEEK_CUR)
// Returns a negative error code on failure. // Returns a negative error code on failure.
int lfs_file_rewind(lfs_t *lfs, lfs_file_t *file); int lfs2_file_rewind(lfs2_t *lfs2, lfs2_file_t *file);
// Return the size of the file // Return the size of the file
// //
// Similar to lfs_file_seek(lfs, file, 0, LFS_SEEK_END) // Similar to lfs2_file_seek(lfs2, file, 0, LFS2_SEEK_END)
// Returns the size of the file, or a negative error code on failure. // 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); lfs2_soff_t lfs2_file_size(lfs2_t *lfs2, lfs2_file_t *file);
/// Directory operations /// /// Directory operations ///
@@ -561,25 +561,25 @@ lfs_soff_t lfs_file_size(lfs_t *lfs, lfs_file_t *file);
// Create a directory // Create a directory
// //
// Returns a negative error code on failure. // Returns a negative error code on failure.
int lfs_mkdir(lfs_t *lfs, const char *path); int lfs2_mkdir(lfs2_t *lfs2, const char *path);
// Open a directory // Open a directory
// //
// Once open a directory can be used with read to iterate over files. // Once open a directory can be used with read to iterate over files.
// Returns a negative error code on failure. // Returns a negative error code on failure.
int lfs_dir_open(lfs_t *lfs, lfs_dir_t *dir, const char *path); int lfs2_dir_open(lfs2_t *lfs2, lfs2_dir_t *dir, const char *path);
// Close a directory // Close a directory
// //
// Releases any allocated resources. // Releases any allocated resources.
// Returns a negative error code on failure. // Returns a negative error code on failure.
int lfs_dir_close(lfs_t *lfs, lfs_dir_t *dir); int lfs2_dir_close(lfs2_t *lfs2, lfs2_dir_t *dir);
// Read an entry in the directory // Read an entry in the directory
// //
// Fills out the info structure, based on the specified file or directory. // Fills out the info structure, based on the specified file or directory.
// Returns a negative error code on failure. // Returns a negative error code on failure.
int lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info); int lfs2_dir_read(lfs2_t *lfs2, lfs2_dir_t *dir, struct lfs2_info *info);
// Change the position of the directory // Change the position of the directory
// //
@@ -587,7 +587,7 @@ int lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info);
// an absolute offset in the directory seek. // an absolute offset in the directory seek.
// //
// Returns a negative error code on failure. // Returns a negative error code on failure.
int lfs_dir_seek(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off); int lfs2_dir_seek(lfs2_t *lfs2, lfs2_dir_t *dir, lfs2_off_t off);
// Return the position of the directory // Return the position of the directory
// //
@@ -595,12 +595,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. // sense, but does indicate the current position in the directory iteration.
// //
// Returns the position of the directory, or a negative error code on failure. // 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); lfs2_soff_t lfs2_dir_tell(lfs2_t *lfs2, lfs2_dir_t *dir);
// Change the position of the directory to the beginning of the directory // Change the position of the directory to the beginning of the directory
// //
// Returns a negative error code on failure. // Returns a negative error code on failure.
int lfs_dir_rewind(lfs_t *lfs, lfs_dir_t *dir); int lfs2_dir_rewind(lfs2_t *lfs2, lfs2_dir_t *dir);
/// Filesystem-level filesystem operations /// Filesystem-level filesystem operations
@@ -611,7 +611,7 @@ int lfs_dir_rewind(lfs_t *lfs, lfs_dir_t *dir);
// size may be larger than the filesystem actually is. // size may be larger than the filesystem actually is.
// //
// Returns the number of allocated blocks, or a negative error code on failure. // Returns the number of allocated blocks, or a negative error code on failure.
lfs_ssize_t lfs_fs_size(lfs_t *lfs); lfs2_ssize_t lfs2_fs_size(lfs2_t *lfs2);
// Traverse through all blocks in use by the filesystem // Traverse through all blocks in use by the filesystem
// //
@@ -620,12 +620,12 @@ lfs_ssize_t lfs_fs_size(lfs_t *lfs);
// blocks are in use or how much of the storage is available. // blocks are in use or how much of the storage is available.
// //
// Returns a negative error code on failure. // Returns a negative error code on failure.
int lfs_fs_traverse(lfs_t *lfs, int (*cb)(void*, lfs_block_t), void *data); int lfs2_fs_traverse(lfs2_t *lfs2, int (*cb)(void*, lfs2_block_t), void *data);
#ifdef LFS_MIGRATE #ifdef LFS2_MIGRATE
// Attempts to migrate a previous version of littlefs // Attempts to migrate a previous version of littlefs
// //
// Behaves similarly to the lfs_format function. Attempts to mount // Behaves similarly to the lfs2_format function. Attempts to mount
// the previous version of littlefs and update the filesystem so it can be // the previous version of littlefs and update the filesystem so it can be
// mounted with the current version of littlefs. // mounted with the current version of littlefs.
// //
@@ -634,7 +634,7 @@ int lfs_fs_traverse(lfs_t *lfs, int (*cb)(void*, lfs_block_t), void *data);
// be zeroed for defaults and backwards compatibility. // be zeroed for defaults and backwards compatibility.
// //
// Returns a negative error code on failure. // Returns a negative error code on failure.
int lfs_migrate(lfs_t *lfs, const struct lfs_config *cfg); int lfs2_migrate(lfs2_t *lfs2, const struct lfs2_config *cfg);
#endif #endif

8
lfs_util.c → lfs2_util.c
View File

@@ -1,17 +1,17 @@
/* /*
* lfs util functions * lfs2 util functions
* *
* Copyright (c) 2017, Arm Limited. All rights reserved. * Copyright (c) 2017, Arm Limited. All rights reserved.
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#include "lfs_util.h" #include "lfs2_util.h"
// Only compile if user does not provide custom config // Only compile if user does not provide custom config
#ifndef LFS_CONFIG #ifndef LFS2_CONFIG
// Software CRC implementation with small lookup table // Software CRC implementation with small lookup table
uint32_t lfs_crc(uint32_t crc, const void *buffer, size_t size) { uint32_t lfs2_crc(uint32_t crc, const void *buffer, size_t size) {
static const uint32_t rtable[16] = { static const uint32_t rtable[16] = {
0x00000000, 0x1db71064, 0x3b6e20c8, 0x26d930ac, 0x00000000, 0x1db71064, 0x3b6e20c8, 0x26d930ac,
0x76dc4190, 0x6b6b51f4, 0x4db26158, 0x5005713c, 0x76dc4190, 0x6b6b51f4, 0x4db26158, 0x5005713c,

118
lfs_util.h → lfs2_util.h
View File

@@ -1,22 +1,22 @@
/* /*
* lfs utility functions * lfs2 utility functions
* *
* Copyright (c) 2017, Arm Limited. All rights reserved. * Copyright (c) 2017, Arm Limited. All rights reserved.
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#ifndef LFS_UTIL_H #ifndef LFS2_UTIL_H
#define LFS_UTIL_H #define LFS2_UTIL_H
// Users can override lfs_util.h with their own configuration by defining // Users can override lfs2_util.h with their own configuration by defining
// LFS_CONFIG as a header file to include (-DLFS_CONFIG=lfs_config.h). // LFS2_CONFIG as a header file to include (-DLFS2_CONFIG=lfs2_config.h).
// //
// If LFS_CONFIG is used, none of the default utils will be emitted and must be // If LFS2_CONFIG is used, none of the default utils will be emitted and must be
// provided by the config file. To start, I would suggest copying lfs_util.h // provided by the config file. To start, I would suggest copying lfs2_util.h
// and modifying as needed. // and modifying as needed.
#ifdef LFS_CONFIG #ifdef LFS2_CONFIG
#define LFS_STRINGIZE(x) LFS_STRINGIZE2(x) #define LFS2_STRINGIZE(x) LFS2_STRINGIZE2(x)
#define LFS_STRINGIZE2(x) #x #define LFS2_STRINGIZE2(x) #x
#include LFS_STRINGIZE(LFS_CONFIG) #include LFS2_STRINGIZE(LFS2_CONFIG)
#else #else
// System includes // System includes
@@ -25,13 +25,13 @@
#include <string.h> #include <string.h>
#include <inttypes.h> #include <inttypes.h>
#ifndef LFS_NO_MALLOC #ifndef LFS2_NO_MALLOC
#include <stdlib.h> #include <stdlib.h>
#endif #endif
#ifndef LFS_NO_ASSERT #ifndef LFS2_NO_ASSERT
#include <assert.h> #include <assert.h>
#endif #endif
#if !defined(LFS_NO_DEBUG) || !defined(LFS_NO_WARN) || !defined(LFS_NO_ERROR) #if !defined(LFS2_NO_DEBUG) || !defined(LFS2_NO_WARN) || !defined(LFS2_NO_ERROR)
#include <stdio.h> #include <stdio.h>
#endif #endif
@@ -46,60 +46,60 @@ extern "C"
// code footprint // code footprint
// Logging functions // Logging functions
#ifndef LFS_NO_DEBUG #ifndef LFS2_NO_DEBUG
#define LFS_DEBUG(fmt, ...) \ #define LFS2_DEBUG(fmt, ...) \
printf("lfs debug:%d: " fmt "\n", __LINE__, __VA_ARGS__) printf("lfs2 debug:%d: " fmt "\n", __LINE__, __VA_ARGS__)
#else #else
#define LFS_DEBUG(fmt, ...) #define LFS2_DEBUG(fmt, ...)
#endif #endif
#ifndef LFS_NO_WARN #ifndef LFS2_NO_WARN
#define LFS_WARN(fmt, ...) \ #define LFS2_WARN(fmt, ...) \
printf("lfs warn:%d: " fmt "\n", __LINE__, __VA_ARGS__) printf("lfs2 warn:%d: " fmt "\n", __LINE__, __VA_ARGS__)
#else #else
#define LFS_WARN(fmt, ...) #define LFS2_WARN(fmt, ...)
#endif #endif
#ifndef LFS_NO_ERROR #ifndef LFS2_NO_ERROR
#define LFS_ERROR(fmt, ...) \ #define LFS2_ERROR(fmt, ...) \
printf("lfs error:%d: " fmt "\n", __LINE__, __VA_ARGS__) printf("lfs2 error:%d: " fmt "\n", __LINE__, __VA_ARGS__)
#else #else
#define LFS_ERROR(fmt, ...) #define LFS2_ERROR(fmt, ...)
#endif #endif
// Runtime assertions // Runtime assertions
#ifndef LFS_NO_ASSERT #ifndef LFS2_NO_ASSERT
#define LFS_ASSERT(test) assert(test) #define LFS2_ASSERT(test) assert(test)
#else #else
#define LFS_ASSERT(test) #define LFS2_ASSERT(test)
#endif #endif
// Builtin functions, these may be replaced by more efficient // Builtin functions, these may be replaced by more efficient
// toolchain-specific implementations. LFS_NO_INTRINSICS falls back to a more // toolchain-specific implementations. LFS2_NO_INTRINSICS falls back to a more
// expensive basic C implementation for debugging purposes // expensive basic C implementation for debugging purposes
// Min/max functions for unsigned 32-bit numbers // Min/max functions for unsigned 32-bit numbers
static inline uint32_t lfs_max(uint32_t a, uint32_t b) { static inline uint32_t lfs2_max(uint32_t a, uint32_t b) {
return (a > b) ? a : b; return (a > b) ? a : b;
} }
static inline uint32_t lfs_min(uint32_t a, uint32_t b) { static inline uint32_t lfs2_min(uint32_t a, uint32_t b) {
return (a < b) ? a : b; return (a < b) ? a : b;
} }
// Align to nearest multiple of a size // Align to nearest multiple of a size
static inline uint32_t lfs_aligndown(uint32_t a, uint32_t alignment) { static inline uint32_t lfs2_aligndown(uint32_t a, uint32_t alignment) {
return a - (a % alignment); return a - (a % alignment);
} }
static inline uint32_t lfs_alignup(uint32_t a, uint32_t alignment) { static inline uint32_t lfs2_alignup(uint32_t a, uint32_t alignment) {
return lfs_aligndown(a + alignment-1, alignment); return lfs2_aligndown(a + alignment-1, alignment);
} }
// Find the next smallest power of 2 less than or equal to a // Find the next smallest power of 2 less than or equal to a
static inline uint32_t lfs_npw2(uint32_t a) { static inline uint32_t lfs2_npw2(uint32_t a) {
#if !defined(LFS_NO_INTRINSICS) && (defined(__GNUC__) || defined(__CC_ARM)) #if !defined(LFS2_NO_INTRINSICS) && (defined(__GNUC__) || defined(__CC_ARM))
return 32 - __builtin_clz(a-1); return 32 - __builtin_clz(a-1);
#else #else
uint32_t r = 0; uint32_t r = 0;
@@ -114,18 +114,18 @@ static inline uint32_t lfs_npw2(uint32_t a) {
} }
// Count the number of trailing binary zeros in a // Count the number of trailing binary zeros in a
// lfs_ctz(0) may be undefined // lfs2_ctz(0) may be undefined
static inline uint32_t lfs_ctz(uint32_t a) { static inline uint32_t lfs2_ctz(uint32_t a) {
#if !defined(LFS_NO_INTRINSICS) && defined(__GNUC__) #if !defined(LFS2_NO_INTRINSICS) && defined(__GNUC__)
return __builtin_ctz(a); return __builtin_ctz(a);
#else #else
return lfs_npw2((a & -a) + 1) - 1; return lfs2_npw2((a & -a) + 1) - 1;
#endif #endif
} }
// Count the number of binary ones in a // Count the number of binary ones in a
static inline uint32_t lfs_popc(uint32_t a) { static inline uint32_t lfs2_popc(uint32_t a) {
#if !defined(LFS_NO_INTRINSICS) && (defined(__GNUC__) || defined(__CC_ARM)) #if !defined(LFS2_NO_INTRINSICS) && (defined(__GNUC__) || defined(__CC_ARM))
return __builtin_popcount(a); return __builtin_popcount(a);
#else #else
a = a - ((a >> 1) & 0x55555555); a = a - ((a >> 1) & 0x55555555);
@@ -136,18 +136,18 @@ static inline uint32_t lfs_popc(uint32_t a) {
// Find the sequence comparison of a and b, this is the distance // Find the sequence comparison of a and b, this is the distance
// between a and b ignoring overflow // between a and b ignoring overflow
static inline int lfs_scmp(uint32_t a, uint32_t b) { static inline int lfs2_scmp(uint32_t a, uint32_t b) {
return (int)(unsigned)(a - b); return (int)(unsigned)(a - b);
} }
// Convert between 32-bit little-endian and native order // Convert between 32-bit little-endian and native order
static inline uint32_t lfs_fromle32(uint32_t a) { static inline uint32_t lfs2_fromle32(uint32_t a) {
#if !defined(LFS_NO_INTRINSICS) && ( \ #if !defined(LFS2_NO_INTRINSICS) && ( \
(defined( BYTE_ORDER ) && BYTE_ORDER == ORDER_LITTLE_ENDIAN ) || \ (defined( BYTE_ORDER ) && BYTE_ORDER == ORDER_LITTLE_ENDIAN ) || \
(defined(__BYTE_ORDER ) && __BYTE_ORDER == __ORDER_LITTLE_ENDIAN ) || \ (defined(__BYTE_ORDER ) && __BYTE_ORDER == __ORDER_LITTLE_ENDIAN ) || \
(defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)) (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__))
return a; return a;
#elif !defined(LFS_NO_INTRINSICS) && ( \ #elif !defined(LFS2_NO_INTRINSICS) && ( \
(defined( BYTE_ORDER ) && BYTE_ORDER == ORDER_BIG_ENDIAN ) || \ (defined( BYTE_ORDER ) && BYTE_ORDER == ORDER_BIG_ENDIAN ) || \
(defined(__BYTE_ORDER ) && __BYTE_ORDER == __ORDER_BIG_ENDIAN ) || \ (defined(__BYTE_ORDER ) && __BYTE_ORDER == __ORDER_BIG_ENDIAN ) || \
(defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)) (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__))
@@ -160,18 +160,18 @@ static inline uint32_t lfs_fromle32(uint32_t a) {
#endif #endif
} }
static inline uint32_t lfs_tole32(uint32_t a) { static inline uint32_t lfs2_tole32(uint32_t a) {
return lfs_fromle32(a); return lfs2_fromle32(a);
} }
// Convert between 32-bit big-endian and native order // Convert between 32-bit big-endian and native order
static inline uint32_t lfs_frombe32(uint32_t a) { static inline uint32_t lfs2_frombe32(uint32_t a) {
#if !defined(LFS_NO_INTRINSICS) && ( \ #if !defined(LFS2_NO_INTRINSICS) && ( \
(defined( BYTE_ORDER ) && BYTE_ORDER == ORDER_LITTLE_ENDIAN ) || \ (defined( BYTE_ORDER ) && BYTE_ORDER == ORDER_LITTLE_ENDIAN ) || \
(defined(__BYTE_ORDER ) && __BYTE_ORDER == __ORDER_LITTLE_ENDIAN ) || \ (defined(__BYTE_ORDER ) && __BYTE_ORDER == __ORDER_LITTLE_ENDIAN ) || \
(defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)) (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__))
return __builtin_bswap32(a); return __builtin_bswap32(a);
#elif !defined(LFS_NO_INTRINSICS) && ( \ #elif !defined(LFS2_NO_INTRINSICS) && ( \
(defined( BYTE_ORDER ) && BYTE_ORDER == ORDER_BIG_ENDIAN ) || \ (defined( BYTE_ORDER ) && BYTE_ORDER == ORDER_BIG_ENDIAN ) || \
(defined(__BYTE_ORDER ) && __BYTE_ORDER == __ORDER_BIG_ENDIAN ) || \ (defined(__BYTE_ORDER ) && __BYTE_ORDER == __ORDER_BIG_ENDIAN ) || \
(defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)) (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__))
@@ -184,17 +184,17 @@ static inline uint32_t lfs_frombe32(uint32_t a) {
#endif #endif
} }
static inline uint32_t lfs_tobe32(uint32_t a) { static inline uint32_t lfs2_tobe32(uint32_t a) {
return lfs_frombe32(a); return lfs2_frombe32(a);
} }
// Calculate CRC-32 with polynomial = 0x04c11db7 // Calculate CRC-32 with polynomial = 0x04c11db7
uint32_t lfs_crc(uint32_t crc, const void *buffer, size_t size); uint32_t lfs2_crc(uint32_t crc, const void *buffer, size_t size);
// Allocate memory, only used if buffers are not provided to littlefs // Allocate memory, only used if buffers are not provided to littlefs
// Note, memory must be 64-bit aligned // Note, memory must be 64-bit aligned
static inline void *lfs_malloc(size_t size) { static inline void *lfs2_malloc(size_t size) {
#ifndef LFS_NO_MALLOC #ifndef LFS2_NO_MALLOC
return malloc(size); return malloc(size);
#else #else
(void)size; (void)size;
@@ -203,8 +203,8 @@ static inline void *lfs_malloc(size_t size) {
} }
// Deallocate memory, only used if buffers are not provided to littlefs // Deallocate memory, only used if buffers are not provided to littlefs
static inline void lfs_free(void *p) { static inline void lfs2_free(void *p) {
#ifndef LFS_NO_MALLOC #ifndef LFS2_NO_MALLOC
free(p); free(p);
#else #else
(void)p; (void)p;

4
scripts/prefix.py
View File

@@ -5,7 +5,7 @@
# conflict at compile time. # conflict at compile time.
# #
# example: # example:
# $ ./scripts/prefix.py lfs2 # $ ./scripts/prefix.py lfs22
import os import os
import os.path import os.path
@@ -16,7 +16,7 @@ import tempfile
import shutil import shutil
import subprocess import subprocess
DEFAULT_PREFIX = "lfs" DEFAULT_PREFIX = "lfs2"
def subn(from_prefix, to_prefix, name): def subn(from_prefix, to_prefix, name):
name, count1 = re.subn('\\b'+from_prefix, to_prefix, name) name, count1 = re.subn('\\b'+from_prefix, to_prefix, name)

80
tests/template.fmt
View File

@@ -1,6 +1,6 @@
/// AUTOGENERATED TEST /// /// AUTOGENERATED TEST ///
#include "lfs.h" #include "lfs2.h"
#include "emubd/lfs_emubd.h" #include "emubd/lfs2_emubd.h"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
@@ -37,7 +37,7 @@ static void test_assert(const char *file, unsigned line,
// utility functions for traversals // utility functions for traversals
static int __attribute__((used)) test_count(void *p, lfs_block_t b) {{ static int __attribute__((used)) test_count(void *p, lfs2_block_t b) {{
(void)b; (void)b;
unsigned *u = (unsigned*)p; unsigned *u = (unsigned*)p;
*u += 1; *u += 1;
@@ -45,72 +45,72 @@ static int __attribute__((used)) test_count(void *p, lfs_block_t b) {{
}} }}
// lfs declarations // lfs2 declarations
lfs_t lfs; lfs2_t lfs2;
lfs_emubd_t bd; lfs2_emubd_t bd;
lfs_file_t file[4]; lfs2_file_t file[4];
lfs_dir_t dir[4]; lfs2_dir_t dir[4];
struct lfs_info info; struct lfs2_info info;
uint8_t buffer[1024]; uint8_t buffer[1024];
uint8_t wbuffer[1024]; uint8_t wbuffer[1024];
uint8_t rbuffer[1024]; uint8_t rbuffer[1024];
lfs_size_t size; lfs2_size_t size;
lfs_size_t wsize; lfs2_size_t wsize;
lfs_size_t rsize; lfs2_size_t rsize;
uintmax_t test; uintmax_t test;
#ifndef LFS_READ_SIZE #ifndef LFS2_READ_SIZE
#define LFS_READ_SIZE 16 #define LFS2_READ_SIZE 16
#endif #endif
#ifndef LFS_PROG_SIZE #ifndef LFS2_PROG_SIZE
#define LFS_PROG_SIZE LFS_READ_SIZE #define LFS2_PROG_SIZE LFS2_READ_SIZE
#endif #endif
#ifndef LFS_BLOCK_SIZE #ifndef LFS2_BLOCK_SIZE
#define LFS_BLOCK_SIZE 512 #define LFS2_BLOCK_SIZE 512
#endif #endif
#ifndef LFS_BLOCK_COUNT #ifndef LFS2_BLOCK_COUNT
#define LFS_BLOCK_COUNT 1024 #define LFS2_BLOCK_COUNT 1024
#endif #endif
#ifndef LFS_BLOCK_CYCLES #ifndef LFS2_BLOCK_CYCLES
#define LFS_BLOCK_CYCLES 1024 #define LFS2_BLOCK_CYCLES 1024
#endif #endif
#ifndef LFS_CACHE_SIZE #ifndef LFS2_CACHE_SIZE
#define LFS_CACHE_SIZE 64 #define LFS2_CACHE_SIZE 64
#endif #endif
#ifndef LFS_LOOKAHEAD_SIZE #ifndef LFS2_LOOKAHEAD_SIZE
#define LFS_LOOKAHEAD_SIZE 16 #define LFS2_LOOKAHEAD_SIZE 16
#endif #endif
const struct lfs_config cfg = {{ const struct lfs2_config cfg = {{
.context = &bd, .context = &bd,
.read = &lfs_emubd_read, .read = &lfs2_emubd_read,
.prog = &lfs_emubd_prog, .prog = &lfs2_emubd_prog,
.erase = &lfs_emubd_erase, .erase = &lfs2_emubd_erase,
.sync = &lfs_emubd_sync, .sync = &lfs2_emubd_sync,
.read_size = LFS_READ_SIZE, .read_size = LFS2_READ_SIZE,
.prog_size = LFS_PROG_SIZE, .prog_size = LFS2_PROG_SIZE,
.block_size = LFS_BLOCK_SIZE, .block_size = LFS2_BLOCK_SIZE,
.block_count = LFS_BLOCK_COUNT, .block_count = LFS2_BLOCK_COUNT,
.block_cycles = LFS_BLOCK_CYCLES, .block_cycles = LFS2_BLOCK_CYCLES,
.cache_size = LFS_CACHE_SIZE, .cache_size = LFS2_CACHE_SIZE,
.lookahead_size = LFS_LOOKAHEAD_SIZE, .lookahead_size = LFS2_LOOKAHEAD_SIZE,
}}; }};
// Entry point // Entry point
int main(void) {{ int main(void) {{
lfs_emubd_create(&cfg, "blocks"); lfs2_emubd_create(&cfg, "blocks");
{tests} {tests}
lfs_emubd_destroy(&cfg); lfs2_emubd_destroy(&cfg);
}} }}

6
tests/test.py
View File

@@ -28,7 +28,7 @@ def generate(test):
# Remove build artifacts to force rebuild # Remove build artifacts to force rebuild
try: try:
os.remove('test.o') os.remove('test.o')
os.remove('lfs') os.remove('lfs2')
except OSError: except OSError:
pass pass
@@ -39,9 +39,9 @@ def compile():
def execute(): def execute():
if 'EXEC' in os.environ: if 'EXEC' in os.environ:
subprocess.check_call([os.environ['EXEC'], "./lfs"]) subprocess.check_call([os.environ['EXEC'], "./lfs2"])
else: else:
subprocess.check_call(["./lfs"]) subprocess.check_call(["./lfs2"])
def main(test=None): def main(test=None):
if test and not test.startswith('-'): if test and not test.startswith('-'):

404
tests/test_alloc.sh
View File

@@ -4,481 +4,481 @@ set -eu
echo "=== Allocator tests ===" echo "=== Allocator tests ==="
rm -rf blocks rm -rf blocks
tests/test.py << TEST tests/test.py << TEST
lfs_format(&lfs, &cfg) => 0; lfs2_format(&lfs2, &cfg) => 0;
TEST TEST
SIZE=15000 SIZE=15000
lfs_mkdir() { lfs2_mkdir() {
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_mkdir(&lfs, "$1") => 0; lfs2_mkdir(&lfs2, "$1") => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
} }
lfs_remove() { lfs2_remove() {
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_remove(&lfs, "$1/eggs") => 0; lfs2_remove(&lfs2, "$1/eggs") => 0;
lfs_remove(&lfs, "$1/bacon") => 0; lfs2_remove(&lfs2, "$1/bacon") => 0;
lfs_remove(&lfs, "$1/pancakes") => 0; lfs2_remove(&lfs2, "$1/pancakes") => 0;
lfs_remove(&lfs, "$1") => 0; lfs2_remove(&lfs2, "$1") => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
} }
lfs_alloc_singleproc() { lfs2_alloc_singleproc() {
tests/test.py << TEST tests/test.py << TEST
const char *names[] = {"bacon", "eggs", "pancakes"}; const char *names[] = {"bacon", "eggs", "pancakes"};
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
for (unsigned n = 0; n < sizeof(names)/sizeof(names[0]); n++) { for (unsigned n = 0; n < sizeof(names)/sizeof(names[0]); n++) {
sprintf((char*)buffer, "$1/%s", names[n]); sprintf((char*)buffer, "$1/%s", names[n]);
lfs_file_open(&lfs, &file[n], (char*)buffer, lfs2_file_open(&lfs2, &file[n], (char*)buffer,
LFS_O_WRONLY | LFS_O_CREAT | LFS_O_APPEND) => 0; LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_APPEND) => 0;
} }
for (unsigned n = 0; n < sizeof(names)/sizeof(names[0]); n++) { for (unsigned n = 0; n < sizeof(names)/sizeof(names[0]); n++) {
size = strlen(names[n]); size = strlen(names[n]);
for (int i = 0; i < $SIZE; i++) { for (int i = 0; i < $SIZE; i++) {
lfs_file_write(&lfs, &file[n], names[n], size) => size; lfs2_file_write(&lfs2, &file[n], names[n], size) => size;
} }
} }
for (unsigned n = 0; n < sizeof(names)/sizeof(names[0]); n++) { for (unsigned n = 0; n < sizeof(names)/sizeof(names[0]); n++) {
lfs_file_close(&lfs, &file[n]) => 0; lfs2_file_close(&lfs2, &file[n]) => 0;
} }
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
} }
lfs_alloc_multiproc() { lfs2_alloc_multiproc() {
for name in bacon eggs pancakes for name in bacon eggs pancakes
do do
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_file_open(&lfs, &file[0], "$1/$name", lfs2_file_open(&lfs2, &file[0], "$1/$name",
LFS_O_WRONLY | LFS_O_CREAT | LFS_O_APPEND) => 0; LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_APPEND) => 0;
size = strlen("$name"); size = strlen("$name");
memcpy(buffer, "$name", size); memcpy(buffer, "$name", size);
for (int i = 0; i < $SIZE; i++) { for (int i = 0; i < $SIZE; i++) {
lfs_file_write(&lfs, &file[0], buffer, size) => size; lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
} }
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
done done
} }
lfs_verify() { lfs2_verify() {
for name in bacon eggs pancakes for name in bacon eggs pancakes
do do
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_file_open(&lfs, &file[0], "$1/$name", LFS_O_RDONLY) => 0; lfs2_file_open(&lfs2, &file[0], "$1/$name", LFS2_O_RDONLY) => 0;
size = strlen("$name"); size = strlen("$name");
for (int i = 0; i < $SIZE; i++) { for (int i = 0; i < $SIZE; i++) {
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "$name", size) => 0; memcmp(buffer, "$name", size) => 0;
} }
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
done done
} }
echo "--- Single-process allocation test ---" echo "--- Single-process allocation test ---"
lfs_mkdir singleproc lfs2_mkdir singleproc
lfs_alloc_singleproc singleproc lfs2_alloc_singleproc singleproc
lfs_verify singleproc lfs2_verify singleproc
echo "--- Multi-process allocation test ---" echo "--- Multi-process allocation test ---"
lfs_mkdir multiproc lfs2_mkdir multiproc
lfs_alloc_multiproc multiproc lfs2_alloc_multiproc multiproc
lfs_verify multiproc lfs2_verify multiproc
lfs_verify singleproc lfs2_verify singleproc
echo "--- Single-process reuse test ---" echo "--- Single-process reuse test ---"
lfs_remove singleproc lfs2_remove singleproc
lfs_mkdir singleprocreuse lfs2_mkdir singleprocreuse
lfs_alloc_singleproc singleprocreuse lfs2_alloc_singleproc singleprocreuse
lfs_verify singleprocreuse lfs2_verify singleprocreuse
lfs_verify multiproc lfs2_verify multiproc
echo "--- Multi-process reuse test ---" echo "--- Multi-process reuse test ---"
lfs_remove multiproc lfs2_remove multiproc
lfs_mkdir multiprocreuse lfs2_mkdir multiprocreuse
lfs_alloc_singleproc multiprocreuse lfs2_alloc_singleproc multiprocreuse
lfs_verify multiprocreuse lfs2_verify multiprocreuse
lfs_verify singleprocreuse lfs2_verify singleprocreuse
echo "--- Cleanup ---" echo "--- Cleanup ---"
lfs_remove multiprocreuse lfs2_remove multiprocreuse
lfs_remove singleprocreuse lfs2_remove singleprocreuse
echo "--- Exhaustion test ---" echo "--- Exhaustion test ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_file_open(&lfs, &file[0], "exhaustion", LFS_O_WRONLY | LFS_O_CREAT); lfs2_file_open(&lfs2, &file[0], "exhaustion", LFS2_O_WRONLY | LFS2_O_CREAT);
size = strlen("exhaustion"); size = strlen("exhaustion");
memcpy(buffer, "exhaustion", size); memcpy(buffer, "exhaustion", size);
lfs_file_write(&lfs, &file[0], buffer, size) => size; lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
lfs_file_sync(&lfs, &file[0]) => 0; lfs2_file_sync(&lfs2, &file[0]) => 0;
size = strlen("blahblahblahblah"); size = strlen("blahblahblahblah");
memcpy(buffer, "blahblahblahblah", size); memcpy(buffer, "blahblahblahblah", size);
lfs_ssize_t res; lfs2_ssize_t res;
while (true) { while (true) {
res = lfs_file_write(&lfs, &file[0], buffer, size); res = lfs2_file_write(&lfs2, &file[0], buffer, size);
if (res < 0) { if (res < 0) {
break; break;
} }
res => size; res => size;
} }
res => LFS_ERR_NOSPC; res => LFS2_ERR_NOSPC;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_file_open(&lfs, &file[0], "exhaustion", LFS_O_RDONLY); lfs2_file_open(&lfs2, &file[0], "exhaustion", LFS2_O_RDONLY);
size = strlen("exhaustion"); size = strlen("exhaustion");
lfs_file_size(&lfs, &file[0]) => size; lfs2_file_size(&lfs2, &file[0]) => size;
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "exhaustion", size) => 0; memcmp(buffer, "exhaustion", size) => 0;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Exhaustion wraparound test ---" echo "--- Exhaustion wraparound test ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_remove(&lfs, "exhaustion") => 0; lfs2_remove(&lfs2, "exhaustion") => 0;
lfs_file_open(&lfs, &file[0], "padding", LFS_O_WRONLY | LFS_O_CREAT); lfs2_file_open(&lfs2, &file[0], "padding", LFS2_O_WRONLY | LFS2_O_CREAT);
size = strlen("buffering"); size = strlen("buffering");
memcpy(buffer, "buffering", size); memcpy(buffer, "buffering", size);
for (int i = 0; i < $SIZE; i++) { for (int i = 0; i < $SIZE; i++) {
lfs_file_write(&lfs, &file[0], buffer, size) => size; lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
} }
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_remove(&lfs, "padding") => 0; lfs2_remove(&lfs2, "padding") => 0;
lfs_file_open(&lfs, &file[0], "exhaustion", LFS_O_WRONLY | LFS_O_CREAT); lfs2_file_open(&lfs2, &file[0], "exhaustion", LFS2_O_WRONLY | LFS2_O_CREAT);
size = strlen("exhaustion"); size = strlen("exhaustion");
memcpy(buffer, "exhaustion", size); memcpy(buffer, "exhaustion", size);
lfs_file_write(&lfs, &file[0], buffer, size) => size; lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
lfs_file_sync(&lfs, &file[0]) => 0; lfs2_file_sync(&lfs2, &file[0]) => 0;
size = strlen("blahblahblahblah"); size = strlen("blahblahblahblah");
memcpy(buffer, "blahblahblahblah", size); memcpy(buffer, "blahblahblahblah", size);
lfs_ssize_t res; lfs2_ssize_t res;
while (true) { while (true) {
res = lfs_file_write(&lfs, &file[0], buffer, size); res = lfs2_file_write(&lfs2, &file[0], buffer, size);
if (res < 0) { if (res < 0) {
break; break;
} }
res => size; res => size;
} }
res => LFS_ERR_NOSPC; res => LFS2_ERR_NOSPC;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_file_open(&lfs, &file[0], "exhaustion", LFS_O_RDONLY); lfs2_file_open(&lfs2, &file[0], "exhaustion", LFS2_O_RDONLY);
size = strlen("exhaustion"); size = strlen("exhaustion");
lfs_file_size(&lfs, &file[0]) => size; lfs2_file_size(&lfs2, &file[0]) => size;
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "exhaustion", size) => 0; memcmp(buffer, "exhaustion", size) => 0;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_remove(&lfs, "exhaustion") => 0; lfs2_remove(&lfs2, "exhaustion") => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Dir exhaustion test ---" echo "--- Dir exhaustion test ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
// find out max file size // find out max file size
lfs_mkdir(&lfs, "exhaustiondir") => 0; lfs2_mkdir(&lfs2, "exhaustiondir") => 0;
size = strlen("blahblahblahblah"); size = strlen("blahblahblahblah");
memcpy(buffer, "blahblahblahblah", size); memcpy(buffer, "blahblahblahblah", size);
lfs_file_open(&lfs, &file[0], "exhaustion", LFS_O_WRONLY | LFS_O_CREAT); lfs2_file_open(&lfs2, &file[0], "exhaustion", LFS2_O_WRONLY | LFS2_O_CREAT);
int count = 0; int count = 0;
int err; int err;
while (true) { while (true) {
err = lfs_file_write(&lfs, &file[0], buffer, size); err = lfs2_file_write(&lfs2, &file[0], buffer, size);
if (err < 0) { if (err < 0) {
break; break;
} }
count += 1; count += 1;
} }
err => LFS_ERR_NOSPC; err => LFS2_ERR_NOSPC;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_remove(&lfs, "exhaustion") => 0; lfs2_remove(&lfs2, "exhaustion") => 0;
lfs_remove(&lfs, "exhaustiondir") => 0; lfs2_remove(&lfs2, "exhaustiondir") => 0;
// see if dir fits with max file size // see if dir fits with max file size
lfs_file_open(&lfs, &file[0], "exhaustion", LFS_O_WRONLY | LFS_O_CREAT); lfs2_file_open(&lfs2, &file[0], "exhaustion", LFS2_O_WRONLY | LFS2_O_CREAT);
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
lfs_file_write(&lfs, &file[0], buffer, size) => size; lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
} }
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_mkdir(&lfs, "exhaustiondir") => 0; lfs2_mkdir(&lfs2, "exhaustiondir") => 0;
lfs_remove(&lfs, "exhaustiondir") => 0; lfs2_remove(&lfs2, "exhaustiondir") => 0;
lfs_remove(&lfs, "exhaustion") => 0; lfs2_remove(&lfs2, "exhaustion") => 0;
// see if dir fits with > max file size // see if dir fits with > max file size
lfs_file_open(&lfs, &file[0], "exhaustion", LFS_O_WRONLY | LFS_O_CREAT); lfs2_file_open(&lfs2, &file[0], "exhaustion", LFS2_O_WRONLY | LFS2_O_CREAT);
for (int i = 0; i < count+1; i++) { for (int i = 0; i < count+1; i++) {
lfs_file_write(&lfs, &file[0], buffer, size) => size; lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
} }
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_mkdir(&lfs, "exhaustiondir") => LFS_ERR_NOSPC; lfs2_mkdir(&lfs2, "exhaustiondir") => LFS2_ERR_NOSPC;
lfs_remove(&lfs, "exhaustion") => 0; lfs2_remove(&lfs2, "exhaustion") => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Chained dir exhaustion test ---" echo "--- Chained dir exhaustion test ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
// find out max file size // find out max file size
lfs_mkdir(&lfs, "exhaustiondir") => 0; lfs2_mkdir(&lfs2, "exhaustiondir") => 0;
for (int i = 0; i < 10; i++) { for (int i = 0; i < 10; i++) {
sprintf((char*)buffer, "dirwithanexhaustivelylongnameforpadding%d", i); sprintf((char*)buffer, "dirwithanexhaustivelylongnameforpadding%d", i);
lfs_mkdir(&lfs, (char*)buffer) => 0; lfs2_mkdir(&lfs2, (char*)buffer) => 0;
} }
size = strlen("blahblahblahblah"); size = strlen("blahblahblahblah");
memcpy(buffer, "blahblahblahblah", size); memcpy(buffer, "blahblahblahblah", size);
lfs_file_open(&lfs, &file[0], "exhaustion", LFS_O_WRONLY | LFS_O_CREAT); lfs2_file_open(&lfs2, &file[0], "exhaustion", LFS2_O_WRONLY | LFS2_O_CREAT);
int count = 0; int count = 0;
int err; int err;
while (true) { while (true) {
err = lfs_file_write(&lfs, &file[0], buffer, size); err = lfs2_file_write(&lfs2, &file[0], buffer, size);
if (err < 0) { if (err < 0) {
break; break;
} }
count += 1; count += 1;
} }
err => LFS_ERR_NOSPC; err => LFS2_ERR_NOSPC;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_remove(&lfs, "exhaustion") => 0; lfs2_remove(&lfs2, "exhaustion") => 0;
lfs_remove(&lfs, "exhaustiondir") => 0; lfs2_remove(&lfs2, "exhaustiondir") => 0;
for (int i = 0; i < 10; i++) { for (int i = 0; i < 10; i++) {
sprintf((char*)buffer, "dirwithanexhaustivelylongnameforpadding%d", i); sprintf((char*)buffer, "dirwithanexhaustivelylongnameforpadding%d", i);
lfs_remove(&lfs, (char*)buffer) => 0; lfs2_remove(&lfs2, (char*)buffer) => 0;
} }
// see that chained dir fails // see that chained dir fails
lfs_file_open(&lfs, &file[0], "exhaustion", LFS_O_WRONLY | LFS_O_CREAT); lfs2_file_open(&lfs2, &file[0], "exhaustion", LFS2_O_WRONLY | LFS2_O_CREAT);
for (int i = 0; i < count+1; i++) { for (int i = 0; i < count+1; i++) {
lfs_file_write(&lfs, &file[0], buffer, size) => size; lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
} }
lfs_file_sync(&lfs, &file[0]) => 0; lfs2_file_sync(&lfs2, &file[0]) => 0;
for (int i = 0; i < 10; i++) { for (int i = 0; i < 10; i++) {
sprintf((char*)buffer, "dirwithanexhaustivelylongnameforpadding%d", i); sprintf((char*)buffer, "dirwithanexhaustivelylongnameforpadding%d", i);
lfs_mkdir(&lfs, (char*)buffer) => 0; lfs2_mkdir(&lfs2, (char*)buffer) => 0;
} }
lfs_mkdir(&lfs, "exhaustiondir") => LFS_ERR_NOSPC; lfs2_mkdir(&lfs2, "exhaustiondir") => LFS2_ERR_NOSPC;
// shorten file to try a second chained dir // shorten file to try a second chained dir
while (true) { while (true) {
err = lfs_mkdir(&lfs, "exhaustiondir"); err = lfs2_mkdir(&lfs2, "exhaustiondir");
if (err != LFS_ERR_NOSPC) { if (err != LFS2_ERR_NOSPC) {
break; break;
} }
lfs_ssize_t filesize = lfs_file_size(&lfs, &file[0]); lfs2_ssize_t filesize = lfs2_file_size(&lfs2, &file[0]);
filesize > 0 => true; filesize > 0 => true;
lfs_file_truncate(&lfs, &file[0], filesize - size) => 0; lfs2_file_truncate(&lfs2, &file[0], filesize - size) => 0;
lfs_file_sync(&lfs, &file[0]) => 0; lfs2_file_sync(&lfs2, &file[0]) => 0;
} }
err => 0; err => 0;
lfs_mkdir(&lfs, "exhaustiondir2") => LFS_ERR_NOSPC; lfs2_mkdir(&lfs2, "exhaustiondir2") => LFS2_ERR_NOSPC;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Split dir test ---" echo "--- Split dir test ---"
rm -rf blocks rm -rf blocks
tests/test.py << TEST tests/test.py << TEST
lfs_format(&lfs, &cfg) => 0; lfs2_format(&lfs2, &cfg) => 0;
TEST TEST
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
// create one block hole for half a directory // create one block hole for half a directory
lfs_file_open(&lfs, &file[0], "bump", LFS_O_WRONLY | LFS_O_CREAT) => 0; lfs2_file_open(&lfs2, &file[0], "bump", LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
for (lfs_size_t i = 0; i < cfg.block_size; i += 2) { for (lfs2_size_t i = 0; i < cfg.block_size; i += 2) {
memcpy(&buffer[i], "hi", 2); memcpy(&buffer[i], "hi", 2);
} }
lfs_file_write(&lfs, &file[0], buffer, cfg.block_size) => cfg.block_size; lfs2_file_write(&lfs2, &file[0], buffer, cfg.block_size) => cfg.block_size;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_file_open(&lfs, &file[0], "exhaustion", LFS_O_WRONLY | LFS_O_CREAT); lfs2_file_open(&lfs2, &file[0], "exhaustion", LFS2_O_WRONLY | LFS2_O_CREAT);
size = strlen("blahblahblahblah"); size = strlen("blahblahblahblah");
memcpy(buffer, "blahblahblahblah", size); memcpy(buffer, "blahblahblahblah", size);
for (lfs_size_t i = 0; for (lfs2_size_t i = 0;
i < (cfg.block_count-4)*(cfg.block_size-8); i < (cfg.block_count-4)*(cfg.block_size-8);
i += size) { i += size) {
lfs_file_write(&lfs, &file[0], buffer, size) => size; lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
} }
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
// remount to force reset of lookahead // remount to force reset of lookahead
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
// open hole // open hole
lfs_remove(&lfs, "bump") => 0; lfs2_remove(&lfs2, "bump") => 0;
lfs_mkdir(&lfs, "splitdir") => 0; lfs2_mkdir(&lfs2, "splitdir") => 0;
lfs_file_open(&lfs, &file[0], "splitdir/bump", lfs2_file_open(&lfs2, &file[0], "splitdir/bump",
LFS_O_WRONLY | LFS_O_CREAT) => 0; LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
for (lfs_size_t i = 0; i < cfg.block_size; i += 2) { for (lfs2_size_t i = 0; i < cfg.block_size; i += 2) {
memcpy(&buffer[i], "hi", 2); memcpy(&buffer[i], "hi", 2);
} }
lfs_file_write(&lfs, &file[0], buffer, 2*cfg.block_size) => LFS_ERR_NOSPC; lfs2_file_write(&lfs2, &file[0], buffer, 2*cfg.block_size) => LFS2_ERR_NOSPC;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Outdated lookahead test ---" echo "--- Outdated lookahead test ---"
rm -rf blocks rm -rf blocks
tests/test.py << TEST tests/test.py << TEST
lfs_format(&lfs, &cfg) => 0; lfs2_format(&lfs2, &cfg) => 0;
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
// fill completely with two files // fill completely with two files
lfs_file_open(&lfs, &file[0], "exhaustion1", lfs2_file_open(&lfs2, &file[0], "exhaustion1",
LFS_O_WRONLY | LFS_O_CREAT) => 0; LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
size = strlen("blahblahblahblah"); size = strlen("blahblahblahblah");
memcpy(buffer, "blahblahblahblah", size); memcpy(buffer, "blahblahblahblah", size);
for (lfs_size_t i = 0; for (lfs2_size_t i = 0;
i < ((cfg.block_count-2)/2)*(cfg.block_size-8); i < ((cfg.block_count-2)/2)*(cfg.block_size-8);
i += size) { i += size) {
lfs_file_write(&lfs, &file[0], buffer, size) => size; lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
} }
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_file_open(&lfs, &file[0], "exhaustion2", lfs2_file_open(&lfs2, &file[0], "exhaustion2",
LFS_O_WRONLY | LFS_O_CREAT) => 0; LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
size = strlen("blahblahblahblah"); size = strlen("blahblahblahblah");
memcpy(buffer, "blahblahblahblah", size); memcpy(buffer, "blahblahblahblah", size);
for (lfs_size_t i = 0; for (lfs2_size_t i = 0;
i < ((cfg.block_count-2+1)/2)*(cfg.block_size-8); i < ((cfg.block_count-2+1)/2)*(cfg.block_size-8);
i += size) { i += size) {
lfs_file_write(&lfs, &file[0], buffer, size) => size; lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
} }
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
// remount to force reset of lookahead // remount to force reset of lookahead
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
// rewrite one file // rewrite one file
lfs_file_open(&lfs, &file[0], "exhaustion1", lfs2_file_open(&lfs2, &file[0], "exhaustion1",
LFS_O_WRONLY | LFS_O_TRUNC) => 0; LFS2_O_WRONLY | LFS2_O_TRUNC) => 0;
lfs_file_sync(&lfs, &file[0]) => 0; lfs2_file_sync(&lfs2, &file[0]) => 0;
size = strlen("blahblahblahblah"); size = strlen("blahblahblahblah");
memcpy(buffer, "blahblahblahblah", size); memcpy(buffer, "blahblahblahblah", size);
for (lfs_size_t i = 0; for (lfs2_size_t i = 0;
i < ((cfg.block_count-2)/2)*(cfg.block_size-8); i < ((cfg.block_count-2)/2)*(cfg.block_size-8);
i += size) { i += size) {
lfs_file_write(&lfs, &file[0], buffer, size) => size; lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
} }
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
// rewrite second file, this requires lookahead does not // rewrite second file, this requires lookahead does not
// use old population // use old population
lfs_file_open(&lfs, &file[0], "exhaustion2", lfs2_file_open(&lfs2, &file[0], "exhaustion2",
LFS_O_WRONLY | LFS_O_TRUNC) => 0; LFS2_O_WRONLY | LFS2_O_TRUNC) => 0;
lfs_file_sync(&lfs, &file[0]) => 0; lfs2_file_sync(&lfs2, &file[0]) => 0;
size = strlen("blahblahblahblah"); size = strlen("blahblahblahblah");
memcpy(buffer, "blahblahblahblah", size); memcpy(buffer, "blahblahblahblah", size);
for (lfs_size_t i = 0; for (lfs2_size_t i = 0;
i < ((cfg.block_count-2+1)/2)*(cfg.block_size-8); i < ((cfg.block_count-2+1)/2)*(cfg.block_size-8);
i += size) { i += size) {
lfs_file_write(&lfs, &file[0], buffer, size) => size; lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
} }
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
TEST TEST
echo "--- Outdated lookahead and split dir test ---" echo "--- Outdated lookahead and split dir test ---"
rm -rf blocks rm -rf blocks
tests/test.py << TEST tests/test.py << TEST
lfs_format(&lfs, &cfg) => 0; lfs2_format(&lfs2, &cfg) => 0;
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
// fill completely with two files // fill completely with two files
lfs_file_open(&lfs, &file[0], "exhaustion1", lfs2_file_open(&lfs2, &file[0], "exhaustion1",
LFS_O_WRONLY | LFS_O_CREAT) => 0; LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
size = strlen("blahblahblahblah"); size = strlen("blahblahblahblah");
memcpy(buffer, "blahblahblahblah", size); memcpy(buffer, "blahblahblahblah", size);
for (lfs_size_t i = 0; for (lfs2_size_t i = 0;
i < ((cfg.block_count-2)/2)*(cfg.block_size-8); i < ((cfg.block_count-2)/2)*(cfg.block_size-8);
i += size) { i += size) {
lfs_file_write(&lfs, &file[0], buffer, size) => size; lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
} }
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_file_open(&lfs, &file[0], "exhaustion2", lfs2_file_open(&lfs2, &file[0], "exhaustion2",
LFS_O_WRONLY | LFS_O_CREAT) => 0; LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
size = strlen("blahblahblahblah"); size = strlen("blahblahblahblah");
memcpy(buffer, "blahblahblahblah", size); memcpy(buffer, "blahblahblahblah", size);
for (lfs_size_t i = 0; for (lfs2_size_t i = 0;
i < ((cfg.block_count-2+1)/2)*(cfg.block_size-8); i < ((cfg.block_count-2+1)/2)*(cfg.block_size-8);
i += size) { i += size) {
lfs_file_write(&lfs, &file[0], buffer, size) => size; lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
} }
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
// remount to force reset of lookahead // remount to force reset of lookahead
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
// rewrite one file with a hole of one block // rewrite one file with a hole of one block
lfs_file_open(&lfs, &file[0], "exhaustion1", lfs2_file_open(&lfs2, &file[0], "exhaustion1",
LFS_O_WRONLY | LFS_O_TRUNC) => 0; LFS2_O_WRONLY | LFS2_O_TRUNC) => 0;
lfs_file_sync(&lfs, &file[0]) => 0; lfs2_file_sync(&lfs2, &file[0]) => 0;
size = strlen("blahblahblahblah"); size = strlen("blahblahblahblah");
memcpy(buffer, "blahblahblahblah", size); memcpy(buffer, "blahblahblahblah", size);
for (lfs_size_t i = 0; for (lfs2_size_t i = 0;
i < ((cfg.block_count-2)/2 - 1)*(cfg.block_size-8); i < ((cfg.block_count-2)/2 - 1)*(cfg.block_size-8);
i += size) { i += size) {
lfs_file_write(&lfs, &file[0], buffer, size) => size; lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
} }
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
// try to allocate a directory, should fail! // try to allocate a directory, should fail!
lfs_mkdir(&lfs, "split") => LFS_ERR_NOSPC; lfs2_mkdir(&lfs2, "split") => LFS2_ERR_NOSPC;
// file should not fail // file should not fail
lfs_file_open(&lfs, &file[0], "notasplit", lfs2_file_open(&lfs2, &file[0], "notasplit",
LFS_O_WRONLY | LFS_O_CREAT) => 0; LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
lfs_file_write(&lfs, &file[0], "hi", 2) => 2; lfs2_file_write(&lfs2, &file[0], "hi", 2) => 2;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Results ---" echo "--- Results ---"

266
tests/test_attrs.sh
View File

@@ -4,282 +4,282 @@ set -eu
echo "=== Attr tests ===" echo "=== Attr tests ==="
rm -rf blocks rm -rf blocks
tests/test.py << TEST tests/test.py << TEST
lfs_format(&lfs, &cfg) => 0; lfs2_format(&lfs2, &cfg) => 0;
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_mkdir(&lfs, "hello") => 0; lfs2_mkdir(&lfs2, "hello") => 0;
lfs_file_open(&lfs, &file[0], "hello/hello", lfs2_file_open(&lfs2, &file[0], "hello/hello",
LFS_O_WRONLY | LFS_O_CREAT) => 0; LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
lfs_file_write(&lfs, &file[0], "hello", strlen("hello")) lfs2_file_write(&lfs2, &file[0], "hello", strlen("hello"))
=> strlen("hello"); => strlen("hello");
lfs_file_close(&lfs, &file[0]); lfs2_file_close(&lfs2, &file[0]);
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Set/get attribute ---" echo "--- Set/get attribute ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_setattr(&lfs, "hello", 'A', "aaaa", 4) => 0; lfs2_setattr(&lfs2, "hello", 'A', "aaaa", 4) => 0;
lfs_setattr(&lfs, "hello", 'B', "bbbbbb", 6) => 0; lfs2_setattr(&lfs2, "hello", 'B', "bbbbbb", 6) => 0;
lfs_setattr(&lfs, "hello", 'C', "ccccc", 5) => 0; lfs2_setattr(&lfs2, "hello", 'C', "ccccc", 5) => 0;
lfs_getattr(&lfs, "hello", 'A', buffer, 4) => 4; lfs2_getattr(&lfs2, "hello", 'A', buffer, 4) => 4;
lfs_getattr(&lfs, "hello", 'B', buffer+4, 6) => 6; lfs2_getattr(&lfs2, "hello", 'B', buffer+4, 6) => 6;
lfs_getattr(&lfs, "hello", 'C', buffer+10, 5) => 5; lfs2_getattr(&lfs2, "hello", 'C', buffer+10, 5) => 5;
memcmp(buffer, "aaaa", 4) => 0; memcmp(buffer, "aaaa", 4) => 0;
memcmp(buffer+4, "bbbbbb", 6) => 0; memcmp(buffer+4, "bbbbbb", 6) => 0;
memcmp(buffer+10, "ccccc", 5) => 0; memcmp(buffer+10, "ccccc", 5) => 0;
lfs_setattr(&lfs, "hello", 'B', "", 0) => 0; lfs2_setattr(&lfs2, "hello", 'B', "", 0) => 0;
lfs_getattr(&lfs, "hello", 'A', buffer, 4) => 4; lfs2_getattr(&lfs2, "hello", 'A', buffer, 4) => 4;
lfs_getattr(&lfs, "hello", 'B', buffer+4, 6) => 0; lfs2_getattr(&lfs2, "hello", 'B', buffer+4, 6) => 0;
lfs_getattr(&lfs, "hello", 'C', buffer+10, 5) => 5; lfs2_getattr(&lfs2, "hello", 'C', buffer+10, 5) => 5;
memcmp(buffer, "aaaa", 4) => 0; memcmp(buffer, "aaaa", 4) => 0;
memcmp(buffer+4, "\0\0\0\0\0\0", 6) => 0; memcmp(buffer+4, "\0\0\0\0\0\0", 6) => 0;
memcmp(buffer+10, "ccccc", 5) => 0; memcmp(buffer+10, "ccccc", 5) => 0;
lfs_removeattr(&lfs, "hello", 'B') => 0; lfs2_removeattr(&lfs2, "hello", 'B') => 0;
lfs_getattr(&lfs, "hello", 'A', buffer, 4) => 4; lfs2_getattr(&lfs2, "hello", 'A', buffer, 4) => 4;
lfs_getattr(&lfs, "hello", 'B', buffer+4, 6) => LFS_ERR_NOATTR; lfs2_getattr(&lfs2, "hello", 'B', buffer+4, 6) => LFS2_ERR_NOATTR;
lfs_getattr(&lfs, "hello", 'C', buffer+10, 5) => 5; lfs2_getattr(&lfs2, "hello", 'C', buffer+10, 5) => 5;
memcmp(buffer, "aaaa", 4) => 0; memcmp(buffer, "aaaa", 4) => 0;
memcmp(buffer+4, "\0\0\0\0\0\0", 6) => 0; memcmp(buffer+4, "\0\0\0\0\0\0", 6) => 0;
memcmp(buffer+10, "ccccc", 5) => 0; memcmp(buffer+10, "ccccc", 5) => 0;
lfs_setattr(&lfs, "hello", 'B', "dddddd", 6) => 0; lfs2_setattr(&lfs2, "hello", 'B', "dddddd", 6) => 0;
lfs_getattr(&lfs, "hello", 'A', buffer, 4) => 4; lfs2_getattr(&lfs2, "hello", 'A', buffer, 4) => 4;
lfs_getattr(&lfs, "hello", 'B', buffer+4, 6) => 6; lfs2_getattr(&lfs2, "hello", 'B', buffer+4, 6) => 6;
lfs_getattr(&lfs, "hello", 'C', buffer+10, 5) => 5; lfs2_getattr(&lfs2, "hello", 'C', buffer+10, 5) => 5;
memcmp(buffer, "aaaa", 4) => 0; memcmp(buffer, "aaaa", 4) => 0;
memcmp(buffer+4, "dddddd", 6) => 0; memcmp(buffer+4, "dddddd", 6) => 0;
memcmp(buffer+10, "ccccc", 5) => 0; memcmp(buffer+10, "ccccc", 5) => 0;
lfs_setattr(&lfs, "hello", 'B', "eee", 3) => 0; lfs2_setattr(&lfs2, "hello", 'B', "eee", 3) => 0;
lfs_getattr(&lfs, "hello", 'A', buffer, 4) => 4; lfs2_getattr(&lfs2, "hello", 'A', buffer, 4) => 4;
lfs_getattr(&lfs, "hello", 'B', buffer+4, 6) => 3; lfs2_getattr(&lfs2, "hello", 'B', buffer+4, 6) => 3;
lfs_getattr(&lfs, "hello", 'C', buffer+10, 5) => 5; lfs2_getattr(&lfs2, "hello", 'C', buffer+10, 5) => 5;
memcmp(buffer, "aaaa", 4) => 0; memcmp(buffer, "aaaa", 4) => 0;
memcmp(buffer+4, "eee\0\0\0", 6) => 0; memcmp(buffer+4, "eee\0\0\0", 6) => 0;
memcmp(buffer+10, "ccccc", 5) => 0; memcmp(buffer+10, "ccccc", 5) => 0;
lfs_setattr(&lfs, "hello", 'A', buffer, LFS_ATTR_MAX+1) => LFS_ERR_NOSPC; lfs2_setattr(&lfs2, "hello", 'A', buffer, LFS2_ATTR_MAX+1) => LFS2_ERR_NOSPC;
lfs_setattr(&lfs, "hello", 'B', "fffffffff", 9) => 0; lfs2_setattr(&lfs2, "hello", 'B', "fffffffff", 9) => 0;
lfs_getattr(&lfs, "hello", 'A', buffer, 4) => 4; lfs2_getattr(&lfs2, "hello", 'A', buffer, 4) => 4;
lfs_getattr(&lfs, "hello", 'B', buffer+4, 6) => 9; lfs2_getattr(&lfs2, "hello", 'B', buffer+4, 6) => 9;
lfs_getattr(&lfs, "hello", 'C', buffer+10, 5) => 5; lfs2_getattr(&lfs2, "hello", 'C', buffer+10, 5) => 5;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_getattr(&lfs, "hello", 'A', buffer, 4) => 4; lfs2_getattr(&lfs2, "hello", 'A', buffer, 4) => 4;
lfs_getattr(&lfs, "hello", 'B', buffer+4, 9) => 9; lfs2_getattr(&lfs2, "hello", 'B', buffer+4, 9) => 9;
lfs_getattr(&lfs, "hello", 'C', buffer+13, 5) => 5; lfs2_getattr(&lfs2, "hello", 'C', buffer+13, 5) => 5;
memcmp(buffer, "aaaa", 4) => 0; memcmp(buffer, "aaaa", 4) => 0;
memcmp(buffer+4, "fffffffff", 9) => 0; memcmp(buffer+4, "fffffffff", 9) => 0;
memcmp(buffer+13, "ccccc", 5) => 0; memcmp(buffer+13, "ccccc", 5) => 0;
lfs_file_open(&lfs, &file[0], "hello/hello", LFS_O_RDONLY) => 0; lfs2_file_open(&lfs2, &file[0], "hello/hello", LFS2_O_RDONLY) => 0;
lfs_file_read(&lfs, &file[0], buffer, sizeof(buffer)) => strlen("hello"); lfs2_file_read(&lfs2, &file[0], buffer, sizeof(buffer)) => strlen("hello");
memcmp(buffer, "hello", strlen("hello")) => 0; memcmp(buffer, "hello", strlen("hello")) => 0;
lfs_file_close(&lfs, &file[0]); lfs2_file_close(&lfs2, &file[0]);
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Set/get root attribute ---" echo "--- Set/get root attribute ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_setattr(&lfs, "/", 'A', "aaaa", 4) => 0; lfs2_setattr(&lfs2, "/", 'A', "aaaa", 4) => 0;
lfs_setattr(&lfs, "/", 'B', "bbbbbb", 6) => 0; lfs2_setattr(&lfs2, "/", 'B', "bbbbbb", 6) => 0;
lfs_setattr(&lfs, "/", 'C', "ccccc", 5) => 0; lfs2_setattr(&lfs2, "/", 'C', "ccccc", 5) => 0;
lfs_getattr(&lfs, "/", 'A', buffer, 4) => 4; lfs2_getattr(&lfs2, "/", 'A', buffer, 4) => 4;
lfs_getattr(&lfs, "/", 'B', buffer+4, 6) => 6; lfs2_getattr(&lfs2, "/", 'B', buffer+4, 6) => 6;
lfs_getattr(&lfs, "/", 'C', buffer+10, 5) => 5; lfs2_getattr(&lfs2, "/", 'C', buffer+10, 5) => 5;
memcmp(buffer, "aaaa", 4) => 0; memcmp(buffer, "aaaa", 4) => 0;
memcmp(buffer+4, "bbbbbb", 6) => 0; memcmp(buffer+4, "bbbbbb", 6) => 0;
memcmp(buffer+10, "ccccc", 5) => 0; memcmp(buffer+10, "ccccc", 5) => 0;
lfs_setattr(&lfs, "/", 'B', "", 0) => 0; lfs2_setattr(&lfs2, "/", 'B', "", 0) => 0;
lfs_getattr(&lfs, "/", 'A', buffer, 4) => 4; lfs2_getattr(&lfs2, "/", 'A', buffer, 4) => 4;
lfs_getattr(&lfs, "/", 'B', buffer+4, 6) => 0; lfs2_getattr(&lfs2, "/", 'B', buffer+4, 6) => 0;
lfs_getattr(&lfs, "/", 'C', buffer+10, 5) => 5; lfs2_getattr(&lfs2, "/", 'C', buffer+10, 5) => 5;
memcmp(buffer, "aaaa", 4) => 0; memcmp(buffer, "aaaa", 4) => 0;
memcmp(buffer+4, "\0\0\0\0\0\0", 6) => 0; memcmp(buffer+4, "\0\0\0\0\0\0", 6) => 0;
memcmp(buffer+10, "ccccc", 5) => 0; memcmp(buffer+10, "ccccc", 5) => 0;
lfs_removeattr(&lfs, "/", 'B') => 0; lfs2_removeattr(&lfs2, "/", 'B') => 0;
lfs_getattr(&lfs, "/", 'A', buffer, 4) => 4; lfs2_getattr(&lfs2, "/", 'A', buffer, 4) => 4;
lfs_getattr(&lfs, "/", 'B', buffer+4, 6) => LFS_ERR_NOATTR; lfs2_getattr(&lfs2, "/", 'B', buffer+4, 6) => LFS2_ERR_NOATTR;
lfs_getattr(&lfs, "/", 'C', buffer+10, 5) => 5; lfs2_getattr(&lfs2, "/", 'C', buffer+10, 5) => 5;
memcmp(buffer, "aaaa", 4) => 0; memcmp(buffer, "aaaa", 4) => 0;
memcmp(buffer+4, "\0\0\0\0\0\0", 6) => 0; memcmp(buffer+4, "\0\0\0\0\0\0", 6) => 0;
memcmp(buffer+10, "ccccc", 5) => 0; memcmp(buffer+10, "ccccc", 5) => 0;
lfs_setattr(&lfs, "/", 'B', "dddddd", 6) => 0; lfs2_setattr(&lfs2, "/", 'B', "dddddd", 6) => 0;
lfs_getattr(&lfs, "/", 'A', buffer, 4) => 4; lfs2_getattr(&lfs2, "/", 'A', buffer, 4) => 4;
lfs_getattr(&lfs, "/", 'B', buffer+4, 6) => 6; lfs2_getattr(&lfs2, "/", 'B', buffer+4, 6) => 6;
lfs_getattr(&lfs, "/", 'C', buffer+10, 5) => 5; lfs2_getattr(&lfs2, "/", 'C', buffer+10, 5) => 5;
memcmp(buffer, "aaaa", 4) => 0; memcmp(buffer, "aaaa", 4) => 0;
memcmp(buffer+4, "dddddd", 6) => 0; memcmp(buffer+4, "dddddd", 6) => 0;
memcmp(buffer+10, "ccccc", 5) => 0; memcmp(buffer+10, "ccccc", 5) => 0;
lfs_setattr(&lfs, "/", 'B', "eee", 3) => 0; lfs2_setattr(&lfs2, "/", 'B', "eee", 3) => 0;
lfs_getattr(&lfs, "/", 'A', buffer, 4) => 4; lfs2_getattr(&lfs2, "/", 'A', buffer, 4) => 4;
lfs_getattr(&lfs, "/", 'B', buffer+4, 6) => 3; lfs2_getattr(&lfs2, "/", 'B', buffer+4, 6) => 3;
lfs_getattr(&lfs, "/", 'C', buffer+10, 5) => 5; lfs2_getattr(&lfs2, "/", 'C', buffer+10, 5) => 5;
memcmp(buffer, "aaaa", 4) => 0; memcmp(buffer, "aaaa", 4) => 0;
memcmp(buffer+4, "eee\0\0\0", 6) => 0; memcmp(buffer+4, "eee\0\0\0", 6) => 0;
memcmp(buffer+10, "ccccc", 5) => 0; memcmp(buffer+10, "ccccc", 5) => 0;
lfs_setattr(&lfs, "/", 'A', buffer, LFS_ATTR_MAX+1) => LFS_ERR_NOSPC; lfs2_setattr(&lfs2, "/", 'A', buffer, LFS2_ATTR_MAX+1) => LFS2_ERR_NOSPC;
lfs_setattr(&lfs, "/", 'B', "fffffffff", 9) => 0; lfs2_setattr(&lfs2, "/", 'B', "fffffffff", 9) => 0;
lfs_getattr(&lfs, "/", 'A', buffer, 4) => 4; lfs2_getattr(&lfs2, "/", 'A', buffer, 4) => 4;
lfs_getattr(&lfs, "/", 'B', buffer+4, 6) => 9; lfs2_getattr(&lfs2, "/", 'B', buffer+4, 6) => 9;
lfs_getattr(&lfs, "/", 'C', buffer+10, 5) => 5; lfs2_getattr(&lfs2, "/", 'C', buffer+10, 5) => 5;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_getattr(&lfs, "/", 'A', buffer, 4) => 4; lfs2_getattr(&lfs2, "/", 'A', buffer, 4) => 4;
lfs_getattr(&lfs, "/", 'B', buffer+4, 9) => 9; lfs2_getattr(&lfs2, "/", 'B', buffer+4, 9) => 9;
lfs_getattr(&lfs, "/", 'C', buffer+13, 5) => 5; lfs2_getattr(&lfs2, "/", 'C', buffer+13, 5) => 5;
memcmp(buffer, "aaaa", 4) => 0; memcmp(buffer, "aaaa", 4) => 0;
memcmp(buffer+4, "fffffffff", 9) => 0; memcmp(buffer+4, "fffffffff", 9) => 0;
memcmp(buffer+13, "ccccc", 5) => 0; memcmp(buffer+13, "ccccc", 5) => 0;
lfs_file_open(&lfs, &file[0], "hello/hello", LFS_O_RDONLY) => 0; lfs2_file_open(&lfs2, &file[0], "hello/hello", LFS2_O_RDONLY) => 0;
lfs_file_read(&lfs, &file[0], buffer, sizeof(buffer)) => strlen("hello"); lfs2_file_read(&lfs2, &file[0], buffer, sizeof(buffer)) => strlen("hello");
memcmp(buffer, "hello", strlen("hello")) => 0; memcmp(buffer, "hello", strlen("hello")) => 0;
lfs_file_close(&lfs, &file[0]); lfs2_file_close(&lfs2, &file[0]);
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Set/get file attribute ---" echo "--- Set/get file attribute ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
struct lfs_attr attrs1[] = { struct lfs2_attr attrs1[] = {
{'A', buffer, 4}, {'A', buffer, 4},
{'B', buffer+4, 6}, {'B', buffer+4, 6},
{'C', buffer+10, 5}, {'C', buffer+10, 5},
}; };
struct lfs_file_config cfg1 = {.attrs=attrs1, .attr_count=3}; struct lfs2_file_config cfg1 = {.attrs=attrs1, .attr_count=3};
lfs_file_opencfg(&lfs, &file[0], "hello/hello", LFS_O_WRONLY, &cfg1) => 0; lfs2_file_opencfg(&lfs2, &file[0], "hello/hello", LFS2_O_WRONLY, &cfg1) => 0;
memcpy(buffer, "aaaa", 4); memcpy(buffer, "aaaa", 4);
memcpy(buffer+4, "bbbbbb", 6); memcpy(buffer+4, "bbbbbb", 6);
memcpy(buffer+10, "ccccc", 5); memcpy(buffer+10, "ccccc", 5);
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
memset(buffer, 0, 15); memset(buffer, 0, 15);
lfs_file_opencfg(&lfs, &file[0], "hello/hello", LFS_O_RDONLY, &cfg1) => 0; lfs2_file_opencfg(&lfs2, &file[0], "hello/hello", LFS2_O_RDONLY, &cfg1) => 0;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
memcmp(buffer, "aaaa", 4) => 0; memcmp(buffer, "aaaa", 4) => 0;
memcmp(buffer+4, "bbbbbb", 6) => 0; memcmp(buffer+4, "bbbbbb", 6) => 0;
memcmp(buffer+10, "ccccc", 5) => 0; memcmp(buffer+10, "ccccc", 5) => 0;
attrs1[1].size = 0; attrs1[1].size = 0;
lfs_file_opencfg(&lfs, &file[0], "hello/hello", LFS_O_WRONLY, &cfg1) => 0; lfs2_file_opencfg(&lfs2, &file[0], "hello/hello", LFS2_O_WRONLY, &cfg1) => 0;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
memset(buffer, 0, 15); memset(buffer, 0, 15);
attrs1[1].size = 6; attrs1[1].size = 6;
lfs_file_opencfg(&lfs, &file[0], "hello/hello", LFS_O_RDONLY, &cfg1) => 0; lfs2_file_opencfg(&lfs2, &file[0], "hello/hello", LFS2_O_RDONLY, &cfg1) => 0;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
memcmp(buffer, "aaaa", 4) => 0; memcmp(buffer, "aaaa", 4) => 0;
memcmp(buffer+4, "\0\0\0\0\0\0", 6) => 0; memcmp(buffer+4, "\0\0\0\0\0\0", 6) => 0;
memcmp(buffer+10, "ccccc", 5) => 0; memcmp(buffer+10, "ccccc", 5) => 0;
attrs1[1].size = 6; attrs1[1].size = 6;
lfs_file_opencfg(&lfs, &file[0], "hello/hello", LFS_O_WRONLY, &cfg1) => 0; lfs2_file_opencfg(&lfs2, &file[0], "hello/hello", LFS2_O_WRONLY, &cfg1) => 0;
memcpy(buffer+4, "dddddd", 6); memcpy(buffer+4, "dddddd", 6);
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
memset(buffer, 0, 15); memset(buffer, 0, 15);
attrs1[1].size = 6; attrs1[1].size = 6;
lfs_file_opencfg(&lfs, &file[0], "hello/hello", LFS_O_RDONLY, &cfg1) => 0; lfs2_file_opencfg(&lfs2, &file[0], "hello/hello", LFS2_O_RDONLY, &cfg1) => 0;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
memcmp(buffer, "aaaa", 4) => 0; memcmp(buffer, "aaaa", 4) => 0;
memcmp(buffer+4, "dddddd", 6) => 0; memcmp(buffer+4, "dddddd", 6) => 0;
memcmp(buffer+10, "ccccc", 5) => 0; memcmp(buffer+10, "ccccc", 5) => 0;
attrs1[1].size = 3; attrs1[1].size = 3;
lfs_file_opencfg(&lfs, &file[0], "hello/hello", LFS_O_WRONLY, &cfg1) => 0; lfs2_file_opencfg(&lfs2, &file[0], "hello/hello", LFS2_O_WRONLY, &cfg1) => 0;
memcpy(buffer+4, "eee", 3); memcpy(buffer+4, "eee", 3);
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
memset(buffer, 0, 15); memset(buffer, 0, 15);
attrs1[1].size = 6; attrs1[1].size = 6;
lfs_file_opencfg(&lfs, &file[0], "hello/hello", LFS_O_RDONLY, &cfg1) => 0; lfs2_file_opencfg(&lfs2, &file[0], "hello/hello", LFS2_O_RDONLY, &cfg1) => 0;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
memcmp(buffer, "aaaa", 4) => 0; memcmp(buffer, "aaaa", 4) => 0;
memcmp(buffer+4, "eee\0\0\0", 6) => 0; memcmp(buffer+4, "eee\0\0\0", 6) => 0;
memcmp(buffer+10, "ccccc", 5) => 0; memcmp(buffer+10, "ccccc", 5) => 0;
attrs1[0].size = LFS_ATTR_MAX+1; attrs1[0].size = LFS2_ATTR_MAX+1;
lfs_file_opencfg(&lfs, &file[0], "hello/hello", LFS_O_WRONLY, &cfg1) lfs2_file_opencfg(&lfs2, &file[0], "hello/hello", LFS2_O_WRONLY, &cfg1)
=> LFS_ERR_NOSPC; => LFS2_ERR_NOSPC;
struct lfs_attr attrs2[] = { struct lfs2_attr attrs2[] = {
{'A', buffer, 4}, {'A', buffer, 4},
{'B', buffer+4, 9}, {'B', buffer+4, 9},
{'C', buffer+13, 5}, {'C', buffer+13, 5},
}; };
struct lfs_file_config cfg2 = {.attrs=attrs2, .attr_count=3}; struct lfs2_file_config cfg2 = {.attrs=attrs2, .attr_count=3};
lfs_file_opencfg(&lfs, &file[0], "hello/hello", LFS_O_RDWR, &cfg2) => 0; lfs2_file_opencfg(&lfs2, &file[0], "hello/hello", LFS2_O_RDWR, &cfg2) => 0;
memcpy(buffer+4, "fffffffff", 9); memcpy(buffer+4, "fffffffff", 9);
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
attrs1[0].size = 4; attrs1[0].size = 4;
lfs_file_opencfg(&lfs, &file[0], "hello/hello", LFS_O_RDONLY, &cfg1) => 0; lfs2_file_opencfg(&lfs2, &file[0], "hello/hello", LFS2_O_RDONLY, &cfg1) => 0;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
struct lfs_attr attrs2[] = { struct lfs2_attr attrs2[] = {
{'A', buffer, 4}, {'A', buffer, 4},
{'B', buffer+4, 9}, {'B', buffer+4, 9},
{'C', buffer+13, 5}, {'C', buffer+13, 5},
}; };
struct lfs_file_config cfg2 = {.attrs=attrs2, .attr_count=3}; struct lfs2_file_config cfg2 = {.attrs=attrs2, .attr_count=3};
lfs_file_opencfg(&lfs, &file[0], "hello/hello", LFS_O_RDONLY, &cfg2) => 0; lfs2_file_opencfg(&lfs2, &file[0], "hello/hello", LFS2_O_RDONLY, &cfg2) => 0;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
memcmp(buffer, "aaaa", 4) => 0; memcmp(buffer, "aaaa", 4) => 0;
memcmp(buffer+4, "fffffffff", 9) => 0; memcmp(buffer+4, "fffffffff", 9) => 0;
memcmp(buffer+13, "ccccc", 5) => 0; memcmp(buffer+13, "ccccc", 5) => 0;
lfs_file_open(&lfs, &file[0], "hello/hello", LFS_O_RDONLY) => 0; lfs2_file_open(&lfs2, &file[0], "hello/hello", LFS2_O_RDONLY) => 0;
lfs_file_read(&lfs, &file[0], buffer, sizeof(buffer)) => strlen("hello"); lfs2_file_read(&lfs2, &file[0], buffer, sizeof(buffer)) => strlen("hello");
memcmp(buffer, "hello", strlen("hello")) => 0; memcmp(buffer, "hello", strlen("hello")) => 0;
lfs_file_close(&lfs, &file[0]); lfs2_file_close(&lfs2, &file[0]);
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Deferred file attributes ---" echo "--- Deferred file attributes ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
struct lfs_attr attrs1[] = { struct lfs2_attr attrs1[] = {
{'B', "gggg", 4}, {'B', "gggg", 4},
{'C', "", 0}, {'C', "", 0},
{'D', "hhhh", 4}, {'D', "hhhh", 4},
}; };
struct lfs_file_config cfg1 = {.attrs=attrs1, .attr_count=3}; struct lfs2_file_config cfg1 = {.attrs=attrs1, .attr_count=3};
lfs_file_opencfg(&lfs, &file[0], "hello/hello", LFS_O_WRONLY, &cfg1) => 0; lfs2_file_opencfg(&lfs2, &file[0], "hello/hello", LFS2_O_WRONLY, &cfg1) => 0;
lfs_getattr(&lfs, "hello/hello", 'B', buffer, 9) => 9; lfs2_getattr(&lfs2, "hello/hello", 'B', buffer, 9) => 9;
lfs_getattr(&lfs, "hello/hello", 'C', buffer+9, 9) => 5; lfs2_getattr(&lfs2, "hello/hello", 'C', buffer+9, 9) => 5;
lfs_getattr(&lfs, "hello/hello", 'D', buffer+18, 9) => LFS_ERR_NOATTR; lfs2_getattr(&lfs2, "hello/hello", 'D', buffer+18, 9) => LFS2_ERR_NOATTR;
memcmp(buffer, "fffffffff", 9) => 0; memcmp(buffer, "fffffffff", 9) => 0;
memcmp(buffer+9, "ccccc\0\0\0\0", 9) => 0; memcmp(buffer+9, "ccccc\0\0\0\0", 9) => 0;
memcmp(buffer+18, "\0\0\0\0\0\0\0\0\0", 9) => 0; memcmp(buffer+18, "\0\0\0\0\0\0\0\0\0", 9) => 0;
lfs_file_sync(&lfs, &file[0]) => 0; lfs2_file_sync(&lfs2, &file[0]) => 0;
lfs_getattr(&lfs, "hello/hello", 'B', buffer, 9) => 4; lfs2_getattr(&lfs2, "hello/hello", 'B', buffer, 9) => 4;
lfs_getattr(&lfs, "hello/hello", 'C', buffer+9, 9) => 0; lfs2_getattr(&lfs2, "hello/hello", 'C', buffer+9, 9) => 0;
lfs_getattr(&lfs, "hello/hello", 'D', buffer+18, 9) => 4; lfs2_getattr(&lfs2, "hello/hello", 'D', buffer+18, 9) => 4;
memcmp(buffer, "gggg\0\0\0\0\0", 9) => 0; memcmp(buffer, "gggg\0\0\0\0\0", 9) => 0;
memcmp(buffer+9, "\0\0\0\0\0\0\0\0\0", 9) => 0; memcmp(buffer+9, "\0\0\0\0\0\0\0\0\0", 9) => 0;
memcmp(buffer+18, "hhhh\0\0\0\0\0", 9) => 0; memcmp(buffer+18, "hhhh\0\0\0\0\0", 9) => 0;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Results ---" echo "--- Results ---"

56
tests/test_corrupt.sh
View File

@@ -6,71 +6,71 @@ echo "=== Corrupt tests ==="
NAMEMULT=64 NAMEMULT=64
FILEMULT=1 FILEMULT=1
lfs_mktree() { lfs2_mktree() {
tests/test.py ${1:-} << TEST tests/test.py ${1:-} << TEST
lfs_format(&lfs, &cfg) => 0; lfs2_format(&lfs2, &cfg) => 0;
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
for (int i = 1; i < 10; i++) { for (int i = 1; i < 10; i++) {
for (int j = 0; j < $NAMEMULT; j++) { for (int j = 0; j < $NAMEMULT; j++) {
buffer[j] = '0'+i; buffer[j] = '0'+i;
} }
buffer[$NAMEMULT] = '\0'; buffer[$NAMEMULT] = '\0';
lfs_mkdir(&lfs, (char*)buffer) => 0; lfs2_mkdir(&lfs2, (char*)buffer) => 0;
buffer[$NAMEMULT] = '/'; buffer[$NAMEMULT] = '/';
for (int j = 0; j < $NAMEMULT; j++) { for (int j = 0; j < $NAMEMULT; j++) {
buffer[j+$NAMEMULT+1] = '0'+i; buffer[j+$NAMEMULT+1] = '0'+i;
} }
buffer[2*$NAMEMULT+1] = '\0'; buffer[2*$NAMEMULT+1] = '\0';
lfs_file_open(&lfs, &file[0], (char*)buffer, lfs2_file_open(&lfs2, &file[0], (char*)buffer,
LFS_O_WRONLY | LFS_O_CREAT) => 0; LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
size = $NAMEMULT; size = $NAMEMULT;
for (int j = 0; j < i*$FILEMULT; j++) { for (int j = 0; j < i*$FILEMULT; j++) {
lfs_file_write(&lfs, &file[0], buffer, size) => size; lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
} }
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
} }
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
} }
lfs_chktree() { lfs2_chktree() {
tests/test.py ${1:-} << TEST tests/test.py ${1:-} << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
for (int i = 1; i < 10; i++) { for (int i = 1; i < 10; i++) {
for (int j = 0; j < $NAMEMULT; j++) { for (int j = 0; j < $NAMEMULT; j++) {
buffer[j] = '0'+i; buffer[j] = '0'+i;
} }
buffer[$NAMEMULT] = '\0'; buffer[$NAMEMULT] = '\0';
lfs_stat(&lfs, (char*)buffer, &info) => 0; lfs2_stat(&lfs2, (char*)buffer, &info) => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
buffer[$NAMEMULT] = '/'; buffer[$NAMEMULT] = '/';
for (int j = 0; j < $NAMEMULT; j++) { for (int j = 0; j < $NAMEMULT; j++) {
buffer[j+$NAMEMULT+1] = '0'+i; buffer[j+$NAMEMULT+1] = '0'+i;
} }
buffer[2*$NAMEMULT+1] = '\0'; buffer[2*$NAMEMULT+1] = '\0';
lfs_file_open(&lfs, &file[0], (char*)buffer, LFS_O_RDONLY) => 0; lfs2_file_open(&lfs2, &file[0], (char*)buffer, LFS2_O_RDONLY) => 0;
size = $NAMEMULT; size = $NAMEMULT;
for (int j = 0; j < i*$FILEMULT; j++) { for (int j = 0; j < i*$FILEMULT; j++) {
lfs_file_read(&lfs, &file[0], rbuffer, size) => size; lfs2_file_read(&lfs2, &file[0], rbuffer, size) => size;
memcmp(buffer, rbuffer, size) => 0; memcmp(buffer, rbuffer, size) => 0;
} }
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
} }
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
} }
echo "--- Sanity check ---" echo "--- Sanity check ---"
rm -rf blocks rm -rf blocks
lfs_mktree lfs2_mktree
lfs_chktree lfs2_chktree
BLOCKS="$(ls blocks | grep -vw '[01]')" BLOCKS="$(ls blocks | grep -vw '[01]')"
echo "--- Block corruption ---" echo "--- Block corruption ---"
@@ -79,8 +79,8 @@ do
rm -rf blocks rm -rf blocks
mkdir blocks mkdir blocks
ln -s /dev/zero blocks/$b ln -s /dev/zero blocks/$b
lfs_mktree lfs2_mktree
lfs_chktree lfs2_chktree
done done
echo "--- Block persistance ---" echo "--- Block persistance ---"
@@ -88,10 +88,10 @@ for b in $BLOCKS
do do
rm -rf blocks rm -rf blocks
mkdir blocks mkdir blocks
lfs_mktree lfs2_mktree
chmod a-w blocks/$b || true chmod a-w blocks/$b || true
lfs_mktree lfs2_mktree
lfs_chktree lfs2_chktree
done done
echo "--- Big region corruption ---" echo "--- Big region corruption ---"
@@ -101,8 +101,8 @@ for i in {2..512}
do do
ln -s /dev/zero blocks/$(printf '%x' $i) ln -s /dev/zero blocks/$(printf '%x' $i)
done done
lfs_mktree lfs2_mktree
lfs_chktree lfs2_chktree
echo "--- Alternating corruption ---" echo "--- Alternating corruption ---"
rm -rf blocks rm -rf blocks
@@ -111,8 +111,8 @@ for i in {2..1024..2}
do do
ln -s /dev/zero blocks/$(printf '%x' $i) ln -s /dev/zero blocks/$(printf '%x' $i)
done done
lfs_mktree lfs2_mktree
lfs_chktree lfs2_chktree
echo "--- Results ---" echo "--- Results ---"
tests/stats.py tests/stats.py

538
tests/test_dirs.sh
View File

@@ -6,294 +6,294 @@ LARGESIZE=128
echo "=== Directory tests ===" echo "=== Directory tests ==="
rm -rf blocks rm -rf blocks
tests/test.py << TEST tests/test.py << TEST
lfs_format(&lfs, &cfg) => 0; lfs2_format(&lfs2, &cfg) => 0;
TEST TEST
echo "--- Root directory ---" echo "--- Root directory ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_dir_open(&lfs, &dir[0], "/") => 0; lfs2_dir_open(&lfs2, &dir[0], "/") => 0;
lfs_dir_close(&lfs, &dir[0]) => 0; lfs2_dir_close(&lfs2, &dir[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Directory creation ---" echo "--- Directory creation ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_mkdir(&lfs, "potato") => 0; lfs2_mkdir(&lfs2, "potato") => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- File creation ---" echo "--- File creation ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_file_open(&lfs, &file[0], "burito", LFS_O_CREAT | LFS_O_WRONLY) => 0; lfs2_file_open(&lfs2, &file[0], "burito", LFS2_O_CREAT | LFS2_O_WRONLY) => 0;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Directory iteration ---" echo "--- Directory iteration ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_dir_open(&lfs, &dir[0], "/") => 0; lfs2_dir_open(&lfs2, &dir[0], "/") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "burito") => 0; strcmp(info.name, "burito") => 0;
info.type => LFS_TYPE_REG; info.type => LFS2_TYPE_REG;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "potato") => 0; strcmp(info.name, "potato") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_dir_close(&lfs, &dir[0]) => 0; lfs2_dir_close(&lfs2, &dir[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Directory failures ---" echo "--- Directory failures ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_mkdir(&lfs, "potato") => LFS_ERR_EXIST; lfs2_mkdir(&lfs2, "potato") => LFS2_ERR_EXIST;
lfs_dir_open(&lfs, &dir[0], "tomato") => LFS_ERR_NOENT; lfs2_dir_open(&lfs2, &dir[0], "tomato") => LFS2_ERR_NOENT;
lfs_dir_open(&lfs, &dir[0], "burito") => LFS_ERR_NOTDIR; lfs2_dir_open(&lfs2, &dir[0], "burito") => LFS2_ERR_NOTDIR;
lfs_file_open(&lfs, &file[0], "tomato", LFS_O_RDONLY) => LFS_ERR_NOENT; lfs2_file_open(&lfs2, &file[0], "tomato", LFS2_O_RDONLY) => LFS2_ERR_NOENT;
lfs_file_open(&lfs, &file[0], "potato", LFS_O_RDONLY) => LFS_ERR_ISDIR; lfs2_file_open(&lfs2, &file[0], "potato", LFS2_O_RDONLY) => LFS2_ERR_ISDIR;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Nested directories ---" echo "--- Nested directories ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_mkdir(&lfs, "potato/baked") => 0; lfs2_mkdir(&lfs2, "potato/baked") => 0;
lfs_mkdir(&lfs, "potato/sweet") => 0; lfs2_mkdir(&lfs2, "potato/sweet") => 0;
lfs_mkdir(&lfs, "potato/fried") => 0; lfs2_mkdir(&lfs2, "potato/fried") => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_dir_open(&lfs, &dir[0], "potato") => 0; lfs2_dir_open(&lfs2, &dir[0], "potato") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "baked") => 0; strcmp(info.name, "baked") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "fried") => 0; strcmp(info.name, "fried") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "sweet") => 0; strcmp(info.name, "sweet") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_dir_close(&lfs, &dir[0]) => 0; lfs2_dir_close(&lfs2, &dir[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Multi-block directory ---" echo "--- Multi-block directory ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_mkdir(&lfs, "cactus") => 0; lfs2_mkdir(&lfs2, "cactus") => 0;
for (int i = 0; i < $LARGESIZE; i++) { for (int i = 0; i < $LARGESIZE; i++) {
sprintf((char*)buffer, "cactus/test%03d", i); sprintf((char*)buffer, "cactus/test%03d", i);
lfs_mkdir(&lfs, (char*)buffer) => 0; lfs2_mkdir(&lfs2, (char*)buffer) => 0;
} }
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_dir_open(&lfs, &dir[0], "cactus") => 0; lfs2_dir_open(&lfs2, &dir[0], "cactus") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
for (int i = 0; i < $LARGESIZE; i++) { for (int i = 0; i < $LARGESIZE; i++) {
sprintf((char*)buffer, "test%03d", i); sprintf((char*)buffer, "test%03d", i);
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, (char*)buffer) => 0; strcmp(info.name, (char*)buffer) => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
} }
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Directory remove ---" echo "--- Directory remove ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_remove(&lfs, "potato") => LFS_ERR_NOTEMPTY; lfs2_remove(&lfs2, "potato") => LFS2_ERR_NOTEMPTY;
lfs_remove(&lfs, "potato/sweet") => 0; lfs2_remove(&lfs2, "potato/sweet") => 0;
lfs_remove(&lfs, "potato/baked") => 0; lfs2_remove(&lfs2, "potato/baked") => 0;
lfs_remove(&lfs, "potato/fried") => 0; lfs2_remove(&lfs2, "potato/fried") => 0;
lfs_dir_open(&lfs, &dir[0], "potato") => 0; lfs2_dir_open(&lfs2, &dir[0], "potato") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_dir_close(&lfs, &dir[0]) => 0; lfs2_dir_close(&lfs2, &dir[0]) => 0;
lfs_remove(&lfs, "potato") => 0; lfs2_remove(&lfs2, "potato") => 0;
lfs_dir_open(&lfs, &dir[0], "/") => 0; lfs2_dir_open(&lfs2, &dir[0], "/") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "burito") => 0; strcmp(info.name, "burito") => 0;
info.type => LFS_TYPE_REG; info.type => LFS2_TYPE_REG;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "cactus") => 0; strcmp(info.name, "cactus") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_dir_close(&lfs, &dir[0]) => 0; lfs2_dir_close(&lfs2, &dir[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_dir_open(&lfs, &dir[0], "/") => 0; lfs2_dir_open(&lfs2, &dir[0], "/") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "burito") => 0; strcmp(info.name, "burito") => 0;
info.type => LFS_TYPE_REG; info.type => LFS2_TYPE_REG;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "cactus") => 0; strcmp(info.name, "cactus") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_dir_close(&lfs, &dir[0]) => 0; lfs2_dir_close(&lfs2, &dir[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Directory rename ---" echo "--- Directory rename ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_mkdir(&lfs, "coldpotato") => 0; lfs2_mkdir(&lfs2, "coldpotato") => 0;
lfs_mkdir(&lfs, "coldpotato/baked") => 0; lfs2_mkdir(&lfs2, "coldpotato/baked") => 0;
lfs_mkdir(&lfs, "coldpotato/sweet") => 0; lfs2_mkdir(&lfs2, "coldpotato/sweet") => 0;
lfs_mkdir(&lfs, "coldpotato/fried") => 0; lfs2_mkdir(&lfs2, "coldpotato/fried") => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_rename(&lfs, "coldpotato", "hotpotato") => 0; lfs2_rename(&lfs2, "coldpotato", "hotpotato") => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_dir_open(&lfs, &dir[0], "hotpotato") => 0; lfs2_dir_open(&lfs2, &dir[0], "hotpotato") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "baked") => 0; strcmp(info.name, "baked") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "fried") => 0; strcmp(info.name, "fried") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "sweet") => 0; strcmp(info.name, "sweet") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_dir_close(&lfs, &dir[0]) => 0; lfs2_dir_close(&lfs2, &dir[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_mkdir(&lfs, "warmpotato") => 0; lfs2_mkdir(&lfs2, "warmpotato") => 0;
lfs_mkdir(&lfs, "warmpotato/mushy") => 0; lfs2_mkdir(&lfs2, "warmpotato/mushy") => 0;
lfs_rename(&lfs, "hotpotato", "warmpotato") => LFS_ERR_NOTEMPTY; lfs2_rename(&lfs2, "hotpotato", "warmpotato") => LFS2_ERR_NOTEMPTY;
lfs_remove(&lfs, "warmpotato/mushy") => 0; lfs2_remove(&lfs2, "warmpotato/mushy") => 0;
lfs_rename(&lfs, "hotpotato", "warmpotato") => 0; lfs2_rename(&lfs2, "hotpotato", "warmpotato") => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_dir_open(&lfs, &dir[0], "warmpotato") => 0; lfs2_dir_open(&lfs2, &dir[0], "warmpotato") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "baked") => 0; strcmp(info.name, "baked") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "fried") => 0; strcmp(info.name, "fried") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "sweet") => 0; strcmp(info.name, "sweet") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_dir_close(&lfs, &dir[0]) => 0; lfs2_dir_close(&lfs2, &dir[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_mkdir(&lfs, "coldpotato") => 0; lfs2_mkdir(&lfs2, "coldpotato") => 0;
lfs_rename(&lfs, "warmpotato/baked", "coldpotato/baked") => 0; lfs2_rename(&lfs2, "warmpotato/baked", "coldpotato/baked") => 0;
lfs_rename(&lfs, "warmpotato/sweet", "coldpotato/sweet") => 0; lfs2_rename(&lfs2, "warmpotato/sweet", "coldpotato/sweet") => 0;
lfs_rename(&lfs, "warmpotato/fried", "coldpotato/fried") => 0; lfs2_rename(&lfs2, "warmpotato/fried", "coldpotato/fried") => 0;
lfs_remove(&lfs, "coldpotato") => LFS_ERR_NOTEMPTY; lfs2_remove(&lfs2, "coldpotato") => LFS2_ERR_NOTEMPTY;
lfs_remove(&lfs, "warmpotato") => 0; lfs2_remove(&lfs2, "warmpotato") => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_dir_open(&lfs, &dir[0], "coldpotato") => 0; lfs2_dir_open(&lfs2, &dir[0], "coldpotato") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "baked") => 0; strcmp(info.name, "baked") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "fried") => 0; strcmp(info.name, "fried") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "sweet") => 0; strcmp(info.name, "sweet") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_dir_close(&lfs, &dir[0]) => 0; lfs2_dir_close(&lfs2, &dir[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Recursive remove ---" echo "--- Recursive remove ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_remove(&lfs, "coldpotato") => LFS_ERR_NOTEMPTY; lfs2_remove(&lfs2, "coldpotato") => LFS2_ERR_NOTEMPTY;
lfs_dir_open(&lfs, &dir[0], "coldpotato") => 0; lfs2_dir_open(&lfs2, &dir[0], "coldpotato") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
while (true) { while (true) {
int err = lfs_dir_read(&lfs, &dir[0], &info); int err = lfs2_dir_read(&lfs2, &dir[0], &info);
err >= 0 => 1; err >= 0 => 1;
if (err == 0) { if (err == 0) {
break; break;
@@ -301,183 +301,183 @@ tests/test.py << TEST
strcpy((char*)buffer, "coldpotato/"); strcpy((char*)buffer, "coldpotato/");
strcat((char*)buffer, info.name); strcat((char*)buffer, info.name);
lfs_remove(&lfs, (char*)buffer) => 0; lfs2_remove(&lfs2, (char*)buffer) => 0;
} }
lfs_remove(&lfs, "coldpotato") => 0; lfs2_remove(&lfs2, "coldpotato") => 0;
TEST TEST
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_dir_open(&lfs, &dir[0], "/") => 0; lfs2_dir_open(&lfs2, &dir[0], "/") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "burito") => 0; strcmp(info.name, "burito") => 0;
info.type => LFS_TYPE_REG; info.type => LFS2_TYPE_REG;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "cactus") => 0; strcmp(info.name, "cactus") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_dir_close(&lfs, &dir[0]) => 0; lfs2_dir_close(&lfs2, &dir[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Multi-block rename ---" echo "--- Multi-block rename ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
for (int i = 0; i < $LARGESIZE; i++) { for (int i = 0; i < $LARGESIZE; i++) {
sprintf((char*)buffer, "cactus/test%03d", i); sprintf((char*)buffer, "cactus/test%03d", i);
sprintf((char*)wbuffer, "cactus/tedd%03d", i); sprintf((char*)wbuffer, "cactus/tedd%03d", i);
lfs_rename(&lfs, (char*)buffer, (char*)wbuffer) => 0; lfs2_rename(&lfs2, (char*)buffer, (char*)wbuffer) => 0;
} }
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_dir_open(&lfs, &dir[0], "cactus") => 0; lfs2_dir_open(&lfs2, &dir[0], "cactus") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
for (int i = 0; i < $LARGESIZE; i++) { for (int i = 0; i < $LARGESIZE; i++) {
sprintf((char*)buffer, "tedd%03d", i); sprintf((char*)buffer, "tedd%03d", i);
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, (char*)buffer) => 0; strcmp(info.name, (char*)buffer) => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
} }
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Multi-block remove ---" echo "--- Multi-block remove ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_remove(&lfs, "cactus") => LFS_ERR_NOTEMPTY; lfs2_remove(&lfs2, "cactus") => LFS2_ERR_NOTEMPTY;
for (int i = 0; i < $LARGESIZE; i++) { for (int i = 0; i < $LARGESIZE; i++) {
sprintf((char*)buffer, "cactus/tedd%03d", i); sprintf((char*)buffer, "cactus/tedd%03d", i);
lfs_remove(&lfs, (char*)buffer) => 0; lfs2_remove(&lfs2, (char*)buffer) => 0;
} }
lfs_remove(&lfs, "cactus") => 0; lfs2_remove(&lfs2, "cactus") => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_dir_open(&lfs, &dir[0], "/") => 0; lfs2_dir_open(&lfs2, &dir[0], "/") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "burito") => 0; strcmp(info.name, "burito") => 0;
info.type => LFS_TYPE_REG; info.type => LFS2_TYPE_REG;
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_dir_close(&lfs, &dir[0]) => 0; lfs2_dir_close(&lfs2, &dir[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Multi-block directory with files ---" echo "--- Multi-block directory with files ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_mkdir(&lfs, "prickly-pear") => 0; lfs2_mkdir(&lfs2, "prickly-pear") => 0;
for (int i = 0; i < $LARGESIZE; i++) { for (int i = 0; i < $LARGESIZE; i++) {
sprintf((char*)buffer, "prickly-pear/test%03d", i); sprintf((char*)buffer, "prickly-pear/test%03d", i);
lfs_file_open(&lfs, &file[0], (char*)buffer, lfs2_file_open(&lfs2, &file[0], (char*)buffer,
LFS_O_WRONLY | LFS_O_CREAT) => 0; LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
size = 6; size = 6;
memcpy(wbuffer, "Hello", size); memcpy(wbuffer, "Hello", size);
lfs_file_write(&lfs, &file[0], wbuffer, size) => size; lfs2_file_write(&lfs2, &file[0], wbuffer, size) => size;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
} }
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_dir_open(&lfs, &dir[0], "prickly-pear") => 0; lfs2_dir_open(&lfs2, &dir[0], "prickly-pear") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
for (int i = 0; i < $LARGESIZE; i++) { for (int i = 0; i < $LARGESIZE; i++) {
sprintf((char*)buffer, "test%03d", i); sprintf((char*)buffer, "test%03d", i);
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, (char*)buffer) => 0; strcmp(info.name, (char*)buffer) => 0;
info.type => LFS_TYPE_REG; info.type => LFS2_TYPE_REG;
info.size => 6; info.size => 6;
} }
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Multi-block rename with files ---" echo "--- Multi-block rename with files ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
for (int i = 0; i < $LARGESIZE; i++) { for (int i = 0; i < $LARGESIZE; i++) {
sprintf((char*)buffer, "prickly-pear/test%03d", i); sprintf((char*)buffer, "prickly-pear/test%03d", i);
sprintf((char*)wbuffer, "prickly-pear/tedd%03d", i); sprintf((char*)wbuffer, "prickly-pear/tedd%03d", i);
lfs_rename(&lfs, (char*)buffer, (char*)wbuffer) => 0; lfs2_rename(&lfs2, (char*)buffer, (char*)wbuffer) => 0;
} }
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_dir_open(&lfs, &dir[0], "prickly-pear") => 0; lfs2_dir_open(&lfs2, &dir[0], "prickly-pear") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
for (int i = 0; i < $LARGESIZE; i++) { for (int i = 0; i < $LARGESIZE; i++) {
sprintf((char*)buffer, "tedd%03d", i); sprintf((char*)buffer, "tedd%03d", i);
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, (char*)buffer) => 0; strcmp(info.name, (char*)buffer) => 0;
info.type => LFS_TYPE_REG; info.type => LFS2_TYPE_REG;
info.size => 6; info.size => 6;
} }
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Multi-block remove with files ---" echo "--- Multi-block remove with files ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_remove(&lfs, "prickly-pear") => LFS_ERR_NOTEMPTY; lfs2_remove(&lfs2, "prickly-pear") => LFS2_ERR_NOTEMPTY;
for (int i = 0; i < $LARGESIZE; i++) { for (int i = 0; i < $LARGESIZE; i++) {
sprintf((char*)buffer, "prickly-pear/tedd%03d", i); sprintf((char*)buffer, "prickly-pear/tedd%03d", i);
lfs_remove(&lfs, (char*)buffer) => 0; lfs2_remove(&lfs2, (char*)buffer) => 0;
} }
lfs_remove(&lfs, "prickly-pear") => 0; lfs2_remove(&lfs2, "prickly-pear") => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_dir_open(&lfs, &dir[0], "/") => 0; lfs2_dir_open(&lfs2, &dir[0], "/") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "burito") => 0; strcmp(info.name, "burito") => 0;
info.type => LFS_TYPE_REG; info.type => LFS2_TYPE_REG;
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_dir_close(&lfs, &dir[0]) => 0; lfs2_dir_close(&lfs2, &dir[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Results ---" echo "--- Results ---"

120
tests/test_entries.sh
View File

@@ -10,10 +10,10 @@ function read_file {
cat << TEST cat << TEST
size = $2; size = $2;
lfs_file_open(&lfs, &file[0], "$1", LFS_O_RDONLY) => 0; lfs2_file_open(&lfs2, &file[0], "$1", LFS2_O_RDONLY) => 0;
lfs_file_read(&lfs, &file[0], rbuffer, size) => size; lfs2_file_read(&lfs2, &file[0], rbuffer, size) => size;
memcmp(rbuffer, wbuffer, size) => 0; memcmp(rbuffer, wbuffer, size) => 0;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
TEST TEST
} }
@@ -21,19 +21,19 @@ function write_file {
cat << TEST cat << TEST
size = $2; size = $2;
lfs_file_open(&lfs, &file[0], "$1", lfs2_file_open(&lfs2, &file[0], "$1",
LFS_O_WRONLY | LFS_O_CREAT | LFS_O_TRUNC) => 0; LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
memset(wbuffer, 'c', size); memset(wbuffer, 'c', size);
lfs_file_write(&lfs, &file[0], wbuffer, size) => size; lfs2_file_write(&lfs2, &file[0], wbuffer, size) => size;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
TEST TEST
} }
echo "--- Entry grow test ---" echo "--- Entry grow test ---"
tests/test.py << TEST tests/test.py << TEST
lfs_format(&lfs, &cfg) => 0; lfs2_format(&lfs2, &cfg) => 0;
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
$(write_file "hi0" 20) $(write_file "hi0" 20)
$(write_file "hi1" 20) $(write_file "hi1" 20)
$(write_file "hi2" 20) $(write_file "hi2" 20)
@@ -46,14 +46,14 @@ tests/test.py << TEST
$(read_file "hi1" 200) $(read_file "hi1" 200)
$(read_file "hi2" 20) $(read_file "hi2" 20)
$(read_file "hi3" 20) $(read_file "hi3" 20)
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Entry shrink test ---" echo "--- Entry shrink test ---"
tests/test.py << TEST tests/test.py << TEST
lfs_format(&lfs, &cfg) => 0; lfs2_format(&lfs2, &cfg) => 0;
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
$(write_file "hi0" 20) $(write_file "hi0" 20)
$(write_file "hi1" 200) $(write_file "hi1" 200)
$(write_file "hi2" 20) $(write_file "hi2" 20)
@@ -66,14 +66,14 @@ tests/test.py << TEST
$(read_file "hi1" 20) $(read_file "hi1" 20)
$(read_file "hi2" 20) $(read_file "hi2" 20)
$(read_file "hi3" 20) $(read_file "hi3" 20)
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Entry spill test ---" echo "--- Entry spill test ---"
tests/test.py << TEST tests/test.py << TEST
lfs_format(&lfs, &cfg) => 0; lfs2_format(&lfs2, &cfg) => 0;
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
$(write_file "hi0" 200) $(write_file "hi0" 200)
$(write_file "hi1" 200) $(write_file "hi1" 200)
$(write_file "hi2" 200) $(write_file "hi2" 200)
@@ -83,14 +83,14 @@ tests/test.py << TEST
$(read_file "hi1" 200) $(read_file "hi1" 200)
$(read_file "hi2" 200) $(read_file "hi2" 200)
$(read_file "hi3" 200) $(read_file "hi3" 200)
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Entry push spill test ---" echo "--- Entry push spill test ---"
tests/test.py << TEST tests/test.py << TEST
lfs_format(&lfs, &cfg) => 0; lfs2_format(&lfs2, &cfg) => 0;
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
$(write_file "hi0" 200) $(write_file "hi0" 200)
$(write_file "hi1" 20) $(write_file "hi1" 20)
$(write_file "hi2" 200) $(write_file "hi2" 200)
@@ -103,14 +103,14 @@ tests/test.py << TEST
$(read_file "hi1" 200) $(read_file "hi1" 200)
$(read_file "hi2" 200) $(read_file "hi2" 200)
$(read_file "hi3" 200) $(read_file "hi3" 200)
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Entry push spill two test ---" echo "--- Entry push spill two test ---"
tests/test.py << TEST tests/test.py << TEST
lfs_format(&lfs, &cfg) => 0; lfs2_format(&lfs2, &cfg) => 0;
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
$(write_file "hi0" 200) $(write_file "hi0" 200)
$(write_file "hi1" 20) $(write_file "hi1" 20)
$(write_file "hi2" 200) $(write_file "hi2" 200)
@@ -125,96 +125,96 @@ tests/test.py << TEST
$(read_file "hi2" 200) $(read_file "hi2" 200)
$(read_file "hi3" 200) $(read_file "hi3" 200)
$(read_file "hi4" 200) $(read_file "hi4" 200)
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Entry drop test ---" echo "--- Entry drop test ---"
tests/test.py << TEST tests/test.py << TEST
lfs_format(&lfs, &cfg) => 0; lfs2_format(&lfs2, &cfg) => 0;
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
$(write_file "hi0" 200) $(write_file "hi0" 200)
$(write_file "hi1" 200) $(write_file "hi1" 200)
$(write_file "hi2" 200) $(write_file "hi2" 200)
$(write_file "hi3" 200) $(write_file "hi3" 200)
lfs_remove(&lfs, "hi1") => 0; lfs2_remove(&lfs2, "hi1") => 0;
lfs_stat(&lfs, "hi1", &info) => LFS_ERR_NOENT; lfs2_stat(&lfs2, "hi1", &info) => LFS2_ERR_NOENT;
$(read_file "hi0" 200) $(read_file "hi0" 200)
$(read_file "hi2" 200) $(read_file "hi2" 200)
$(read_file "hi3" 200) $(read_file "hi3" 200)
lfs_remove(&lfs, "hi2") => 0; lfs2_remove(&lfs2, "hi2") => 0;
lfs_stat(&lfs, "hi2", &info) => LFS_ERR_NOENT; lfs2_stat(&lfs2, "hi2", &info) => LFS2_ERR_NOENT;
$(read_file "hi0" 200) $(read_file "hi0" 200)
$(read_file "hi3" 200) $(read_file "hi3" 200)
lfs_remove(&lfs, "hi3") => 0; lfs2_remove(&lfs2, "hi3") => 0;
lfs_stat(&lfs, "hi3", &info) => LFS_ERR_NOENT; lfs2_stat(&lfs2, "hi3", &info) => LFS2_ERR_NOENT;
$(read_file "hi0" 200) $(read_file "hi0" 200)
lfs_remove(&lfs, "hi0") => 0; lfs2_remove(&lfs2, "hi0") => 0;
lfs_stat(&lfs, "hi0", &info) => LFS_ERR_NOENT; lfs2_stat(&lfs2, "hi0", &info) => LFS2_ERR_NOENT;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Create too big ---" echo "--- Create too big ---"
tests/test.py << TEST tests/test.py << TEST
lfs_format(&lfs, &cfg) => 0; lfs2_format(&lfs2, &cfg) => 0;
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
memset(buffer, 'm', 200); memset(buffer, 'm', 200);
buffer[200] = '\0'; buffer[200] = '\0';
size = 400; size = 400;
lfs_file_open(&lfs, &file[0], (char*)buffer, lfs2_file_open(&lfs2, &file[0], (char*)buffer,
LFS_O_WRONLY | LFS_O_CREAT | LFS_O_TRUNC) => 0; LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
memset(wbuffer, 'c', size); memset(wbuffer, 'c', size);
lfs_file_write(&lfs, &file[0], wbuffer, size) => size; lfs2_file_write(&lfs2, &file[0], wbuffer, size) => size;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
size = 400; size = 400;
lfs_file_open(&lfs, &file[0], (char*)buffer, LFS_O_RDONLY) => 0; lfs2_file_open(&lfs2, &file[0], (char*)buffer, LFS2_O_RDONLY) => 0;
lfs_file_read(&lfs, &file[0], rbuffer, size) => size; lfs2_file_read(&lfs2, &file[0], rbuffer, size) => size;
memcmp(rbuffer, wbuffer, size) => 0; memcmp(rbuffer, wbuffer, size) => 0;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Resize too big ---" echo "--- Resize too big ---"
tests/test.py << TEST tests/test.py << TEST
lfs_format(&lfs, &cfg) => 0; lfs2_format(&lfs2, &cfg) => 0;
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
memset(buffer, 'm', 200); memset(buffer, 'm', 200);
buffer[200] = '\0'; buffer[200] = '\0';
size = 40; size = 40;
lfs_file_open(&lfs, &file[0], (char*)buffer, lfs2_file_open(&lfs2, &file[0], (char*)buffer,
LFS_O_WRONLY | LFS_O_CREAT | LFS_O_TRUNC) => 0; LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
memset(wbuffer, 'c', size); memset(wbuffer, 'c', size);
lfs_file_write(&lfs, &file[0], wbuffer, size) => size; lfs2_file_write(&lfs2, &file[0], wbuffer, size) => size;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
size = 40; size = 40;
lfs_file_open(&lfs, &file[0], (char*)buffer, LFS_O_RDONLY) => 0; lfs2_file_open(&lfs2, &file[0], (char*)buffer, LFS2_O_RDONLY) => 0;
lfs_file_read(&lfs, &file[0], rbuffer, size) => size; lfs2_file_read(&lfs2, &file[0], rbuffer, size) => size;
memcmp(rbuffer, wbuffer, size) => 0; memcmp(rbuffer, wbuffer, size) => 0;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
size = 400; size = 400;
lfs_file_open(&lfs, &file[0], (char*)buffer, lfs2_file_open(&lfs2, &file[0], (char*)buffer,
LFS_O_WRONLY | LFS_O_CREAT | LFS_O_TRUNC) => 0; LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
memset(wbuffer, 'c', size); memset(wbuffer, 'c', size);
lfs_file_write(&lfs, &file[0], wbuffer, size) => size; lfs2_file_write(&lfs2, &file[0], wbuffer, size) => size;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
size = 400; size = 400;
lfs_file_open(&lfs, &file[0], (char*)buffer, LFS_O_RDONLY) => 0; lfs2_file_open(&lfs2, &file[0], (char*)buffer, LFS2_O_RDONLY) => 0;
lfs_file_read(&lfs, &file[0], rbuffer, size) => size; lfs2_file_read(&lfs2, &file[0], rbuffer, size) => size;
memcmp(rbuffer, wbuffer, size) => 0; memcmp(rbuffer, wbuffer, size) => 0;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Results ---" echo "--- Results ---"

104
tests/test_files.sh
View File

@@ -8,65 +8,65 @@ LARGESIZE=262144
echo "=== File tests ===" echo "=== File tests ==="
rm -rf blocks rm -rf blocks
tests/test.py << TEST tests/test.py << TEST
lfs_format(&lfs, &cfg) => 0; lfs2_format(&lfs2, &cfg) => 0;
TEST TEST
echo "--- Simple file test ---" echo "--- Simple file test ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_file_open(&lfs, &file[0], "hello", LFS_O_WRONLY | LFS_O_CREAT) => 0; lfs2_file_open(&lfs2, &file[0], "hello", LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
size = strlen("Hello World!\n"); size = strlen("Hello World!\n");
memcpy(wbuffer, "Hello World!\n", size); memcpy(wbuffer, "Hello World!\n", size);
lfs_file_write(&lfs, &file[0], wbuffer, size) => size; lfs2_file_write(&lfs2, &file[0], wbuffer, size) => size;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_file_open(&lfs, &file[0], "hello", LFS_O_RDONLY) => 0; lfs2_file_open(&lfs2, &file[0], "hello", LFS2_O_RDONLY) => 0;
size = strlen("Hello World!\n"); size = strlen("Hello World!\n");
lfs_file_read(&lfs, &file[0], rbuffer, size) => size; lfs2_file_read(&lfs2, &file[0], rbuffer, size) => size;
memcmp(rbuffer, wbuffer, size) => 0; memcmp(rbuffer, wbuffer, size) => 0;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
w_test() { w_test() {
tests/test.py ${4:-} << TEST tests/test.py ${4:-} << TEST
size = $1; size = $1;
lfs_size_t chunk = 31; lfs2_size_t chunk = 31;
srand(0); srand(0);
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_file_open(&lfs, &file[0], "$2", lfs2_file_open(&lfs2, &file[0], "$2",
${3:-LFS_O_WRONLY | LFS_O_CREAT | LFS_O_TRUNC}) => 0; ${3:-LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC}) => 0;
for (lfs_size_t i = 0; i < size; i += chunk) { for (lfs2_size_t i = 0; i < size; i += chunk) {
chunk = (chunk < size - i) ? chunk : size - i; chunk = (chunk < size - i) ? chunk : size - i;
for (lfs_size_t b = 0; b < chunk; b++) { for (lfs2_size_t b = 0; b < chunk; b++) {
buffer[b] = rand() & 0xff; buffer[b] = rand() & 0xff;
} }
lfs_file_write(&lfs, &file[0], buffer, chunk) => chunk; lfs2_file_write(&lfs2, &file[0], buffer, chunk) => chunk;
} }
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
} }
r_test() { r_test() {
tests/test.py << TEST tests/test.py << TEST
size = $1; size = $1;
lfs_size_t chunk = 29; lfs2_size_t chunk = 29;
srand(0); srand(0);
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_stat(&lfs, "$2", &info) => 0; lfs2_stat(&lfs2, "$2", &info) => 0;
info.type => LFS_TYPE_REG; info.type => LFS2_TYPE_REG;
info.size => size; info.size => size;
lfs_file_open(&lfs, &file[0], "$2", ${3:-LFS_O_RDONLY}) => 0; lfs2_file_open(&lfs2, &file[0], "$2", ${3:-LFS2_O_RDONLY}) => 0;
for (lfs_size_t i = 0; i < size; i += chunk) { for (lfs2_size_t i = 0; i < size; i += chunk) {
chunk = (chunk < size - i) ? chunk : size - i; chunk = (chunk < size - i) ? chunk : size - i;
lfs_file_read(&lfs, &file[0], buffer, chunk) => chunk; lfs2_file_read(&lfs2, &file[0], buffer, chunk) => chunk;
for (lfs_size_t b = 0; b < chunk && i+b < size; b++) { for (lfs2_size_t b = 0; b < chunk && i+b < size; b++) {
buffer[b] => rand() & 0xff; buffer[b] => rand() & 0xff;
} }
} }
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
} }
@@ -106,52 +106,52 @@ r_test 0 noavacado
echo "--- Dir check ---" echo "--- Dir check ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_dir_open(&lfs, &dir[0], "/") => 0; lfs2_dir_open(&lfs2, &dir[0], "/") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "hello") => 0; strcmp(info.name, "hello") => 0;
info.type => LFS_TYPE_REG; info.type => LFS2_TYPE_REG;
info.size => strlen("Hello World!\n"); info.size => strlen("Hello World!\n");
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "largeavacado") => 0; strcmp(info.name, "largeavacado") => 0;
info.type => LFS_TYPE_REG; info.type => LFS2_TYPE_REG;
info.size => $LARGESIZE; info.size => $LARGESIZE;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "mediumavacado") => 0; strcmp(info.name, "mediumavacado") => 0;
info.type => LFS_TYPE_REG; info.type => LFS2_TYPE_REG;
info.size => $MEDIUMSIZE; info.size => $MEDIUMSIZE;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "noavacado") => 0; strcmp(info.name, "noavacado") => 0;
info.type => LFS_TYPE_REG; info.type => LFS2_TYPE_REG;
info.size => 0; info.size => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "smallavacado") => 0; strcmp(info.name, "smallavacado") => 0;
info.type => LFS_TYPE_REG; info.type => LFS2_TYPE_REG;
info.size => $SMALLSIZE; info.size => $SMALLSIZE;
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_dir_close(&lfs, &dir[0]) => 0; lfs2_dir_close(&lfs2, &dir[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Many file test ---" echo "--- Many file test ---"
tests/test.py << TEST tests/test.py << TEST
lfs_format(&lfs, &cfg) => 0; lfs2_format(&lfs2, &cfg) => 0;
TEST TEST
tests/test.py << TEST tests/test.py << TEST
// Create 300 files of 6 bytes // Create 300 files of 6 bytes
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_mkdir(&lfs, "directory") => 0; lfs2_mkdir(&lfs2, "directory") => 0;
for (unsigned i = 0; i < 300; i++) { for (unsigned i = 0; i < 300; i++) {
snprintf((char*)buffer, sizeof(buffer), "file_%03d", i); snprintf((char*)buffer, sizeof(buffer), "file_%03d", i);
lfs_file_open(&lfs, &file[0], (char*)buffer, LFS_O_WRONLY | LFS_O_CREAT) => 0; lfs2_file_open(&lfs2, &file[0], (char*)buffer, LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
size = 6; size = 6;
memcpy(wbuffer, "Hello", size); memcpy(wbuffer, "Hello", size);
lfs_file_write(&lfs, &file[0], wbuffer, size) => size; lfs2_file_write(&lfs2, &file[0], wbuffer, size) => size;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
} }
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Results ---" echo "--- Results ---"

28
tests/test_format.sh
View File

@@ -6,44 +6,44 @@ rm -rf blocks
echo "--- Basic formatting ---" echo "--- Basic formatting ---"
tests/test.py << TEST tests/test.py << TEST
lfs_format(&lfs, &cfg) => 0; lfs2_format(&lfs2, &cfg) => 0;
TEST TEST
echo "--- Basic mounting ---" echo "--- Basic mounting ---"
tests/test.py << TEST tests/test.py << TEST
lfs_format(&lfs, &cfg) => 0; lfs2_format(&lfs2, &cfg) => 0;
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Invalid superblocks ---" echo "--- Invalid superblocks ---"
ln -f -s /dev/zero blocks/0 ln -f -s /dev/zero blocks/0
ln -f -s /dev/zero blocks/1 ln -f -s /dev/zero blocks/1
tests/test.py << TEST tests/test.py << TEST
lfs_format(&lfs, &cfg) => LFS_ERR_NOSPC; lfs2_format(&lfs2, &cfg) => LFS2_ERR_NOSPC;
TEST TEST
rm blocks/0 blocks/1 rm blocks/0 blocks/1
echo "--- Invalid mount ---" echo "--- Invalid mount ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => LFS_ERR_CORRUPT; lfs2_mount(&lfs2, &cfg) => LFS2_ERR_CORRUPT;
TEST TEST
echo "--- Expanding superblock ---" echo "--- Expanding superblock ---"
tests/test.py << TEST tests/test.py << TEST
lfs_format(&lfs, &cfg) => 0; lfs2_format(&lfs2, &cfg) => 0;
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
for (int i = 0; i < 100; i++) { for (int i = 0; i < 100; i++) {
lfs_mkdir(&lfs, "dummy") => 0; lfs2_mkdir(&lfs2, "dummy") => 0;
lfs_remove(&lfs, "dummy") => 0; lfs2_remove(&lfs2, "dummy") => 0;
} }
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_mkdir(&lfs, "dummy") => 0; lfs2_mkdir(&lfs2, "dummy") => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Results ---" echo "--- Results ---"

192
tests/test_interspersed.sh
View File

@@ -4,182 +4,182 @@ set -eu
echo "=== Interspersed tests ===" echo "=== Interspersed tests ==="
rm -rf blocks rm -rf blocks
tests/test.py << TEST tests/test.py << TEST
lfs_format(&lfs, &cfg) => 0; lfs2_format(&lfs2, &cfg) => 0;
TEST TEST
echo "--- Interspersed file test ---" echo "--- Interspersed file test ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_file_open(&lfs, &file[0], "a", LFS_O_WRONLY | LFS_O_CREAT) => 0; lfs2_file_open(&lfs2, &file[0], "a", LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
lfs_file_open(&lfs, &file[1], "b", LFS_O_WRONLY | LFS_O_CREAT) => 0; lfs2_file_open(&lfs2, &file[1], "b", LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
lfs_file_open(&lfs, &file[2], "c", LFS_O_WRONLY | LFS_O_CREAT) => 0; lfs2_file_open(&lfs2, &file[2], "c", LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
lfs_file_open(&lfs, &file[3], "d", LFS_O_WRONLY | LFS_O_CREAT) => 0; lfs2_file_open(&lfs2, &file[3], "d", LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
for (int i = 0; i < 10; i++) { for (int i = 0; i < 10; i++) {
lfs_file_write(&lfs, &file[0], (const void*)"a", 1) => 1; lfs2_file_write(&lfs2, &file[0], (const void*)"a", 1) => 1;
lfs_file_write(&lfs, &file[1], (const void*)"b", 1) => 1; lfs2_file_write(&lfs2, &file[1], (const void*)"b", 1) => 1;
lfs_file_write(&lfs, &file[2], (const void*)"c", 1) => 1; lfs2_file_write(&lfs2, &file[2], (const void*)"c", 1) => 1;
lfs_file_write(&lfs, &file[3], (const void*)"d", 1) => 1; lfs2_file_write(&lfs2, &file[3], (const void*)"d", 1) => 1;
} }
lfs_file_close(&lfs, &file[0]); lfs2_file_close(&lfs2, &file[0]);
lfs_file_close(&lfs, &file[1]); lfs2_file_close(&lfs2, &file[1]);
lfs_file_close(&lfs, &file[2]); lfs2_file_close(&lfs2, &file[2]);
lfs_file_close(&lfs, &file[3]); lfs2_file_close(&lfs2, &file[3]);
lfs_dir_open(&lfs, &dir[0], "/") => 0; lfs2_dir_open(&lfs2, &dir[0], "/") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "a") => 0; strcmp(info.name, "a") => 0;
info.type => LFS_TYPE_REG; info.type => LFS2_TYPE_REG;
info.size => 10; info.size => 10;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "b") => 0; strcmp(info.name, "b") => 0;
info.type => LFS_TYPE_REG; info.type => LFS2_TYPE_REG;
info.size => 10; info.size => 10;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "c") => 0; strcmp(info.name, "c") => 0;
info.type => LFS_TYPE_REG; info.type => LFS2_TYPE_REG;
info.size => 10; info.size => 10;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "d") => 0; strcmp(info.name, "d") => 0;
info.type => LFS_TYPE_REG; info.type => LFS2_TYPE_REG;
info.size => 10; info.size => 10;
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_dir_close(&lfs, &dir[0]) => 0; lfs2_dir_close(&lfs2, &dir[0]) => 0;
lfs_file_open(&lfs, &file[0], "a", LFS_O_RDONLY) => 0; lfs2_file_open(&lfs2, &file[0], "a", LFS2_O_RDONLY) => 0;
lfs_file_open(&lfs, &file[1], "b", LFS_O_RDONLY) => 0; lfs2_file_open(&lfs2, &file[1], "b", LFS2_O_RDONLY) => 0;
lfs_file_open(&lfs, &file[2], "c", LFS_O_RDONLY) => 0; lfs2_file_open(&lfs2, &file[2], "c", LFS2_O_RDONLY) => 0;
lfs_file_open(&lfs, &file[3], "d", LFS_O_RDONLY) => 0; lfs2_file_open(&lfs2, &file[3], "d", LFS2_O_RDONLY) => 0;
for (int i = 0; i < 10; i++) { for (int i = 0; i < 10; i++) {
lfs_file_read(&lfs, &file[0], buffer, 1) => 1; lfs2_file_read(&lfs2, &file[0], buffer, 1) => 1;
buffer[0] => 'a'; buffer[0] => 'a';
lfs_file_read(&lfs, &file[1], buffer, 1) => 1; lfs2_file_read(&lfs2, &file[1], buffer, 1) => 1;
buffer[0] => 'b'; buffer[0] => 'b';
lfs_file_read(&lfs, &file[2], buffer, 1) => 1; lfs2_file_read(&lfs2, &file[2], buffer, 1) => 1;
buffer[0] => 'c'; buffer[0] => 'c';
lfs_file_read(&lfs, &file[3], buffer, 1) => 1; lfs2_file_read(&lfs2, &file[3], buffer, 1) => 1;
buffer[0] => 'd'; buffer[0] => 'd';
} }
lfs_file_close(&lfs, &file[0]); lfs2_file_close(&lfs2, &file[0]);
lfs_file_close(&lfs, &file[1]); lfs2_file_close(&lfs2, &file[1]);
lfs_file_close(&lfs, &file[2]); lfs2_file_close(&lfs2, &file[2]);
lfs_file_close(&lfs, &file[3]); lfs2_file_close(&lfs2, &file[3]);
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Interspersed remove file test ---" echo "--- Interspersed remove file test ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_file_open(&lfs, &file[0], "e", LFS_O_WRONLY | LFS_O_CREAT) => 0; lfs2_file_open(&lfs2, &file[0], "e", LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
for (int i = 0; i < 5; i++) { for (int i = 0; i < 5; i++) {
lfs_file_write(&lfs, &file[0], (const void*)"e", 1) => 1; lfs2_file_write(&lfs2, &file[0], (const void*)"e", 1) => 1;
} }
lfs_remove(&lfs, "a") => 0; lfs2_remove(&lfs2, "a") => 0;
lfs_remove(&lfs, "b") => 0; lfs2_remove(&lfs2, "b") => 0;
lfs_remove(&lfs, "c") => 0; lfs2_remove(&lfs2, "c") => 0;
lfs_remove(&lfs, "d") => 0; lfs2_remove(&lfs2, "d") => 0;
for (int i = 0; i < 5; i++) { for (int i = 0; i < 5; i++) {
lfs_file_write(&lfs, &file[0], (const void*)"e", 1) => 1; lfs2_file_write(&lfs2, &file[0], (const void*)"e", 1) => 1;
} }
lfs_file_close(&lfs, &file[0]); lfs2_file_close(&lfs2, &file[0]);
lfs_dir_open(&lfs, &dir[0], "/") => 0; lfs2_dir_open(&lfs2, &dir[0], "/") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "e") => 0; strcmp(info.name, "e") => 0;
info.type => LFS_TYPE_REG; info.type => LFS2_TYPE_REG;
info.size => 10; info.size => 10;
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_dir_close(&lfs, &dir[0]) => 0; lfs2_dir_close(&lfs2, &dir[0]) => 0;
lfs_file_open(&lfs, &file[0], "e", LFS_O_RDONLY) => 0; lfs2_file_open(&lfs2, &file[0], "e", LFS2_O_RDONLY) => 0;
for (int i = 0; i < 10; i++) { for (int i = 0; i < 10; i++) {
lfs_file_read(&lfs, &file[0], buffer, 1) => 1; lfs2_file_read(&lfs2, &file[0], buffer, 1) => 1;
buffer[0] => 'e'; buffer[0] => 'e';
} }
lfs_file_close(&lfs, &file[0]); lfs2_file_close(&lfs2, &file[0]);
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Remove inconveniently test ---" echo "--- Remove inconveniently test ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_file_open(&lfs, &file[0], "e", LFS_O_WRONLY | LFS_O_TRUNC) => 0; lfs2_file_open(&lfs2, &file[0], "e", LFS2_O_WRONLY | LFS2_O_TRUNC) => 0;
lfs_file_open(&lfs, &file[1], "f", LFS_O_WRONLY | LFS_O_CREAT) => 0; lfs2_file_open(&lfs2, &file[1], "f", LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
lfs_file_open(&lfs, &file[2], "g", LFS_O_WRONLY | LFS_O_CREAT) => 0; lfs2_file_open(&lfs2, &file[2], "g", LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
for (int i = 0; i < 5; i++) { for (int i = 0; i < 5; i++) {
lfs_file_write(&lfs, &file[0], (const void*)"e", 1) => 1; lfs2_file_write(&lfs2, &file[0], (const void*)"e", 1) => 1;
lfs_file_write(&lfs, &file[1], (const void*)"f", 1) => 1; lfs2_file_write(&lfs2, &file[1], (const void*)"f", 1) => 1;
lfs_file_write(&lfs, &file[2], (const void*)"g", 1) => 1; lfs2_file_write(&lfs2, &file[2], (const void*)"g", 1) => 1;
} }
lfs_remove(&lfs, "f") => 0; lfs2_remove(&lfs2, "f") => 0;
for (int i = 0; i < 5; i++) { for (int i = 0; i < 5; i++) {
lfs_file_write(&lfs, &file[0], (const void*)"e", 1) => 1; lfs2_file_write(&lfs2, &file[0], (const void*)"e", 1) => 1;
lfs_file_write(&lfs, &file[1], (const void*)"f", 1) => 1; lfs2_file_write(&lfs2, &file[1], (const void*)"f", 1) => 1;
lfs_file_write(&lfs, &file[2], (const void*)"g", 1) => 1; lfs2_file_write(&lfs2, &file[2], (const void*)"g", 1) => 1;
} }
lfs_file_close(&lfs, &file[0]); lfs2_file_close(&lfs2, &file[0]);
lfs_file_close(&lfs, &file[1]); lfs2_file_close(&lfs2, &file[1]);
lfs_file_close(&lfs, &file[2]); lfs2_file_close(&lfs2, &file[2]);
lfs_dir_open(&lfs, &dir[0], "/") => 0; lfs2_dir_open(&lfs2, &dir[0], "/") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "e") => 0; strcmp(info.name, "e") => 0;
info.type => LFS_TYPE_REG; info.type => LFS2_TYPE_REG;
info.size => 10; info.size => 10;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "g") => 0; strcmp(info.name, "g") => 0;
info.type => LFS_TYPE_REG; info.type => LFS2_TYPE_REG;
info.size => 10; info.size => 10;
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_dir_close(&lfs, &dir[0]) => 0; lfs2_dir_close(&lfs2, &dir[0]) => 0;
lfs_file_open(&lfs, &file[0], "e", LFS_O_RDONLY) => 0; lfs2_file_open(&lfs2, &file[0], "e", LFS2_O_RDONLY) => 0;
lfs_file_open(&lfs, &file[1], "g", LFS_O_RDONLY) => 0; lfs2_file_open(&lfs2, &file[1], "g", LFS2_O_RDONLY) => 0;
for (int i = 0; i < 10; i++) { for (int i = 0; i < 10; i++) {
lfs_file_read(&lfs, &file[0], buffer, 1) => 1; lfs2_file_read(&lfs2, &file[0], buffer, 1) => 1;
buffer[0] => 'e'; buffer[0] => 'e';
lfs_file_read(&lfs, &file[1], buffer, 1) => 1; lfs2_file_read(&lfs2, &file[1], buffer, 1) => 1;
buffer[0] => 'g'; buffer[0] => 'g';
} }
lfs_file_close(&lfs, &file[0]); lfs2_file_close(&lfs2, &file[0]);
lfs_file_close(&lfs, &file[1]); lfs2_file_close(&lfs2, &file[1]);
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Results ---" echo "--- Results ---"

370
tests/test_move.sh
View File

@@ -4,327 +4,327 @@ set -eu
echo "=== Move tests ===" echo "=== Move tests ==="
rm -rf blocks rm -rf blocks
tests/test.py << TEST tests/test.py << TEST
lfs_format(&lfs, &cfg) => 0; lfs2_format(&lfs2, &cfg) => 0;
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_mkdir(&lfs, "a") => 0; lfs2_mkdir(&lfs2, "a") => 0;
lfs_mkdir(&lfs, "b") => 0; lfs2_mkdir(&lfs2, "b") => 0;
lfs_mkdir(&lfs, "c") => 0; lfs2_mkdir(&lfs2, "c") => 0;
lfs_mkdir(&lfs, "d") => 0; lfs2_mkdir(&lfs2, "d") => 0;
lfs_mkdir(&lfs, "a/hi") => 0; lfs2_mkdir(&lfs2, "a/hi") => 0;
lfs_mkdir(&lfs, "a/hi/hola") => 0; lfs2_mkdir(&lfs2, "a/hi/hola") => 0;
lfs_mkdir(&lfs, "a/hi/bonjour") => 0; lfs2_mkdir(&lfs2, "a/hi/bonjour") => 0;
lfs_mkdir(&lfs, "a/hi/ohayo") => 0; lfs2_mkdir(&lfs2, "a/hi/ohayo") => 0;
lfs_file_open(&lfs, &file[0], "a/hello", LFS_O_CREAT | LFS_O_WRONLY) => 0; lfs2_file_open(&lfs2, &file[0], "a/hello", LFS2_O_CREAT | LFS2_O_WRONLY) => 0;
lfs_file_write(&lfs, &file[0], "hola\n", 5) => 5; lfs2_file_write(&lfs2, &file[0], "hola\n", 5) => 5;
lfs_file_write(&lfs, &file[0], "bonjour\n", 8) => 8; lfs2_file_write(&lfs2, &file[0], "bonjour\n", 8) => 8;
lfs_file_write(&lfs, &file[0], "ohayo\n", 6) => 6; lfs2_file_write(&lfs2, &file[0], "ohayo\n", 6) => 6;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Move file ---" echo "--- Move file ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_rename(&lfs, "a/hello", "b/hello") => 0; lfs2_rename(&lfs2, "a/hello", "b/hello") => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_dir_open(&lfs, &dir[0], "a") => 0; lfs2_dir_open(&lfs2, &dir[0], "a") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "hi") => 0; strcmp(info.name, "hi") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_dir_close(&lfs, &dir[0]) => 0; lfs2_dir_close(&lfs2, &dir[0]) => 0;
lfs_dir_open(&lfs, &dir[0], "b") => 0; lfs2_dir_open(&lfs2, &dir[0], "b") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "hello") => 0; strcmp(info.name, "hello") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Move file corrupt source ---" echo "--- Move file corrupt source ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_rename(&lfs, "b/hello", "c/hello") => 0; lfs2_rename(&lfs2, "b/hello", "c/hello") => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
tests/corrupt.py -n 1 tests/corrupt.py -n 1
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_dir_open(&lfs, &dir[0], "b") => 0; lfs2_dir_open(&lfs2, &dir[0], "b") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_dir_close(&lfs, &dir[0]) => 0; lfs2_dir_close(&lfs2, &dir[0]) => 0;
lfs_dir_open(&lfs, &dir[0], "c") => 0; lfs2_dir_open(&lfs2, &dir[0], "c") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "hello") => 0; strcmp(info.name, "hello") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Move file corrupt source and dest ---" echo "--- Move file corrupt source and dest ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_rename(&lfs, "c/hello", "d/hello") => 0; lfs2_rename(&lfs2, "c/hello", "d/hello") => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
tests/corrupt.py -n 2 tests/corrupt.py -n 2
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_dir_open(&lfs, &dir[0], "c") => 0; lfs2_dir_open(&lfs2, &dir[0], "c") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "hello") => 0; strcmp(info.name, "hello") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_dir_close(&lfs, &dir[0]) => 0; lfs2_dir_close(&lfs2, &dir[0]) => 0;
lfs_dir_open(&lfs, &dir[0], "d") => 0; lfs2_dir_open(&lfs2, &dir[0], "d") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Move file after corrupt ---" echo "--- Move file after corrupt ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_rename(&lfs, "c/hello", "d/hello") => 0; lfs2_rename(&lfs2, "c/hello", "d/hello") => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_dir_open(&lfs, &dir[0], "c") => 0; lfs2_dir_open(&lfs2, &dir[0], "c") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_dir_close(&lfs, &dir[0]) => 0; lfs2_dir_close(&lfs2, &dir[0]) => 0;
lfs_dir_open(&lfs, &dir[0], "d") => 0; lfs2_dir_open(&lfs2, &dir[0], "d") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "hello") => 0; strcmp(info.name, "hello") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Move dir ---" echo "--- Move dir ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_rename(&lfs, "a/hi", "b/hi") => 0; lfs2_rename(&lfs2, "a/hi", "b/hi") => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_dir_open(&lfs, &dir[0], "a") => 0; lfs2_dir_open(&lfs2, &dir[0], "a") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_dir_close(&lfs, &dir[0]) => 0; lfs2_dir_close(&lfs2, &dir[0]) => 0;
lfs_dir_open(&lfs, &dir[0], "b") => 0; lfs2_dir_open(&lfs2, &dir[0], "b") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "hi") => 0; strcmp(info.name, "hi") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Move dir corrupt source ---" echo "--- Move dir corrupt source ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_rename(&lfs, "b/hi", "c/hi") => 0; lfs2_rename(&lfs2, "b/hi", "c/hi") => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
tests/corrupt.py -n 1 tests/corrupt.py -n 1
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_dir_open(&lfs, &dir[0], "b") => 0; lfs2_dir_open(&lfs2, &dir[0], "b") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_dir_close(&lfs, &dir[0]) => 0; lfs2_dir_close(&lfs2, &dir[0]) => 0;
lfs_dir_open(&lfs, &dir[0], "c") => 0; lfs2_dir_open(&lfs2, &dir[0], "c") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "hi") => 0; strcmp(info.name, "hi") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Move dir corrupt source and dest ---" echo "--- Move dir corrupt source and dest ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_rename(&lfs, "c/hi", "d/hi") => 0; lfs2_rename(&lfs2, "c/hi", "d/hi") => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
tests/corrupt.py -n 2 tests/corrupt.py -n 2
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_dir_open(&lfs, &dir[0], "c") => 0; lfs2_dir_open(&lfs2, &dir[0], "c") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "hi") => 0; strcmp(info.name, "hi") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_dir_close(&lfs, &dir[0]) => 0; lfs2_dir_close(&lfs2, &dir[0]) => 0;
lfs_dir_open(&lfs, &dir[0], "d") => 0; lfs2_dir_open(&lfs2, &dir[0], "d") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "hello") => 0; strcmp(info.name, "hello") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Move dir after corrupt ---" echo "--- Move dir after corrupt ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_rename(&lfs, "c/hi", "d/hi") => 0; lfs2_rename(&lfs2, "c/hi", "d/hi") => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_dir_open(&lfs, &dir[0], "c") => 0; lfs2_dir_open(&lfs2, &dir[0], "c") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_dir_close(&lfs, &dir[0]) => 0; lfs2_dir_close(&lfs2, &dir[0]) => 0;
lfs_dir_open(&lfs, &dir[0], "d") => 0; lfs2_dir_open(&lfs2, &dir[0], "d") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "hello") => 0; strcmp(info.name, "hello") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "hi") => 0; strcmp(info.name, "hi") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Move check ---" echo "--- Move check ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_dir_open(&lfs, &dir[0], "a/hi") => LFS_ERR_NOENT; lfs2_dir_open(&lfs2, &dir[0], "a/hi") => LFS2_ERR_NOENT;
lfs_dir_open(&lfs, &dir[0], "b/hi") => LFS_ERR_NOENT; lfs2_dir_open(&lfs2, &dir[0], "b/hi") => LFS2_ERR_NOENT;
lfs_dir_open(&lfs, &dir[0], "c/hi") => LFS_ERR_NOENT; lfs2_dir_open(&lfs2, &dir[0], "c/hi") => LFS2_ERR_NOENT;
lfs_dir_open(&lfs, &dir[0], "d/hi") => 0; lfs2_dir_open(&lfs2, &dir[0], "d/hi") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "bonjour") => 0; strcmp(info.name, "bonjour") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "hola") => 0; strcmp(info.name, "hola") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "ohayo") => 0; strcmp(info.name, "ohayo") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_dir_close(&lfs, &dir[0]) => 0; lfs2_dir_close(&lfs2, &dir[0]) => 0;
lfs_dir_open(&lfs, &dir[0], "a/hello") => LFS_ERR_NOENT; lfs2_dir_open(&lfs2, &dir[0], "a/hello") => LFS2_ERR_NOENT;
lfs_dir_open(&lfs, &dir[0], "b/hello") => LFS_ERR_NOENT; lfs2_dir_open(&lfs2, &dir[0], "b/hello") => LFS2_ERR_NOENT;
lfs_dir_open(&lfs, &dir[0], "c/hello") => LFS_ERR_NOENT; lfs2_dir_open(&lfs2, &dir[0], "c/hello") => LFS2_ERR_NOENT;
lfs_file_open(&lfs, &file[0], "d/hello", LFS_O_RDONLY) => 0; lfs2_file_open(&lfs2, &file[0], "d/hello", LFS2_O_RDONLY) => 0;
lfs_file_read(&lfs, &file[0], buffer, 5) => 5; lfs2_file_read(&lfs2, &file[0], buffer, 5) => 5;
memcmp(buffer, "hola\n", 5) => 0; memcmp(buffer, "hola\n", 5) => 0;
lfs_file_read(&lfs, &file[0], buffer, 8) => 8; lfs2_file_read(&lfs2, &file[0], buffer, 8) => 8;
memcmp(buffer, "bonjour\n", 8) => 0; memcmp(buffer, "bonjour\n", 8) => 0;
lfs_file_read(&lfs, &file[0], buffer, 6) => 6; lfs2_file_read(&lfs2, &file[0], buffer, 6) => 6;
memcmp(buffer, "ohayo\n", 6) => 0; memcmp(buffer, "ohayo\n", 6) => 0;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Move state stealing ---" echo "--- Move state stealing ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_remove(&lfs, "b") => 0; lfs2_remove(&lfs2, "b") => 0;
lfs_remove(&lfs, "c") => 0; lfs2_remove(&lfs2, "c") => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_dir_open(&lfs, &dir[0], "a/hi") => LFS_ERR_NOENT; lfs2_dir_open(&lfs2, &dir[0], "a/hi") => LFS2_ERR_NOENT;
lfs_dir_open(&lfs, &dir[0], "b") => LFS_ERR_NOENT; lfs2_dir_open(&lfs2, &dir[0], "b") => LFS2_ERR_NOENT;
lfs_dir_open(&lfs, &dir[0], "c") => LFS_ERR_NOENT; lfs2_dir_open(&lfs2, &dir[0], "c") => LFS2_ERR_NOENT;
lfs_dir_open(&lfs, &dir[0], "d/hi") => 0; lfs2_dir_open(&lfs2, &dir[0], "d/hi") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "bonjour") => 0; strcmp(info.name, "bonjour") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "hola") => 0; strcmp(info.name, "hola") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "ohayo") => 0; strcmp(info.name, "ohayo") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 0; lfs2_dir_read(&lfs2, &dir[0], &info) => 0;
lfs_dir_close(&lfs, &dir[0]) => 0; lfs2_dir_close(&lfs2, &dir[0]) => 0;
lfs_dir_open(&lfs, &dir[0], "a/hello") => LFS_ERR_NOENT; lfs2_dir_open(&lfs2, &dir[0], "a/hello") => LFS2_ERR_NOENT;
lfs_dir_open(&lfs, &dir[0], "b") => LFS_ERR_NOENT; lfs2_dir_open(&lfs2, &dir[0], "b") => LFS2_ERR_NOENT;
lfs_dir_open(&lfs, &dir[0], "c") => LFS_ERR_NOENT; lfs2_dir_open(&lfs2, &dir[0], "c") => LFS2_ERR_NOENT;
lfs_file_open(&lfs, &file[0], "d/hello", LFS_O_RDONLY) => 0; lfs2_file_open(&lfs2, &file[0], "d/hello", LFS2_O_RDONLY) => 0;
lfs_file_read(&lfs, &file[0], buffer, 5) => 5; lfs2_file_read(&lfs2, &file[0], buffer, 5) => 5;
memcmp(buffer, "hola\n", 5) => 0; memcmp(buffer, "hola\n", 5) => 0;
lfs_file_read(&lfs, &file[0], buffer, 8) => 8; lfs2_file_read(&lfs2, &file[0], buffer, 8) => 8;
memcmp(buffer, "bonjour\n", 8) => 0; memcmp(buffer, "bonjour\n", 8) => 0;
lfs_file_read(&lfs, &file[0], buffer, 6) => 6; lfs2_file_read(&lfs2, &file[0], buffer, 6) => 6;
memcmp(buffer, "ohayo\n", 6) => 0; memcmp(buffer, "ohayo\n", 6) => 0;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST

34
tests/test_orphan.sh
View File

@@ -4,41 +4,41 @@ set -eu
echo "=== Orphan tests ===" echo "=== Orphan tests ==="
rm -rf blocks rm -rf blocks
tests/test.py << TEST tests/test.py << TEST
lfs_format(&lfs, &cfg) => 0; lfs2_format(&lfs2, &cfg) => 0;
TEST TEST
echo "--- Orphan test ---" echo "--- Orphan test ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_mkdir(&lfs, "parent") => 0; lfs2_mkdir(&lfs2, "parent") => 0;
lfs_mkdir(&lfs, "parent/orphan") => 0; lfs2_mkdir(&lfs2, "parent/orphan") => 0;
lfs_mkdir(&lfs, "parent/child") => 0; lfs2_mkdir(&lfs2, "parent/child") => 0;
lfs_remove(&lfs, "parent/orphan") => 0; lfs2_remove(&lfs2, "parent/orphan") => 0;
TEST TEST
# corrupt most recent commit, this should be the update to the previous # corrupt most recent commit, this should be the update to the previous
# linked-list entry and should orphan the child # linked-list entry and should orphan the child
tests/corrupt.py tests/corrupt.py
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_stat(&lfs, "parent/orphan", &info) => LFS_ERR_NOENT; lfs2_stat(&lfs2, "parent/orphan", &info) => LFS2_ERR_NOENT;
lfs_ssize_t before = lfs_fs_size(&lfs); lfs2_ssize_t before = lfs2_fs_size(&lfs2);
before => 8; before => 8;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_stat(&lfs, "parent/orphan", &info) => LFS_ERR_NOENT; lfs2_stat(&lfs2, "parent/orphan", &info) => LFS2_ERR_NOENT;
lfs_ssize_t orphaned = lfs_fs_size(&lfs); lfs2_ssize_t orphaned = lfs2_fs_size(&lfs2);
orphaned => 8; orphaned => 8;
lfs_mkdir(&lfs, "parent/otherchild") => 0; lfs2_mkdir(&lfs2, "parent/otherchild") => 0;
lfs_stat(&lfs, "parent/orphan", &info) => LFS_ERR_NOENT; lfs2_stat(&lfs2, "parent/orphan", &info) => LFS2_ERR_NOENT;
lfs_ssize_t deorphaned = lfs_fs_size(&lfs); lfs2_ssize_t deorphaned = lfs2_fs_size(&lfs2);
deorphaned => 8; deorphaned => 8;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Results ---" echo "--- Results ---"

214
tests/test_paths.sh
View File

@@ -4,197 +4,197 @@ set -eu
echo "=== Path tests ===" echo "=== Path tests ==="
rm -rf blocks rm -rf blocks
tests/test.py << TEST tests/test.py << TEST
lfs_format(&lfs, &cfg) => 0; lfs2_format(&lfs2, &cfg) => 0;
TEST TEST
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_mkdir(&lfs, "tea") => 0; lfs2_mkdir(&lfs2, "tea") => 0;
lfs_mkdir(&lfs, "coffee") => 0; lfs2_mkdir(&lfs2, "coffee") => 0;
lfs_mkdir(&lfs, "soda") => 0; lfs2_mkdir(&lfs2, "soda") => 0;
lfs_mkdir(&lfs, "tea/hottea") => 0; lfs2_mkdir(&lfs2, "tea/hottea") => 0;
lfs_mkdir(&lfs, "tea/warmtea") => 0; lfs2_mkdir(&lfs2, "tea/warmtea") => 0;
lfs_mkdir(&lfs, "tea/coldtea") => 0; lfs2_mkdir(&lfs2, "tea/coldtea") => 0;
lfs_mkdir(&lfs, "coffee/hotcoffee") => 0; lfs2_mkdir(&lfs2, "coffee/hotcoffee") => 0;
lfs_mkdir(&lfs, "coffee/warmcoffee") => 0; lfs2_mkdir(&lfs2, "coffee/warmcoffee") => 0;
lfs_mkdir(&lfs, "coffee/coldcoffee") => 0; lfs2_mkdir(&lfs2, "coffee/coldcoffee") => 0;
lfs_mkdir(&lfs, "soda/hotsoda") => 0; lfs2_mkdir(&lfs2, "soda/hotsoda") => 0;
lfs_mkdir(&lfs, "soda/warmsoda") => 0; lfs2_mkdir(&lfs2, "soda/warmsoda") => 0;
lfs_mkdir(&lfs, "soda/coldsoda") => 0; lfs2_mkdir(&lfs2, "soda/coldsoda") => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Root path tests ---" echo "--- Root path tests ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_stat(&lfs, "tea/hottea", &info) => 0; lfs2_stat(&lfs2, "tea/hottea", &info) => 0;
strcmp(info.name, "hottea") => 0; strcmp(info.name, "hottea") => 0;
lfs_stat(&lfs, "/tea/hottea", &info) => 0; lfs2_stat(&lfs2, "/tea/hottea", &info) => 0;
strcmp(info.name, "hottea") => 0; strcmp(info.name, "hottea") => 0;
lfs_mkdir(&lfs, "/milk1") => 0; lfs2_mkdir(&lfs2, "/milk1") => 0;
lfs_stat(&lfs, "/milk1", &info) => 0; lfs2_stat(&lfs2, "/milk1", &info) => 0;
strcmp(info.name, "milk1") => 0; strcmp(info.name, "milk1") => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Redundant slash path tests ---" echo "--- Redundant slash path tests ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_stat(&lfs, "/tea/hottea", &info) => 0; lfs2_stat(&lfs2, "/tea/hottea", &info) => 0;
strcmp(info.name, "hottea") => 0; strcmp(info.name, "hottea") => 0;
lfs_stat(&lfs, "//tea//hottea", &info) => 0; lfs2_stat(&lfs2, "//tea//hottea", &info) => 0;
strcmp(info.name, "hottea") => 0; strcmp(info.name, "hottea") => 0;
lfs_stat(&lfs, "///tea///hottea", &info) => 0; lfs2_stat(&lfs2, "///tea///hottea", &info) => 0;
strcmp(info.name, "hottea") => 0; strcmp(info.name, "hottea") => 0;
lfs_mkdir(&lfs, "///milk2") => 0; lfs2_mkdir(&lfs2, "///milk2") => 0;
lfs_stat(&lfs, "///milk2", &info) => 0; lfs2_stat(&lfs2, "///milk2", &info) => 0;
strcmp(info.name, "milk2") => 0; strcmp(info.name, "milk2") => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Dot path tests ---" echo "--- Dot path tests ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_stat(&lfs, "./tea/hottea", &info) => 0; lfs2_stat(&lfs2, "./tea/hottea", &info) => 0;
strcmp(info.name, "hottea") => 0; strcmp(info.name, "hottea") => 0;
lfs_stat(&lfs, "/./tea/hottea", &info) => 0; lfs2_stat(&lfs2, "/./tea/hottea", &info) => 0;
strcmp(info.name, "hottea") => 0; strcmp(info.name, "hottea") => 0;
lfs_stat(&lfs, "/././tea/hottea", &info) => 0; lfs2_stat(&lfs2, "/././tea/hottea", &info) => 0;
strcmp(info.name, "hottea") => 0; strcmp(info.name, "hottea") => 0;
lfs_stat(&lfs, "/./tea/./hottea", &info) => 0; lfs2_stat(&lfs2, "/./tea/./hottea", &info) => 0;
strcmp(info.name, "hottea") => 0; strcmp(info.name, "hottea") => 0;
lfs_mkdir(&lfs, "/./milk3") => 0; lfs2_mkdir(&lfs2, "/./milk3") => 0;
lfs_stat(&lfs, "/./milk3", &info) => 0; lfs2_stat(&lfs2, "/./milk3", &info) => 0;
strcmp(info.name, "milk3") => 0; strcmp(info.name, "milk3") => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Dot dot path tests ---" echo "--- Dot dot path tests ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_stat(&lfs, "coffee/../tea/hottea", &info) => 0; lfs2_stat(&lfs2, "coffee/../tea/hottea", &info) => 0;
strcmp(info.name, "hottea") => 0; strcmp(info.name, "hottea") => 0;
lfs_stat(&lfs, "tea/coldtea/../hottea", &info) => 0; lfs2_stat(&lfs2, "tea/coldtea/../hottea", &info) => 0;
strcmp(info.name, "hottea") => 0; strcmp(info.name, "hottea") => 0;
lfs_stat(&lfs, "coffee/coldcoffee/../../tea/hottea", &info) => 0; lfs2_stat(&lfs2, "coffee/coldcoffee/../../tea/hottea", &info) => 0;
strcmp(info.name, "hottea") => 0; strcmp(info.name, "hottea") => 0;
lfs_stat(&lfs, "coffee/../soda/../tea/hottea", &info) => 0; lfs2_stat(&lfs2, "coffee/../soda/../tea/hottea", &info) => 0;
strcmp(info.name, "hottea") => 0; strcmp(info.name, "hottea") => 0;
lfs_mkdir(&lfs, "coffee/../milk4") => 0; lfs2_mkdir(&lfs2, "coffee/../milk4") => 0;
lfs_stat(&lfs, "coffee/../milk4", &info) => 0; lfs2_stat(&lfs2, "coffee/../milk4", &info) => 0;
strcmp(info.name, "milk4") => 0; strcmp(info.name, "milk4") => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Trailing dot path tests ---" echo "--- Trailing dot path tests ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_stat(&lfs, "tea/hottea/", &info) => 0; lfs2_stat(&lfs2, "tea/hottea/", &info) => 0;
strcmp(info.name, "hottea") => 0; strcmp(info.name, "hottea") => 0;
lfs_stat(&lfs, "tea/hottea/.", &info) => 0; lfs2_stat(&lfs2, "tea/hottea/.", &info) => 0;
strcmp(info.name, "hottea") => 0; strcmp(info.name, "hottea") => 0;
lfs_stat(&lfs, "tea/hottea/./.", &info) => 0; lfs2_stat(&lfs2, "tea/hottea/./.", &info) => 0;
strcmp(info.name, "hottea") => 0; strcmp(info.name, "hottea") => 0;
lfs_stat(&lfs, "tea/hottea/..", &info) => 0; lfs2_stat(&lfs2, "tea/hottea/..", &info) => 0;
strcmp(info.name, "tea") => 0; strcmp(info.name, "tea") => 0;
lfs_stat(&lfs, "tea/hottea/../.", &info) => 0; lfs2_stat(&lfs2, "tea/hottea/../.", &info) => 0;
strcmp(info.name, "tea") => 0; strcmp(info.name, "tea") => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Root dot dot path tests ---" echo "--- Root dot dot path tests ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_stat(&lfs, "coffee/../../../../../../tea/hottea", &info) => 0; lfs2_stat(&lfs2, "coffee/../../../../../../tea/hottea", &info) => 0;
strcmp(info.name, "hottea") => 0; strcmp(info.name, "hottea") => 0;
lfs_mkdir(&lfs, "coffee/../../../../../../milk5") => 0; lfs2_mkdir(&lfs2, "coffee/../../../../../../milk5") => 0;
lfs_stat(&lfs, "coffee/../../../../../../milk5", &info) => 0; lfs2_stat(&lfs2, "coffee/../../../../../../milk5", &info) => 0;
strcmp(info.name, "milk5") => 0; strcmp(info.name, "milk5") => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Root tests ---" echo "--- Root tests ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_stat(&lfs, "/", &info) => 0; lfs2_stat(&lfs2, "/", &info) => 0;
info.type => LFS_TYPE_DIR; info.type => LFS2_TYPE_DIR;
strcmp(info.name, "/") => 0; strcmp(info.name, "/") => 0;
lfs_mkdir(&lfs, "/") => LFS_ERR_EXIST; lfs2_mkdir(&lfs2, "/") => LFS2_ERR_EXIST;
lfs_file_open(&lfs, &file[0], "/", LFS_O_WRONLY | LFS_O_CREAT) lfs2_file_open(&lfs2, &file[0], "/", LFS2_O_WRONLY | LFS2_O_CREAT)
=> LFS_ERR_ISDIR; => LFS2_ERR_ISDIR;
// more corner cases // more corner cases
lfs_remove(&lfs, "") => LFS_ERR_INVAL; lfs2_remove(&lfs2, "") => LFS2_ERR_INVAL;
lfs_remove(&lfs, ".") => LFS_ERR_INVAL; lfs2_remove(&lfs2, ".") => LFS2_ERR_INVAL;
lfs_remove(&lfs, "..") => LFS_ERR_INVAL; lfs2_remove(&lfs2, "..") => LFS2_ERR_INVAL;
lfs_remove(&lfs, "/") => LFS_ERR_INVAL; lfs2_remove(&lfs2, "/") => LFS2_ERR_INVAL;
lfs_remove(&lfs, "//") => LFS_ERR_INVAL; lfs2_remove(&lfs2, "//") => LFS2_ERR_INVAL;
lfs_remove(&lfs, "./") => LFS_ERR_INVAL; lfs2_remove(&lfs2, "./") => LFS2_ERR_INVAL;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Sketchy path tests ---" echo "--- Sketchy path tests ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_mkdir(&lfs, "dirt/ground") => LFS_ERR_NOENT; lfs2_mkdir(&lfs2, "dirt/ground") => LFS2_ERR_NOENT;
lfs_mkdir(&lfs, "dirt/ground/earth") => LFS_ERR_NOENT; lfs2_mkdir(&lfs2, "dirt/ground/earth") => LFS2_ERR_NOENT;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Superblock conflict test ---" echo "--- Superblock conflict test ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_mkdir(&lfs, "littlefs") => 0; lfs2_mkdir(&lfs2, "littlefs") => 0;
lfs_remove(&lfs, "littlefs") => 0; lfs2_remove(&lfs2, "littlefs") => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Max path test ---" echo "--- Max path test ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
memset(buffer, 'w', LFS_NAME_MAX+1); memset(buffer, 'w', LFS2_NAME_MAX+1);
buffer[LFS_NAME_MAX+2] = '\0'; buffer[LFS2_NAME_MAX+2] = '\0';
lfs_mkdir(&lfs, (char*)buffer) => LFS_ERR_NAMETOOLONG; lfs2_mkdir(&lfs2, (char*)buffer) => LFS2_ERR_NAMETOOLONG;
lfs_file_open(&lfs, &file[0], (char*)buffer, lfs2_file_open(&lfs2, &file[0], (char*)buffer,
LFS_O_WRONLY | LFS_O_CREAT) => LFS_ERR_NAMETOOLONG; LFS2_O_WRONLY | LFS2_O_CREAT) => LFS2_ERR_NAMETOOLONG;
memcpy(buffer, "coffee/", strlen("coffee/")); memcpy(buffer, "coffee/", strlen("coffee/"));
memset(buffer+strlen("coffee/"), 'w', LFS_NAME_MAX+1); memset(buffer+strlen("coffee/"), 'w', LFS2_NAME_MAX+1);
buffer[strlen("coffee/")+LFS_NAME_MAX+2] = '\0'; buffer[strlen("coffee/")+LFS2_NAME_MAX+2] = '\0';
lfs_mkdir(&lfs, (char*)buffer) => LFS_ERR_NAMETOOLONG; lfs2_mkdir(&lfs2, (char*)buffer) => LFS2_ERR_NAMETOOLONG;
lfs_file_open(&lfs, &file[0], (char*)buffer, lfs2_file_open(&lfs2, &file[0], (char*)buffer,
LFS_O_WRONLY | LFS_O_CREAT) => LFS_ERR_NAMETOOLONG; LFS2_O_WRONLY | LFS2_O_CREAT) => LFS2_ERR_NAMETOOLONG;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Really big path test ---" echo "--- Really big path test ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
memset(buffer, 'w', LFS_NAME_MAX); memset(buffer, 'w', LFS2_NAME_MAX);
buffer[LFS_NAME_MAX+1] = '\0'; buffer[LFS2_NAME_MAX+1] = '\0';
lfs_mkdir(&lfs, (char*)buffer) => 0; lfs2_mkdir(&lfs2, (char*)buffer) => 0;
lfs_remove(&lfs, (char*)buffer) => 0; lfs2_remove(&lfs2, (char*)buffer) => 0;
lfs_file_open(&lfs, &file[0], (char*)buffer, lfs2_file_open(&lfs2, &file[0], (char*)buffer,
LFS_O_WRONLY | LFS_O_CREAT) => 0; LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_remove(&lfs, (char*)buffer) => 0; lfs2_remove(&lfs2, (char*)buffer) => 0;
memcpy(buffer, "coffee/", strlen("coffee/")); memcpy(buffer, "coffee/", strlen("coffee/"));
memset(buffer+strlen("coffee/"), 'w', LFS_NAME_MAX); memset(buffer+strlen("coffee/"), 'w', LFS2_NAME_MAX);
buffer[strlen("coffee/")+LFS_NAME_MAX+1] = '\0'; buffer[strlen("coffee/")+LFS2_NAME_MAX+1] = '\0';
lfs_mkdir(&lfs, (char*)buffer) => 0; lfs2_mkdir(&lfs2, (char*)buffer) => 0;
lfs_remove(&lfs, (char*)buffer) => 0; lfs2_remove(&lfs2, (char*)buffer) => 0;
lfs_file_open(&lfs, &file[0], (char*)buffer, lfs2_file_open(&lfs2, &file[0], (char*)buffer,
LFS_O_WRONLY | LFS_O_CREAT) => 0; LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_remove(&lfs, (char*)buffer) => 0; lfs2_remove(&lfs2, (char*)buffer) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Results ---" echo "--- Results ---"

320
tests/test_seek.sh
View File

@@ -8,353 +8,353 @@ LARGESIZE=132
echo "=== Seek tests ===" echo "=== Seek tests ==="
rm -rf blocks rm -rf blocks
tests/test.py << TEST tests/test.py << TEST
lfs_format(&lfs, &cfg) => 0; lfs2_format(&lfs2, &cfg) => 0;
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_mkdir(&lfs, "hello") => 0; lfs2_mkdir(&lfs2, "hello") => 0;
for (int i = 0; i < $LARGESIZE; i++) { for (int i = 0; i < $LARGESIZE; i++) {
sprintf((char*)buffer, "hello/kitty%03d", i); sprintf((char*)buffer, "hello/kitty%03d", i);
lfs_file_open(&lfs, &file[0], (char*)buffer, lfs2_file_open(&lfs2, &file[0], (char*)buffer,
LFS_O_WRONLY | LFS_O_CREAT | LFS_O_APPEND) => 0; LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_APPEND) => 0;
size = strlen("kittycatcat"); size = strlen("kittycatcat");
memcpy(buffer, "kittycatcat", size); memcpy(buffer, "kittycatcat", size);
for (int j = 0; j < $LARGESIZE; j++) { for (int j = 0; j < $LARGESIZE; j++) {
lfs_file_write(&lfs, &file[0], buffer, size); lfs2_file_write(&lfs2, &file[0], buffer, size);
} }
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
} }
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Simple dir seek ---" echo "--- Simple dir seek ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_dir_open(&lfs, &dir[0], "hello") => 0; lfs2_dir_open(&lfs2, &dir[0], "hello") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
lfs_soff_t pos; lfs2_soff_t pos;
int i; int i;
for (i = 0; i < $SMALLSIZE; i++) { for (i = 0; i < $SMALLSIZE; i++) {
sprintf((char*)buffer, "kitty%03d", i); sprintf((char*)buffer, "kitty%03d", i);
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, (char*)buffer) => 0; strcmp(info.name, (char*)buffer) => 0;
pos = lfs_dir_tell(&lfs, &dir[0]); pos = lfs2_dir_tell(&lfs2, &dir[0]);
} }
pos >= 0 => 1; pos >= 0 => 1;
lfs_dir_seek(&lfs, &dir[0], pos) => 0; lfs2_dir_seek(&lfs2, &dir[0], pos) => 0;
sprintf((char*)buffer, "kitty%03d", i); sprintf((char*)buffer, "kitty%03d", i);
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, (char*)buffer) => 0; strcmp(info.name, (char*)buffer) => 0;
lfs_dir_rewind(&lfs, &dir[0]) => 0; lfs2_dir_rewind(&lfs2, &dir[0]) => 0;
sprintf((char*)buffer, "kitty%03d", 0); sprintf((char*)buffer, "kitty%03d", 0);
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, (char*)buffer) => 0; strcmp(info.name, (char*)buffer) => 0;
lfs_dir_seek(&lfs, &dir[0], pos) => 0; lfs2_dir_seek(&lfs2, &dir[0], pos) => 0;
sprintf((char*)buffer, "kitty%03d", i); sprintf((char*)buffer, "kitty%03d", i);
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, (char*)buffer) => 0; strcmp(info.name, (char*)buffer) => 0;
lfs_dir_close(&lfs, &dir[0]) => 0; lfs2_dir_close(&lfs2, &dir[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Large dir seek ---" echo "--- Large dir seek ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_dir_open(&lfs, &dir[0], "hello") => 0; lfs2_dir_open(&lfs2, &dir[0], "hello") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
lfs_soff_t pos; lfs2_soff_t pos;
int i; int i;
for (i = 0; i < $MEDIUMSIZE; i++) { for (i = 0; i < $MEDIUMSIZE; i++) {
sprintf((char*)buffer, "kitty%03d", i); sprintf((char*)buffer, "kitty%03d", i);
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, (char*)buffer) => 0; strcmp(info.name, (char*)buffer) => 0;
pos = lfs_dir_tell(&lfs, &dir[0]); pos = lfs2_dir_tell(&lfs2, &dir[0]);
} }
pos >= 0 => 1; pos >= 0 => 1;
lfs_dir_seek(&lfs, &dir[0], pos) => 0; lfs2_dir_seek(&lfs2, &dir[0], pos) => 0;
sprintf((char*)buffer, "kitty%03d", i); sprintf((char*)buffer, "kitty%03d", i);
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, (char*)buffer) => 0; strcmp(info.name, (char*)buffer) => 0;
lfs_dir_rewind(&lfs, &dir[0]) => 0; lfs2_dir_rewind(&lfs2, &dir[0]) => 0;
sprintf((char*)buffer, "kitty%03d", 0); sprintf((char*)buffer, "kitty%03d", 0);
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, ".") => 0; strcmp(info.name, ".") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, "..") => 0; strcmp(info.name, "..") => 0;
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, (char*)buffer) => 0; strcmp(info.name, (char*)buffer) => 0;
lfs_dir_seek(&lfs, &dir[0], pos) => 0; lfs2_dir_seek(&lfs2, &dir[0], pos) => 0;
sprintf((char*)buffer, "kitty%03d", i); sprintf((char*)buffer, "kitty%03d", i);
lfs_dir_read(&lfs, &dir[0], &info) => 1; lfs2_dir_read(&lfs2, &dir[0], &info) => 1;
strcmp(info.name, (char*)buffer) => 0; strcmp(info.name, (char*)buffer) => 0;
lfs_dir_close(&lfs, &dir[0]) => 0; lfs2_dir_close(&lfs2, &dir[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Simple file seek ---" echo "--- Simple file seek ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_file_open(&lfs, &file[0], "hello/kitty042", LFS_O_RDONLY) => 0; lfs2_file_open(&lfs2, &file[0], "hello/kitty042", LFS2_O_RDONLY) => 0;
lfs_soff_t pos; lfs2_soff_t pos;
size = strlen("kittycatcat"); size = strlen("kittycatcat");
for (int i = 0; i < $SMALLSIZE; i++) { for (int i = 0; i < $SMALLSIZE; i++) {
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "kittycatcat", size) => 0; memcmp(buffer, "kittycatcat", size) => 0;
pos = lfs_file_tell(&lfs, &file[0]); pos = lfs2_file_tell(&lfs2, &file[0]);
} }
pos >= 0 => 1; pos >= 0 => 1;
lfs_file_seek(&lfs, &file[0], pos, LFS_SEEK_SET) => pos; lfs2_file_seek(&lfs2, &file[0], pos, LFS2_SEEK_SET) => pos;
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "kittycatcat", size) => 0; memcmp(buffer, "kittycatcat", size) => 0;
lfs_file_rewind(&lfs, &file[0]) => 0; lfs2_file_rewind(&lfs2, &file[0]) => 0;
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "kittycatcat", size) => 0; memcmp(buffer, "kittycatcat", size) => 0;
lfs_file_seek(&lfs, &file[0], 0, LFS_SEEK_CUR) => size; lfs2_file_seek(&lfs2, &file[0], 0, LFS2_SEEK_CUR) => size;
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "kittycatcat", size) => 0; memcmp(buffer, "kittycatcat", size) => 0;
lfs_file_seek(&lfs, &file[0], size, LFS_SEEK_CUR) => 3*size; lfs2_file_seek(&lfs2, &file[0], size, LFS2_SEEK_CUR) => 3*size;
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "kittycatcat", size) => 0; memcmp(buffer, "kittycatcat", size) => 0;
lfs_file_seek(&lfs, &file[0], pos, LFS_SEEK_SET) => pos; lfs2_file_seek(&lfs2, &file[0], pos, LFS2_SEEK_SET) => pos;
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "kittycatcat", size) => 0; memcmp(buffer, "kittycatcat", size) => 0;
lfs_file_seek(&lfs, &file[0], -size, LFS_SEEK_CUR) => pos; lfs2_file_seek(&lfs2, &file[0], -size, LFS2_SEEK_CUR) => pos;
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "kittycatcat", size) => 0; memcmp(buffer, "kittycatcat", size) => 0;
lfs_file_seek(&lfs, &file[0], -size, LFS_SEEK_END) >= 0 => 1; lfs2_file_seek(&lfs2, &file[0], -size, LFS2_SEEK_END) >= 0 => 1;
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "kittycatcat", size) => 0; memcmp(buffer, "kittycatcat", size) => 0;
size = lfs_file_size(&lfs, &file[0]); size = lfs2_file_size(&lfs2, &file[0]);
lfs_file_seek(&lfs, &file[0], 0, LFS_SEEK_CUR) => size; lfs2_file_seek(&lfs2, &file[0], 0, LFS2_SEEK_CUR) => size;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Large file seek ---" echo "--- Large file seek ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_file_open(&lfs, &file[0], "hello/kitty042", LFS_O_RDONLY) => 0; lfs2_file_open(&lfs2, &file[0], "hello/kitty042", LFS2_O_RDONLY) => 0;
lfs_soff_t pos; lfs2_soff_t pos;
size = strlen("kittycatcat"); size = strlen("kittycatcat");
for (int i = 0; i < $MEDIUMSIZE; i++) { for (int i = 0; i < $MEDIUMSIZE; i++) {
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "kittycatcat", size) => 0; memcmp(buffer, "kittycatcat", size) => 0;
pos = lfs_file_tell(&lfs, &file[0]); pos = lfs2_file_tell(&lfs2, &file[0]);
} }
pos >= 0 => 1; pos >= 0 => 1;
lfs_file_seek(&lfs, &file[0], pos, LFS_SEEK_SET) => pos; lfs2_file_seek(&lfs2, &file[0], pos, LFS2_SEEK_SET) => pos;
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "kittycatcat", size) => 0; memcmp(buffer, "kittycatcat", size) => 0;
lfs_file_rewind(&lfs, &file[0]) => 0; lfs2_file_rewind(&lfs2, &file[0]) => 0;
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "kittycatcat", size) => 0; memcmp(buffer, "kittycatcat", size) => 0;
lfs_file_seek(&lfs, &file[0], 0, LFS_SEEK_CUR) => size; lfs2_file_seek(&lfs2, &file[0], 0, LFS2_SEEK_CUR) => size;
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "kittycatcat", size) => 0; memcmp(buffer, "kittycatcat", size) => 0;
lfs_file_seek(&lfs, &file[0], size, LFS_SEEK_CUR) => 3*size; lfs2_file_seek(&lfs2, &file[0], size, LFS2_SEEK_CUR) => 3*size;
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "kittycatcat", size) => 0; memcmp(buffer, "kittycatcat", size) => 0;
lfs_file_seek(&lfs, &file[0], pos, LFS_SEEK_SET) => pos; lfs2_file_seek(&lfs2, &file[0], pos, LFS2_SEEK_SET) => pos;
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "kittycatcat", size) => 0; memcmp(buffer, "kittycatcat", size) => 0;
lfs_file_seek(&lfs, &file[0], -size, LFS_SEEK_CUR) => pos; lfs2_file_seek(&lfs2, &file[0], -size, LFS2_SEEK_CUR) => pos;
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "kittycatcat", size) => 0; memcmp(buffer, "kittycatcat", size) => 0;
lfs_file_seek(&lfs, &file[0], -size, LFS_SEEK_END) >= 0 => 1; lfs2_file_seek(&lfs2, &file[0], -size, LFS2_SEEK_END) >= 0 => 1;
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "kittycatcat", size) => 0; memcmp(buffer, "kittycatcat", size) => 0;
size = lfs_file_size(&lfs, &file[0]); size = lfs2_file_size(&lfs2, &file[0]);
lfs_file_seek(&lfs, &file[0], 0, LFS_SEEK_CUR) => size; lfs2_file_seek(&lfs2, &file[0], 0, LFS2_SEEK_CUR) => size;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Simple file seek and write ---" echo "--- Simple file seek and write ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_file_open(&lfs, &file[0], "hello/kitty042", LFS_O_RDWR) => 0; lfs2_file_open(&lfs2, &file[0], "hello/kitty042", LFS2_O_RDWR) => 0;
lfs_soff_t pos; lfs2_soff_t pos;
size = strlen("kittycatcat"); size = strlen("kittycatcat");
for (int i = 0; i < $SMALLSIZE; i++) { for (int i = 0; i < $SMALLSIZE; i++) {
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "kittycatcat", size) => 0; memcmp(buffer, "kittycatcat", size) => 0;
pos = lfs_file_tell(&lfs, &file[0]); pos = lfs2_file_tell(&lfs2, &file[0]);
} }
pos >= 0 => 1; pos >= 0 => 1;
memcpy(buffer, "doggodogdog", size); memcpy(buffer, "doggodogdog", size);
lfs_file_seek(&lfs, &file[0], pos, LFS_SEEK_SET) => pos; lfs2_file_seek(&lfs2, &file[0], pos, LFS2_SEEK_SET) => pos;
lfs_file_write(&lfs, &file[0], buffer, size) => size; lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
lfs_file_seek(&lfs, &file[0], pos, LFS_SEEK_SET) => pos; lfs2_file_seek(&lfs2, &file[0], pos, LFS2_SEEK_SET) => pos;
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "doggodogdog", size) => 0; memcmp(buffer, "doggodogdog", size) => 0;
lfs_file_rewind(&lfs, &file[0]) => 0; lfs2_file_rewind(&lfs2, &file[0]) => 0;
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "kittycatcat", size) => 0; memcmp(buffer, "kittycatcat", size) => 0;
lfs_file_seek(&lfs, &file[0], pos, LFS_SEEK_SET) => pos; lfs2_file_seek(&lfs2, &file[0], pos, LFS2_SEEK_SET) => pos;
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "doggodogdog", size) => 0; memcmp(buffer, "doggodogdog", size) => 0;
lfs_file_seek(&lfs, &file[0], -size, LFS_SEEK_END) >= 0 => 1; lfs2_file_seek(&lfs2, &file[0], -size, LFS2_SEEK_END) >= 0 => 1;
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "kittycatcat", size) => 0; memcmp(buffer, "kittycatcat", size) => 0;
size = lfs_file_size(&lfs, &file[0]); size = lfs2_file_size(&lfs2, &file[0]);
lfs_file_seek(&lfs, &file[0], 0, LFS_SEEK_CUR) => size; lfs2_file_seek(&lfs2, &file[0], 0, LFS2_SEEK_CUR) => size;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Large file seek and write ---" echo "--- Large file seek and write ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_file_open(&lfs, &file[0], "hello/kitty042", LFS_O_RDWR) => 0; lfs2_file_open(&lfs2, &file[0], "hello/kitty042", LFS2_O_RDWR) => 0;
lfs_soff_t pos; lfs2_soff_t pos;
size = strlen("kittycatcat"); size = strlen("kittycatcat");
for (int i = 0; i < $MEDIUMSIZE; i++) { for (int i = 0; i < $MEDIUMSIZE; i++) {
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
if (i != $SMALLSIZE) { if (i != $SMALLSIZE) {
memcmp(buffer, "kittycatcat", size) => 0; memcmp(buffer, "kittycatcat", size) => 0;
} }
pos = lfs_file_tell(&lfs, &file[0]); pos = lfs2_file_tell(&lfs2, &file[0]);
} }
pos >= 0 => 1; pos >= 0 => 1;
memcpy(buffer, "doggodogdog", size); memcpy(buffer, "doggodogdog", size);
lfs_file_seek(&lfs, &file[0], pos, LFS_SEEK_SET) => pos; lfs2_file_seek(&lfs2, &file[0], pos, LFS2_SEEK_SET) => pos;
lfs_file_write(&lfs, &file[0], buffer, size) => size; lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
lfs_file_seek(&lfs, &file[0], pos, LFS_SEEK_SET) => pos; lfs2_file_seek(&lfs2, &file[0], pos, LFS2_SEEK_SET) => pos;
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "doggodogdog", size) => 0; memcmp(buffer, "doggodogdog", size) => 0;
lfs_file_rewind(&lfs, &file[0]) => 0; lfs2_file_rewind(&lfs2, &file[0]) => 0;
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "kittycatcat", size) => 0; memcmp(buffer, "kittycatcat", size) => 0;
lfs_file_seek(&lfs, &file[0], pos, LFS_SEEK_SET) => pos; lfs2_file_seek(&lfs2, &file[0], pos, LFS2_SEEK_SET) => pos;
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "doggodogdog", size) => 0; memcmp(buffer, "doggodogdog", size) => 0;
lfs_file_seek(&lfs, &file[0], -size, LFS_SEEK_END) >= 0 => 1; lfs2_file_seek(&lfs2, &file[0], -size, LFS2_SEEK_END) >= 0 => 1;
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "kittycatcat", size) => 0; memcmp(buffer, "kittycatcat", size) => 0;
size = lfs_file_size(&lfs, &file[0]); size = lfs2_file_size(&lfs2, &file[0]);
lfs_file_seek(&lfs, &file[0], 0, LFS_SEEK_CUR) => size; lfs2_file_seek(&lfs2, &file[0], 0, LFS2_SEEK_CUR) => size;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Boundary seek and write ---" echo "--- Boundary seek and write ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_file_open(&lfs, &file[0], "hello/kitty042", LFS_O_RDWR) => 0; lfs2_file_open(&lfs2, &file[0], "hello/kitty042", LFS2_O_RDWR) => 0;
size = strlen("hedgehoghog"); size = strlen("hedgehoghog");
const lfs_soff_t offsets[] = {512, 1020, 513, 1021, 511, 1019}; const lfs2_soff_t offsets[] = {512, 1020, 513, 1021, 511, 1019};
for (unsigned i = 0; i < sizeof(offsets) / sizeof(offsets[0]); i++) { for (unsigned i = 0; i < sizeof(offsets) / sizeof(offsets[0]); i++) {
lfs_soff_t off = offsets[i]; lfs2_soff_t off = offsets[i];
memcpy(buffer, "hedgehoghog", size); memcpy(buffer, "hedgehoghog", size);
lfs_file_seek(&lfs, &file[0], off, LFS_SEEK_SET) => off; lfs2_file_seek(&lfs2, &file[0], off, LFS2_SEEK_SET) => off;
lfs_file_write(&lfs, &file[0], buffer, size) => size; lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
lfs_file_seek(&lfs, &file[0], off, LFS_SEEK_SET) => off; lfs2_file_seek(&lfs2, &file[0], off, LFS2_SEEK_SET) => off;
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "hedgehoghog", size) => 0; memcmp(buffer, "hedgehoghog", size) => 0;
lfs_file_seek(&lfs, &file[0], 0, LFS_SEEK_SET) => 0; lfs2_file_seek(&lfs2, &file[0], 0, LFS2_SEEK_SET) => 0;
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "kittycatcat", size) => 0; memcmp(buffer, "kittycatcat", size) => 0;
lfs_file_sync(&lfs, &file[0]) => 0; lfs2_file_sync(&lfs2, &file[0]) => 0;
} }
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Out-of-bounds seek ---" echo "--- Out-of-bounds seek ---"
tests/test.py << TEST tests/test.py << TEST
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
lfs_file_open(&lfs, &file[0], "hello/kitty042", LFS_O_RDWR) => 0; lfs2_file_open(&lfs2, &file[0], "hello/kitty042", LFS2_O_RDWR) => 0;
size = strlen("kittycatcat"); size = strlen("kittycatcat");
lfs_file_size(&lfs, &file[0]) => $LARGESIZE*size; lfs2_file_size(&lfs2, &file[0]) => $LARGESIZE*size;
lfs_file_seek(&lfs, &file[0], ($LARGESIZE+$SMALLSIZE)*size, lfs2_file_seek(&lfs2, &file[0], ($LARGESIZE+$SMALLSIZE)*size,
LFS_SEEK_SET) => ($LARGESIZE+$SMALLSIZE)*size; LFS2_SEEK_SET) => ($LARGESIZE+$SMALLSIZE)*size;
lfs_file_read(&lfs, &file[0], buffer, size) => 0; lfs2_file_read(&lfs2, &file[0], buffer, size) => 0;
memcpy(buffer, "porcupineee", size); memcpy(buffer, "porcupineee", size);
lfs_file_write(&lfs, &file[0], buffer, size) => size; lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
lfs_file_seek(&lfs, &file[0], ($LARGESIZE+$SMALLSIZE)*size, lfs2_file_seek(&lfs2, &file[0], ($LARGESIZE+$SMALLSIZE)*size,
LFS_SEEK_SET) => ($LARGESIZE+$SMALLSIZE)*size; LFS2_SEEK_SET) => ($LARGESIZE+$SMALLSIZE)*size;
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "porcupineee", size) => 0; memcmp(buffer, "porcupineee", size) => 0;
lfs_file_seek(&lfs, &file[0], $LARGESIZE*size, lfs2_file_seek(&lfs2, &file[0], $LARGESIZE*size,
LFS_SEEK_SET) => $LARGESIZE*size; LFS2_SEEK_SET) => $LARGESIZE*size;
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "\0\0\0\0\0\0\0\0\0\0\0", size) => 0; memcmp(buffer, "\0\0\0\0\0\0\0\0\0\0\0", size) => 0;
lfs_file_seek(&lfs, &file[0], -(($LARGESIZE+$SMALLSIZE)*size), lfs2_file_seek(&lfs2, &file[0], -(($LARGESIZE+$SMALLSIZE)*size),
LFS_SEEK_CUR) => LFS_ERR_INVAL; LFS2_SEEK_CUR) => LFS2_ERR_INVAL;
lfs_file_tell(&lfs, &file[0]) => ($LARGESIZE+1)*size; lfs2_file_tell(&lfs2, &file[0]) => ($LARGESIZE+1)*size;
lfs_file_seek(&lfs, &file[0], -(($LARGESIZE+2*$SMALLSIZE)*size), lfs2_file_seek(&lfs2, &file[0], -(($LARGESIZE+2*$SMALLSIZE)*size),
LFS_SEEK_END) => LFS_ERR_INVAL; LFS2_SEEK_END) => LFS2_ERR_INVAL;
lfs_file_tell(&lfs, &file[0]) => ($LARGESIZE+1)*size; lfs2_file_tell(&lfs2, &file[0]) => ($LARGESIZE+1)*size;
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
echo "--- Results ---" echo "--- Results ---"

80
tests/test_truncate.sh
View File

@@ -8,7 +8,7 @@ LARGESIZE=8192
echo "=== Truncate tests ===" echo "=== Truncate tests ==="
rm -rf blocks rm -rf blocks
tests/test.py << TEST tests/test.py << TEST
lfs_format(&lfs, &cfg) => 0; lfs2_format(&lfs2, &cfg) => 0;
TEST TEST
truncate_test() { truncate_test() {
@@ -17,98 +17,98 @@ STARTSEEKS="$2"
HOTSIZES="$3" HOTSIZES="$3"
COLDSIZES="$4" COLDSIZES="$4"
tests/test.py << TEST tests/test.py << TEST
static const lfs_off_t startsizes[] = {$STARTSIZES}; static const lfs2_off_t startsizes[] = {$STARTSIZES};
static const lfs_off_t startseeks[] = {$STARTSEEKS}; static const lfs2_off_t startseeks[] = {$STARTSEEKS};
static const lfs_off_t hotsizes[] = {$HOTSIZES}; static const lfs2_off_t hotsizes[] = {$HOTSIZES};
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
for (unsigned i = 0; i < sizeof(startsizes)/sizeof(startsizes[0]); i++) { for (unsigned i = 0; i < sizeof(startsizes)/sizeof(startsizes[0]); i++) {
sprintf((char*)buffer, "hairyhead%d", i); sprintf((char*)buffer, "hairyhead%d", i);
lfs_file_open(&lfs, &file[0], (const char*)buffer, lfs2_file_open(&lfs2, &file[0], (const char*)buffer,
LFS_O_WRONLY | LFS_O_CREAT | LFS_O_TRUNC) => 0; LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
strcpy((char*)buffer, "hair"); strcpy((char*)buffer, "hair");
size = strlen((char*)buffer); size = strlen((char*)buffer);
for (lfs_off_t j = 0; j < startsizes[i]; j += size) { for (lfs2_off_t j = 0; j < startsizes[i]; j += size) {
lfs_file_write(&lfs, &file[0], buffer, size) => size; lfs2_file_write(&lfs2, &file[0], buffer, size) => size;
} }
lfs_file_size(&lfs, &file[0]) => startsizes[i]; lfs2_file_size(&lfs2, &file[0]) => startsizes[i];
if (startseeks[i] != startsizes[i]) { if (startseeks[i] != startsizes[i]) {
lfs_file_seek(&lfs, &file[0], lfs2_file_seek(&lfs2, &file[0],
startseeks[i], LFS_SEEK_SET) => startseeks[i]; startseeks[i], LFS2_SEEK_SET) => startseeks[i];
} }
lfs_file_truncate(&lfs, &file[0], hotsizes[i]) => 0; lfs2_file_truncate(&lfs2, &file[0], hotsizes[i]) => 0;
lfs_file_size(&lfs, &file[0]) => hotsizes[i]; lfs2_file_size(&lfs2, &file[0]) => hotsizes[i];
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
} }
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
tests/test.py << TEST tests/test.py << TEST
static const lfs_off_t startsizes[] = {$STARTSIZES}; static const lfs2_off_t startsizes[] = {$STARTSIZES};
static const lfs_off_t hotsizes[] = {$HOTSIZES}; static const lfs2_off_t hotsizes[] = {$HOTSIZES};
static const lfs_off_t coldsizes[] = {$COLDSIZES}; static const lfs2_off_t coldsizes[] = {$COLDSIZES};
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
for (unsigned i = 0; i < sizeof(startsizes)/sizeof(startsizes[0]); i++) { for (unsigned i = 0; i < sizeof(startsizes)/sizeof(startsizes[0]); i++) {
sprintf((char*)buffer, "hairyhead%d", i); sprintf((char*)buffer, "hairyhead%d", i);
lfs_file_open(&lfs, &file[0], (const char*)buffer, LFS_O_RDWR) => 0; lfs2_file_open(&lfs2, &file[0], (const char*)buffer, LFS2_O_RDWR) => 0;
lfs_file_size(&lfs, &file[0]) => hotsizes[i]; lfs2_file_size(&lfs2, &file[0]) => hotsizes[i];
size = strlen("hair"); size = strlen("hair");
lfs_off_t j = 0; lfs2_off_t j = 0;
for (; j < startsizes[i] && j < hotsizes[i]; j += size) { for (; j < startsizes[i] && j < hotsizes[i]; j += size) {
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "hair", size) => 0; memcmp(buffer, "hair", size) => 0;
} }
for (; j < hotsizes[i]; j += size) { for (; j < hotsizes[i]; j += size) {
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "\0\0\0\0", size) => 0; memcmp(buffer, "\0\0\0\0", size) => 0;
} }
lfs_file_truncate(&lfs, &file[0], coldsizes[i]) => 0; lfs2_file_truncate(&lfs2, &file[0], coldsizes[i]) => 0;
lfs_file_size(&lfs, &file[0]) => coldsizes[i]; lfs2_file_size(&lfs2, &file[0]) => coldsizes[i];
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
} }
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
tests/test.py << TEST tests/test.py << TEST
static const lfs_off_t startsizes[] = {$STARTSIZES}; static const lfs2_off_t startsizes[] = {$STARTSIZES};
static const lfs_off_t hotsizes[] = {$HOTSIZES}; static const lfs2_off_t hotsizes[] = {$HOTSIZES};
static const lfs_off_t coldsizes[] = {$COLDSIZES}; static const lfs2_off_t coldsizes[] = {$COLDSIZES};
lfs_mount(&lfs, &cfg) => 0; lfs2_mount(&lfs2, &cfg) => 0;
for (unsigned i = 0; i < sizeof(startsizes)/sizeof(startsizes[0]); i++) { for (unsigned i = 0; i < sizeof(startsizes)/sizeof(startsizes[0]); i++) {
sprintf((char*)buffer, "hairyhead%d", i); sprintf((char*)buffer, "hairyhead%d", i);
lfs_file_open(&lfs, &file[0], (const char*)buffer, LFS_O_RDONLY) => 0; lfs2_file_open(&lfs2, &file[0], (const char*)buffer, LFS2_O_RDONLY) => 0;
lfs_file_size(&lfs, &file[0]) => coldsizes[i]; lfs2_file_size(&lfs2, &file[0]) => coldsizes[i];
size = strlen("hair"); size = strlen("hair");
lfs_off_t j = 0; lfs2_off_t j = 0;
for (; j < startsizes[i] && j < hotsizes[i] && j < coldsizes[i]; for (; j < startsizes[i] && j < hotsizes[i] && j < coldsizes[i];
j += size) { j += size) {
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "hair", size) => 0; memcmp(buffer, "hair", size) => 0;
} }
for (; j < coldsizes[i]; j += size) { for (; j < coldsizes[i]; j += size) {
lfs_file_read(&lfs, &file[0], buffer, size) => size; lfs2_file_read(&lfs2, &file[0], buffer, size) => size;
memcmp(buffer, "\0\0\0\0", size) => 0; memcmp(buffer, "\0\0\0\0", size) => 0;
} }
lfs_file_close(&lfs, &file[0]) => 0; lfs2_file_close(&lfs2, &file[0]) => 0;
} }
lfs_unmount(&lfs) => 0; lfs2_unmount(&lfs2) => 0;
TEST TEST
} }