Generated v2 prefixes

Interestingly this was introduced by two different PRs which were not tested
together until pre-release testing:

- Fix lfs_file_seek doesn't update cache properties correctly
- Fix compiler warnings when LFS_READONLY defined

.github/workflows/post-release.yml

@@ -0,0 +1,26 @@
+name: post-release
+on:
+  release:
+    branches: [master]
+    types: [released]
+
+jobs:
+  post-release:
+    runs-on: ubuntu-18.04
+    steps:
+      # trigger post-release in dependency repo, this indirection allows the
+      # dependency repo to be updated often without affecting this repo. At
+      # the time of this comment, the dependency repo is responsible for
+      # creating PRs for other dependent repos post-release.
+      - name: trigger-post-release
+        continue-on-error: true
+        run: |
+          curl -sS -X POST -H "authorization: token ${{secrets.BOT_TOKEN}}" \
+            "$GITHUB_API_URL/repos/${{secrets.POST_RELEASE_REPO}}/dispatches" \
+            -d "$(jq -n '{
+              event_type: "post-release",
+              client_payload: {
+                repo: env.GITHUB_REPOSITORY,
+                version: "${{github.event.release.tag_name}}"}}' \
+              | tee /dev/stderr)"
+

.github/workflows/release.yml

@@ -0,0 +1,215 @@
+name: release
+on:
+  workflow_run:
+    workflows: [test]
+    branches: [master]
+    types: [completed]
+
+jobs:
+  release:
+    runs-on: ubuntu-18.04
+
+    # need to manually check for a couple things
+    # - tests passed?
+    # - we are the most recent commit on master?
+    if: ${{github.event.workflow_run.conclusion == 'success' &&
+      github.event.workflow_run.head_sha == github.sha}}
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{github.event.workflow_run.head_sha}}
+          # need workflow access since we push branches
+          # containing workflows
+          token: ${{secrets.BOT_TOKEN}}
+          # need all tags
+          fetch-depth: 0
+
+      # try to get results from tests
+      - uses: dawidd6/action-download-artifact@v2
+        continue-on-error: true
+        with:
+          workflow: ${{github.event.workflow_run.name}}
+          run_id: ${{github.event.workflow_run.id}}
+          name: results
+          path: results
+
+      - name: find-version
+        run: |
+          # rip version from lfs2.h
+          LFS2_VERSION="$(grep -o '^#define LFS2_VERSION .*$' lfs2.h \
+            | awk '{print $3}')"
+          LFS2_VERSION_MAJOR="$((0xffff & ($LFS2_VERSION >> 16)))"
+          LFS2_VERSION_MINOR="$((0xffff & ($LFS2_VERSION >>  0)))"
+
+          # find a new patch version based on what we find in our tags
+          LFS2_VERSION_PATCH="$( \
+            ( git describe --tags --abbrev=0 \
+                --match="v$LFS2_VERSION_MAJOR.$LFS2_VERSION_MINOR.*" \
+              || echo 'v0.0.-1' ) \
+            | awk -F '.' '{print $3+1}')"
+
+          # found new version
+          LFS2_VERSION="v$LFS2_VERSION_MAJOR`
+            `.$LFS2_VERSION_MINOR`
+            `.$LFS2_VERSION_PATCH"
+          echo "LFS2_VERSION=$LFS2_VERSION"
+          echo "LFS2_VERSION=$LFS2_VERSION" >> $GITHUB_ENV
+          echo "LFS2_VERSION_MAJOR=$LFS2_VERSION_MAJOR" >> $GITHUB_ENV
+          echo "LFS2_VERSION_MINOR=$LFS2_VERSION_MINOR" >> $GITHUB_ENV
+          echo "LFS2_VERSION_PATCH=$LFS2_VERSION_PATCH" >> $GITHUB_ENV
+
+      # try to find previous version?
+      - name: find-prev-version
+        continue-on-error: true
+        run: |
+          LFS2_PREV_VERSION="$(git describe --tags --abbrev=0 --match 'v*')"
+          echo "LFS2_PREV_VERSION=$LFS2_PREV_VERSION"
+          echo "LFS2_PREV_VERSION=$LFS2_PREV_VERSION" >> $GITHUB_ENV
+
+      # try to find results from tests
+      - name: collect-results
+        run: |
+          # previous results to compare against?
+          [ -n "$LFS2_PREV_VERSION" ] && curl -sS \
+            "$GITHUB_API_URL/repos/$GITHUB_REPOSITORY/`
+              `status/$LFS2_PREV_VERSION" \
+            | jq -re 'select(.sha != env.GITHUB_SHA) | .statuses[]' \
+            >> prev-results.json \
+            || true
+
+          # unfortunately these each have their own format
+          [ -e results/code-thumb.csv ] && ( \
+            export PREV="$(jq -re '
+                  select(.context == "results / code").description
+                  | capture("Code size is (?<result>[0-9]+)").result' \
+                prev-results.json || echo 0)"
+            ./scripts/code.py -u results/code-thumb.csv -s | awk '
+              NR==2 {printf "Code size,%d B",$2}
+              NR==2 && ENVIRON["PREV"]+0 != 0 {
+                printf " (%+.1f%%)",100*($2-ENVIRON["PREV"])/ENVIRON["PREV"]}
+              NR==2 {printf "\n"}' \
+            >> results.csv)
+          [ -e results/code-thumb-readonly.csv ] && ( \
+            export PREV="$(jq -re '
+                  select(.context == "results / code (readonly)").description
+                  | capture("Code size is (?<result>[0-9]+)").result' \
+                prev-results.json || echo 0)"
+            ./scripts/code.py -u results/code-thumb-readonly.csv -s | awk '
+              NR==2 {printf "Code size<br/>(readonly),%d B",$2}
+              NR==2 && ENVIRON["PREV"]+0 != 0 {
+                printf " (%+.1f%%)",100*($2-ENVIRON["PREV"])/ENVIRON["PREV"]}
+              NR==2 {printf "\n"}' \
+            >> results.csv)
+          [ -e results/code-thumb-threadsafe.csv ] && ( \
+            export PREV="$(jq -re '
+                  select(.context == "results / code (threadsafe)").description
+                  | capture("Code size is (?<result>[0-9]+)").result' \
+                prev-results.json || echo 0)"
+            ./scripts/code.py -u results/code-thumb-threadsafe.csv -s | awk '
+              NR==2 {printf "Code size<br/>(threadsafe),%d B",$2}
+              NR==2 && ENVIRON["PREV"]+0 != 0 {
+                printf " (%+.1f%%)",100*($2-ENVIRON["PREV"])/ENVIRON["PREV"]}
+              NR==2 {printf "\n"}' \
+            >> results.csv)
+          [ -e results/code-thumb-migrate.csv ] && ( \
+            export PREV="$(jq -re '
+                  select(.context == "results / code (migrate)").description
+                  | capture("Code size is (?<result>[0-9]+)").result' \
+                prev-results.json || echo 0)"
+            ./scripts/code.py -u results/code-thumb-migrate.csv -s | awk '
+              NR==2 {printf "Code size<br/>(migrate),%d B",$2}
+              NR==2 && ENVIRON["PREV"]+0 != 0 {
+                printf " (%+.1f%%)",100*($2-ENVIRON["PREV"])/ENVIRON["PREV"]}
+              NR==2 {printf "\n"}' \
+            >> results.csv)
+          [ -e results/code-thumb-error-asserts.csv ] && ( \
+            export PREV="$(jq -re '
+                  select(.context == "results / code (error-asserts)").description
+                  | capture("Code size is (?<result>[0-9]+)").result' \
+                prev-results.json || echo 0)"
+            ./scripts/code.py -u results/code-thumb-error-asserts.csv -s | awk '
+              NR==2 {printf "Code size<br/>(error-asserts),%d B",$2}
+              NR==2 && ENVIRON["PREV"]+0 != 0 {
+                printf " (%+.1f%%)",100*($2-ENVIRON["PREV"])/ENVIRON["PREV"]}
+              NR==2 {printf "\n"}' \
+            >> results.csv)
+          [ -e results/coverage.csv ] && ( \
+            export PREV="$(jq -re '
+                  select(.context == "results / coverage").description
+                  | capture("Coverage is (?<result>[0-9\\.]+)").result' \
+                prev-results.json || echo 0)"
+            ./scripts/coverage.py -u results/coverage.csv -s | awk -F '[ /%]+' '
+              NR==2 {printf "Coverage,%.1f%% of %d lines",$4,$3}
+              NR==2 && ENVIRON["PREV"]+0 != 0 {
+                printf " (%+.1f%%)",$4-ENVIRON["PREV"]}
+              NR==2 {printf "\n"}' \
+            >> results.csv)
+
+          # transpose to GitHub table
+          [ -e results.csv ] || exit 0
+          awk -F ',' '
+            {label[NR]=$1; value[NR]=$2}
+            END {
+              for (r=1; r<=NR; r++) {printf "| %s ",label[r]}; printf "|\n";
+              for (r=1; r<=NR; r++) {printf "|:--"}; printf "|\n";
+              for (r=1; r<=NR; r++) {printf "| %s ",value[r]}; printf "|\n"}' \
+            results.csv > results.txt
+          echo "RESULTS:"
+          cat results.txt
+
+      # find changes from history
+      - name: collect-changes
+        run: |
+          [ -n "$LFS2_PREV_VERSION" ] || exit 0
+          # use explicit link to github commit so that release notes can
+          # be copied elsewhere
+          git log "$LFS2_PREV_VERSION.." \
+            --grep='^Merge' --invert-grep \
+            --format="format:[\`%h\`](`
+              `https://github.com/$GITHUB_REPOSITORY/commit/%h) %s" \
+            > changes.txt
+          echo "CHANGES:"
+          cat changes.txt
+
+      # create and update major branches (vN and vN-prefix)
+      - name: create-major-branches
+        run: |
+          # create major branch
+          git branch "v$LFS2_VERSION_MAJOR" HEAD
+
+          # create major prefix branch
+          git config user.name ${{secrets.BOT_USER}}
+          git config user.email ${{secrets.BOT_EMAIL}}
+          git fetch "https://github.com/$GITHUB_REPOSITORY.git" \
+            "v$LFS2_VERSION_MAJOR-prefix" || true
+          ./scripts/prefix.py "lfs2$LFS2_VERSION_MAJOR"
+          git branch "v$LFS2_VERSION_MAJOR-prefix" $( \
+            git commit-tree $(git write-tree) \
+              $(git rev-parse --verify -q FETCH_HEAD | sed -e 's/^/-p /') \
+              -p HEAD \
+              -m "Generated v$LFS2_VERSION_MAJOR prefixes")
+          git reset --hard
+
+          # push!
+          git push --atomic origin \
+            "v$LFS2_VERSION_MAJOR" \
+            "v$LFS2_VERSION_MAJOR-prefix"
+
+      # build release notes
+      - name: create-release
+        run: |
+          # create release and patch version tag (vN.N.N)
+          # only draft if not a patch release
+          [ -e results.txt ] && export RESULTS="$(cat results.txt)"
+          [ -e changes.txt ] && export CHANGES="$(cat changes.txt)"
+          curl -sS -X POST -H "authorization: token ${{secrets.BOT_TOKEN}}" \
+            "$GITHUB_API_URL/repos/$GITHUB_REPOSITORY/releases" \
+            -d "$(jq -n '{
+              tag_name: env.LFS2_VERSION,
+              name: env.LFS2_VERSION | rtrimstr(".0"),
+              target_commitish: "${{github.event.workflow_run.head_sha}}",
+              draft: env.LFS2_VERSION | endswith(".0"),
+              body: [env.RESULTS, env.CHANGES | select(.)] | join("\n\n")}' \
+              | tee /dev/stderr)"
+

.github/workflows/status.yml

@@ -0,0 +1,55 @@
+name: status
+on:
+  workflow_run:
+    workflows: [test]
+    types: [completed]
+
+jobs:
+  status:
+    runs-on: ubuntu-18.04
+    steps:
+      # custom statuses?
+      - uses: dawidd6/action-download-artifact@v2
+        continue-on-error: true
+        with:
+          workflow: ${{github.event.workflow_run.name}}
+          run_id: ${{github.event.workflow_run.id}}
+          name: status
+          path: status
+      - name: update-status
+        continue-on-error: true
+        run: |
+          ls status
+          for s in $(shopt -s nullglob ; echo status/*.json)
+          do
+            # parse requested status
+            export STATE="$(jq -er '.state' $s)"
+            export CONTEXT="$(jq -er '.context' $s)"
+            export DESCRIPTION="$(jq -er '.description' $s)"
+            # help lookup URL for job/steps because GitHub makes
+            # it VERY HARD to link to specific jobs
+            export TARGET_URL="$(
+              jq -er '.target_url // empty' $s || (
+                export TARGET_JOB="$(jq -er '.target_job' $s)"
+                export TARGET_STEP="$(jq -er '.target_step // ""' $s)"
+                curl -sS -H "authorization: token ${{secrets.BOT_TOKEN}}" \
+                  "$GITHUB_API_URL/repos/$GITHUB_REPOSITORY/actions/runs/`
+                    `${{github.event.workflow_run.id}}/jobs" \
+                  | jq -er '.jobs[]
+                    | select(.name == env.TARGET_JOB)
+                    | .html_url
+                      + "?check_suite_focus=true"
+                      + ((.steps[]
+                        | select(.name == env.TARGET_STEP)
+                        | "#step:\(.number):0") // "")'))"
+            # update status
+            curl -sS -X POST -H "authorization: token ${{secrets.BOT_TOKEN}}" \
+              "$GITHUB_API_URL/repos/$GITHUB_REPOSITORY/statuses/`
+                `${{github.event.workflow_run.head_sha}}" \
+              -d "$(jq -n '{
+                state: env.STATE,
+                context: env.CONTEXT,
+                description: env.DESCRIPTION,
+                target_url: env.TARGET_URL}' \
+                | tee /dev/stderr)"
+          done

.github/workflows/test.yml

@@ -0,0 +1,446 @@
+name: test
+on: [push, pull_request]
+
+env:
+  CFLAGS: -Werror
+  MAKEFLAGS: -j
+
+jobs:
+  # run tests
+  test:
+    runs-on: ubuntu-18.04
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: [x86_64, thumb, mips, powerpc]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: install
+        run: |
+          # need toml, also pip3 isn't installed by default?
+          sudo apt-get update -qq
+          sudo apt-get install -qq python3 python3-pip lcov
+          sudo pip3 install toml
+          gcc --version
+
+          # setup a ram-backed disk to speed up reentrant tests
+          mkdir disks
+          sudo mount -t tmpfs -o size=100m tmpfs disks
+          TESTFLAGS="$TESTFLAGS --disk=disks/disk"
+
+          # collect coverage
+          mkdir -p coverage
+          TESTFLAGS="$TESTFLAGS --coverage=`
+            `coverage/${{github.job}}-${{matrix.arch}}.info"
+
+          echo "TESTFLAGS=$TESTFLAGS" >> $GITHUB_ENV
+
+      # cross-compile with ARM Thumb (32-bit, little-endian)
+      - name: install-thumb
+        if: ${{matrix.arch == 'thumb'}}
+        run: |
+          sudo apt-get install -qq \
+            gcc-arm-linux-gnueabi \
+            libc6-dev-armel-cross \
+            qemu-user
+          echo "CC=arm-linux-gnueabi-gcc -mthumb --static" >> $GITHUB_ENV
+          echo "EXEC=qemu-arm" >> $GITHUB_ENV
+          arm-linux-gnueabi-gcc --version
+          qemu-arm -version
+      # cross-compile with MIPS (32-bit, big-endian)
+      - name: install-mips
+        if: ${{matrix.arch == 'mips'}}
+        run: |
+          sudo apt-get install -qq \
+            gcc-mips-linux-gnu \
+            libc6-dev-mips-cross \
+            qemu-user
+          echo "CC=mips-linux-gnu-gcc --static" >> $GITHUB_ENV
+          echo "EXEC=qemu-mips" >> $GITHUB_ENV
+          mips-linux-gnu-gcc --version
+          qemu-mips -version
+      # cross-compile with PowerPC (32-bit, big-endian)
+      - name: install-powerpc
+        if: ${{matrix.arch == 'powerpc'}}
+        run: |
+          sudo apt-get install -qq \
+            gcc-powerpc-linux-gnu \
+            libc6-dev-powerpc-cross \
+            qemu-user
+          echo "CC=powerpc-linux-gnu-gcc --static" >> $GITHUB_ENV
+          echo "EXEC=qemu-ppc" >> $GITHUB_ENV
+          powerpc-linux-gnu-gcc --version
+          qemu-ppc -version
+
+      # make sure example can at least compile
+      - name: test-example
+        run: |
+          sed -n '/``` c/,/```/{/```/d; p}' README.md > test.c
+          make all CFLAGS+=" \
+            -Duser_provided_block_device_read=NULL \
+            -Duser_provided_block_device_prog=NULL \
+            -Duser_provided_block_device_erase=NULL \
+            -Duser_provided_block_device_sync=NULL \
+            -include stdio.h"
+          rm test.c
+
+      # test configurations
+      # normal+reentrant tests
+      - name: test-default
+        run: |
+          make clean
+          make test TESTFLAGS+="-nrk"
+      # NOR flash: read/prog = 1 block = 4KiB
+      - name: test-nor
+        run: |
+          make clean
+          make test TESTFLAGS+="-nrk \
+            -DLFS2_READ_SIZE=1 -DLFS2_BLOCK_SIZE=4096"
+      # SD/eMMC: read/prog = 512 block = 512
+      - name: test-emmc
+        run: |
+          make clean
+          make test TESTFLAGS+="-nrk \
+            -DLFS2_READ_SIZE=512 -DLFS2_BLOCK_SIZE=512"
+      # NAND flash: read/prog = 4KiB block = 32KiB
+      - name: test-nand
+        run: |
+          make clean
+          make test TESTFLAGS+="-nrk \
+            -DLFS2_READ_SIZE=4096 -DLFS2_BLOCK_SIZE=\(32*1024\)"
+      # other extreme geometries that are useful for various corner cases
+      - name: test-no-intrinsics
+        run: |
+          make clean
+          make test TESTFLAGS+="-nrk \
+            -DLFS2_NO_INTRINSICS"
+      - name: test-byte-writes
+        # it just takes too long to test byte-level writes when in qemu,
+        # should be plenty covered by the other configurations
+        if: ${{matrix.arch == 'x86_64'}}
+        run: |
+          make clean
+          make test TESTFLAGS+="-nrk \
+            -DLFS2_READ_SIZE=1 -DLFS2_CACHE_SIZE=1"
+      - name: test-block-cycles
+        run: |
+          make clean
+          make test TESTFLAGS+="-nrk \
+            -DLFS2_BLOCK_CYCLES=1"
+      - name: test-odd-block-count
+        run: |
+          make clean
+          make test TESTFLAGS+="-nrk \
+            -DLFS2_BLOCK_COUNT=1023 -DLFS2_LOOKAHEAD_SIZE=256"
+      - name: test-odd-block-size
+        run: |
+          make clean
+          make test TESTFLAGS+="-nrk \
+            -DLFS2_READ_SIZE=11 -DLFS2_BLOCK_SIZE=704"
+
+      # upload coverage for later coverage
+      - name: upload-coverage
+        uses: actions/upload-artifact@v2
+        with:
+          name: coverage
+          path: coverage
+          retention-days: 1
+
+      # update results
+      - name: results-code
+        run: |
+          mkdir -p results
+          make clean
+          make code \
+            CFLAGS+=" \
+              -DLFS2_NO_ASSERT \
+              -DLFS2_NO_DEBUG \
+              -DLFS2_NO_WARN \
+              -DLFS2_NO_ERROR" \
+            CODEFLAGS+="-o results/code-${{matrix.arch}}.csv"
+      - name: results-code-readonly
+        run: |
+          mkdir -p results
+          make clean
+          make code \
+            CFLAGS+=" \
+              -DLFS2_NO_ASSERT \
+              -DLFS2_NO_DEBUG \
+              -DLFS2_NO_WARN \
+              -DLFS2_NO_ERROR \
+              -DLFS2_READONLY" \
+            CODEFLAGS+="-o results/code-${{matrix.arch}}-readonly.csv"
+      - name: results-code-threadsafe
+        run: |
+          mkdir -p results
+          make clean
+          make code \
+            CFLAGS+=" \
+              -DLFS2_NO_ASSERT \
+              -DLFS2_NO_DEBUG \
+              -DLFS2_NO_WARN \
+              -DLFS2_NO_ERROR \
+              -DLFS2_THREADSAFE" \
+            CODEFLAGS+="-o results/code-${{matrix.arch}}-threadsafe.csv"
+      - name: results-code-migrate
+        run: |
+          mkdir -p results
+          make clean
+          make code \
+            CFLAGS+=" \
+              -DLFS2_NO_ASSERT \
+              -DLFS2_NO_DEBUG \
+              -DLFS2_NO_WARN \
+              -DLFS2_NO_ERROR \
+              -DLFS2_MIGRATE" \
+            CODEFLAGS+="-o results/code-${{matrix.arch}}-migrate.csv"
+      - name: results-code-error-asserts
+        run: |
+          mkdir -p results
+          make clean
+          make code \
+            CFLAGS+=" \
+              -DLFS2_NO_DEBUG \
+              -DLFS2_NO_WARN \
+              -DLFS2_NO_ERROR \
+              -D'LFS2_ASSERT(test)=do {if(!(test)) {return -1;}} while(0)'" \
+            CODEFLAGS+="-o results/code-${{matrix.arch}}-error-asserts.csv"
+      - name: upload-results
+        uses: actions/upload-artifact@v2
+        with:
+          name: results
+          path: results
+      # limit reporting to Thumb, otherwise there would be too many numbers
+      # flying around for the results to be easily readable
+      - name: collect-status
+        if: ${{matrix.arch == 'thumb'}}
+        run: |
+          mkdir -p status
+          for f in $(shopt -s nullglob ; echo results/code*.csv)
+          do
+            export STEP="results-code$(
+              echo $f | sed -n 's/.*code-.*-\(.*\).csv/-\1/p')"
+            export CONTEXT="results / code$(
+              echo $f | sed -n 's/.*code-.*-\(.*\).csv/ (\1)/p')"
+            export PREV="$(curl -sS \
+              "$GITHUB_API_URL/repos/$GITHUB_REPOSITORY/status/master" \
+              | jq -re 'select(.sha != env.GITHUB_SHA) | .statuses[]
+                | select(.context == env.CONTEXT).description
+                | capture("Code size is (?<result>[0-9]+)").result' \
+              || echo 0)"
+            export DESCRIPTION="$(./scripts/code.py -u $f -s | awk '
+              NR==2 {printf "Code size is %d B",$2}
+              NR==2 && ENVIRON["PREV"]+0 != 0 {
+                printf " (%+.1f%%)",100*($2-ENVIRON["PREV"])/ENVIRON["PREV"]}')"
+            jq -n '{
+              state: "success",
+              context: env.CONTEXT,
+              description: env.DESCRIPTION,
+              target_job: "${{github.job}} (${{matrix.arch}})",
+              target_step: env.STEP}' \
+              | tee status/code$(
+                echo $f | sed -n 's/.*code-.*-\(.*\).csv/-\1/p').json
+          done
+      - name: upload-status
+        if: ${{matrix.arch == 'thumb'}}
+        uses: actions/upload-artifact@v2
+        with:
+          name: status
+          path: status
+          retention-days: 1
+
+  # run under Valgrind to check for memory errors
+  valgrind:
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: install
+        run: |
+          # need toml, also pip3 isn't installed by default?
+          sudo apt-get update -qq
+          sudo apt-get install -qq python3 python3-pip
+          sudo pip3 install toml
+      - name: install-valgrind
+        run: |
+          sudo apt-get update -qq
+          sudo apt-get install -qq valgrind
+          valgrind --version
+      # normal tests, we don't need to test all geometries
+      - name: test-valgrind
+        run: make test TESTFLAGS+="-k --valgrind"
+
+  # self-host with littlefs-fuse for a fuzz-like test
+  fuse:
+    runs-on: ubuntu-18.04
+    if: ${{!endsWith(github.ref, '-prefix')}}
+    steps:
+      - uses: actions/checkout@v2
+      - name: install
+        run: |
+          # need toml, also pip3 isn't installed by default?
+          sudo apt-get update -qq
+          sudo apt-get install -qq python3 python3-pip libfuse-dev
+          sudo pip3 install toml
+          fusermount -V
+          gcc --version
+      - uses: actions/checkout@v2
+        with:
+          repository: littlefs-project/littlefs-fuse
+          ref: v2
+          path: littlefs-fuse
+      - name: setup
+        run: |
+          # copy our new version into littlefs-fuse
+          rm -rf littlefs-fuse/littlefs/*
+          cp -r $(git ls-tree --name-only HEAD) littlefs-fuse/littlefs
+
+          # setup disk for littlefs-fuse
+          mkdir mount
+          sudo chmod a+rw /dev/loop0
+          dd if=/dev/zero bs=512 count=128K of=disk
+          losetup /dev/loop0 disk
+      - name: test
+        run: |
+          # self-host test
+          make -C littlefs-fuse
+
+          littlefs-fuse/lfs2 --format /dev/loop0
+          littlefs-fuse/lfs2 /dev/loop0 mount
+
+          ls mount
+          mkdir mount/littlefs
+          cp -r $(git ls-tree --name-only HEAD) mount/littlefs
+          cd mount/littlefs
+          stat .
+          ls -flh
+          make -B test
+
+  # test migration using littlefs-fuse
+  migrate:
+    runs-on: ubuntu-18.04
+    if: ${{!endsWith(github.ref, '-prefix')}}
+    steps:
+      - uses: actions/checkout@v2
+      - name: install
+        run: |
+          # need toml, also pip3 isn't installed by default?
+          sudo apt-get update -qq
+          sudo apt-get install -qq python3 python3-pip libfuse-dev
+          sudo pip3 install toml
+          fusermount -V
+          gcc --version
+      - uses: actions/checkout@v2
+        with:
+          repository: littlefs-project/littlefs-fuse
+          ref: v2
+          path: v2
+      - uses: actions/checkout@v2
+        with:
+          repository: littlefs-project/littlefs-fuse
+          ref: v1
+          path: v1
+      - name: setup
+        run: |
+          # copy our new version into littlefs-fuse
+          rm -rf v2/littlefs/*
+          cp -r $(git ls-tree --name-only HEAD) v2/littlefs
+
+          # setup disk for littlefs-fuse
+          mkdir mount
+          sudo chmod a+rw /dev/loop0
+          dd if=/dev/zero bs=512 count=128K of=disk
+          losetup /dev/loop0 disk
+      - name: test
+        run: |
+          # compile v1 and v2
+          make -C v1
+          make -C v2
+
+          # run self-host test with v1
+          v1/lfs2 --format /dev/loop0
+          v1/lfs2 /dev/loop0 mount
+
+          ls mount
+          mkdir mount/littlefs
+          cp -r $(git ls-tree --name-only HEAD) mount/littlefs
+          cd mount/littlefs
+          stat .
+          ls -flh
+          make -B test
+
+          # attempt to migrate
+          cd ../..
+          fusermount -u mount
+
+          v2/lfs2 --migrate /dev/loop0
+          v2/lfs2 /dev/loop0 mount
+
+          # run self-host test with v2 right where we left off
+          ls mount
+          cd mount/littlefs
+          stat .
+          ls -flh
+          make -B test
+
+  # collect coverage info
+  coverage:
+    runs-on: ubuntu-18.04
+    needs: [test]
+    steps:
+      - uses: actions/checkout@v2
+      - name: install
+        run: |
+          sudo apt-get update -qq
+          sudo apt-get install -qq python3 python3-pip lcov
+          sudo pip3 install toml
+      # yes we continue-on-error nearly every step, continue-on-error
+      # at job level apparently still marks a job as failed, which isn't
+      # what we want
+      - uses: actions/download-artifact@v2
+        continue-on-error: true
+        with:
+          name: coverage
+          path: coverage
+      - name: results-coverage
+        continue-on-error: true
+        run: |
+          mkdir -p results
+          lcov $(for f in coverage/*.info ; do echo "-a $f" ; done) \
+            -o results/coverage.info
+          ./scripts/coverage.py results/coverage.info -o results/coverage.csv
+      - name: upload-results
+        uses: actions/upload-artifact@v2
+        with:
+          name: results
+          path: results
+      - name: collect-status
+        run: |
+          mkdir -p status
+          [ -e results/coverage.csv ] || exit 0
+          export STEP="results-coverage"
+          export CONTEXT="results / coverage"
+          export PREV="$(curl -sS \
+            "$GITHUB_API_URL/repos/$GITHUB_REPOSITORY/status/master" \
+            | jq -re 'select(.sha != env.GITHUB_SHA) | .statuses[]
+              | select(.context == env.CONTEXT).description
+              | capture("Coverage is (?<result>[0-9\\.]+)").result' \
+            || echo 0)"
+          export DESCRIPTION="$(
+            ./scripts/coverage.py -u results/coverage.csv -s | awk -F '[ /%]+' '
+              NR==2 {printf "Coverage is %.1f%% of %d lines",$4,$3}
+              NR==2 && ENVIRON["PREV"]+0 != 0 {
+                printf " (%+.1f%%)",$4-ENVIRON["PREV"]}')"
+          jq -n '{
+            state: "success",
+            context: env.CONTEXT,
+            description: env.DESCRIPTION,
+            target_job: "${{github.job}}",
+            target_step: env.STEP}' \
+            | tee status/coverage.json
+      - name: upload-status
+        uses: actions/upload-artifact@v2
+        with:
+          name: status
+          path: status
+          retention-days: 1

.gitignore

@@ -5,5 +5,8 @@
 
 # Testing things
 blocks/
-lfs
+lfs2
 test.c
+tests/*.toml.*
+scripts/__pycache__
+.gdb_history

.travis.yml

@@ -1,215 +0,0 @@
-# Environment variables
-env:
-  global:
-    - CFLAGS=-Werror
-
-# Common test script
-script:
-  # make sure example can at least compile
-  - sed -n '/``` c/,/```/{/```/d; p;}' README.md > test.c &&
-    make all CFLAGS+="
-        -Duser_provided_block_device_read=NULL
-        -Duser_provided_block_device_prog=NULL
-        -Duser_provided_block_device_erase=NULL
-        -Duser_provided_block_device_sync=NULL
-        -include stdio.h"
-
-  # run tests
-  - make test QUIET=1
-
-  # run tests with a few different configurations
-  - make test QUIET=1 CFLAGS+="-DLFS_READ_SIZE=1      -DLFS_PROG_SIZE=1"
-  - make test QUIET=1 CFLAGS+="-DLFS_READ_SIZE=512    -DLFS_PROG_SIZE=512"
-  - make test QUIET=1 CFLAGS+="-DLFS_BLOCK_COUNT=1023 -DLFS_LOOKAHEAD=2048"
-
-  - make clean test QUIET=1 CFLAGS+="-DLFS_NO_INTRINSICS"
-
-  # compile and find the code size with the smallest configuration
-  - make clean size
-        OBJ="$(ls lfs*.o | tr '\n' ' ')"
-        CFLAGS+="-DLFS_NO_ASSERT -DLFS_NO_DEBUG -DLFS_NO_WARN -DLFS_NO_ERROR"
-        | tee sizes
-
-  # update status if we succeeded, compare with master if possible
-  - |
-    if [ "$TRAVIS_TEST_RESULT" -eq 0 ]
-    then
-        CURR=$(tail -n1 sizes | awk '{print $1}')
-        PREV=$(curl -u $GEKY_BOT_STATUSES https://api.github.com/repos/$TRAVIS_REPO_SLUG/status/master \
-            | jq -re "select(.sha != \"$TRAVIS_COMMIT\")
-                | .statuses[] | select(.context == \"$STAGE/$NAME\").description
-                | capture(\"code size is (?<size>[0-9]+)\").size" \
-            || echo 0)
-
-        STATUS="Passed, code size is ${CURR}B"
-        if [ "$PREV" -ne 0 ]
-        then
-            STATUS="$STATUS ($(python -c "print '%+.2f' % (100*($CURR-$PREV)/$PREV.0)")%)"
-        fi
-    fi
-
-# CI matrix
-jobs:
-  include:
-    # native testing
-    - stage: test
-      env:
-        - STAGE=test
-        - NAME=littlefs-x86
-
-    # cross-compile with ARM (thumb mode)
-    - stage: test
-      env:
-        - STAGE=test
-        - NAME=littlefs-arm
-        - CC="arm-linux-gnueabi-gcc --static -mthumb"
-        - EXEC="qemu-arm"
-      install:
-        - sudo apt-get install gcc-arm-linux-gnueabi qemu-user
-        - arm-linux-gnueabi-gcc --version
-        - qemu-arm -version
-
-    # cross-compile with PowerPC
-    - stage: test
-      env:
-        - STAGE=test
-        - NAME=littlefs-powerpc
-        - CC="powerpc-linux-gnu-gcc --static"
-        - EXEC="qemu-ppc"
-      install:
-        - sudo apt-get install gcc-powerpc-linux-gnu qemu-user
-        - powerpc-linux-gnu-gcc --version
-        - qemu-ppc -version
-
-    # cross-compile with MIPS
-    - stage: test
-      env:
-        - STAGE=test
-        - NAME=littlefs-mips
-        - CC="mips-linux-gnu-gcc --static"
-        - EXEC="qemu-mips"
-      install:
-        - sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ xenial main universe"
-        - sudo apt-get -qq update
-        - sudo apt-get install gcc-mips-linux-gnu qemu-user
-        - mips-linux-gnu-gcc --version
-        - qemu-mips -version
-
-    # self-host with littlefs-fuse for fuzz test
-    - stage: test
-      env:
-        - STAGE=test
-        - NAME=littlefs-fuse
-      install:
-        - sudo apt-get install libfuse-dev
-        - git clone --depth 1 https://github.com/geky/littlefs-fuse
-        - fusermount -V
-        - gcc --version
-      before_script:
-        # setup disk for littlefs-fuse
-        - rm -rf littlefs-fuse/littlefs/*
-        - cp -r $(git ls-tree --name-only HEAD) littlefs-fuse/littlefs
-
-        - mkdir mount
-        - sudo chmod a+rw /dev/loop0
-        - dd if=/dev/zero bs=512 count=2048 of=disk
-        - losetup /dev/loop0 disk
-      script:
-        # self-host test
-        - make -C littlefs-fuse
-
-        - littlefs-fuse/lfs --format /dev/loop0
-        - littlefs-fuse/lfs /dev/loop0 mount
-
-        - ls mount
-        - mkdir mount/littlefs
-        - cp -r $(git ls-tree --name-only HEAD) mount/littlefs
-        - cd mount/littlefs
-        - ls
-        - make -B test_dirs test_files QUIET=1
-
-      # Automatically update releases
-    - stage: deploy
-      env:
-        - STAGE=deploy
-        - NAME=deploy
-      script:
-        # Find version defined in lfs.h
-        - LFS_VERSION=$(grep -ox '#define LFS_VERSION .*' lfs.h | cut -d ' ' -f3)
-        - LFS_VERSION_MAJOR=$((0xffff & ($LFS_VERSION >> 16)))
-        - LFS_VERSION_MINOR=$((0xffff & ($LFS_VERSION >>  0)))
-        # Grab latests patch from repo tags, default to 0
-        - LFS_VERSION_PATCH=$(curl -f -u "$GEKY_BOT_RELEASES"
-                https://api.github.com/repos/$TRAVIS_REPO_SLUG/git/refs
-                | jq 'map(.ref | match(
-                    "refs/tags/v'"$LFS_VERSION_MAJOR"'\\.'"$LFS_VERSION_MINOR"'\\.(.*)$")
-                    .captures[].string | tonumber + 1) | max // 0')
-        # We have our new version
-        - LFS_VERSION="v$LFS_VERSION_MAJOR.$LFS_VERSION_MINOR.$LFS_VERSION_PATCH"
-        - echo "VERSION $LFS_VERSION"
-        - |
-          # Check that we're the most recent commit
-          CURRENT_COMMIT=$(curl -f -u "$GEKY_BOT_RELEASES" \
-                https://api.github.com/repos/$TRAVIS_REPO_SLUG/commits/master \
-                | jq -re '.sha')
-          if [ "$TRAVIS_COMMIT" == "$CURRENT_COMMIT" ]
-          then
-            # Build release notes
-            PREV=$(git tag --sort=-v:refname -l "v*" | head -1)
-            if [ ! -z "$PREV" ]
-            then
-                echo "PREV $PREV"
-                CHANGES=$'### Changes\n\n'$( \
-                    git log --oneline $PREV.. --grep='^Merge' --invert-grep)
-                printf "CHANGES\n%s\n\n" "$CHANGES"
-            fi
-            # Create the release
-            curl -f -u "$GEKY_BOT_RELEASES" -X POST \
-                https://api.github.com/repos/$TRAVIS_REPO_SLUG/releases \
-                -d "{
-                    \"tag_name\": \"$LFS_VERSION\",
-                    \"target_commitish\": \"$TRAVIS_COMMIT\",
-                    \"name\": \"${LFS_VERSION%.0}\",
-                    \"body\": $(jq -sR '.' <<< "$CHANGES")
-                }"
-          fi
-
-# Manage statuses
-before_install:
-  - |
-    curl -u $GEKY_BOT_STATUSES -X POST \
-        https://api.github.com/repos/$TRAVIS_REPO_SLUG/statuses/${TRAVIS_PULL_REQUEST_SHA:-$TRAVIS_COMMIT} \
-        -d "{
-            \"context\": \"$STAGE/$NAME\",
-            \"state\": \"pending\",
-            \"description\": \"${STATUS:-In progress}\",
-            \"target_url\": \"https://travis-ci.org/$TRAVIS_REPO_SLUG/jobs/$TRAVIS_JOB_ID\"
-        }"
-
-after_failure:
-  - |
-    curl -u $GEKY_BOT_STATUSES -X POST \
-        https://api.github.com/repos/$TRAVIS_REPO_SLUG/statuses/${TRAVIS_PULL_REQUEST_SHA:-$TRAVIS_COMMIT} \
-        -d "{
-            \"context\": \"$STAGE/$NAME\",
-            \"state\": \"failure\",
-            \"description\": \"${STATUS:-Failed}\",
-            \"target_url\": \"https://travis-ci.org/$TRAVIS_REPO_SLUG/jobs/$TRAVIS_JOB_ID\"
-        }"
-
-after_success:
-  - |
-    curl -u $GEKY_BOT_STATUSES -X POST \
-        https://api.github.com/repos/$TRAVIS_REPO_SLUG/statuses/${TRAVIS_PULL_REQUEST_SHA:-$TRAVIS_COMMIT} \
-        -d "{
-            \"context\": \"$STAGE/$NAME\",
-            \"state\": \"success\",
-            \"description\": \"${STATUS:-Passed}\",
-            \"target_url\": \"https://travis-ci.org/$TRAVIS_REPO_SLUG/jobs/$TRAVIS_JOB_ID\"
-        }"
-
-# Job control
-stages:
-    - name: test
-    - name: deploy
-      if: branch = master AND type = push

Makefile

@@ -1,68 +1,114 @@
-TARGET = lfs.a
+ifdef BUILDDIR
-ifneq ($(wildcard test.c main.c),)
+# make sure BUILDDIR ends with a slash
-override TARGET = lfs
+override BUILDDIR := $(BUILDDIR)/
+# bit of a hack, but we want to make sure BUILDDIR directory structure
+# is correct before any commands
+$(if $(findstring n,$(MAKEFLAGS)),, $(shell mkdir -p \
+	$(BUILDDIR) \
+	$(BUILDDIR)bd \
+	$(BUILDDIR)tests))
 endif
 
+# overridable target/src/tools/flags/etc
+ifneq ($(wildcard test.c main.c),)
+TARGET ?= $(BUILDDIR)lfs2
+else
+TARGET ?= $(BUILDDIR)lfs2.a
+endif
+
+
 CC ?= gcc
 AR ?= ar
 SIZE ?= size
+CTAGS ?= ctags
+NM ?= nm
+LCOV ?= lcov
 
-SRC += $(wildcard *.c emubd/*.c)
+SRC ?= $(wildcard *.c)
-OBJ := $(SRC:.c=.o)
+OBJ := $(SRC:%.c=$(BUILDDIR)%.o)
-DEP := $(SRC:.c=.d)
+DEP := $(SRC:%.c=$(BUILDDIR)%.d)
-ASM := $(SRC:.c=.s)
+ASM := $(SRC:%.c=$(BUILDDIR)%.s)
-
-TEST := $(patsubst tests/%.sh,%,$(wildcard tests/test_*))
-
-SHELL = /bin/bash -o pipefail
 
 ifdef DEBUG
 override CFLAGS += -O0 -g3
 else
 override CFLAGS += -Os
 endif
-ifdef WORD
+ifdef TRACE
-override CFLAGS += -m$(WORD)
+override CFLAGS += -DLFS2_YES_TRACE
 endif
 override CFLAGS += -I.
-override CFLAGS += -std=c99 -Wall -pedantic -Wshadow -Wunused-parameter
+override CFLAGS += -std=c99 -Wall -pedantic
+override CFLAGS += -Wextra -Wshadow -Wjump-misses-init -Wundef
+
+ifdef VERBOSE
+override TESTFLAGS += -v
+override CODEFLAGS += -v
+override COVERAGEFLAGS += -v
+endif
+ifdef EXEC
+override TESTFLAGS += --exec="$(EXEC)"
+endif
+ifdef BUILDDIR
+override TESTFLAGS += --build-dir="$(BUILDDIR:/=)"
+override CODEFLAGS += --build-dir="$(BUILDDIR:/=)"
+endif
+ifneq ($(NM),nm)
+override CODEFLAGS += --nm-tool="$(NM)"
+endif
 
 
-all: $(TARGET)
+# commands
+.PHONY: all build
+all build: $(TARGET)
 
+.PHONY: asm
 asm: $(ASM)
 
+.PHONY: size
 size: $(OBJ)
 	$(SIZE) -t $^
 
-.SUFFIXES:
+.PHONY: tags
-test: test_format test_dirs test_files test_seek test_truncate \
+tags:
-	test_interspersed test_alloc test_paths test_orphan test_move test_corrupt
+	$(CTAGS) --totals --c-types=+p $(shell find -H -name '*.h') $(SRC)
-	@rm test.c
-test_%: tests/test_%.sh
 
-ifdef QUIET
+.PHONY: code
-	@./$< | sed -n '/^[-=]/p'
+code: $(OBJ)
-else
+	./scripts/code.py $^ $(CODEFLAGS)
-	./$<
-endif
 
+.PHONY: test
+test:
+	./scripts/test.py $(TESTFLAGS)
+.SECONDEXPANSION:
+test%: tests/test$$(firstword $$(subst \#, ,%)).toml
+	./scripts/test.py $@ $(TESTFLAGS)
+
+.PHONY: coverage
+coverage:
+	./scripts/coverage.py $(BUILDDIR)tests/*.toml.info $(COVERAGEFLAGS)
+
+# rules
 -include $(DEP)
+.SUFFIXES:
 
-lfs: $(OBJ)
+$(BUILDDIR)lfs2: $(OBJ)
 	$(CC) $(CFLAGS) $^ $(LFLAGS) -o $@
 
-%.a: $(OBJ)
+$(BUILDDIR)%.a: $(OBJ)
 	$(AR) rcs $@ $^
 
-%.o: %.c
+$(BUILDDIR)%.o: %.c
 	$(CC) -c -MMD $(CFLAGS) $< -o $@
 
-%.s: %.c
+$(BUILDDIR)%.s: %.c
 	$(CC) -S $(CFLAGS) $< -o $@
 
+# clean everything
+.PHONY: clean
 clean:
 	rm -f $(TARGET)
 	rm -f $(OBJ)
 	rm -f $(DEP)
 	rm -f $(ASM)
+	rm -f $(BUILDDIR)tests/*.toml.*

README.md

@@ -1,6 +1,6 @@
-## The little filesystem
+## littlefs
 
-A little fail-safe filesystem designed for embedded systems.
+A little fail-safe filesystem designed for microcontrollers.
 
 ```
    | | |     .---._____
@@ -11,17 +11,19 @@ A little fail-safe filesystem designed for embedded systems.
    | | |
 ```
 
-**Bounded RAM/ROM** - The littlefs is designed to work with a limited amount
+**Power-loss resilience** - littlefs is designed to handle random power
-of memory. Recursion is avoided and dynamic memory is limited to configurable
+failures. All file operations have strong copy-on-write guarantees and if
-buffers that can be provided statically.
+power is lost the filesystem will fall back to the last known good state.
 
-**Power-loss resilient** - The littlefs is designed for systems that may have
+**Dynamic wear leveling** - littlefs is designed with flash in mind, and
-random power failures. The littlefs has strong copy-on-write guarantees and
+provides wear leveling over dynamic blocks. Additionally, littlefs can
-storage on disk is always kept in a valid state.
+detect bad blocks and work around them.
 
-**Wear leveling** - Since the most common form of embedded storage is erodible
+**Bounded RAM/ROM** - littlefs is designed to work with a small amount of
-flash memories, littlefs provides a form of dynamic wear leveling for systems
+memory. RAM usage is strictly bounded, which means RAM consumption does not
-that can not fit a full flash translation layer.
+change as the filesystem grows. The filesystem contains no unbounded
+recursion and dynamic memory is limited to configurable buffers that can be
+provided statically.
 
 ## Example
 
@@ -30,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:
 
 ``` c
-#include "lfs.h"
+#include "lfs2.h"
 
 // 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
-const struct lfs_config cfg = {
+const struct lfs2_config cfg = {
     // block device operations
     .read  = user_provided_block_device_read,
     .prog  = user_provided_block_device_prog,
@@ -49,36 +51,38 @@ const struct lfs_config cfg = {
     .prog_size = 16,
     .block_size = 4096,
     .block_count = 128,
-    .lookahead = 128,
+    .cache_size = 16,
+    .lookahead_size = 16,
+    .block_cycles = 500,
 };
 
 // entry point
 int main(void) {
     // mount the filesystem
-    int err = lfs_mount(&lfs, &cfg);
+    int err = lfs2_mount(&lfs2, &cfg);
 
     // reformat if we can't mount the filesystem
     // this should only happen on the first boot
     if (err) {
-        lfs_format(&lfs, &cfg);
+        lfs2_format(&lfs2, &cfg);
-        lfs_mount(&lfs, &cfg);
+        lfs2_mount(&lfs2, &cfg);
     }
 
     // read current count
     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
     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
-    lfs_file_close(&lfs, &file);
+    lfs2_file_close(&lfs2, &file);
 
     // release any resources we were using
-    lfs_unmount(&lfs);
+    lfs2_unmount(&lfs2);
 
     // print the boot count
     printf("boot_count: %d\n", boot_count);
@@ -88,17 +92,17 @@ int main(void) {
 ## Usage
 
 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).
 
-As you may have noticed, littlefs takes in a configuration structure that
+littlefs takes in a configuration structure that defines how the filesystem
-defines how the filesystem operates. The configuration struct provides the
+operates. The configuration struct provides the filesystem with the block
-filesystem with the block device operations and dimensions, tweakable
+device operations and dimensions, tweakable parameters that tradeoff memory
-parameters that tradeoff memory usage for performance, and optional
+usage for performance, and optional static buffers if the user wants to avoid
-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
-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.
 
 Once mounted, the littlefs provides a full set of POSIX-like file and
@@ -106,17 +110,20 @@ directory functions, with the deviation that the allocation of filesystem
 structures must be provided by the user.
 
 All POSIX operations, such as remove and rename, are atomic, even in event
-of power-loss. Additionally, no file updates are actually committed to the
+of power-loss. Additionally, file updates are not actually committed to
-filesystem until sync or close is called on the file.
+the filesystem until sync or close is called on the file.
 
 ## Other notes
 
-All littlefs have the potential to return a negative error code. The errors
+Littlefs is written in C, and specifically should compile with any compiler
-can be either one of those found in the `enum lfs_error` in [lfs.h](lfs.h),
+that conforms to the `C99` standard.
-or an error returned by the user's block device operations.
+
+All littlefs calls have the potential to return a negative error code. The
+errors can be either one of those found in the `enum lfs2_error` in
+[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
-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
 code of these functions, instead all data is read back and checked for
 integrity.
@@ -127,19 +134,65 @@ from memory, otherwise data integrity can not be guaranteed. If the `write`
 function does not perform caching, and therefore each `read` or `write` call
 hits the memory, the `sync` function can simply return 0.
 
-## Reference material
+## Design
 
-[DESIGN.md](DESIGN.md) - DESIGN.md contains a fully detailed dive into how
+At a high level, littlefs is a block based filesystem that uses small logs to
-littlefs actually works. I would encourage you to read it since the
+store metadata and larger copy-on-write (COW) structures to store file data.
-solutions and tradeoffs at work here are quite interesting.
 
-[SPEC.md](SPEC.md) - SPEC.md contains the on-disk specification of littlefs
+In littlefs, these ingredients form a sort of two-layered cake, with the small
-with all the nitty-gritty details. Can be useful for developing tooling.
+logs (called metadata pairs) providing fast updates to metadata anywhere on
+storage, while the COW structures store file data compactly and without any
+wear amplification cost.
+
+Both of these data structures are built out of blocks, which are fed by a
+common block allocator. By limiting the number of erases allowed on a block
+per allocation, the allocator provides dynamic wear leveling over the entire
+filesystem.
+
+```
+                    root
+                   .--------.--------.
+                   | A'| B'|         |
+                   |   |   |->       |
+                   |   |   |         |
+                   '--------'--------'
+                .----'   '--------------.
+       A       v                 B       v
+      .--------.--------.       .--------.--------.
+      | C'| D'|         |       | E'|new|         |
+      |   |   |->       |       |   | E'|->       |
+      |   |   |         |       |   |   |         |
+      '--------'--------'       '--------'--------'
+      .-'   '--.                  |   '------------------.
+     v          v              .-'                        v
+.--------.  .--------.        v                       .--------.
+|   C    |  |   D    |   .--------.       write       | new E  |
+|        |  |        |   |   E    |        ==>        |        |
+|        |  |        |   |        |                   |        |
+'--------'  '--------'   |        |                   '--------'
+                         '--------'                   .-'    |
+                         .-'    '-.    .-------------|------'
+                        v          v  v              v
+                   .--------.  .--------.       .--------.
+                   |   F    |  |   G    |       | new F  |
+                   |        |  |        |       |        |
+                   |        |  |        |       |        |
+                   '--------'  '--------'       '--------'
+```
+
+More details on how littlefs works can be found in [DESIGN.md](DESIGN.md) and
+[SPEC.md](SPEC.md).
+
+- [DESIGN.md](DESIGN.md) - A fully detailed dive into how littlefs works.
+  I would suggest reading it as the tradeoffs at work are quite interesting.
+
+- [SPEC.md](SPEC.md) - The on-disk specification of littlefs with all the
+  nitty-gritty details. May be useful for tooling development.
 
 ## Testing
 
 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](bd/lfs2_testbd.h) found in the `bd` directory.
 The tests assume a Linux environment and can be started with make:
 
 ``` bash
@@ -148,9 +201,9 @@ make test
 
 ## License
 
-The littlefs is provided under the [BSD-3-Clause](https://spdx.org/licenses/BSD-3-Clause.html)
+The littlefs is provided under the [BSD-3-Clause] license. See
-license. See [LICENSE.md](LICENSE.md) for more information. Contributions to
+[LICENSE.md](LICENSE.md) for more information. Contributions to this project
-this project are accepted under the same license.
+are accepted under the same license.
 
 Individual files contain the following tag instead of the full license text.
 
@@ -161,17 +214,45 @@ License Identifiers that are here available: http://spdx.org/licenses/
 
 ## Related projects
 
-[Mbed OS](https://github.com/ARMmbed/mbed-os/tree/master/features/filesystem/littlefs) -
+- [littlefs-fuse] - A [FUSE] wrapper for littlefs. The project allows you to
-The easiest way to get started with littlefs is to jump into [Mbed](https://os.mbed.com/),
+  mount littlefs directly on a Linux machine. Can be useful for debugging
-which already has block device drivers for most forms of embedded storage. The
+  littlefs if you have an SD card handy.
-littlefs is available in Mbed OS as the [LittleFileSystem](https://os.mbed.com/docs/latest/reference/littlefilesystem.html)
-class.
 
-[littlefs-fuse](https://github.com/geky/littlefs-fuse) - A [FUSE](https://github.com/libfuse/libfuse)
+- [littlefs-js] - A javascript wrapper for littlefs. I'm not sure why you would
-wrapper for littlefs. The project allows you to mount littlefs directly on a
+  want this, but it is handy for demos.  You can see it in action
-Linux machine. Can be useful for debugging littlefs if you have an SD card
+  [here][littlefs-js-demo].
-handy.
   
-[littlefs-js](https://github.com/geky/littlefs-js) - A javascript wrapper for
+- [littlefs-python] - A Python wrapper for littlefs. The project allows you
-littlefs. I'm not sure why you would want this, but it is handy for demos.
+  to create images of the filesystem on your PC. Check if littlefs will fit
-You can see it in action [here](http://littlefs.geky.net/demo.html).
+  your needs, create images for a later download to the target memory or
+  inspect the content of a binary image of the target memory.
+
+- [mklfs] - A command line tool built by the [Lua RTOS] guys for making
+  littlefs images from a host PC. Supports Windows, Mac OS, and Linux.
+
+- [Mbed OS] - The easiest way to get started with littlefs is to jump into Mbed
+  which already has block device drivers for most forms of embedded storage.
+  littlefs is available in Mbed OS as the [LittleFileSystem] class.
+
+- [SPIFFS] - Another excellent embedded filesystem for NOR flash. As a more
+  traditional logging filesystem with full static wear-leveling, SPIFFS will
+  likely outperform littlefs on small memories such as the internal flash on
+  microcontrollers.
+
+- [Dhara] - An interesting NAND flash translation layer designed for small
+  MCUs. It offers static wear-leveling and power-resilience with only a fixed
+  _O(|address|)_ pointer structure stored on each block and in RAM.
+
+
+[BSD-3-Clause]: https://spdx.org/licenses/BSD-3-Clause.html
+[littlefs-fuse]: https://github.com/geky/littlefs-fuse
+[FUSE]: https://github.com/libfuse/libfuse
+[littlefs-js]: https://github.com/geky/littlefs-js
+[littlefs-js-demo]:http://littlefs.geky.net/demo.html
+[mklfs]: https://github.com/whitecatboard/Lua-RTOS-ESP32/tree/master/components/mklfs/src
+[Lua RTOS]: https://github.com/whitecatboard/Lua-RTOS-ESP32
+[Mbed OS]: https://github.com/armmbed/mbed-os
+[LittleFileSystem]: https://os.mbed.com/docs/mbed-os/v5.12/apis/littlefilesystem.html
+[SPIFFS]: https://github.com/pellepl/spiffs
+[Dhara]: https://github.com/dlbeer/dhara
+[littlefs-python]: https://pypi.org/project/littlefs-python/

bd/lfs2_filebd.c

@@ -0,0 +1,205 @@
+/*
+ * Block device emulated in a file
+ *
+ * Copyright (c) 2017, Arm Limited. All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+#include "bd/lfs2_filebd.h"
+
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+
+int lfs2_filebd_createcfg(const struct lfs2_config *cfg, const char *path,
+        const struct lfs2_filebd_config *bdcfg) {
+    LFS2_FILEBD_TRACE("lfs2_filebd_createcfg(%p {.context=%p, "
+                ".read=%p, .prog=%p, .erase=%p, .sync=%p, "
+                ".read_size=%"PRIu32", .prog_size=%"PRIu32", "
+                ".block_size=%"PRIu32", .block_count=%"PRIu32"}, "
+                "\"%s\", "
+                "%p {.erase_value=%"PRId32"})",
+            (void*)cfg, cfg->context,
+            (void*)(uintptr_t)cfg->read, (void*)(uintptr_t)cfg->prog,
+            (void*)(uintptr_t)cfg->erase, (void*)(uintptr_t)cfg->sync,
+            cfg->read_size, cfg->prog_size, cfg->block_size, cfg->block_count,
+            path, (void*)bdcfg, bdcfg->erase_value);
+    lfs2_filebd_t *bd = cfg->context;
+    bd->cfg = bdcfg;
+
+    // open file
+    bd->fd = open(path, O_RDWR | O_CREAT, 0666);
+    if (bd->fd < 0) {
+        int err = -errno;
+        LFS2_FILEBD_TRACE("lfs2_filebd_createcfg -> %d", err);
+        return err;
+    }
+
+    LFS2_FILEBD_TRACE("lfs2_filebd_createcfg -> %d", 0);
+    return 0;
+}
+
+int lfs2_filebd_create(const struct lfs2_config *cfg, const char *path) {
+    LFS2_FILEBD_TRACE("lfs2_filebd_create(%p {.context=%p, "
+                ".read=%p, .prog=%p, .erase=%p, .sync=%p, "
+                ".read_size=%"PRIu32", .prog_size=%"PRIu32", "
+                ".block_size=%"PRIu32", .block_count=%"PRIu32"}, "
+                "\"%s\")",
+            (void*)cfg, cfg->context,
+            (void*)(uintptr_t)cfg->read, (void*)(uintptr_t)cfg->prog,
+            (void*)(uintptr_t)cfg->erase, (void*)(uintptr_t)cfg->sync,
+            cfg->read_size, cfg->prog_size, cfg->block_size, cfg->block_count,
+            path);
+    static const struct lfs2_filebd_config defaults = {.erase_value=-1};
+    int err = lfs2_filebd_createcfg(cfg, path, &defaults);
+    LFS2_FILEBD_TRACE("lfs2_filebd_create -> %d", err);
+    return err;
+}
+
+int lfs2_filebd_destroy(const struct lfs2_config *cfg) {
+    LFS2_FILEBD_TRACE("lfs2_filebd_destroy(%p)", (void*)cfg);
+    lfs2_filebd_t *bd = cfg->context;
+    int err = close(bd->fd);
+    if (err < 0) {
+        err = -errno;
+        LFS2_FILEBD_TRACE("lfs2_filebd_destroy -> %d", err);
+        return err;
+    }
+    LFS2_FILEBD_TRACE("lfs2_filebd_destroy -> %d", 0);
+    return 0;
+}
+
+int lfs2_filebd_read(const struct lfs2_config *cfg, lfs2_block_t block,
+        lfs2_off_t off, void *buffer, lfs2_size_t size) {
+    LFS2_FILEBD_TRACE("lfs2_filebd_read(%p, "
+                "0x%"PRIx32", %"PRIu32", %p, %"PRIu32")",
+            (void*)cfg, block, off, buffer, size);
+    lfs2_filebd_t *bd = cfg->context;
+
+    // check if read is valid
+    LFS2_ASSERT(off  % cfg->read_size == 0);
+    LFS2_ASSERT(size % cfg->read_size == 0);
+    LFS2_ASSERT(block < cfg->block_count);
+
+    // zero for reproducibility (in case file is truncated)
+    if (bd->cfg->erase_value != -1) {
+        memset(buffer, bd->cfg->erase_value, size);
+    }
+
+    // read
+    off_t res1 = lseek(bd->fd,
+            (off_t)block*cfg->block_size + (off_t)off, SEEK_SET);
+    if (res1 < 0) {
+        int err = -errno;
+        LFS2_FILEBD_TRACE("lfs2_filebd_read -> %d", err);
+        return err;
+    }
+
+    ssize_t res2 = read(bd->fd, buffer, size);
+    if (res2 < 0) {
+        int err = -errno;
+        LFS2_FILEBD_TRACE("lfs2_filebd_read -> %d", err);
+        return err;
+    }
+
+    LFS2_FILEBD_TRACE("lfs2_filebd_read -> %d", 0);
+    return 0;
+}
+
+int lfs2_filebd_prog(const struct lfs2_config *cfg, lfs2_block_t block,
+        lfs2_off_t off, const void *buffer, lfs2_size_t size) {
+    LFS2_FILEBD_TRACE("lfs2_filebd_prog(%p, 0x%"PRIx32", %"PRIu32", %p, %"PRIu32")",
+            (void*)cfg, block, off, buffer, size);
+    lfs2_filebd_t *bd = cfg->context;
+
+    // check if write is valid
+    LFS2_ASSERT(off  % cfg->prog_size == 0);
+    LFS2_ASSERT(size % cfg->prog_size == 0);
+    LFS2_ASSERT(block < cfg->block_count);
+
+    // check that data was erased? only needed for testing
+    if (bd->cfg->erase_value != -1) {
+        off_t res1 = lseek(bd->fd,
+                (off_t)block*cfg->block_size + (off_t)off, SEEK_SET);
+        if (res1 < 0) {
+            int err = -errno;
+            LFS2_FILEBD_TRACE("lfs2_filebd_prog -> %d", err);
+            return err;
+        }
+
+        for (lfs2_off_t i = 0; i < size; i++) {
+            uint8_t c;
+            ssize_t res2 = read(bd->fd, &c, 1);
+            if (res2 < 0) {
+                int err = -errno;
+                LFS2_FILEBD_TRACE("lfs2_filebd_prog -> %d", err);
+                return err;
+            }
+
+            LFS2_ASSERT(c == bd->cfg->erase_value);
+        }
+    }
+
+    // program data
+    off_t res1 = lseek(bd->fd,
+            (off_t)block*cfg->block_size + (off_t)off, SEEK_SET);
+    if (res1 < 0) {
+        int err = -errno;
+        LFS2_FILEBD_TRACE("lfs2_filebd_prog -> %d", err);
+        return err;
+    }
+
+    ssize_t res2 = write(bd->fd, buffer, size);
+    if (res2 < 0) {
+        int err = -errno;
+        LFS2_FILEBD_TRACE("lfs2_filebd_prog -> %d", err);
+        return err;
+    }
+
+    LFS2_FILEBD_TRACE("lfs2_filebd_prog -> %d", 0);
+    return 0;
+}
+
+int lfs2_filebd_erase(const struct lfs2_config *cfg, lfs2_block_t block) {
+    LFS2_FILEBD_TRACE("lfs2_filebd_erase(%p, 0x%"PRIx32")", (void*)cfg, block);
+    lfs2_filebd_t *bd = cfg->context;
+
+    // check if erase is valid
+    LFS2_ASSERT(block < cfg->block_count);
+
+    // erase, only needed for testing
+    if (bd->cfg->erase_value != -1) {
+        off_t res1 = lseek(bd->fd, (off_t)block*cfg->block_size, SEEK_SET);
+        if (res1 < 0) {
+            int err = -errno;
+            LFS2_FILEBD_TRACE("lfs2_filebd_erase -> %d", err);
+            return err;
+        }
+
+        for (lfs2_off_t i = 0; i < cfg->block_size; i++) {
+            ssize_t res2 = write(bd->fd, &(uint8_t){bd->cfg->erase_value}, 1);
+            if (res2 < 0) {
+                int err = -errno;
+                LFS2_FILEBD_TRACE("lfs2_filebd_erase -> %d", err);
+                return err;
+            }
+        }
+    }
+
+    LFS2_FILEBD_TRACE("lfs2_filebd_erase -> %d", 0);
+    return 0;
+}
+
+int lfs2_filebd_sync(const struct lfs2_config *cfg) {
+    LFS2_FILEBD_TRACE("lfs2_filebd_sync(%p)", (void*)cfg);
+    // file sync
+    lfs2_filebd_t *bd = cfg->context;
+    int err = fsync(bd->fd);
+    if (err) {
+        err = -errno;
+        LFS2_FILEBD_TRACE("lfs2_filebd_sync -> %d", 0);
+        return err;
+    }
+
+    LFS2_FILEBD_TRACE("lfs2_filebd_sync -> %d", 0);
+    return 0;
+}

bd/lfs2_filebd.h

@@ -0,0 +1,73 @@
+/*
+ * Block device emulated in a file
+ *
+ * Copyright (c) 2017, Arm Limited. All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+#ifndef LFS2_FILEBD_H
+#define LFS2_FILEBD_H
+
+#include "lfs2.h"
+#include "lfs2_util.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+
+// Block device specific tracing
+#ifdef LFS2_FILEBD_YES_TRACE
+#define LFS2_FILEBD_TRACE(...) LFS2_TRACE(__VA_ARGS__)
+#else
+#define LFS2_FILEBD_TRACE(...)
+#endif
+
+// filebd config (optional)
+struct lfs2_filebd_config {
+    // 8-bit erase value to use for simulating erases. -1 does not simulate
+    // erases, which can speed up testing by avoiding all the extra block-device
+    // operations to store the erase value.
+    int32_t erase_value;
+};
+
+// filebd state
+typedef struct lfs2_filebd {
+    int fd;
+    const struct lfs2_filebd_config *cfg;
+} lfs2_filebd_t;
+
+
+// Create a file block device using the geometry in lfs2_config
+int lfs2_filebd_create(const struct lfs2_config *cfg, const char *path);
+int lfs2_filebd_createcfg(const struct lfs2_config *cfg, const char *path,
+        const struct lfs2_filebd_config *bdcfg);
+
+// Clean up memory associated with block device
+int lfs2_filebd_destroy(const struct lfs2_config *cfg);
+
+// Read a block
+int lfs2_filebd_read(const struct lfs2_config *cfg, lfs2_block_t block,
+        lfs2_off_t off, void *buffer, lfs2_size_t size);
+
+// Program a block
+//
+// The block must have previously been erased.
+int lfs2_filebd_prog(const struct lfs2_config *cfg, lfs2_block_t block,
+        lfs2_off_t off, const void *buffer, lfs2_size_t size);
+
+// Erase a block
+//
+// A block must be erased before being programmed. The
+// state of an erased block is undefined.
+int lfs2_filebd_erase(const struct lfs2_config *cfg, lfs2_block_t block);
+
+// Sync the block device
+int lfs2_filebd_sync(const struct lfs2_config *cfg);
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif

bd/lfs2_rambd.c

@@ -0,0 +1,142 @@
+/*
+ * Block device emulated in RAM
+ *
+ * Copyright (c) 2017, Arm Limited. All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+#include "bd/lfs2_rambd.h"
+
+int lfs2_rambd_createcfg(const struct lfs2_config *cfg,
+        const struct lfs2_rambd_config *bdcfg) {
+    LFS2_RAMBD_TRACE("lfs2_rambd_createcfg(%p {.context=%p, "
+                ".read=%p, .prog=%p, .erase=%p, .sync=%p, "
+                ".read_size=%"PRIu32", .prog_size=%"PRIu32", "
+                ".block_size=%"PRIu32", .block_count=%"PRIu32"}, "
+                "%p {.erase_value=%"PRId32", .buffer=%p})",
+            (void*)cfg, cfg->context,
+            (void*)(uintptr_t)cfg->read, (void*)(uintptr_t)cfg->prog,
+            (void*)(uintptr_t)cfg->erase, (void*)(uintptr_t)cfg->sync,
+            cfg->read_size, cfg->prog_size, cfg->block_size, cfg->block_count,
+            (void*)bdcfg, bdcfg->erase_value, bdcfg->buffer);
+    lfs2_rambd_t *bd = cfg->context;
+    bd->cfg = bdcfg;
+
+    // allocate buffer?
+    if (bd->cfg->buffer) {
+        bd->buffer = bd->cfg->buffer;
+    } else {
+        bd->buffer = lfs2_malloc(cfg->block_size * cfg->block_count);
+        if (!bd->buffer) {
+            LFS2_RAMBD_TRACE("lfs2_rambd_createcfg -> %d", LFS2_ERR_NOMEM);
+            return LFS2_ERR_NOMEM;
+        }
+    }
+
+    // zero for reproducibility?
+    if (bd->cfg->erase_value != -1) {
+        memset(bd->buffer, bd->cfg->erase_value,
+                cfg->block_size * cfg->block_count);
+    } else {
+        memset(bd->buffer, 0, cfg->block_size * cfg->block_count);
+    }
+
+    LFS2_RAMBD_TRACE("lfs2_rambd_createcfg -> %d", 0);
+    return 0;
+}
+
+int lfs2_rambd_create(const struct lfs2_config *cfg) {
+    LFS2_RAMBD_TRACE("lfs2_rambd_create(%p {.context=%p, "
+                ".read=%p, .prog=%p, .erase=%p, .sync=%p, "
+                ".read_size=%"PRIu32", .prog_size=%"PRIu32", "
+                ".block_size=%"PRIu32", .block_count=%"PRIu32"})",
+            (void*)cfg, cfg->context,
+            (void*)(uintptr_t)cfg->read, (void*)(uintptr_t)cfg->prog,
+            (void*)(uintptr_t)cfg->erase, (void*)(uintptr_t)cfg->sync,
+            cfg->read_size, cfg->prog_size, cfg->block_size, cfg->block_count);
+    static const struct lfs2_rambd_config defaults = {.erase_value=-1};
+    int err = lfs2_rambd_createcfg(cfg, &defaults);
+    LFS2_RAMBD_TRACE("lfs2_rambd_create -> %d", err);
+    return err;
+}
+
+int lfs2_rambd_destroy(const struct lfs2_config *cfg) {
+    LFS2_RAMBD_TRACE("lfs2_rambd_destroy(%p)", (void*)cfg);
+    // clean up memory
+    lfs2_rambd_t *bd = cfg->context;
+    if (!bd->cfg->buffer) {
+        lfs2_free(bd->buffer);
+    }
+    LFS2_RAMBD_TRACE("lfs2_rambd_destroy -> %d", 0);
+    return 0;
+}
+
+int lfs2_rambd_read(const struct lfs2_config *cfg, lfs2_block_t block,
+        lfs2_off_t off, void *buffer, lfs2_size_t size) {
+    LFS2_RAMBD_TRACE("lfs2_rambd_read(%p, "
+                "0x%"PRIx32", %"PRIu32", %p, %"PRIu32")",
+            (void*)cfg, block, off, buffer, size);
+    lfs2_rambd_t *bd = cfg->context;
+
+    // check if read is valid
+    LFS2_ASSERT(off  % cfg->read_size == 0);
+    LFS2_ASSERT(size % cfg->read_size == 0);
+    LFS2_ASSERT(block < cfg->block_count);
+
+    // read data
+    memcpy(buffer, &bd->buffer[block*cfg->block_size + off], size);
+
+    LFS2_RAMBD_TRACE("lfs2_rambd_read -> %d", 0);
+    return 0;
+}
+
+int lfs2_rambd_prog(const struct lfs2_config *cfg, lfs2_block_t block,
+        lfs2_off_t off, const void *buffer, lfs2_size_t size) {
+    LFS2_RAMBD_TRACE("lfs2_rambd_prog(%p, "
+                "0x%"PRIx32", %"PRIu32", %p, %"PRIu32")",
+            (void*)cfg, block, off, buffer, size);
+    lfs2_rambd_t *bd = cfg->context;
+
+    // check if write is valid
+    LFS2_ASSERT(off  % cfg->prog_size == 0);
+    LFS2_ASSERT(size % cfg->prog_size == 0);
+    LFS2_ASSERT(block < cfg->block_count);
+
+    // check that data was erased? only needed for testing
+    if (bd->cfg->erase_value != -1) {
+        for (lfs2_off_t i = 0; i < size; i++) {
+            LFS2_ASSERT(bd->buffer[block*cfg->block_size + off + i] ==
+                    bd->cfg->erase_value);
+        }
+    }
+
+    // program data
+    memcpy(&bd->buffer[block*cfg->block_size + off], buffer, size);
+
+    LFS2_RAMBD_TRACE("lfs2_rambd_prog -> %d", 0);
+    return 0;
+}
+
+int lfs2_rambd_erase(const struct lfs2_config *cfg, lfs2_block_t block) {
+    LFS2_RAMBD_TRACE("lfs2_rambd_erase(%p, 0x%"PRIx32")", (void*)cfg, block);
+    lfs2_rambd_t *bd = cfg->context;
+
+    // check if erase is valid
+    LFS2_ASSERT(block < cfg->block_count);
+
+    // erase, only needed for testing
+    if (bd->cfg->erase_value != -1) {
+        memset(&bd->buffer[block*cfg->block_size],
+                bd->cfg->erase_value, cfg->block_size);
+    }
+
+    LFS2_RAMBD_TRACE("lfs2_rambd_erase -> %d", 0);
+    return 0;
+}
+
+int lfs2_rambd_sync(const struct lfs2_config *cfg) {
+    LFS2_RAMBD_TRACE("lfs2_rambd_sync(%p)", (void*)cfg);
+    // sync does nothing because we aren't backed by anything real
+    (void)cfg;
+    LFS2_RAMBD_TRACE("lfs2_rambd_sync -> %d", 0);
+    return 0;
+}

bd/lfs2_rambd.h

@@ -0,0 +1,75 @@
+/*
+ * Block device emulated in RAM
+ *
+ * Copyright (c) 2017, Arm Limited. All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+#ifndef LFS2_RAMBD_H
+#define LFS2_RAMBD_H
+
+#include "lfs2.h"
+#include "lfs2_util.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+
+// Block device specific tracing
+#ifdef LFS2_RAMBD_YES_TRACE
+#define LFS2_RAMBD_TRACE(...) LFS2_TRACE(__VA_ARGS__)
+#else
+#define LFS2_RAMBD_TRACE(...)
+#endif
+
+// rambd config (optional)
+struct lfs2_rambd_config {
+    // 8-bit erase value to simulate erasing with. -1 indicates no erase
+    // occurs, which is still a valid block device
+    int32_t erase_value;
+
+    // Optional statically allocated buffer for the block device.
+    void *buffer;
+};
+
+// rambd state
+typedef struct lfs2_rambd {
+    uint8_t *buffer;
+    const struct lfs2_rambd_config *cfg;
+} lfs2_rambd_t;
+
+
+// Create a RAM block device using the geometry in lfs2_config
+int lfs2_rambd_create(const struct lfs2_config *cfg);
+int lfs2_rambd_createcfg(const struct lfs2_config *cfg,
+        const struct lfs2_rambd_config *bdcfg);
+
+// Clean up memory associated with block device
+int lfs2_rambd_destroy(const struct lfs2_config *cfg);
+
+// Read a block
+int lfs2_rambd_read(const struct lfs2_config *cfg, lfs2_block_t block,
+        lfs2_off_t off, void *buffer, lfs2_size_t size);
+
+// Program a block
+//
+// The block must have previously been erased.
+int lfs2_rambd_prog(const struct lfs2_config *cfg, lfs2_block_t block,
+        lfs2_off_t off, const void *buffer, lfs2_size_t size);
+
+// Erase a block
+//
+// A block must be erased before being programmed. The
+// state of an erased block is undefined.
+int lfs2_rambd_erase(const struct lfs2_config *cfg, lfs2_block_t block);
+
+// Sync the block device
+int lfs2_rambd_sync(const struct lfs2_config *cfg);
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif

bd/lfs2_testbd.c

@@ -0,0 +1,302 @@
+/*
+ * Testing block device, wraps filebd and rambd while providing a bunch
+ * of hooks for testing littlefs in various conditions.
+ *
+ * Copyright (c) 2017, Arm Limited. All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+#include "bd/lfs2_testbd.h"
+
+#include <stdlib.h>
+
+
+int lfs2_testbd_createcfg(const struct lfs2_config *cfg, const char *path,
+        const struct lfs2_testbd_config *bdcfg) {
+    LFS2_TESTBD_TRACE("lfs2_testbd_createcfg(%p {.context=%p, "
+                ".read=%p, .prog=%p, .erase=%p, .sync=%p, "
+                ".read_size=%"PRIu32", .prog_size=%"PRIu32", "
+                ".block_size=%"PRIu32", .block_count=%"PRIu32"}, "
+                "\"%s\", "
+                "%p {.erase_value=%"PRId32", .erase_cycles=%"PRIu32", "
+                ".badblock_behavior=%"PRIu8", .power_cycles=%"PRIu32", "
+                ".buffer=%p, .wear_buffer=%p})",
+            (void*)cfg, cfg->context,
+            (void*)(uintptr_t)cfg->read, (void*)(uintptr_t)cfg->prog,
+            (void*)(uintptr_t)cfg->erase, (void*)(uintptr_t)cfg->sync,
+            cfg->read_size, cfg->prog_size, cfg->block_size, cfg->block_count,
+            path, (void*)bdcfg, bdcfg->erase_value, bdcfg->erase_cycles,
+            bdcfg->badblock_behavior, bdcfg->power_cycles,
+            bdcfg->buffer, bdcfg->wear_buffer);
+    lfs2_testbd_t *bd = cfg->context;
+    bd->cfg = bdcfg;
+
+    // setup testing things
+    bd->persist = path;
+    bd->power_cycles = bd->cfg->power_cycles;
+
+    if (bd->cfg->erase_cycles) {
+        if (bd->cfg->wear_buffer) {
+            bd->wear = bd->cfg->wear_buffer;
+        } else {
+            bd->wear = lfs2_malloc(sizeof(lfs2_testbd_wear_t)*cfg->block_count);
+            if (!bd->wear) {
+                LFS2_TESTBD_TRACE("lfs2_testbd_createcfg -> %d", LFS2_ERR_NOMEM);
+                return LFS2_ERR_NOMEM;
+            }
+        }
+
+        memset(bd->wear, 0, sizeof(lfs2_testbd_wear_t) * cfg->block_count);
+    }
+
+    // create underlying block device
+    if (bd->persist) {
+        bd->u.file.cfg = (struct lfs2_filebd_config){
+            .erase_value = bd->cfg->erase_value,
+        };
+        int err = lfs2_filebd_createcfg(cfg, path, &bd->u.file.cfg);
+        LFS2_TESTBD_TRACE("lfs2_testbd_createcfg -> %d", err);
+        return err;
+    } else {
+        bd->u.ram.cfg = (struct lfs2_rambd_config){
+            .erase_value = bd->cfg->erase_value,
+            .buffer = bd->cfg->buffer,
+        };
+        int err = lfs2_rambd_createcfg(cfg, &bd->u.ram.cfg);
+        LFS2_TESTBD_TRACE("lfs2_testbd_createcfg -> %d", err);
+        return err;
+    }
+}
+
+int lfs2_testbd_create(const struct lfs2_config *cfg, const char *path) {
+    LFS2_TESTBD_TRACE("lfs2_testbd_create(%p {.context=%p, "
+                ".read=%p, .prog=%p, .erase=%p, .sync=%p, "
+                ".read_size=%"PRIu32", .prog_size=%"PRIu32", "
+                ".block_size=%"PRIu32", .block_count=%"PRIu32"}, "
+                "\"%s\")",
+            (void*)cfg, cfg->context,
+            (void*)(uintptr_t)cfg->read, (void*)(uintptr_t)cfg->prog,
+            (void*)(uintptr_t)cfg->erase, (void*)(uintptr_t)cfg->sync,
+            cfg->read_size, cfg->prog_size, cfg->block_size, cfg->block_count,
+            path);
+    static const struct lfs2_testbd_config defaults = {.erase_value=-1};
+    int err = lfs2_testbd_createcfg(cfg, path, &defaults);
+    LFS2_TESTBD_TRACE("lfs2_testbd_create -> %d", err);
+    return err;
+}
+
+int lfs2_testbd_destroy(const struct lfs2_config *cfg) {
+    LFS2_TESTBD_TRACE("lfs2_testbd_destroy(%p)", (void*)cfg);
+    lfs2_testbd_t *bd = cfg->context;
+    if (bd->cfg->erase_cycles && !bd->cfg->wear_buffer) {
+        lfs2_free(bd->wear);
+    }
+
+    if (bd->persist) {
+        int err = lfs2_filebd_destroy(cfg);
+        LFS2_TESTBD_TRACE("lfs2_testbd_destroy -> %d", err);
+        return err;
+    } else {
+        int err = lfs2_rambd_destroy(cfg);
+        LFS2_TESTBD_TRACE("lfs2_testbd_destroy -> %d", err);
+        return err;
+    }
+}
+
+/// Internal mapping to block devices ///
+static int lfs2_testbd_rawread(const struct lfs2_config *cfg, lfs2_block_t block,
+        lfs2_off_t off, void *buffer, lfs2_size_t size) {
+    lfs2_testbd_t *bd = cfg->context;
+    if (bd->persist) {
+        return lfs2_filebd_read(cfg, block, off, buffer, size);
+    } else {
+        return lfs2_rambd_read(cfg, block, off, buffer, size);
+    }
+}
+
+static int lfs2_testbd_rawprog(const struct lfs2_config *cfg, lfs2_block_t block,
+        lfs2_off_t off, const void *buffer, lfs2_size_t size) {
+    lfs2_testbd_t *bd = cfg->context;
+    if (bd->persist) {
+        return lfs2_filebd_prog(cfg, block, off, buffer, size);
+    } else {
+        return lfs2_rambd_prog(cfg, block, off, buffer, size);
+    }
+}
+
+static int lfs2_testbd_rawerase(const struct lfs2_config *cfg,
+        lfs2_block_t block) {
+    lfs2_testbd_t *bd = cfg->context;
+    if (bd->persist) {
+        return lfs2_filebd_erase(cfg, block);
+    } else {
+        return lfs2_rambd_erase(cfg, block);
+    }
+}
+
+static int lfs2_testbd_rawsync(const struct lfs2_config *cfg) {
+    lfs2_testbd_t *bd = cfg->context;
+    if (bd->persist) {
+        return lfs2_filebd_sync(cfg);
+    } else {
+        return lfs2_rambd_sync(cfg);
+    }
+}
+
+/// block device API ///
+int lfs2_testbd_read(const struct lfs2_config *cfg, lfs2_block_t block,
+        lfs2_off_t off, void *buffer, lfs2_size_t size) {
+    LFS2_TESTBD_TRACE("lfs2_testbd_read(%p, "
+                "0x%"PRIx32", %"PRIu32", %p, %"PRIu32")",
+            (void*)cfg, block, off, buffer, size);
+    lfs2_testbd_t *bd = cfg->context;
+
+    // check if read is valid
+    LFS2_ASSERT(off  % cfg->read_size == 0);
+    LFS2_ASSERT(size % cfg->read_size == 0);
+    LFS2_ASSERT(block < cfg->block_count);
+
+    // block bad?
+    if (bd->cfg->erase_cycles && bd->wear[block] >= bd->cfg->erase_cycles &&
+            bd->cfg->badblock_behavior == LFS2_TESTBD_BADBLOCK_READERROR) {
+        LFS2_TESTBD_TRACE("lfs2_testbd_read -> %d", LFS2_ERR_CORRUPT);
+        return LFS2_ERR_CORRUPT;
+    }
+
+    // read
+    int err = lfs2_testbd_rawread(cfg, block, off, buffer, size);
+    LFS2_TESTBD_TRACE("lfs2_testbd_read -> %d", err);
+    return err;
+}
+
+int lfs2_testbd_prog(const struct lfs2_config *cfg, lfs2_block_t block,
+        lfs2_off_t off, const void *buffer, lfs2_size_t size) {
+    LFS2_TESTBD_TRACE("lfs2_testbd_prog(%p, "
+                "0x%"PRIx32", %"PRIu32", %p, %"PRIu32")",
+            (void*)cfg, block, off, buffer, size);
+    lfs2_testbd_t *bd = cfg->context;
+
+    // check if write is valid
+    LFS2_ASSERT(off  % cfg->prog_size == 0);
+    LFS2_ASSERT(size % cfg->prog_size == 0);
+    LFS2_ASSERT(block < cfg->block_count);
+
+    // block bad?
+    if (bd->cfg->erase_cycles && bd->wear[block] >= bd->cfg->erase_cycles) {
+        if (bd->cfg->badblock_behavior ==
+                LFS2_TESTBD_BADBLOCK_PROGERROR) {
+            LFS2_TESTBD_TRACE("lfs2_testbd_prog -> %d", LFS2_ERR_CORRUPT);
+            return LFS2_ERR_CORRUPT;
+        } else if (bd->cfg->badblock_behavior ==
+                LFS2_TESTBD_BADBLOCK_PROGNOOP ||
+                bd->cfg->badblock_behavior ==
+                LFS2_TESTBD_BADBLOCK_ERASENOOP) {
+            LFS2_TESTBD_TRACE("lfs2_testbd_prog -> %d", 0);
+            return 0;
+        }
+    }
+
+    // prog
+    int err = lfs2_testbd_rawprog(cfg, block, off, buffer, size);
+    if (err) {
+        LFS2_TESTBD_TRACE("lfs2_testbd_prog -> %d", err);
+        return err;
+    }
+
+    // lose power?
+    if (bd->power_cycles > 0) {
+        bd->power_cycles -= 1;
+        if (bd->power_cycles == 0) {
+            // sync to make sure we persist the last changes
+            LFS2_ASSERT(lfs2_testbd_rawsync(cfg) == 0);
+            // simulate power loss
+            exit(33);
+        }
+    }
+
+    LFS2_TESTBD_TRACE("lfs2_testbd_prog -> %d", 0);
+    return 0;
+}
+
+int lfs2_testbd_erase(const struct lfs2_config *cfg, lfs2_block_t block) {
+    LFS2_TESTBD_TRACE("lfs2_testbd_erase(%p, 0x%"PRIx32")", (void*)cfg, block);
+    lfs2_testbd_t *bd = cfg->context;
+
+    // check if erase is valid
+    LFS2_ASSERT(block < cfg->block_count);
+
+    // block bad?
+    if (bd->cfg->erase_cycles) {
+        if (bd->wear[block] >= bd->cfg->erase_cycles) {
+            if (bd->cfg->badblock_behavior ==
+                    LFS2_TESTBD_BADBLOCK_ERASEERROR) {
+                LFS2_TESTBD_TRACE("lfs2_testbd_erase -> %d", LFS2_ERR_CORRUPT);
+                return LFS2_ERR_CORRUPT;
+            } else if (bd->cfg->badblock_behavior ==
+                    LFS2_TESTBD_BADBLOCK_ERASENOOP) {
+                LFS2_TESTBD_TRACE("lfs2_testbd_erase -> %d", 0);
+                return 0;
+            }
+        } else {
+            // mark wear
+            bd->wear[block] += 1;
+        }
+    }
+
+    // erase
+    int err = lfs2_testbd_rawerase(cfg, block);
+    if (err) {
+        LFS2_TESTBD_TRACE("lfs2_testbd_erase -> %d", err);
+        return err;
+    }
+
+    // lose power?
+    if (bd->power_cycles > 0) {
+        bd->power_cycles -= 1;
+        if (bd->power_cycles == 0) {
+            // sync to make sure we persist the last changes
+            LFS2_ASSERT(lfs2_testbd_rawsync(cfg) == 0);
+            // simulate power loss
+            exit(33);
+        }
+    }
+
+    LFS2_TESTBD_TRACE("lfs2_testbd_prog -> %d", 0);
+    return 0;
+}
+
+int lfs2_testbd_sync(const struct lfs2_config *cfg) {
+    LFS2_TESTBD_TRACE("lfs2_testbd_sync(%p)", (void*)cfg);
+    int err = lfs2_testbd_rawsync(cfg);
+    LFS2_TESTBD_TRACE("lfs2_testbd_sync -> %d", err);
+    return err;
+}
+
+
+/// simulated wear operations ///
+lfs2_testbd_swear_t lfs2_testbd_getwear(const struct lfs2_config *cfg,
+        lfs2_block_t block) {
+    LFS2_TESTBD_TRACE("lfs2_testbd_getwear(%p, %"PRIu32")", (void*)cfg, block);
+    lfs2_testbd_t *bd = cfg->context;
+
+    // check if block is valid
+    LFS2_ASSERT(bd->cfg->erase_cycles);
+    LFS2_ASSERT(block < cfg->block_count);
+
+    LFS2_TESTBD_TRACE("lfs2_testbd_getwear -> %"PRIu32, bd->wear[block]);
+    return bd->wear[block];
+}
+
+int lfs2_testbd_setwear(const struct lfs2_config *cfg,
+        lfs2_block_t block, lfs2_testbd_wear_t wear) {
+    LFS2_TESTBD_TRACE("lfs2_testbd_setwear(%p, %"PRIu32")", (void*)cfg, block);
+    lfs2_testbd_t *bd = cfg->context;
+
+    // check if block is valid
+    LFS2_ASSERT(bd->cfg->erase_cycles);
+    LFS2_ASSERT(block < cfg->block_count);
+
+    bd->wear[block] = wear;
+
+    LFS2_TESTBD_TRACE("lfs2_testbd_setwear -> %d", 0);
+    return 0;
+}

bd/lfs2_testbd.h

@@ -0,0 +1,141 @@
+/*
+ * Testing block device, wraps filebd and rambd while providing a bunch
+ * of hooks for testing littlefs in various conditions.
+ *
+ * Copyright (c) 2017, Arm Limited. All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+#ifndef LFS2_TESTBD_H
+#define LFS2_TESTBD_H
+
+#include "lfs2.h"
+#include "lfs2_util.h"
+#include "bd/lfs2_rambd.h"
+#include "bd/lfs2_filebd.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+
+// Block device specific tracing
+#ifdef LFS2_TESTBD_YES_TRACE
+#define LFS2_TESTBD_TRACE(...) LFS2_TRACE(__VA_ARGS__)
+#else
+#define LFS2_TESTBD_TRACE(...)
+#endif
+
+// Mode determining how "bad blocks" behave during testing. This simulates
+// some real-world circumstances such as progs not sticking (prog-noop),
+// a readonly disk (erase-noop), and ECC failures (read-error).
+//
+// Not that read-noop is not allowed. Read _must_ return a consistent (but
+// may be arbitrary) value on every read.
+enum lfs2_testbd_badblock_behavior {
+    LFS2_TESTBD_BADBLOCK_PROGERROR,
+    LFS2_TESTBD_BADBLOCK_ERASEERROR,
+    LFS2_TESTBD_BADBLOCK_READERROR,
+    LFS2_TESTBD_BADBLOCK_PROGNOOP,
+    LFS2_TESTBD_BADBLOCK_ERASENOOP,
+};
+
+// Type for measuring wear
+typedef uint32_t lfs2_testbd_wear_t;
+typedef int32_t  lfs2_testbd_swear_t;
+
+// testbd config, this is required for testing
+struct lfs2_testbd_config {
+    // 8-bit erase value to use for simulating erases. -1 does not simulate
+    // erases, which can speed up testing by avoiding all the extra block-device
+    // operations to store the erase value.
+    int32_t erase_value;
+
+    // Number of erase cycles before a block becomes "bad". The exact behavior
+    // of bad blocks is controlled by the badblock_mode.
+    uint32_t erase_cycles;
+
+    // The mode determining how bad blocks fail
+    uint8_t badblock_behavior;
+
+    // Number of write operations (erase/prog) before forcefully killing
+    // the program with exit. Simulates power-loss. 0 disables.
+    uint32_t power_cycles;
+
+    // Optional buffer for RAM block device.
+    void *buffer;
+
+    // Optional buffer for wear
+    void *wear_buffer;
+};
+
+// testbd state
+typedef struct lfs2_testbd {
+    union {
+        struct {
+            lfs2_filebd_t bd;
+            struct lfs2_filebd_config cfg;
+        } file;
+        struct {
+            lfs2_rambd_t bd;
+            struct lfs2_rambd_config cfg;
+        } ram;
+    } u;
+
+    bool persist;
+    uint32_t power_cycles;
+    lfs2_testbd_wear_t *wear;
+
+    const struct lfs2_testbd_config *cfg;
+} lfs2_testbd_t;
+
+
+/// Block device API ///
+
+// Create a test block device using the geometry in lfs2_config
+//
+// Note that filebd is used if a path is provided, if path is NULL
+// testbd will use rambd which can be much faster.
+int lfs2_testbd_create(const struct lfs2_config *cfg, const char *path);
+int lfs2_testbd_createcfg(const struct lfs2_config *cfg, const char *path,
+        const struct lfs2_testbd_config *bdcfg);
+
+// Clean up memory associated with block device
+int lfs2_testbd_destroy(const struct lfs2_config *cfg);
+
+// Read a block
+int lfs2_testbd_read(const struct lfs2_config *cfg, lfs2_block_t block,
+        lfs2_off_t off, void *buffer, lfs2_size_t size);
+
+// Program a block
+//
+// The block must have previously been erased.
+int lfs2_testbd_prog(const struct lfs2_config *cfg, lfs2_block_t block,
+        lfs2_off_t off, const void *buffer, lfs2_size_t size);
+
+// Erase a block
+//
+// A block must be erased before being programmed. The
+// state of an erased block is undefined.
+int lfs2_testbd_erase(const struct lfs2_config *cfg, lfs2_block_t block);
+
+// Sync the block device
+int lfs2_testbd_sync(const struct lfs2_config *cfg);
+
+
+/// Additional extended API for driving test features ///
+
+// Get simulated wear on a given block
+lfs2_testbd_swear_t lfs2_testbd_getwear(const struct lfs2_config *cfg,
+        lfs2_block_t block);
+
+// Manually set simulated wear on a given block
+int lfs2_testbd_setwear(const struct lfs2_config *cfg,
+        lfs2_block_t block, lfs2_testbd_wear_t wear);
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif

emubd/lfs_emubd.c

@@ -1,242 +0,0 @@
-/*
- * Block device emulated on standard files
- *
- * Copyright (c) 2017, Arm Limited. All rights reserved.
- * SPDX-License-Identifier: BSD-3-Clause
- */
-#include "emubd/lfs_emubd.h"
-
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <limits.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <assert.h>
-#include <stdbool.h>
-#include <inttypes.h>
-
-
-// Block device emulated on existing filesystem
-int lfs_emubd_create(const struct lfs_config *cfg, const char *path) {
-    lfs_emubd_t *emu = cfg->context;
-    emu->cfg.read_size   = cfg->read_size;
-    emu->cfg.prog_size   = cfg->prog_size;
-    emu->cfg.block_size  = cfg->block_size;
-    emu->cfg.block_count = cfg->block_count;
-
-    // Allocate buffer for creating children files
-    size_t pathlen = strlen(path);
-    emu->path = malloc(pathlen + 1 + LFS_NAME_MAX + 1);
-    if (!emu->path) {
-        return -ENOMEM;
-    }
-
-    strcpy(emu->path, path);
-    emu->path[pathlen] = '/';
-    emu->child = &emu->path[pathlen+1];
-    memset(emu->child, '\0', LFS_NAME_MAX+1);
-
-    // Create directory if it doesn't exist
-    int err = mkdir(path, 0777);
-    if (err && errno != EEXIST) {
-        return -errno;
-    }
-
-    // Load stats to continue incrementing
-    snprintf(emu->child, LFS_NAME_MAX, "stats");
-    FILE *f = fopen(emu->path, "r");
-    if (!f) {
-        return -errno;
-    }
-
-    size_t res = fread(&emu->stats, sizeof(emu->stats), 1, f);
-    if (res < 1) {
-        return -errno;
-    }
-
-    err = fclose(f);
-    if (err) {
-        return -errno;
-    }
-
-    return 0;
-}
-
-void lfs_emubd_destroy(const struct lfs_config *cfg) {
-    lfs_emubd_sync(cfg);
-
-    lfs_emubd_t *emu = cfg->context;
-    free(emu->path);
-}
-
-int lfs_emubd_read(const struct lfs_config *cfg, lfs_block_t block,
-        lfs_off_t off, void *buffer, lfs_size_t size) {
-    lfs_emubd_t *emu = cfg->context;
-    uint8_t *data = buffer;
-
-    // Check if read is valid
-    assert(off  % cfg->read_size == 0);
-    assert(size % cfg->read_size == 0);
-    assert(block < cfg->block_count);
-
-    // Zero out buffer for debugging
-    memset(data, 0, size);
-
-    // Read data
-    snprintf(emu->child, LFS_NAME_MAX, "%" PRIx32, block);
-
-    FILE *f = fopen(emu->path, "rb");
-    if (!f && errno != ENOENT) {
-        return -errno;
-    }
-
-    if (f) {
-        int err = fseek(f, off, SEEK_SET);
-        if (err) {
-            return -errno;
-        }
-
-        size_t res = fread(data, 1, size, f);
-        if (res < size && !feof(f)) {
-            return -errno;
-        }
-
-        err = fclose(f);
-        if (err) {
-            return -errno;
-        }
-    }
-
-    emu->stats.read_count += 1;
-    return 0;
-}
-
-int lfs_emubd_prog(const struct lfs_config *cfg, lfs_block_t block,
-        lfs_off_t off, const void *buffer, lfs_size_t size) {
-    lfs_emubd_t *emu = cfg->context;
-    const uint8_t *data = buffer;
-
-    // Check if write is valid
-    assert(off  % cfg->prog_size == 0);
-    assert(size % cfg->prog_size == 0);
-    assert(block < cfg->block_count);
-
-    // Program data
-    snprintf(emu->child, LFS_NAME_MAX, "%" PRIx32, block);
-
-    FILE *f = fopen(emu->path, "r+b");
-    if (!f) {
-        return (errno == EACCES) ? 0 : -errno;
-    }
-
-    // Check that file was erased
-    assert(f);
-
-    int err = fseek(f, off, SEEK_SET);
-    if (err) {
-        return -errno;
-    }
-
-    size_t res = fwrite(data, 1, size, f);
-    if (res < size) {
-        return -errno;
-    }
-
-    err = fseek(f, off, SEEK_SET);
-    if (err) {
-        return -errno;
-    }
-
-    uint8_t dat;
-    res = fread(&dat, 1, 1, f);
-    if (res < 1) {
-        return -errno;
-    }
-
-    err = fclose(f);
-    if (err) {
-        return -errno;
-    }
-
-    emu->stats.prog_count += 1;
-    return 0;
-}
-
-int lfs_emubd_erase(const struct lfs_config *cfg, lfs_block_t block) {
-    lfs_emubd_t *emu = cfg->context;
-
-    // Check if erase is valid
-    assert(block < cfg->block_count);
-
-    // Erase the block
-    snprintf(emu->child, LFS_NAME_MAX, "%" PRIx32, block);
-    struct stat st;
-    int err = stat(emu->path, &st);
-    if (err && errno != ENOENT) {
-        return -errno;
-    }
-
-    if (!err && S_ISREG(st.st_mode) && (S_IWUSR & st.st_mode)) {
-        err = unlink(emu->path);
-        if (err) {
-            return -errno;
-        }
-    }
-
-    if (err || (S_ISREG(st.st_mode) && (S_IWUSR & st.st_mode))) {
-        FILE *f = fopen(emu->path, "w");
-        if (!f) {
-            return -errno;
-        }
-
-        err = fclose(f);
-        if (err) {
-            return -errno;
-        }
-    }
-
-    emu->stats.erase_count += 1;
-    return 0;
-}
-
-int lfs_emubd_sync(const struct lfs_config *cfg) {
-    lfs_emubd_t *emu = cfg->context;
-
-    // Just write out info/stats for later lookup
-    snprintf(emu->child, LFS_NAME_MAX, "config");
-    FILE *f = fopen(emu->path, "w");
-    if (!f) {
-        return -errno;
-    }
-
-    size_t res = fwrite(&emu->cfg, sizeof(emu->cfg), 1, f);
-    if (res < 1) {
-        return -errno;
-    }
-
-    int err = fclose(f);
-    if (err) {
-        return -errno;
-    }
-
-    snprintf(emu->child, LFS_NAME_MAX, "stats");
-    f = fopen(emu->path, "w");
-    if (!f) {
-        return -errno;
-    }
-
-    res = fwrite(&emu->stats, sizeof(emu->stats), 1, f);
-    if (res < 1) {
-        return -errno;
-    }
-
-    err = fclose(f);
-    if (err) {
-        return -errno;
-    }
-
-    return 0;
-}

emubd/lfs_emubd.h

@@ -1,87 +0,0 @@
-/*
- * Block device emulated on standard files
- *
- * Copyright (c) 2017, Arm Limited. All rights reserved.
- * SPDX-License-Identifier: BSD-3-Clause
- */
-#ifndef LFS_EMUBD_H
-#define LFS_EMUBD_H
-
-#include "lfs.h"
-#include "lfs_util.h"
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-
-// Config options
-#ifndef LFS_EMUBD_READ_SIZE
-#define LFS_EMUBD_READ_SIZE 1
-#endif
-
-#ifndef LFS_EMUBD_PROG_SIZE
-#define LFS_EMUBD_PROG_SIZE 1
-#endif
-
-#ifndef LFS_EMUBD_ERASE_SIZE
-#define LFS_EMUBD_ERASE_SIZE 512
-#endif
-
-#ifndef LFS_EMUBD_TOTAL_SIZE
-#define LFS_EMUBD_TOTAL_SIZE 524288
-#endif
-
-
-// The emu bd state
-typedef struct lfs_emubd {
-    char *path;
-    char *child;
-
-    struct {
-        uint64_t read_count;
-        uint64_t prog_count;
-        uint64_t erase_count;
-    } stats;
-
-    struct {
-        uint32_t read_size;
-        uint32_t prog_size;
-        uint32_t block_size;
-        uint32_t block_count;
-    } cfg;
-} lfs_emubd_t;
-
-
-// Create a block device using path for the directory to store blocks
-int lfs_emubd_create(const struct lfs_config *cfg, const char *path);
-
-// Clean up memory associated with emu block device
-void lfs_emubd_destroy(const struct lfs_config *cfg);
-
-// Read a block
-int lfs_emubd_read(const struct lfs_config *cfg, lfs_block_t block,
-        lfs_off_t off, void *buffer, lfs_size_t size);
-
-// Program a block
-//
-// The block must have previously been erased.
-int lfs_emubd_prog(const struct lfs_config *cfg, lfs_block_t block,
-        lfs_off_t off, const void *buffer, lfs_size_t size);
-
-// Erase a block
-//
-// A block must be erased before being programmed. The
-// state of an erased block is undefined.
-int lfs_emubd_erase(const struct lfs_config *cfg, lfs_block_t block);
-
-// Sync the block device
-int lfs_emubd_sync(const struct lfs_config *cfg);
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif

lfs.h

@@ -1,494 +0,0 @@
-/*
- * The little filesystem
- *
- * Copyright (c) 2017, Arm Limited. All rights reserved.
- * SPDX-License-Identifier: BSD-3-Clause
- */
-#ifndef LFS_H
-#define LFS_H
-
-#include <stdint.h>
-#include <stdbool.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-
-/// Version info ///
-
-// Software library version
-// Major (top-nibble), incremented on backwards incompatible changes
-// Minor (bottom-nibble), incremented on feature additions
-#define LFS_VERSION 0x00010006
-#define LFS_VERSION_MAJOR (0xffff & (LFS_VERSION >> 16))
-#define LFS_VERSION_MINOR (0xffff & (LFS_VERSION >>  0))
-
-// Version of On-disk data structures
-// Major (top-nibble), incremented on backwards incompatible changes
-// Minor (bottom-nibble), incremented on feature additions
-#define LFS_DISK_VERSION 0x00010001
-#define LFS_DISK_VERSION_MAJOR (0xffff & (LFS_DISK_VERSION >> 16))
-#define LFS_DISK_VERSION_MINOR (0xffff & (LFS_DISK_VERSION >>  0))
-
-
-/// Definitions ///
-
-// Type definitions
-typedef uint32_t lfs_size_t;
-typedef uint32_t lfs_off_t;
-
-typedef int32_t  lfs_ssize_t;
-typedef int32_t  lfs_soff_t;
-
-typedef uint32_t lfs_block_t;
-
-// Max name size in bytes
-#ifndef LFS_NAME_MAX
-#define LFS_NAME_MAX 255
-#endif
-
-// Possible error codes, these are negative to allow
-// valid positive return values
-enum lfs_error {
-    LFS_ERR_OK       = 0,    // No error
-    LFS_ERR_IO       = -5,   // Error during device operation
-    LFS_ERR_CORRUPT  = -52,  // Corrupted
-    LFS_ERR_NOENT    = -2,   // No directory entry
-    LFS_ERR_EXIST    = -17,  // Entry already exists
-    LFS_ERR_NOTDIR   = -20,  // Entry is not a dir
-    LFS_ERR_ISDIR    = -21,  // Entry is a dir
-    LFS_ERR_NOTEMPTY = -39,  // Dir is not empty
-    LFS_ERR_BADF     = -9,   // Bad file number
-    LFS_ERR_INVAL    = -22,  // Invalid parameter
-    LFS_ERR_NOSPC    = -28,  // No space left on device
-    LFS_ERR_NOMEM    = -12,  // No more memory available
-};
-
-// File types
-enum lfs_type {
-    LFS_TYPE_REG        = 0x11,
-    LFS_TYPE_DIR        = 0x22,
-    LFS_TYPE_SUPERBLOCK = 0x2e,
-};
-
-// File open flags
-enum lfs_open_flags {
-    // open flags
-    LFS_O_RDONLY = 1,        // Open a file as read only
-    LFS_O_WRONLY = 2,        // Open a file as write only
-    LFS_O_RDWR   = 3,        // Open a file as read and write
-    LFS_O_CREAT  = 0x0100,   // Create a file if it does not exist
-    LFS_O_EXCL   = 0x0200,   // Fail if a file already exists
-    LFS_O_TRUNC  = 0x0400,   // Truncate the existing file to zero size
-    LFS_O_APPEND = 0x0800,   // Move to end of file on every write
-
-    // internally used flags
-    LFS_F_DIRTY   = 0x10000, // File does not match storage
-    LFS_F_WRITING = 0x20000, // File has been written since last flush
-    LFS_F_READING = 0x40000, // File has been read since last flush
-    LFS_F_ERRED   = 0x80000, // An error occured during write
-};
-
-// File seek flags
-enum lfs_whence_flags {
-    LFS_SEEK_SET = 0,   // Seek relative to an absolute position
-    LFS_SEEK_CUR = 1,   // Seek relative to the current file position
-    LFS_SEEK_END = 2,   // Seek relative to the end of the file
-};
-
-
-// Configuration provided during initialization of the littlefs
-struct lfs_config {
-    // Opaque user provided context that can be used to pass
-    // information to the block device operations
-    void *context;
-
-    // Read a region in a block. Negative error codes are propogated
-    // to the user.
-    int (*read)(const struct lfs_config *c, lfs_block_t block,
-            lfs_off_t off, void *buffer, lfs_size_t size);
-
-    // Program a region in a block. The block must have previously
-    // been erased. Negative error codes are propogated to the user.
-    // May return LFS_ERR_CORRUPT if the block should be considered bad.
-    int (*prog)(const struct lfs_config *c, lfs_block_t block,
-            lfs_off_t off, const void *buffer, lfs_size_t size);
-
-    // Erase a block. A block must be erased before being programmed.
-    // The state of an erased block is undefined. Negative error codes
-    // are propogated to the user.
-    // May return LFS_ERR_CORRUPT if the block should be considered bad.
-    int (*erase)(const struct lfs_config *c, lfs_block_t block);
-
-    // Sync the state of the underlying block device. Negative error codes
-    // are propogated to the user.
-    int (*sync)(const struct lfs_config *c);
-
-    // Minimum size of a block read. This determines the size of read buffers.
-    // This may be larger than the physical read size to improve performance
-    // by caching more of the block device.
-    lfs_size_t read_size;
-
-    // Minimum size of a block program. This determines the size of program
-    // buffers. This may be larger than the physical program size to improve
-    // performance by caching more of the block device.
-    // Must be a multiple of the read size.
-    lfs_size_t prog_size;
-
-    // Size of an erasable block. This does not impact ram consumption and
-    // may be larger than the physical erase size. However, this should be
-    // kept small as each file currently takes up an entire block.
-    // Must be a multiple of the program size.
-    lfs_size_t block_size;
-
-    // Number of erasable blocks on the device.
-    lfs_size_t block_count;
-
-    // Number of blocks to lookahead during block allocation. A larger
-    // lookahead reduces the number of passes required to allocate a block.
-    // The lookahead buffer requires only 1 bit per block so it can be quite
-    // large with little ram impact. Should be a multiple of 32.
-    lfs_size_t lookahead;
-
-    // Optional, statically allocated read buffer. Must be read sized.
-    void *read_buffer;
-
-    // Optional, statically allocated program buffer. Must be program sized.
-    void *prog_buffer;
-
-    // Optional, statically allocated lookahead buffer. Must be 1 bit per
-    // lookahead block.
-    void *lookahead_buffer;
-
-    // Optional, statically allocated buffer for files. Must be program sized.
-    // If enabled, only one file may be opened at a time.
-    void *file_buffer;
-};
-
-// Optional configuration provided during lfs_file_opencfg
-struct lfs_file_config {
-    // Optional, statically allocated buffer for files. Must be program sized.
-    // If NULL, malloc will be used by default.
-    void *buffer;
-};
-
-// File info structure
-struct lfs_info {
-    // Type of the file, either LFS_TYPE_REG or LFS_TYPE_DIR
-    uint8_t type;
-
-    // Size of the file, only valid for REG files
-    lfs_size_t size;
-
-    // Name of the file stored as a null-terminated string
-    char name[LFS_NAME_MAX+1];
-};
-
-
-/// littlefs data structures ///
-typedef struct lfs_entry {
-    lfs_off_t off;
-
-    struct lfs_disk_entry {
-        uint8_t type;
-        uint8_t elen;
-        uint8_t alen;
-        uint8_t nlen;
-        union {
-            struct {
-                lfs_block_t head;
-                lfs_size_t size;
-            } file;
-            lfs_block_t dir[2];
-        } u;
-    } d;
-} lfs_entry_t;
-
-typedef struct lfs_cache {
-    lfs_block_t block;
-    lfs_off_t off;
-    uint8_t *buffer;
-} lfs_cache_t;
-
-typedef struct lfs_file {
-    struct lfs_file *next;
-    lfs_block_t pair[2];
-    lfs_off_t poff;
-
-    lfs_block_t head;
-    lfs_size_t size;
-
-    const struct lfs_file_config *cfg;
-    uint32_t flags;
-    lfs_off_t pos;
-    lfs_block_t block;
-    lfs_off_t off;
-    lfs_cache_t cache;
-} lfs_file_t;
-
-typedef struct lfs_dir {
-    struct lfs_dir *next;
-    lfs_block_t pair[2];
-    lfs_off_t off;
-
-    lfs_block_t head[2];
-    lfs_off_t pos;
-
-    struct lfs_disk_dir {
-        uint32_t rev;
-        lfs_size_t size;
-        lfs_block_t tail[2];
-    } d;
-} lfs_dir_t;
-
-typedef struct lfs_superblock {
-    lfs_off_t off;
-
-    struct lfs_disk_superblock {
-        uint8_t type;
-        uint8_t elen;
-        uint8_t alen;
-        uint8_t nlen;
-        lfs_block_t root[2];
-        uint32_t block_size;
-        uint32_t block_count;
-        uint32_t version;
-        char magic[8];
-    } d;
-} lfs_superblock_t;
-
-typedef struct lfs_free {
-    lfs_block_t off;
-    lfs_block_t size;
-    lfs_block_t i;
-    lfs_block_t ack;
-    uint32_t *buffer;
-} lfs_free_t;
-
-// The littlefs type
-typedef struct lfs {
-    const struct lfs_config *cfg;
-
-    lfs_block_t root[2];
-    lfs_file_t *files;
-    lfs_dir_t *dirs;
-
-    lfs_cache_t rcache;
-    lfs_cache_t pcache;
-
-    lfs_free_t free;
-    bool deorphaned;
-} lfs_t;
-
-
-/// Filesystem functions ///
-
-// Format a block device with the littlefs
-//
-// Requires a littlefs object and config struct. This clobbers the littlefs
-// object, and does not leave the filesystem mounted. The config struct must
-// be zeroed for defaults and backwards compatibility.
-//
-// Returns a negative error code on failure.
-int lfs_format(lfs_t *lfs, const struct lfs_config *config);
-
-// Mounts a littlefs
-//
-// Requires a littlefs object and config struct. Multiple filesystems
-// may be mounted simultaneously with multiple littlefs objects. Both
-// lfs and config must be allocated while mounted. The config struct must
-// be zeroed for defaults and backwards compatibility.
-//
-// Returns a negative error code on failure.
-int lfs_mount(lfs_t *lfs, const struct lfs_config *config);
-
-// Unmounts a littlefs
-//
-// Does nothing besides releasing any allocated resources.
-// Returns a negative error code on failure.
-int lfs_unmount(lfs_t *lfs);
-
-/// General operations ///
-
-// Removes a file or directory
-//
-// If removing a directory, the directory must be empty.
-// Returns a negative error code on failure.
-int lfs_remove(lfs_t *lfs, const char *path);
-
-// Rename or move a file or directory
-//
-// If the destination exists, it must match the source in type.
-// If the destination is a directory, the directory must be empty.
-//
-// Returns a negative error code on failure.
-int lfs_rename(lfs_t *lfs, const char *oldpath, const char *newpath);
-
-// Find info about a file or directory
-//
-// Fills out the info structure, based on the specified file or directory.
-// Returns a negative error code on failure.
-int lfs_stat(lfs_t *lfs, const char *path, struct lfs_info *info);
-
-
-/// File operations ///
-
-// Open a file
-//
-// 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.
-//
-// Returns a negative error code on failure.
-int lfs_file_open(lfs_t *lfs, lfs_file_t *file,
-        const char *path, int flags);
-
-// Open a file with extra configuration
-//
-// 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.
-//
-// 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
-// config struct must be zeroed for defaults and backwards compatibility.
-//
-// Returns a negative error code on failure.
-int lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file,
-        const char *path, int flags,
-        const struct lfs_file_config *config);
-
-// Close a file
-//
-// Any pending writes are written out to storage as though
-// sync had been called and releases any allocated resources.
-//
-// Returns a negative error code on failure.
-int lfs_file_close(lfs_t *lfs, lfs_file_t *file);
-
-// Synchronize a file on storage
-//
-// Any pending writes are written out to storage.
-// Returns a negative error code on failure.
-int lfs_file_sync(lfs_t *lfs, lfs_file_t *file);
-
-// Read data from file
-//
-// Takes a buffer and size indicating where to store the read data.
-// Returns the number of bytes read, or a negative error code on failure.
-lfs_ssize_t lfs_file_read(lfs_t *lfs, lfs_file_t *file,
-        void *buffer, lfs_size_t size);
-
-// Write data to file
-//
-// Takes a buffer and size indicating the data to write. The file will not
-// actually be updated on the storage until either sync or close is called.
-//
-// Returns the number of bytes written, or a negative error code on failure.
-lfs_ssize_t lfs_file_write(lfs_t *lfs, lfs_file_t *file,
-        const void *buffer, lfs_size_t size);
-
-// Change the position of the file
-//
-// The change in position is determined by the offset and whence flag.
-// Returns the 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,
-        lfs_soff_t off, int whence);
-
-// Truncates the size of the file to the specified size
-//
-// Returns a negative error code on failure.
-int lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size);
-
-// Return the position of the file
-//
-// Equivalent to lfs_file_seek(lfs, file, 0, LFS_SEEK_CUR)
-// Returns the position of the file, or a negative error code on failure.
-lfs_soff_t lfs_file_tell(lfs_t *lfs, lfs_file_t *file);
-
-// Change the position of the file to the beginning of the file
-//
-// Equivalent to lfs_file_seek(lfs, file, 0, LFS_SEEK_CUR)
-// Returns a negative error code on failure.
-int lfs_file_rewind(lfs_t *lfs, lfs_file_t *file);
-
-// Return the size of the file
-//
-// Similar to lfs_file_seek(lfs, file, 0, LFS_SEEK_END)
-// 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);
-
-
-/// Directory operations ///
-
-// Create a directory
-//
-// Returns a negative error code on failure.
-int lfs_mkdir(lfs_t *lfs, const char *path);
-
-// Open a directory
-//
-// Once open a directory can be used with read to iterate over files.
-// Returns a negative error code on failure.
-int lfs_dir_open(lfs_t *lfs, lfs_dir_t *dir, const char *path);
-
-// Close a directory
-//
-// Releases any allocated resources.
-// Returns a negative error code on failure.
-int lfs_dir_close(lfs_t *lfs, lfs_dir_t *dir);
-
-// Read an entry in the directory
-//
-// Fills out the info structure, based on the specified file or directory.
-// Returns a negative error code on failure.
-int lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info);
-
-// Change the position of the directory
-//
-// The new off must be a value previous returned from tell and specifies
-// an absolute offset in the directory seek.
-//
-// Returns a negative error code on failure.
-int lfs_dir_seek(lfs_t *lfs, lfs_dir_t *dir, lfs_off_t off);
-
-// Return the position of the directory
-//
-// The returned offset is only meant to be consumed by seek and may not make
-// sense, but does indicate the current position in the directory iteration.
-//
-// Returns the position of the directory, or a negative error code on failure.
-lfs_soff_t lfs_dir_tell(lfs_t *lfs, lfs_dir_t *dir);
-
-// Change the position of the directory to the beginning of the directory
-//
-// Returns a negative error code on failure.
-int lfs_dir_rewind(lfs_t *lfs, lfs_dir_t *dir);
-
-
-/// Miscellaneous littlefs specific operations ///
-
-// Traverse through all blocks in use by the filesystem
-//
-// The provided callback will be called with each block address that is
-// currently in use by the filesystem. This can be used to determine which
-// blocks are in use or how much of the storage is available.
-//
-// Returns a negative error code on failure.
-int lfs_traverse(lfs_t *lfs, int (*cb)(void*, lfs_block_t), void *data);
-
-// Prunes any recoverable errors that may have occured in the filesystem
-//
-// Not needed to be called by user unless an operation is interrupted
-// but the filesystem is still mounted. This is already called on first
-// allocation.
-//
-// Returns a negative error code on failure.
-int lfs_deorphan(lfs_t *lfs);
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif

lfs2.h

@@ -0,0 +1,695 @@
+/*
+ * The little filesystem
+ *
+ * Copyright (c) 2017, Arm Limited. All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+#ifndef LFS2_H
+#define LFS2_H
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "lfs2_util.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+
+/// Version info ///
+
+// Software library version
+// Major (top-nibble), incremented on backwards incompatible changes
+// Minor (bottom-nibble), incremented on feature additions
+#define LFS2_VERSION 0x00020004
+#define LFS2_VERSION_MAJOR (0xffff & (LFS2_VERSION >> 16))
+#define LFS2_VERSION_MINOR (0xffff & (LFS2_VERSION >>  0))
+
+// Version of On-disk data structures
+// Major (top-nibble), incremented on backwards incompatible changes
+// Minor (bottom-nibble), incremented on feature additions
+#define LFS2_DISK_VERSION 0x00020000
+#define LFS2_DISK_VERSION_MAJOR (0xffff & (LFS2_DISK_VERSION >> 16))
+#define LFS2_DISK_VERSION_MINOR (0xffff & (LFS2_DISK_VERSION >>  0))
+
+
+/// Definitions ///
+
+// Type definitions
+typedef uint32_t lfs2_size_t;
+typedef uint32_t lfs2_off_t;
+
+typedef int32_t  lfs2_ssize_t;
+typedef int32_t  lfs2_soff_t;
+
+typedef uint32_t lfs2_block_t;
+
+// 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
+// respected by other littlefs drivers.
+#ifndef LFS2_NAME_MAX
+#define LFS2_NAME_MAX 255
+#endif
+
+// Maximum size of a file in bytes, may be redefined to limit to support other
+// drivers. Limited on disk to <= 4294967296. However, above 2147483647 the
+// functions lfs2_file_seek, lfs2_file_size, and lfs2_file_tell will return
+// incorrect values due to using signed integers. Stored in superblock and
+// must be respected by other littlefs drivers.
+#ifndef LFS2_FILE_MAX
+#define LFS2_FILE_MAX 2147483647
+#endif
+
+// Maximum size of custom attributes in bytes, may be redefined, but there is
+// no real benefit to using a smaller LFS2_ATTR_MAX. Limited to <= 1022.
+#ifndef LFS2_ATTR_MAX
+#define LFS2_ATTR_MAX 1022
+#endif
+
+// Possible error codes, these are negative to allow
+// valid positive return values
+enum lfs2_error {
+    LFS2_ERR_OK          = 0,    // No error
+    LFS2_ERR_IO          = -5,   // Error during device operation
+    LFS2_ERR_CORRUPT     = -84,  // Corrupted
+    LFS2_ERR_NOENT       = -2,   // No directory entry
+    LFS2_ERR_EXIST       = -17,  // Entry already exists
+    LFS2_ERR_NOTDIR      = -20,  // Entry is not a dir
+    LFS2_ERR_ISDIR       = -21,  // Entry is a dir
+    LFS2_ERR_NOTEMPTY    = -39,  // Dir is not empty
+    LFS2_ERR_BADF        = -9,   // Bad file number
+    LFS2_ERR_FBIG        = -27,  // File too large
+    LFS2_ERR_INVAL       = -22,  // Invalid parameter
+    LFS2_ERR_NOSPC       = -28,  // No space left on device
+    LFS2_ERR_NOMEM       = -12,  // No more memory available
+    LFS2_ERR_NOATTR      = -61,  // No data/attr available
+    LFS2_ERR_NAMETOOLONG = -36,  // File name too long
+};
+
+// File types
+enum lfs2_type {
+    // file types
+    LFS2_TYPE_REG            = 0x001,
+    LFS2_TYPE_DIR            = 0x002,
+
+    // internally used types
+    LFS2_TYPE_SPLICE         = 0x400,
+    LFS2_TYPE_NAME           = 0x000,
+    LFS2_TYPE_STRUCT         = 0x200,
+    LFS2_TYPE_USERATTR       = 0x300,
+    LFS2_TYPE_FROM           = 0x100,
+    LFS2_TYPE_TAIL           = 0x600,
+    LFS2_TYPE_GLOBALS        = 0x700,
+    LFS2_TYPE_CRC            = 0x500,
+
+    // internally used type specializations
+    LFS2_TYPE_CREATE         = 0x401,
+    LFS2_TYPE_DELETE         = 0x4ff,
+    LFS2_TYPE_SUPERBLOCK     = 0x0ff,
+    LFS2_TYPE_DIRSTRUCT      = 0x200,
+    LFS2_TYPE_CTZSTRUCT      = 0x202,
+    LFS2_TYPE_INLINESTRUCT   = 0x201,
+    LFS2_TYPE_SOFTTAIL       = 0x600,
+    LFS2_TYPE_HARDTAIL       = 0x601,
+    LFS2_TYPE_MOVESTATE      = 0x7ff,
+
+    // internal chip sources
+    LFS2_FROM_NOOP           = 0x000,
+    LFS2_FROM_MOVE           = 0x101,
+    LFS2_FROM_USERATTRS      = 0x102,
+};
+
+// File open flags
+enum lfs2_open_flags {
+    // open flags
+    LFS2_O_RDONLY = 1,         // Open a file as read only
+#ifndef LFS2_READONLY
+    LFS2_O_WRONLY = 2,         // Open a file as write only
+    LFS2_O_RDWR   = 3,         // Open a file as read and write
+    LFS2_O_CREAT  = 0x0100,    // Create a file if it does not exist
+    LFS2_O_EXCL   = 0x0200,    // Fail if a file already exists
+    LFS2_O_TRUNC  = 0x0400,    // Truncate the existing file to zero size
+    LFS2_O_APPEND = 0x0800,    // Move to end of file on every write
+#endif
+
+    // internally used flags
+#ifndef LFS2_READONLY
+    LFS2_F_DIRTY   = 0x010000, // File does not match storage
+    LFS2_F_WRITING = 0x020000, // File has been written since last flush
+#endif
+    LFS2_F_READING = 0x040000, // File has been read since last flush
+#ifndef LFS2_READONLY
+    LFS2_F_ERRED   = 0x080000, // An error occurred during write
+#endif
+    LFS2_F_INLINE  = 0x100000, // Currently inlined in directory entry
+};
+
+// File seek flags
+enum lfs2_whence_flags {
+    LFS2_SEEK_SET = 0,   // Seek relative to an absolute position
+    LFS2_SEEK_CUR = 1,   // Seek relative to the current file position
+    LFS2_SEEK_END = 2,   // Seek relative to the end of the file
+};
+
+
+// Configuration provided during initialization of the littlefs
+struct lfs2_config {
+    // Opaque user provided context that can be used to pass
+    // information to the block device operations
+    void *context;
+
+    // Read a region in a block. Negative error codes are propagated
+    // to the user.
+    int (*read)(const struct lfs2_config *c, lfs2_block_t block,
+            lfs2_off_t off, void *buffer, lfs2_size_t size);
+
+    // Program a region in a block. The block must have previously
+    // been erased. Negative error codes are propagated to the user.
+    // May return LFS2_ERR_CORRUPT if the block should be considered bad.
+    int (*prog)(const struct lfs2_config *c, lfs2_block_t block,
+            lfs2_off_t off, const void *buffer, lfs2_size_t size);
+
+    // Erase a block. A block must be erased before being programmed.
+    // The state of an erased block is undefined. Negative error codes
+    // are propagated to the user.
+    // May return LFS2_ERR_CORRUPT if the block should be considered bad.
+    int (*erase)(const struct lfs2_config *c, lfs2_block_t block);
+
+    // Sync the state of the underlying block device. Negative error codes
+    // are propagated to the user.
+    int (*sync)(const struct lfs2_config *c);
+
+#ifdef LFS2_THREADSAFE
+    // Lock the underlying block device. Negative error codes
+    // are propagated to the user.
+    int (*lock)(const struct lfs2_config *c);
+
+    // Unlock the underlying block device. Negative error codes
+    // are propagated to the user.
+    int (*unlock)(const struct lfs2_config *c);
+#endif
+
+    // Minimum size of a block read in bytes. All read operations will be a
+    // multiple of this value.
+    lfs2_size_t read_size;
+
+    // Minimum size of a block program in bytes. All program operations will be
+    // a multiple of this value.
+    lfs2_size_t prog_size;
+
+    // Size of an erasable block in bytes. This does not impact ram consumption
+    // and 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 and
+    // program sizes.
+    lfs2_size_t block_size;
+
+    // Number of erasable blocks on the device.
+    lfs2_size_t block_count;
+
+    // Number of erase cycles before littlefs evicts metadata logs and moves
+    // the metadata to another block. Suggested values are in the
+    // range 100-1000, with large values having better performance at the cost
+    // of less consistent wear distribution.
+    //
+    // Set to -1 to disable block-level wear-leveling.
+    int32_t block_cycles;
+
+    // Size of block caches in bytes. Each cache buffers a portion of a block in
+    // RAM. The littlefs needs a read cache, a program cache, and one additional
+    // cache per file. Larger caches can improve performance by storing more
+    // 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.
+    lfs2_size_t cache_size;
+
+    // Size of the lookahead buffer in bytes. A larger lookahead buffer
+    // increases the number of blocks found during an allocation pass. The
+    // lookahead buffer is stored as a compact bitmap, so each byte of RAM
+    // can track 8 blocks. Must be a multiple of 8.
+    lfs2_size_t lookahead_size;
+
+    // Optional statically allocated read buffer. Must be cache_size.
+    // By default lfs2_malloc is used to allocate this buffer.
+    void *read_buffer;
+
+    // Optional statically allocated program buffer. Must be cache_size.
+    // By default lfs2_malloc is used to allocate this buffer.
+    void *prog_buffer;
+
+    // Optional statically allocated lookahead buffer. Must be lookahead_size
+    // and aligned to a 32-bit boundary. By default lfs2_malloc is used to
+    // allocate this buffer.
+    void *lookahead_buffer;
+
+    // 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
+    // the LFS2_NAME_MAX define. Defaults to LFS2_NAME_MAX when zero. Stored in
+    // superblock and must be respected by other littlefs drivers.
+    lfs2_size_t name_max;
+
+    // Optional upper limit on files in bytes. No downside for larger files
+    // but must be <= LFS2_FILE_MAX. Defaults to LFS2_FILE_MAX when zero. Stored
+    // in superblock and must be respected by other littlefs drivers.
+    lfs2_size_t file_max;
+
+    // Optional upper limit on custom attributes in bytes. No downside for
+    // larger attributes size but must be <= LFS2_ATTR_MAX. Defaults to
+    // LFS2_ATTR_MAX when zero.
+    lfs2_size_t attr_max;
+
+    // Optional upper limit on total space given to metadata pairs in bytes. On
+    // devices with large blocks (e.g. 128kB) setting this to a low size (2-8kB)
+    // can help bound the metadata compaction time. Must be <= block_size.
+    // Defaults to block_size when zero.
+    lfs2_size_t metadata_max;
+};
+
+// File info structure
+struct lfs2_info {
+    // Type of the file, either LFS2_TYPE_REG or LFS2_TYPE_DIR
+    uint8_t type;
+
+    // Size of the file, only valid for REG files. Limited to 32-bits.
+    lfs2_size_t size;
+
+    // Name of the file stored as a null-terminated string. Limited to
+    // LFS2_NAME_MAX+1, which can be changed by redefining LFS2_NAME_MAX to
+    // reduce RAM. LFS2_NAME_MAX is stored in superblock and must be
+    // respected by other littlefs drivers.
+    char name[LFS2_NAME_MAX+1];
+};
+
+// Custom attribute structure, used to describe custom attributes
+// committed atomically during file writes.
+struct lfs2_attr {
+    // 8-bit type of attribute, provided by user and used to
+    // identify the attribute
+    uint8_t type;
+
+    // Pointer to buffer containing the attribute
+    void *buffer;
+
+    // Size of attribute in bytes, limited to LFS2_ATTR_MAX
+    lfs2_size_t size;
+};
+
+// Optional configuration provided during lfs2_file_opencfg
+struct lfs2_file_config {
+    // Optional statically allocated file buffer. Must be cache_size.
+    // By default lfs2_malloc is used to allocate this buffer.
+    void *buffer;
+
+    // Optional list of custom attributes related to the file. If the file
+    // is opened with read access, these attributes will be read from disk
+    // during the open call. If the file is opened with write access, the
+    // attributes will be written to disk every file sync or close. This
+    // write occurs atomically with update to the file's contents.
+    //
+    // Custom attributes are uniquely identified by an 8-bit type and limited
+    // 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, then it will be silently truncated. If the attribute is not
+    // found, it will be created implicitly.
+    struct lfs2_attr *attrs;
+
+    // Number of custom attributes in the list
+    lfs2_size_t attr_count;
+};
+
+
+/// internal littlefs data structures ///
+typedef struct lfs2_cache {
+    lfs2_block_t block;
+    lfs2_off_t off;
+    lfs2_size_t size;
+    uint8_t *buffer;
+} lfs2_cache_t;
+
+typedef struct lfs2_mdir {
+    lfs2_block_t pair[2];
+    uint32_t rev;
+    lfs2_off_t off;
+    uint32_t etag;
+    uint16_t count;
+    bool erased;
+    bool split;
+    lfs2_block_t tail[2];
+} lfs2_mdir_t;
+
+// littlefs directory type
+typedef struct lfs2_dir {
+    struct lfs2_dir *next;
+    uint16_t id;
+    uint8_t type;
+    lfs2_mdir_t m;
+
+    lfs2_off_t pos;
+    lfs2_block_t head[2];
+} lfs2_dir_t;
+
+// littlefs file type
+typedef struct lfs2_file {
+    struct lfs2_file *next;
+    uint16_t id;
+    uint8_t type;
+    lfs2_mdir_t m;
+
+    struct lfs2_ctz {
+        lfs2_block_t head;
+        lfs2_size_t size;
+    } ctz;
+
+    uint32_t flags;
+    lfs2_off_t pos;
+    lfs2_block_t block;
+    lfs2_off_t off;
+    lfs2_cache_t cache;
+
+    const struct lfs2_file_config *cfg;
+} lfs2_file_t;
+
+typedef struct lfs2_superblock {
+    uint32_t version;
+    lfs2_size_t block_size;
+    lfs2_size_t block_count;
+    lfs2_size_t name_max;
+    lfs2_size_t file_max;
+    lfs2_size_t attr_max;
+} lfs2_superblock_t;
+
+typedef struct lfs2_gstate {
+    uint32_t tag;
+    lfs2_block_t pair[2];
+} lfs2_gstate_t;
+
+// The littlefs filesystem type
+typedef struct lfs2 {
+    lfs2_cache_t rcache;
+    lfs2_cache_t pcache;
+
+    lfs2_block_t root[2];
+    struct lfs2_mlist {
+        struct lfs2_mlist *next;
+        uint16_t id;
+        uint8_t type;
+        lfs2_mdir_t m;
+    } *mlist;
+    uint32_t seed;
+
+    lfs2_gstate_t gstate;
+    lfs2_gstate_t gdisk;
+    lfs2_gstate_t gdelta;
+
+    struct lfs2_free {
+        lfs2_block_t off;
+        lfs2_block_t size;
+        lfs2_block_t i;
+        lfs2_block_t ack;
+        uint32_t *buffer;
+    } free;
+
+    const struct lfs2_config *cfg;
+    lfs2_size_t name_max;
+    lfs2_size_t file_max;
+    lfs2_size_t attr_max;
+
+#ifdef LFS2_MIGRATE
+    struct lfs21 *lfs21;
+#endif
+} lfs2_t;
+
+
+/// Filesystem functions ///
+
+#ifndef LFS2_READONLY
+// Format a block device with the littlefs
+//
+// Requires a littlefs object and config struct. This clobbers the littlefs
+// object, and does not leave the filesystem mounted. The config struct must
+// be zeroed for defaults and backwards compatibility.
+//
+// Returns a negative error code on failure.
+int lfs2_format(lfs2_t *lfs2, const struct lfs2_config *config);
+#endif
+
+// Mounts a littlefs
+//
+// Requires a littlefs object and config struct. Multiple filesystems
+// may be mounted simultaneously with multiple littlefs objects. Both
+// lfs2 and config must be allocated while mounted. The config struct must
+// be zeroed for defaults and backwards compatibility.
+//
+// Returns a negative error code on failure.
+int lfs2_mount(lfs2_t *lfs2, const struct lfs2_config *config);
+
+// Unmounts a littlefs
+//
+// Does nothing besides releasing any allocated resources.
+// Returns a negative error code on failure.
+int lfs2_unmount(lfs2_t *lfs2);
+
+/// General operations ///
+
+#ifndef LFS2_READONLY
+// Removes a file or directory
+//
+// If removing a directory, the directory must be empty.
+// Returns a negative error code on failure.
+int lfs2_remove(lfs2_t *lfs2, const char *path);
+#endif
+
+#ifndef LFS2_READONLY
+// Rename or move a file or directory
+//
+// If the destination exists, it must match the source in type.
+// If the destination is a directory, the directory must be empty.
+//
+// Returns a negative error code on failure.
+int lfs2_rename(lfs2_t *lfs2, const char *oldpath, const char *newpath);
+#endif
+
+// Find info about a file or directory
+//
+// Fills out the info structure, based on the specified file or directory.
+// Returns a negative error code on failure.
+int lfs2_stat(lfs2_t *lfs2, const char *path, struct lfs2_info *info);
+
+// Get a custom attribute
+//
+// Custom attributes are uniquely identified by an 8-bit type and limited
+// 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,
+// then it will be silently truncated. If no attribute is found, the error
+// 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.
+// Note, the returned size is the size of the attribute on disk, irrespective
+// of the size of the buffer. This can be used to dynamically allocate a buffer
+// or check for existence.
+lfs2_ssize_t lfs2_getattr(lfs2_t *lfs2, const char *path,
+        uint8_t type, void *buffer, lfs2_size_t size);
+
+#ifndef LFS2_READONLY
+// Set custom attributes
+//
+// Custom attributes are uniquely identified by an 8-bit type and limited
+// to LFS2_ATTR_MAX bytes. If an attribute is not found, it will be
+// implicitly created.
+//
+// Returns a negative error code on failure.
+int lfs2_setattr(lfs2_t *lfs2, const char *path,
+        uint8_t type, const void *buffer, lfs2_size_t size);
+#endif
+
+#ifndef LFS2_READONLY
+// Removes a custom attribute
+//
+// If an attribute is not found, nothing happens.
+//
+// Returns a negative error code on failure.
+int lfs2_removeattr(lfs2_t *lfs2, const char *path, uint8_t type);
+#endif
+
+
+/// File operations ///
+
+// Open a file
+//
+// The mode that the file is opened in is determined by the flags, which
+// are values from the enum lfs2_open_flags that are bitwise-ored together.
+//
+// Returns a negative error code on failure.
+int lfs2_file_open(lfs2_t *lfs2, lfs2_file_t *file,
+        const char *path, int flags);
+
+// Open a file with extra configuration
+//
+// The mode that the file is opened in is determined by the flags, which
+// are values from the enum lfs2_open_flags that are bitwise-ored together.
+//
+// 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
+// config struct must be zeroed for defaults and backwards compatibility.
+//
+// Returns a negative error code on failure.
+int lfs2_file_opencfg(lfs2_t *lfs2, lfs2_file_t *file,
+        const char *path, int flags,
+        const struct lfs2_file_config *config);
+
+// Close a file
+//
+// Any pending writes are written out to storage as though
+// sync had been called and releases any allocated resources.
+//
+// Returns a negative error code on failure.
+int lfs2_file_close(lfs2_t *lfs2, lfs2_file_t *file);
+
+// Synchronize a file on storage
+//
+// Any pending writes are written out to storage.
+// Returns a negative error code on failure.
+int lfs2_file_sync(lfs2_t *lfs2, lfs2_file_t *file);
+
+// Read data from file
+//
+// Takes a buffer and size indicating where to store the read data.
+// Returns the number of bytes read, or a negative error code on failure.
+lfs2_ssize_t lfs2_file_read(lfs2_t *lfs2, lfs2_file_t *file,
+        void *buffer, lfs2_size_t size);
+
+#ifndef LFS2_READONLY
+// Write data to file
+//
+// Takes a buffer and size indicating the data to write. The file will not
+// 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.
+lfs2_ssize_t lfs2_file_write(lfs2_t *lfs2, lfs2_file_t *file,
+        const void *buffer, lfs2_size_t size);
+#endif
+
+// Change the position of the file
+//
+// The change in position is determined by the offset and whence flag.
+// Returns the new position of the file, or a negative error code on failure.
+lfs2_soff_t lfs2_file_seek(lfs2_t *lfs2, lfs2_file_t *file,
+        lfs2_soff_t off, int whence);
+
+#ifndef LFS2_READONLY
+// Truncates the size of the file to the specified size
+//
+// Returns a negative error code on failure.
+int lfs2_file_truncate(lfs2_t *lfs2, lfs2_file_t *file, lfs2_off_t size);
+#endif
+
+// Return the position of the file
+//
+// Equivalent to lfs2_file_seek(lfs2, file, 0, LFS2_SEEK_CUR)
+// Returns the position of the file, or a negative error code on failure.
+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
+//
+// Equivalent to lfs2_file_seek(lfs2, file, 0, LFS2_SEEK_SET)
+// Returns a negative error code on failure.
+int lfs2_file_rewind(lfs2_t *lfs2, lfs2_file_t *file);
+
+// Return the size of the file
+//
+// Similar to lfs2_file_seek(lfs2, file, 0, LFS2_SEEK_END)
+// Returns the size of the file, or a negative error code on failure.
+lfs2_soff_t lfs2_file_size(lfs2_t *lfs2, lfs2_file_t *file);
+
+
+/// Directory operations ///
+
+#ifndef LFS2_READONLY
+// Create a directory
+//
+// Returns a negative error code on failure.
+int lfs2_mkdir(lfs2_t *lfs2, const char *path);
+#endif
+
+// Open a directory
+//
+// Once open a directory can be used with read to iterate over files.
+// Returns a negative error code on failure.
+int lfs2_dir_open(lfs2_t *lfs2, lfs2_dir_t *dir, const char *path);
+
+// Close a directory
+//
+// Releases any allocated resources.
+// Returns a negative error code on failure.
+int lfs2_dir_close(lfs2_t *lfs2, lfs2_dir_t *dir);
+
+// Read an entry in the directory
+//
+// Fills out the info structure, based on the specified file or directory.
+// Returns a positive value on success, 0 at the end of directory,
+// or a negative error code on failure.
+int lfs2_dir_read(lfs2_t *lfs2, lfs2_dir_t *dir, struct lfs2_info *info);
+
+// Change the position of the directory
+//
+// The new off must be a value previous returned from tell and specifies
+// an absolute offset in the directory seek.
+//
+// Returns a negative error code on failure.
+int lfs2_dir_seek(lfs2_t *lfs2, lfs2_dir_t *dir, lfs2_off_t off);
+
+// Return the position of the directory
+//
+// The returned offset is only meant to be consumed by seek and may not make
+// sense, but does indicate the current position in the directory iteration.
+//
+// Returns the position of the directory, or a negative error code on failure.
+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
+//
+// Returns a negative error code on failure.
+int lfs2_dir_rewind(lfs2_t *lfs2, lfs2_dir_t *dir);
+
+
+/// Filesystem-level filesystem operations
+
+// Finds the current size of the filesystem
+//
+// Note: Result is best effort. If files share COW structures, the returned
+// size may be larger than the filesystem actually is.
+//
+// Returns the number of allocated blocks, or a negative error code on failure.
+lfs2_ssize_t lfs2_fs_size(lfs2_t *lfs2);
+
+// Traverse through all blocks in use by the filesystem
+//
+// The provided callback will be called with each block address that is
+// currently in use by the filesystem. This can be used to determine which
+// blocks are in use or how much of the storage is available.
+//
+// Returns a negative error code on failure.
+int lfs2_fs_traverse(lfs2_t *lfs2, int (*cb)(void*, lfs2_block_t), void *data);
+
+#ifndef LFS2_READONLY
+#ifdef LFS2_MIGRATE
+// Attempts to migrate a previous version of littlefs
+//
+// Behaves similarly to the lfs2_format function. Attempts to mount
+// the previous version of littlefs and update the filesystem so it can be
+// mounted with the current version of littlefs.
+//
+// Requires a littlefs object and config struct. This clobbers the littlefs
+// object, and does not leave the filesystem mounted. The config struct must
+// be zeroed for defaults and backwards compatibility.
+//
+// Returns a negative error code on failure.
+int lfs2_migrate(lfs2_t *lfs2, const struct lfs2_config *cfg);
+#endif
+#endif
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif

lfs2_util.c

@@ -1,17 +1,17 @@
 /*
- * lfs util functions
+ * lfs2 util functions
  *
  * Copyright (c) 2017, Arm Limited. All rights reserved.
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include "lfs_util.h"
+#include "lfs2_util.h"
 
 // Only compile if user does not provide custom config
-#ifndef LFS_CONFIG
+#ifndef LFS2_CONFIG
 
 
 // Software CRC implementation with small lookup table
-void lfs_crc(uint32_t *restrict 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] = {
         0x00000000, 0x1db71064, 0x3b6e20c8, 0x26d930ac,
         0x76dc4190, 0x6b6b51f4, 0x4db26158, 0x5005713c,
@@ -22,9 +22,11 @@ void lfs_crc(uint32_t *restrict crc, const void *buffer, size_t size) {
     const uint8_t *data = buffer;
 
     for (size_t i = 0; i < size; i++) {
-        *crc = (*crc >> 4) ^ rtable[(*crc ^ (data[i] >> 0)) & 0xf];
+        crc = (crc >> 4) ^ rtable[(crc ^ (data[i] >> 0)) & 0xf];
-        *crc = (*crc >> 4) ^ rtable[(*crc ^ (data[i] >> 4)) & 0xf];
+        crc = (crc >> 4) ^ rtable[(crc ^ (data[i] >> 4)) & 0xf];
     }
+
+    return crc;
 }
 
 

lfs2_util.h

@@ -0,0 +1,244 @@
+/*
+ * lfs2 utility functions
+ *
+ * Copyright (c) 2017, Arm Limited. All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+#ifndef LFS2_UTIL_H
+#define LFS2_UTIL_H
+
+// Users can override lfs2_util.h with their own configuration by defining
+// LFS2_CONFIG as a header file to include (-DLFS2_CONFIG=lfs2_config.h).
+//
+// 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 lfs2_util.h
+// and modifying as needed.
+#ifdef LFS2_CONFIG
+#define LFS2_STRINGIZE(x) LFS2_STRINGIZE2(x)
+#define LFS2_STRINGIZE2(x) #x
+#include LFS2_STRINGIZE(LFS2_CONFIG)
+#else
+
+// System includes
+#include <stdint.h>
+#include <stdbool.h>
+#include <string.h>
+#include <inttypes.h>
+
+#ifndef LFS2_NO_MALLOC
+#include <stdlib.h>
+#endif
+#ifndef LFS2_NO_ASSERT
+#include <assert.h>
+#endif
+#if !defined(LFS2_NO_DEBUG) || \
+        !defined(LFS2_NO_WARN) || \
+        !defined(LFS2_NO_ERROR) || \
+        defined(LFS2_YES_TRACE)
+#include <stdio.h>
+#endif
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+
+// Macros, may be replaced by system specific wrappers. Arguments to these
+// macros must not have side-effects as the macros can be removed for a smaller
+// code footprint
+
+// Logging functions
+#ifndef LFS2_TRACE
+#ifdef LFS2_YES_TRACE
+#define LFS2_TRACE_(fmt, ...) \
+    printf("%s:%d:trace: " fmt "%s\n", __FILE__, __LINE__, __VA_ARGS__)
+#define LFS2_TRACE(...) LFS2_TRACE_(__VA_ARGS__, "")
+#else
+#define LFS2_TRACE(...)
+#endif
+#endif
+
+#ifndef LFS2_DEBUG
+#ifndef LFS2_NO_DEBUG
+#define LFS2_DEBUG_(fmt, ...) \
+    printf("%s:%d:debug: " fmt "%s\n", __FILE__, __LINE__, __VA_ARGS__)
+#define LFS2_DEBUG(...) LFS2_DEBUG_(__VA_ARGS__, "")
+#else
+#define LFS2_DEBUG(...)
+#endif
+#endif
+
+#ifndef LFS2_WARN
+#ifndef LFS2_NO_WARN
+#define LFS2_WARN_(fmt, ...) \
+    printf("%s:%d:warn: " fmt "%s\n", __FILE__, __LINE__, __VA_ARGS__)
+#define LFS2_WARN(...) LFS2_WARN_(__VA_ARGS__, "")
+#else
+#define LFS2_WARN(...)
+#endif
+#endif
+
+#ifndef LFS2_ERROR
+#ifndef LFS2_NO_ERROR
+#define LFS2_ERROR_(fmt, ...) \
+    printf("%s:%d:error: " fmt "%s\n", __FILE__, __LINE__, __VA_ARGS__)
+#define LFS2_ERROR(...) LFS2_ERROR_(__VA_ARGS__, "")
+#else
+#define LFS2_ERROR(...)
+#endif
+#endif
+
+// Runtime assertions
+#ifndef LFS2_ASSERT
+#ifndef LFS2_NO_ASSERT
+#define LFS2_ASSERT(test) assert(test)
+#else
+#define LFS2_ASSERT(test)
+#endif
+#endif
+
+
+// Builtin functions, these may be replaced by more efficient
+// toolchain-specific implementations. LFS2_NO_INTRINSICS falls back to a more
+// expensive basic C implementation for debugging purposes
+
+// Min/max functions for unsigned 32-bit numbers
+static inline uint32_t lfs2_max(uint32_t a, uint32_t b) {
+    return (a > b) ? a : b;
+}
+
+static inline uint32_t lfs2_min(uint32_t a, uint32_t b) {
+    return (a < b) ? a : b;
+}
+
+// Align to nearest multiple of a size
+static inline uint32_t lfs2_aligndown(uint32_t a, uint32_t alignment) {
+    return a - (a % alignment);
+}
+
+static inline uint32_t lfs2_alignup(uint32_t a, uint32_t alignment) {
+    return lfs2_aligndown(a + alignment-1, alignment);
+}
+
+// Find the smallest power of 2 greater than or equal to a
+static inline uint32_t lfs2_npw2(uint32_t a) {
+#if !defined(LFS2_NO_INTRINSICS) && (defined(__GNUC__) || defined(__CC_ARM))
+    return 32 - __builtin_clz(a-1);
+#else
+    uint32_t r = 0;
+    uint32_t s;
+    a -= 1;
+    s = (a > 0xffff) << 4; a >>= s; r |= s;
+    s = (a > 0xff  ) << 3; a >>= s; r |= s;
+    s = (a > 0xf   ) << 2; a >>= s; r |= s;
+    s = (a > 0x3   ) << 1; a >>= s; r |= s;
+    return (r | (a >> 1)) + 1;
+#endif
+}
+
+// Count the number of trailing binary zeros in a
+// lfs2_ctz(0) may be undefined
+static inline uint32_t lfs2_ctz(uint32_t a) {
+#if !defined(LFS2_NO_INTRINSICS) && defined(__GNUC__)
+    return __builtin_ctz(a);
+#else
+    return lfs2_npw2((a & -a) + 1) - 1;
+#endif
+}
+
+// Count the number of binary ones in a
+static inline uint32_t lfs2_popc(uint32_t a) {
+#if !defined(LFS2_NO_INTRINSICS) && (defined(__GNUC__) || defined(__CC_ARM))
+    return __builtin_popcount(a);
+#else
+    a = a - ((a >> 1) & 0x55555555);
+    a = (a & 0x33333333) + ((a >> 2) & 0x33333333);
+    return (((a + (a >> 4)) & 0xf0f0f0f) * 0x1010101) >> 24;
+#endif
+}
+
+// Find the sequence comparison of a and b, this is the distance
+// between a and b ignoring overflow
+static inline int lfs2_scmp(uint32_t a, uint32_t b) {
+    return (int)(unsigned)(a - b);
+}
+
+// Convert between 32-bit little-endian and native order
+static inline uint32_t lfs2_fromle32(uint32_t a) {
+#if !defined(LFS2_NO_INTRINSICS) && ( \
+    (defined(  BYTE_ORDER  ) && defined(  ORDER_LITTLE_ENDIAN  ) &&   BYTE_ORDER   ==   ORDER_LITTLE_ENDIAN  ) || \
+    (defined(__BYTE_ORDER  ) && defined(__ORDER_LITTLE_ENDIAN  ) && __BYTE_ORDER   == __ORDER_LITTLE_ENDIAN  ) || \
+    (defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__))
+    return a;
+#elif !defined(LFS2_NO_INTRINSICS) && ( \
+    (defined(  BYTE_ORDER  ) && defined(  ORDER_BIG_ENDIAN  ) &&   BYTE_ORDER   ==   ORDER_BIG_ENDIAN  ) || \
+    (defined(__BYTE_ORDER  ) && defined(__ORDER_BIG_ENDIAN  ) && __BYTE_ORDER   == __ORDER_BIG_ENDIAN  ) || \
+    (defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__))
+    return __builtin_bswap32(a);
+#else
+    return (((uint8_t*)&a)[0] <<  0) |
+           (((uint8_t*)&a)[1] <<  8) |
+           (((uint8_t*)&a)[2] << 16) |
+           (((uint8_t*)&a)[3] << 24);
+#endif
+}
+
+static inline uint32_t lfs2_tole32(uint32_t a) {
+    return lfs2_fromle32(a);
+}
+
+// Convert between 32-bit big-endian and native order
+static inline uint32_t lfs2_frombe32(uint32_t a) {
+#if !defined(LFS2_NO_INTRINSICS) && ( \
+    (defined(  BYTE_ORDER  ) && defined(  ORDER_LITTLE_ENDIAN  ) &&   BYTE_ORDER   ==   ORDER_LITTLE_ENDIAN  ) || \
+    (defined(__BYTE_ORDER  ) && defined(__ORDER_LITTLE_ENDIAN  ) && __BYTE_ORDER   == __ORDER_LITTLE_ENDIAN  ) || \
+    (defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__))
+    return __builtin_bswap32(a);
+#elif !defined(LFS2_NO_INTRINSICS) && ( \
+    (defined(  BYTE_ORDER  ) && defined(  ORDER_BIG_ENDIAN  ) &&   BYTE_ORDER   ==   ORDER_BIG_ENDIAN  ) || \
+    (defined(__BYTE_ORDER  ) && defined(__ORDER_BIG_ENDIAN  ) && __BYTE_ORDER   == __ORDER_BIG_ENDIAN  ) || \
+    (defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__))
+    return a;
+#else
+    return (((uint8_t*)&a)[0] << 24) |
+           (((uint8_t*)&a)[1] << 16) |
+           (((uint8_t*)&a)[2] <<  8) |
+           (((uint8_t*)&a)[3] <<  0);
+#endif
+}
+
+static inline uint32_t lfs2_tobe32(uint32_t a) {
+    return lfs2_frombe32(a);
+}
+
+// Calculate CRC-32 with polynomial = 0x04c11db7
+uint32_t lfs2_crc(uint32_t crc, const void *buffer, size_t size);
+
+// Allocate memory, only used if buffers are not provided to littlefs
+// Note, memory must be 64-bit aligned
+static inline void *lfs2_malloc(size_t size) {
+#ifndef LFS2_NO_MALLOC
+    return malloc(size);
+#else
+    (void)size;
+    return NULL;
+#endif
+}
+
+// Deallocate memory, only used if buffers are not provided to littlefs
+static inline void lfs2_free(void *p) {
+#ifndef LFS2_NO_MALLOC
+    free(p);
+#else
+    (void)p;
+#endif
+}
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif
+#endif

lfs_util.h

@@ -1,186 +0,0 @@
-/*
- * lfs utility functions
- *
- * Copyright (c) 2017, Arm Limited. All rights reserved.
- * SPDX-License-Identifier: BSD-3-Clause
- */
-#ifndef LFS_UTIL_H
-#define LFS_UTIL_H
-
-// Users can override lfs_util.h with their own configuration by defining
-// LFS_CONFIG as a header file to include (-DLFS_CONFIG=lfs_config.h).
-//
-// If LFS_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 and
-// modifying as needed.
-#ifdef LFS_CONFIG
-#define LFS_STRINGIZE(x) LFS_STRINGIZE2(x)
-#define LFS_STRINGIZE2(x) #x
-#include LFS_STRINGIZE(LFS_CONFIG)
-#else
-
-// System includes
-#include <stdint.h>
-#include <stdbool.h>
-#include <string.h>
-
-#ifndef LFS_NO_MALLOC
-#include <stdlib.h>
-#endif
-#ifndef LFS_NO_ASSERT
-#include <assert.h>
-#endif
-#if !defined(LFS_NO_DEBUG) || !defined(LFS_NO_WARN) || !defined(LFS_NO_ERROR)
-#include <stdio.h>
-#endif
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-
-// Macros, may be replaced by system specific wrappers. Arguments to these
-// macros must not have side-effects as the macros can be removed for a smaller
-// code footprint
-
-// Logging functions
-#ifndef LFS_NO_DEBUG
-#define LFS_DEBUG(fmt, ...) \
-    printf("lfs debug:%d: " fmt "\n", __LINE__, __VA_ARGS__)
-#else
-#define LFS_DEBUG(fmt, ...)
-#endif
-
-#ifndef LFS_NO_WARN
-#define LFS_WARN(fmt, ...) \
-    printf("lfs warn:%d: " fmt "\n", __LINE__, __VA_ARGS__)
-#else
-#define LFS_WARN(fmt, ...)
-#endif
-
-#ifndef LFS_NO_ERROR
-#define LFS_ERROR(fmt, ...) \
-    printf("lfs error:%d: " fmt "\n", __LINE__, __VA_ARGS__)
-#else
-#define LFS_ERROR(fmt, ...)
-#endif
-
-// Runtime assertions
-#ifndef LFS_NO_ASSERT
-#define LFS_ASSERT(test) assert(test)
-#else
-#define LFS_ASSERT(test)
-#endif
-
-
-// Builtin functions, these may be replaced by more efficient
-// toolchain-specific implementations. LFS_NO_INTRINSICS falls back to a more
-// expensive basic C implementation for debugging purposes
-
-// Min/max functions for unsigned 32-bit numbers
-static inline uint32_t lfs_max(uint32_t a, uint32_t b) {
-    return (a > b) ? a : b;
-}
-
-static inline uint32_t lfs_min(uint32_t a, uint32_t b) {
-    return (a < b) ? a : b;
-}
-
-// Find the next smallest power of 2 less than or equal to a
-static inline uint32_t lfs_npw2(uint32_t a) {
-#if !defined(LFS_NO_INTRINSICS) && (defined(__GNUC__) || defined(__CC_ARM))
-    return 32 - __builtin_clz(a-1);
-#else
-    uint32_t r = 0;
-    uint32_t s;
-    a -= 1;
-    s = (a > 0xffff) << 4; a >>= s; r |= s;
-    s = (a > 0xff  ) << 3; a >>= s; r |= s;
-    s = (a > 0xf   ) << 2; a >>= s; r |= s;
-    s = (a > 0x3   ) << 1; a >>= s; r |= s;
-    return (r | (a >> 1)) + 1;
-#endif
-}
-
-// Count the number of trailing binary zeros in a
-// lfs_ctz(0) may be undefined
-static inline uint32_t lfs_ctz(uint32_t a) {
-#if !defined(LFS_NO_INTRINSICS) && defined(__GNUC__)
-    return __builtin_ctz(a);
-#else
-    return lfs_npw2((a & -a) + 1) - 1;
-#endif
-}
-
-// Count the number of binary ones in a
-static inline uint32_t lfs_popc(uint32_t a) {
-#if !defined(LFS_NO_INTRINSICS) && (defined(__GNUC__) || defined(__CC_ARM))
-    return __builtin_popcount(a);
-#else
-    a = a - ((a >> 1) & 0x55555555);
-    a = (a & 0x33333333) + ((a >> 2) & 0x33333333);
-    return (((a + (a >> 4)) & 0xf0f0f0f) * 0x1010101) >> 24;
-#endif
-}
-
-// Find the sequence comparison of a and b, this is the distance
-// between a and b ignoring overflow
-static inline int lfs_scmp(uint32_t a, uint32_t b) {
-    return (int)(unsigned)(a - b);
-}
-
-// Convert from 32-bit little-endian to native order
-static inline uint32_t lfs_fromle32(uint32_t a) {
-#if !defined(LFS_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__))
-    return a;
-#elif !defined(LFS_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__))
-    return __builtin_bswap32(a);
-#else
-    return (((uint8_t*)&a)[0] <<  0) |
-           (((uint8_t*)&a)[1] <<  8) |
-           (((uint8_t*)&a)[2] << 16) |
-           (((uint8_t*)&a)[3] << 24);
-#endif
-}
-
-// Convert to 32-bit little-endian from native order
-static inline uint32_t lfs_tole32(uint32_t a) {
-    return lfs_fromle32(a);
-}
-
-// Calculate CRC-32 with polynomial = 0x04c11db7
-void lfs_crc(uint32_t *crc, const void *buffer, size_t size);
-
-// Allocate memory, only used if buffers are not provided to littlefs
-static inline void *lfs_malloc(size_t size) {
-#ifndef LFS_NO_MALLOC
-    return malloc(size);
-#else
-    (void)size;
-    return NULL;
-#endif
-}
-
-// Deallocate memory, only used if buffers are not provided to littlefs
-static inline void lfs_free(void *p) {
-#ifndef LFS_NO_MALLOC
-    free(p);
-#else
-    (void)p;
-#endif
-}
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif
-#endif

scripts/code.py

@@ -0,0 +1,214 @@
+#!/usr/bin/env python3
+#
+# Script to find code size at the function level. Basically just a bit wrapper
+# around nm with some extra conveniences for comparing builds. Heavily inspired
+# by Linux's Bloat-O-Meter.
+#
+
+import os
+import glob
+import itertools as it
+import subprocess as sp
+import shlex
+import re
+import csv
+import collections as co
+
+
+OBJ_PATHS = ['*.o', 'bd/*.o']
+
+def collect(paths, **args):
+    results = co.defaultdict(lambda: 0)
+    pattern = re.compile(
+        '^(?P<size>[0-9a-fA-F]+)' +
+        ' (?P<type>[%s])' % re.escape(args['type']) +
+        ' (?P<func>.+?)$')
+    for path in paths:
+        # note nm-tool may contain extra args
+        cmd = args['nm_tool'] + ['--size-sort', path]
+        if args.get('verbose'):
+            print(' '.join(shlex.quote(c) for c in cmd))
+        proc = sp.Popen(cmd,
+            stdout=sp.PIPE,
+            stderr=sp.PIPE if not args.get('verbose') else None,
+            universal_newlines=True)
+        for line in proc.stdout:
+            m = pattern.match(line)
+            if m:
+                results[(path, m.group('func'))] += int(m.group('size'), 16)
+        proc.wait()
+        if proc.returncode != 0:
+            if not args.get('verbose'):
+                for line in proc.stderr:
+                    sys.stdout.write(line)
+            sys.exit(-1)
+
+    flat_results = []
+    for (file, func), size in results.items():
+        # map to source files
+        if args.get('build_dir'):
+            file = re.sub('%s/*' % re.escape(args['build_dir']), '', file)
+        # discard internal functions
+        if func.startswith('__'):
+            continue
+        # discard .8449 suffixes created by optimizer
+        func = re.sub('\.[0-9]+', '', func)
+        flat_results.append((file, func, size))
+
+    return flat_results
+
+def main(**args):
+    # find sizes
+    if not args.get('use', None):
+        # find .o files
+        paths = []
+        for path in args['obj_paths']:
+            if os.path.isdir(path):
+                path = path + '/*.o'
+
+            for path in glob.glob(path):
+                paths.append(path)
+
+        if not paths:
+            print('no .obj files found in %r?' % args['obj_paths'])
+            sys.exit(-1)
+
+        results = collect(paths, **args)
+    else:
+        with open(args['use']) as f:
+            r = csv.DictReader(f)
+            results = [
+                (   result['file'],
+                    result['function'],
+                    int(result['size']))
+                for result in r]
+
+    total = 0
+    for _, _, size in results:
+        total += size
+
+    # find previous results?
+    if args.get('diff'):
+        with open(args['diff']) as f:
+            r = csv.DictReader(f)
+            prev_results = [
+                (   result['file'],
+                    result['function'],
+                    int(result['size']))
+                for result in r]
+
+        prev_total = 0
+        for _, _, size in prev_results:
+            prev_total += size
+
+    # write results to CSV
+    if args.get('output'):
+        with open(args['output'], 'w') as f:
+            w = csv.writer(f)
+            w.writerow(['file', 'function', 'size'])
+            for file, func, size in sorted(results):
+                w.writerow((file, func, size))
+
+    # print results
+    def dedup_entries(results, by='function'):
+        entries = co.defaultdict(lambda: 0)
+        for file, func, size in results:
+            entry = (file if by == 'file' else func)
+            entries[entry] += size
+        return entries
+
+    def diff_entries(olds, news):
+        diff = co.defaultdict(lambda: (0, 0, 0, 0))
+        for name, new in news.items():
+            diff[name] = (0, new, new, 1.0)
+        for name, old in olds.items():
+            _, new, _, _ = diff[name]
+            diff[name] = (old, new, new-old, (new-old)/old if old else 1.0)
+        return diff
+
+    def print_header(by=''):
+        if not args.get('diff'):
+            print('%-36s %7s' % (by, 'size'))
+        else:
+            print('%-36s %7s %7s %7s' % (by, 'old', 'new', 'diff'))
+
+    def print_entries(by='function'):
+        entries = dedup_entries(results, by=by)
+
+        if not args.get('diff'):
+            print_header(by=by)
+            for name, size in sorted(entries.items()):
+                print("%-36s %7d" % (name, size))
+        else:
+            prev_entries = dedup_entries(prev_results, by=by)
+            diff = diff_entries(prev_entries, entries)
+            print_header(by='%s (%d added, %d removed)' % (by,
+                sum(1 for old, _, _, _ in diff.values() if not old),
+                sum(1 for _, new, _, _ in diff.values() if not new)))
+            for name, (old, new, diff, ratio) in sorted(diff.items(),
+                    key=lambda x: (-x[1][3], x)):
+                if ratio or args.get('all'):
+                    print("%-36s %7s %7s %+7d%s" % (name,
+                        old or "-",
+                        new or "-",
+                        diff,
+                        ' (%+.1f%%)' % (100*ratio) if ratio else ''))
+
+    def print_totals():
+        if not args.get('diff'):
+            print("%-36s %7d" % ('TOTAL', total))
+        else:
+            ratio = (total-prev_total)/prev_total if prev_total else 1.0
+            print("%-36s %7s %7s %+7d%s" % (
+                'TOTAL',
+                prev_total if prev_total else '-',
+                total if total else '-',
+                total-prev_total,
+                ' (%+.1f%%)' % (100*ratio) if ratio else ''))
+
+    if args.get('quiet'):
+        pass
+    elif args.get('summary'):
+        print_header()
+        print_totals()
+    elif args.get('files'):
+        print_entries(by='file')
+        print_totals()
+    else:
+        print_entries(by='function')
+        print_totals()
+
+if __name__ == "__main__":
+    import argparse
+    import sys
+    parser = argparse.ArgumentParser(
+        description="Find code size at the function level.")
+    parser.add_argument('obj_paths', nargs='*', default=OBJ_PATHS,
+        help="Description of where to find *.o files. May be a directory \
+            or a list of paths. Defaults to %r." % OBJ_PATHS)
+    parser.add_argument('-v', '--verbose', action='store_true',
+        help="Output commands that run behind the scenes.")
+    parser.add_argument('-o', '--output',
+        help="Specify CSV file to store results.")
+    parser.add_argument('-u', '--use',
+        help="Don't compile and find code sizes, instead use this CSV file.")
+    parser.add_argument('-d', '--diff',
+        help="Specify CSV file to diff code size against.")
+    parser.add_argument('-a', '--all', action='store_true',
+        help="Show all functions, not just the ones that changed.")
+    parser.add_argument('--files', action='store_true',
+        help="Show file-level code sizes. Note this does not include padding! "
+            "So sizes may differ from other tools.")
+    parser.add_argument('-s', '--summary', action='store_true',
+        help="Only show the total code size.")
+    parser.add_argument('-q', '--quiet', action='store_true',
+        help="Don't show anything, useful with -o.")
+    parser.add_argument('--type', default='tTrRdDbB',
+        help="Type of symbols to report, this uses the same single-character "
+            "type-names emitted by nm. Defaults to %(default)r.")
+    parser.add_argument('--nm-tool', default=['nm'], type=lambda x: x.split(),
+        help="Path to the nm tool to use.")
+    parser.add_argument('--build-dir',
+        help="Specify the relative build directory. Used to map object files \
+            to the correct source files.")
+    sys.exit(main(**vars(parser.parse_args())))

scripts/coverage.py

@@ -0,0 +1,254 @@
+#!/usr/bin/env python3
+#
+# Parse and report coverage info from .info files generated by lcov
+#
+import os
+import glob
+import csv
+import re
+import collections as co
+import bisect as b
+
+
+INFO_PATHS = ['tests/*.toml.info']
+
+def collect(paths, **args):
+    file = None
+    funcs = []
+    lines = co.defaultdict(lambda: 0)
+    pattern = re.compile(
+        '^(?P<file>SF:/?(?P<file_name>.*))$'
+        '|^(?P<func>FN:(?P<func_lineno>[0-9]*),(?P<func_name>.*))$'
+        '|^(?P<line>DA:(?P<line_lineno>[0-9]*),(?P<line_hits>[0-9]*))$')
+    for path in paths:
+        with open(path) as f:
+            for line in f:
+                m = pattern.match(line)
+                if m and m.group('file'):
+                    file = m.group('file_name')
+                elif m and file and m.group('func'):
+                    funcs.append((file, int(m.group('func_lineno')),
+                        m.group('func_name')))
+                elif m and file and m.group('line'):
+                    lines[(file, int(m.group('line_lineno')))] += (
+                        int(m.group('line_hits')))
+
+    # map line numbers to functions
+    funcs.sort()
+    def func_from_lineno(file, lineno):
+        i = b.bisect(funcs, (file, lineno))
+        if i and funcs[i-1][0] == file:
+            return funcs[i-1][2]
+        else:
+            return None
+
+    # reduce to function info
+    reduced_funcs = co.defaultdict(lambda: (0, 0))
+    for (file, line_lineno), line_hits in lines.items():
+        func = func_from_lineno(file, line_lineno)
+        if not func:
+            continue
+        hits, count = reduced_funcs[(file, func)]
+        reduced_funcs[(file, func)] = (hits + (line_hits > 0), count + 1)
+
+    results = []
+    for (file, func), (hits, count) in reduced_funcs.items():
+        # discard internal/testing functions (test_* injected with
+        # internal testing)
+        if func.startswith('__') or func.startswith('test_'):
+            continue
+        # discard .8449 suffixes created by optimizer
+        func = re.sub('\.[0-9]+', '', func)
+        results.append((file, func, hits, count))
+
+    return results
+
+
+def main(**args):
+    # find coverage
+    if not args.get('use'):
+        # find *.info files
+        paths = []
+        for path in args['info_paths']:
+            if os.path.isdir(path):
+                path = path + '/*.gcov'
+
+            for path in glob.glob(path):
+                paths.append(path)
+
+        if not paths:
+            print('no .info files found in %r?' % args['info_paths'])
+            sys.exit(-1)
+
+        results = collect(paths, **args)
+    else:
+        with open(args['use']) as f:
+            r = csv.DictReader(f)
+            results = [
+                (   result['file'],
+                    result['function'],
+                    int(result['hits']),
+                    int(result['count']))
+                for result in r]
+
+    total_hits, total_count = 0, 0
+    for _, _, hits, count in results:
+        total_hits += hits
+        total_count += count
+
+    # find previous results?
+    if args.get('diff'):
+        with open(args['diff']) as f:
+            r = csv.DictReader(f)
+            prev_results = [
+                (   result['file'],
+                    result['function'],
+                    int(result['hits']),
+                    int(result['count']))
+                for result in r]
+
+        prev_total_hits, prev_total_count = 0, 0
+        for _, _, hits, count in prev_results:
+            prev_total_hits += hits
+            prev_total_count += count
+
+    # write results to CSV
+    if args.get('output'):
+        with open(args['output'], 'w') as f:
+            w = csv.writer(f)
+            w.writerow(['file', 'function', 'hits', 'count'])
+            for file, func, hits, count in sorted(results):
+                w.writerow((file, func, hits, count))
+
+    # print results
+    def dedup_entries(results, by='function'):
+        entries = co.defaultdict(lambda: (0, 0))
+        for file, func, hits, count in results:
+            entry = (file if by == 'file' else func)
+            entry_hits, entry_count = entries[entry]
+            entries[entry] = (entry_hits + hits, entry_count + count)
+        return entries
+
+    def diff_entries(olds, news):
+        diff = co.defaultdict(lambda: (0, 0, 0, 0, 0, 0, 0))
+        for name, (new_hits, new_count) in news.items():
+            diff[name] = (
+                0, 0,
+                new_hits, new_count,
+                new_hits, new_count,
+                (new_hits/new_count if new_count else 1.0) - 1.0)
+        for name, (old_hits, old_count) in olds.items():
+            _, _, new_hits, new_count, _, _, _ = diff[name]
+            diff[name] = (
+                old_hits, old_count,
+                new_hits, new_count,
+                new_hits-old_hits, new_count-old_count,
+                ((new_hits/new_count if new_count else 1.0)
+                    - (old_hits/old_count if old_count else 1.0)))
+        return diff
+
+    def print_header(by=''):
+        if not args.get('diff'):
+            print('%-36s %19s' % (by, 'hits/line'))
+        else:
+            print('%-36s %19s %19s %11s' % (by, 'old', 'new', 'diff'))
+
+    def print_entries(by='function'):
+        entries = dedup_entries(results, by=by)
+
+        if not args.get('diff'):
+            print_header(by=by)
+            for name, (hits, count) in sorted(entries.items()):
+                print("%-36s %11s %7s" % (name,
+                    '%d/%d' % (hits, count)
+                        if count else '-',
+                    '%.1f%%' % (100*hits/count)
+                        if count else '-'))
+        else:
+            prev_entries = dedup_entries(prev_results, by=by)
+            diff = diff_entries(prev_entries, entries)
+            print_header(by='%s (%d added, %d removed)' % (by,
+                sum(1 for _, old, _, _, _, _, _ in diff.values() if not old),
+                sum(1 for _, _, _, new, _, _, _ in diff.values() if not new)))
+            for name, (
+                    old_hits, old_count,
+                    new_hits, new_count,
+                    diff_hits, diff_count, ratio) in sorted(diff.items(),
+                        key=lambda x: (-x[1][6], x)):
+                if ratio or args.get('all'):
+                    print("%-36s %11s %7s %11s %7s %11s%s" % (name,
+                        '%d/%d' % (old_hits, old_count)
+                            if old_count else '-',
+                        '%.1f%%' % (100*old_hits/old_count)
+                            if old_count else '-',
+                        '%d/%d' % (new_hits, new_count)
+                            if new_count else '-',
+                        '%.1f%%' % (100*new_hits/new_count)
+                            if new_count else '-',
+                        '%+d/%+d' % (diff_hits, diff_count),
+                        ' (%+.1f%%)' % (100*ratio) if ratio else ''))
+
+    def print_totals():
+        if not args.get('diff'):
+            print("%-36s %11s %7s" % ('TOTAL',
+                '%d/%d' % (total_hits, total_count)
+                    if total_count else '-',
+                '%.1f%%' % (100*total_hits/total_count)
+                    if total_count else '-'))
+        else:
+            ratio = ((total_hits/total_count
+                    if total_count else 1.0)
+                - (prev_total_hits/prev_total_count
+                    if prev_total_count else 1.0))
+            print("%-36s %11s %7s %11s %7s %11s%s" % ('TOTAL',
+                '%d/%d' % (prev_total_hits, prev_total_count)
+                    if prev_total_count else '-',
+                '%.1f%%' % (100*prev_total_hits/prev_total_count)
+                    if prev_total_count else '-',
+                '%d/%d' % (total_hits, total_count)
+                    if total_count else '-',
+                '%.1f%%' % (100*total_hits/total_count)
+                    if total_count else '-',
+                '%+d/%+d' % (total_hits-prev_total_hits,
+                    total_count-prev_total_count),
+                ' (%+.1f%%)' % (100*ratio) if ratio else ''))
+
+    if args.get('quiet'):
+        pass
+    elif args.get('summary'):
+        print_header()
+        print_totals()
+    elif args.get('files'):
+        print_entries(by='file')
+        print_totals()
+    else:
+        print_entries(by='function')
+        print_totals()
+
+if __name__ == "__main__":
+    import argparse
+    import sys
+    parser = argparse.ArgumentParser(
+        description="Parse and report coverage info from .info files \
+            generated by lcov")
+    parser.add_argument('info_paths', nargs='*', default=INFO_PATHS,
+        help="Description of where to find *.info files. May be a directory \
+            or list of paths. *.info files will be merged to show the total \
+            coverage. Defaults to %r." % INFO_PATHS)
+    parser.add_argument('-v', '--verbose', action='store_true',
+        help="Output commands that run behind the scenes.")
+    parser.add_argument('-o', '--output',
+        help="Specify CSV file to store results.")
+    parser.add_argument('-u', '--use',
+        help="Don't do any work, instead use this CSV file.")
+    parser.add_argument('-d', '--diff',
+        help="Specify CSV file to diff code size against.")
+    parser.add_argument('-a', '--all', action='store_true',
+        help="Show all functions, not just the ones that changed.")
+    parser.add_argument('--files', action='store_true',
+        help="Show file-level coverage.")
+    parser.add_argument('-s', '--summary', action='store_true',
+        help="Only show the total coverage.")
+    parser.add_argument('-q', '--quiet', action='store_true',
+        help="Don't show anything, useful with -o.")
+    sys.exit(main(**vars(parser.parse_args())))

scripts/explode_asserts.py

@@ -0,0 +1,383 @@
+#!/usr/bin/env python3
+
+import re
+import sys
+
+PATTERN = ['LFS2_ASSERT', 'assert']
+PREFIX = 'LFS2'
+MAXWIDTH = 16
+
+ASSERT = "__{PREFIX}_ASSERT_{TYPE}_{COMP}"
+FAIL = """
+__attribute__((unused))
+static void __{prefix}_assert_fail_{type}(
+        const char *file, int line, const char *comp,
+        {ctype} lh, size_t lsize,
+        {ctype} rh, size_t rsize) {{
+    printf("%s:%d:assert: assert failed with ", file, line);
+    __{prefix}_assert_print_{type}(lh, lsize);
+    printf(", expected %s ", comp);
+    __{prefix}_assert_print_{type}(rh, rsize);
+    printf("\\n");
+    fflush(NULL);
+    raise(SIGABRT);
+}}
+"""
+
+COMP = {
+    '==': 'eq',
+    '!=': 'ne',
+    '<=': 'le',
+    '>=': 'ge',
+    '<':  'lt',
+    '>':  'gt',
+}
+
+TYPE = {
+    'int': {
+        'ctype': 'intmax_t',
+        'fail': FAIL,
+        'print': """
+        __attribute__((unused))
+        static void __{prefix}_assert_print_{type}({ctype} v, size_t size) {{
+            (void)size;
+            printf("%"PRIiMAX, v);
+        }}
+        """,
+        'assert': """
+        #define __{PREFIX}_ASSERT_{TYPE}_{COMP}(file, line, lh, rh)
+        do {{
+            __typeof__(lh) _lh = lh;
+            __typeof__(lh) _rh = (__typeof__(lh))rh;
+            if (!(_lh {op} _rh)) {{
+                __{prefix}_assert_fail_{type}(file, line, "{comp}",
+                        (intmax_t)_lh, 0, (intmax_t)_rh, 0);
+            }}
+        }} while (0)
+        """
+    },
+    'bool': {
+        'ctype': 'bool',
+        'fail': FAIL,
+        'print': """
+        __attribute__((unused))
+        static void __{prefix}_assert_print_{type}({ctype} v, size_t size) {{
+            (void)size;
+            printf("%s", v ? "true" : "false");
+        }}
+        """,
+        'assert': """
+        #define __{PREFIX}_ASSERT_{TYPE}_{COMP}(file, line, lh, rh)
+        do {{
+            bool _lh = !!(lh);
+            bool _rh = !!(rh);
+            if (!(_lh {op} _rh)) {{
+                __{prefix}_assert_fail_{type}(file, line, "{comp}",
+                        _lh, 0, _rh, 0);
+            }}
+        }} while (0)
+        """
+    },
+    'mem': {
+        'ctype': 'const void *',
+        'fail': FAIL,
+        'print': """
+        __attribute__((unused))
+        static void __{prefix}_assert_print_{type}({ctype} v, size_t size) {{
+            const uint8_t *s = v;
+            printf("\\\"");
+            for (size_t i = 0; i < size && i < {maxwidth}; i++) {{
+                if (s[i] >= ' ' && s[i] <= '~') {{
+                    printf("%c", s[i]);
+                }} else {{
+                    printf("\\\\x%02x", s[i]);
+                }}
+            }}
+            if (size > {maxwidth}) {{
+                printf("...");
+            }}
+            printf("\\\"");
+        }}
+        """,
+        'assert': """
+        #define __{PREFIX}_ASSERT_{TYPE}_{COMP}(file, line, lh, rh, size)
+        do {{
+            const void *_lh = lh;
+            const void *_rh = rh;
+            if (!(memcmp(_lh, _rh, size) {op} 0)) {{
+                __{prefix}_assert_fail_{type}(file, line, "{comp}",
+                        _lh, size, _rh, size);
+            }}
+        }} while (0)
+        """
+    },
+    'str': {
+        'ctype': 'const char *',
+        'fail': FAIL,
+        'print': """
+        __attribute__((unused))
+        static void __{prefix}_assert_print_{type}({ctype} v, size_t size) {{
+            __{prefix}_assert_print_mem(v, size);
+        }}
+        """,
+        'assert': """
+        #define __{PREFIX}_ASSERT_{TYPE}_{COMP}(file, line, lh, rh)
+        do {{
+            const char *_lh = lh;
+            const char *_rh = rh;
+            if (!(strcmp(_lh, _rh) {op} 0)) {{
+                __{prefix}_assert_fail_{type}(file, line, "{comp}",
+                        _lh, strlen(_lh), _rh, strlen(_rh));
+            }}
+        }} while (0)
+        """
+    }
+}
+
+def mkdecls(outf, maxwidth=16):
+    outf.write("#include <stdio.h>\n")
+    outf.write("#include <stdbool.h>\n")
+    outf.write("#include <stdint.h>\n")
+    outf.write("#include <inttypes.h>\n")
+    outf.write("#include <signal.h>\n")
+
+    for type, desc in sorted(TYPE.items()):
+        format = {
+            'type': type.lower(), 'TYPE': type.upper(),
+            'ctype': desc['ctype'],
+            'prefix': PREFIX.lower(), 'PREFIX': PREFIX.upper(),
+            'maxwidth': maxwidth,
+        }
+        outf.write(re.sub('\s+', ' ',
+            desc['print'].strip().format(**format))+'\n')
+        outf.write(re.sub('\s+', ' ',
+            desc['fail'].strip().format(**format))+'\n')
+
+        for op, comp in sorted(COMP.items()):
+            format.update({
+                'comp': comp.lower(), 'COMP': comp.upper(),
+                'op': op,
+            })
+            outf.write(re.sub('\s+', ' ',
+                desc['assert'].strip().format(**format))+'\n')
+
+def mkassert(type, comp, lh, rh, size=None):
+    format = {
+        'type': type.lower(), 'TYPE': type.upper(),
+        'comp': comp.lower(), 'COMP': comp.upper(),
+        'prefix': PREFIX.lower(), 'PREFIX': PREFIX.upper(),
+        'lh': lh.strip(' '),
+        'rh': rh.strip(' '),
+        'size': size,
+    }
+    if size:
+        return ((ASSERT + '(__FILE__, __LINE__, {lh}, {rh}, {size})')
+            .format(**format))
+    else:
+        return ((ASSERT + '(__FILE__, __LINE__, {lh}, {rh})')
+            .format(**format))
+
+
+# simple recursive descent parser
+LEX = {
+    'ws':       [r'(?:\s|\n|#.*?\n|//.*?\n|/\*.*?\*/)+'],
+    'assert':   PATTERN,
+    'string':   [r'"(?:\\.|[^"])*"', r"'(?:\\.|[^'])\'"],
+    'arrow':    ['=>'],
+    'paren':    ['\(', '\)'],
+    'op':       ['strcmp', 'memcmp', '->'],
+    'comp':     ['==', '!=', '<=', '>=', '<', '>'],
+    'logic':    ['\&\&', '\|\|'],
+    'sep':      [':', ';', '\{', '\}', ','],
+}
+
+class ParseFailure(Exception):
+    def __init__(self, expected, found):
+        self.expected = expected
+        self.found = found
+
+    def __str__(self):
+        return "expected %r, found %s..." % (
+            self.expected, repr(self.found)[:70])
+
+class Parse:
+    def __init__(self, inf, lexemes):
+        p = '|'.join('(?P<%s>%s)' % (n, '|'.join(l))
+            for n, l in lexemes.items())
+        p = re.compile(p, re.DOTALL)
+        data = inf.read()
+        tokens = []
+        while True:
+            m = p.search(data)
+            if m:
+                if m.start() > 0:
+                    tokens.append((None, data[:m.start()]))
+                tokens.append((m.lastgroup, m.group()))
+                data = data[m.end():]
+            else:
+                tokens.append((None, data))
+                break
+        self.tokens = tokens
+        self.off = 0
+
+    def lookahead(self, *pattern):
+        if self.off < len(self.tokens):
+            token = self.tokens[self.off]
+            if token[0] in pattern or token[1] in pattern:
+                self.m = token[1]
+                return self.m
+        self.m = None
+        return self.m
+
+    def accept(self, *patterns):
+        m = self.lookahead(*patterns)
+        if m is not None:
+            self.off += 1
+        return m
+
+    def expect(self, *patterns):
+        m = self.accept(*patterns)
+        if not m:
+            raise ParseFailure(patterns, self.tokens[self.off:])
+        return m
+
+    def push(self):
+        return self.off
+
+    def pop(self, state):
+        self.off = state
+
+def passert(p):
+    def pastr(p):
+        p.expect('assert') ; p.accept('ws') ; p.expect('(') ; p.accept('ws')
+        p.expect('strcmp') ; p.accept('ws') ; p.expect('(') ; p.accept('ws')
+        lh = pexpr(p) ; p.accept('ws')
+        p.expect(',') ; p.accept('ws')
+        rh = pexpr(p) ; p.accept('ws')
+        p.expect(')') ; p.accept('ws')
+        comp = p.expect('comp') ; p.accept('ws')
+        p.expect('0') ; p.accept('ws')
+        p.expect(')')
+        return mkassert('str', COMP[comp], lh, rh)
+
+    def pamem(p):
+        p.expect('assert') ; p.accept('ws') ; p.expect('(') ; p.accept('ws')
+        p.expect('memcmp') ; p.accept('ws') ; p.expect('(') ; p.accept('ws')
+        lh = pexpr(p) ; p.accept('ws')
+        p.expect(',') ; p.accept('ws')
+        rh = pexpr(p) ; p.accept('ws')
+        p.expect(',') ; p.accept('ws')
+        size = pexpr(p) ; p.accept('ws')
+        p.expect(')') ; p.accept('ws')
+        comp = p.expect('comp') ; p.accept('ws')
+        p.expect('0') ; p.accept('ws')
+        p.expect(')')
+        return mkassert('mem', COMP[comp], lh, rh, size)
+
+    def paint(p):
+        p.expect('assert') ; p.accept('ws') ; p.expect('(') ; p.accept('ws')
+        lh = pexpr(p) ; p.accept('ws')
+        comp = p.expect('comp') ; p.accept('ws')
+        rh = pexpr(p) ; p.accept('ws')
+        p.expect(')')
+        return mkassert('int', COMP[comp], lh, rh)
+
+    def pabool(p):
+        p.expect('assert') ; p.accept('ws') ; p.expect('(') ; p.accept('ws')
+        lh = pexprs(p) ; p.accept('ws')
+        p.expect(')')
+        return mkassert('bool', 'eq', lh, 'true')
+
+    def pa(p):
+        return p.expect('assert')
+
+    state = p.push()
+    lastf = None
+    for pa in [pastr, pamem, paint, pabool, pa]:
+        try:
+            return pa(p)
+        except ParseFailure as f:
+            p.pop(state)
+            lastf = f
+    else:
+        raise lastf
+
+def pexpr(p):
+    res = []
+    while True:
+        if p.accept('('):
+            res.append(p.m)
+            while True:
+                res.append(pexprs(p))
+                if p.accept('sep'):
+                    res.append(p.m)
+                else:
+                    break
+            res.append(p.expect(')'))
+        elif p.lookahead('assert'):
+            res.append(passert(p))
+        elif p.accept('assert', 'ws', 'string', 'op', None):
+            res.append(p.m)
+        else:
+            return ''.join(res)
+
+def pexprs(p):
+    res = []
+    while True:
+        res.append(pexpr(p))
+        if p.accept('comp', 'logic', ','):
+            res.append(p.m)
+        else:
+            return ''.join(res)
+
+def pstmt(p):
+    ws = p.accept('ws') or ''
+    lh = pexprs(p)
+    if p.accept('=>'):
+        rh = pexprs(p)
+        return ws + mkassert('int', 'eq', lh, rh)
+    else:
+        return ws + lh
+
+
+def main(args):
+    inf = open(args.input, 'r') if args.input else sys.stdin
+    outf = open(args.output, 'w') if args.output else sys.stdout
+
+    lexemes = LEX.copy()
+    if args.pattern:
+        lexemes['assert'] = args.pattern
+    p = Parse(inf, lexemes)
+
+    # write extra verbose asserts
+    mkdecls(outf, maxwidth=args.maxwidth)
+    if args.input:
+        outf.write("#line %d \"%s\"\n" % (1, args.input))
+
+    # parse and write out stmt at a time
+    try:
+        while True:
+            outf.write(pstmt(p))
+            if p.accept('sep'):
+                outf.write(p.m)
+            else:
+                break
+    except ParseFailure as f:
+        pass
+
+    for i in range(p.off, len(p.tokens)):
+        outf.write(p.tokens[i][1])
+
+if __name__ == "__main__":
+    import argparse
+    parser = argparse.ArgumentParser(
+        description="Cpp step that increases assert verbosity")
+    parser.add_argument('input', nargs='?',
+        help="Input C file after cpp.")
+    parser.add_argument('-o', '--output', required=True,
+        help="Output C file.")
+    parser.add_argument('-p', '--pattern', action='append',
+        help="Patterns to search for starting an assert statement.")
+    parser.add_argument('--maxwidth', default=MAXWIDTH, type=int,
+        help="Maximum number of characters to display for strcmp and memcmp.")
+    main(parser.parse_args())

scripts/prefix.py

@@ -0,0 +1,61 @@
+#!/usr/bin/env python2
+
+# This script replaces prefixes of files, and symbols in that file.
+# Useful for creating different versions of the codebase that don't
+# conflict at compile time.
+#
+# example:
+# $ ./scripts/prefix.py lfs22
+
+import os
+import os.path
+import re
+import glob
+import itertools
+import tempfile
+import shutil
+import subprocess
+
+DEFAULT_PREFIX = "lfs2"
+
+def subn(from_prefix, to_prefix, name):
+    name, count1 = re.subn('\\b'+from_prefix, to_prefix, name)
+    name, count2 = re.subn('\\b'+from_prefix.upper(), to_prefix.upper(), name)
+    name, count3 = re.subn('\\B-D'+from_prefix.upper(),
+            '-D'+to_prefix.upper(), name)
+    return name, count1+count2+count3
+
+def main(from_prefix, to_prefix=None, files=None):
+    if not to_prefix:
+        from_prefix, to_prefix = DEFAULT_PREFIX, from_prefix
+
+    if not files:
+        files = subprocess.check_output([
+                'git', 'ls-tree', '-r', '--name-only', 'HEAD']).split()
+
+    for oldname in files:
+        # Rename any matching file names
+        newname, namecount = subn(from_prefix, to_prefix, oldname)
+        if namecount:
+            subprocess.check_call(['git', 'mv', oldname, newname])
+
+        # Rename any prefixes in file
+        count = 0
+        with open(newname+'~', 'w') as tempf:
+            with open(newname) as newf:
+                for line in newf:
+                    line, n = subn(from_prefix, to_prefix, line)
+                    count += n
+                    tempf.write(line)
+        shutil.copystat(newname, newname+'~')
+        os.rename(newname+'~', newname)
+        subprocess.check_call(['git', 'add', newname])
+
+        # Summary
+        print '%s: %d replacements' % (
+                '%s -> %s' % (oldname, newname) if namecount else oldname,
+                count)
+
+if __name__ == "__main__":
+    import sys
+    sys.exit(main(*sys.argv[1:]))

scripts/readblock.py

@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+
+import subprocess as sp
+
+def main(args):
+    with open(args.disk, 'rb') as f:
+        f.seek(args.block * args.block_size)
+        block = (f.read(args.block_size)
+            .ljust(args.block_size, b'\xff'))
+
+    # what did you expect?
+    print("%-8s  %-s" % ('off', 'data'))
+    return sp.run(['xxd', '-g1', '-'], input=block).returncode
+
+if __name__ == "__main__":
+    import argparse
+    import sys
+    parser = argparse.ArgumentParser(
+        description="Hex dump a specific block in a disk.")
+    parser.add_argument('disk',
+        help="File representing the block device.")
+    parser.add_argument('block_size', type=lambda x: int(x, 0),
+        help="Size of a block in bytes.")
+    parser.add_argument('block', type=lambda x: int(x, 0),
+        help="Address of block to dump.")
+    sys.exit(main(parser.parse_args()))

scripts/readmdir.py

@@ -0,0 +1,367 @@
+#!/usr/bin/env python3
+
+import struct
+import binascii
+import sys
+import itertools as it
+
+TAG_TYPES = {
+    'splice':       (0x700, 0x400),
+    'create':       (0x7ff, 0x401),
+    'delete':       (0x7ff, 0x4ff),
+    'name':         (0x700, 0x000),
+    'reg':          (0x7ff, 0x001),
+    'dir':          (0x7ff, 0x002),
+    'superblock':   (0x7ff, 0x0ff),
+    'struct':       (0x700, 0x200),
+    'dirstruct':    (0x7ff, 0x200),
+    'ctzstruct':    (0x7ff, 0x202),
+    'inlinestruct': (0x7ff, 0x201),
+    'userattr':     (0x700, 0x300),
+    'tail':         (0x700, 0x600),
+    'softtail':     (0x7ff, 0x600),
+    'hardtail':     (0x7ff, 0x601),
+    'gstate':       (0x700, 0x700),
+    'movestate':    (0x7ff, 0x7ff),
+    'crc':          (0x700, 0x500),
+}
+
+class Tag:
+    def __init__(self, *args):
+        if len(args) == 1:
+            self.tag = args[0]
+        elif len(args) == 3:
+            if isinstance(args[0], str):
+                type = TAG_TYPES[args[0]][1]
+            else:
+                type = args[0]
+
+            if isinstance(args[1], str):
+                id = int(args[1], 0) if args[1] not in 'x.' else 0x3ff
+            else:
+                id = args[1]
+
+            if isinstance(args[2], str):
+                size = int(args[2], str) if args[2] not in 'x.' else 0x3ff
+            else:
+                size = args[2]
+
+            self.tag = (type << 20) | (id << 10) | size
+        else:
+            assert False
+
+    @property
+    def isvalid(self):
+        return not bool(self.tag & 0x80000000)
+
+    @property
+    def isattr(self):
+        return not bool(self.tag & 0x40000000)
+
+    @property
+    def iscompactable(self):
+        return bool(self.tag & 0x20000000)
+
+    @property
+    def isunique(self):
+        return not bool(self.tag & 0x10000000)
+
+    @property
+    def type(self):
+        return (self.tag & 0x7ff00000) >> 20
+
+    @property
+    def type1(self):
+        return (self.tag & 0x70000000) >> 20
+
+    @property
+    def type3(self):
+        return (self.tag & 0x7ff00000) >> 20
+
+    @property
+    def id(self):
+        return (self.tag & 0x000ffc00) >> 10
+
+    @property
+    def size(self):
+        return (self.tag & 0x000003ff) >> 0
+
+    @property
+    def dsize(self):
+        return 4 + (self.size if self.size != 0x3ff else 0)
+
+    @property
+    def chunk(self):
+        return self.type & 0xff
+
+    @property
+    def schunk(self):
+        return struct.unpack('b', struct.pack('B', self.chunk))[0]
+
+    def is_(self, type):
+        return (self.type & TAG_TYPES[type][0]) == TAG_TYPES[type][1]
+
+    def mkmask(self):
+        return Tag(
+            0x700 if self.isunique else 0x7ff,
+            0x3ff if self.isattr else 0,
+            0)
+
+    def chid(self, nid):
+        ntag = Tag(self.type, nid, self.size)
+        if hasattr(self, 'off'):  ntag.off  = self.off
+        if hasattr(self, 'data'): ntag.data = self.data
+        if hasattr(self, 'crc'):  ntag.crc  = self.crc
+        return ntag
+
+    def typerepr(self):
+        if self.is_('crc') and getattr(self, 'crc', 0xffffffff) != 0xffffffff:
+            return 'crc (bad)'
+
+        reverse_types = {v: k for k, v in TAG_TYPES.items()}
+        for prefix in range(12):
+            mask = 0x7ff & ~((1 << prefix)-1)
+            if (mask, self.type & mask) in reverse_types:
+                type = reverse_types[mask, self.type & mask]
+                if prefix > 0:
+                    return '%s %#0*x' % (
+                        type, prefix//4, self.type & ((1 << prefix)-1))
+                else:
+                    return type
+        else:
+            return '%02x' % self.type
+
+    def idrepr(self):
+        return repr(self.id) if self.id != 0x3ff else '.'
+
+    def sizerepr(self):
+        return repr(self.size) if self.size != 0x3ff else 'x'
+
+    def __repr__(self):
+        return 'Tag(%r, %d, %d)' % (self.typerepr(), self.id, self.size)
+
+    def __lt__(self, other):
+        return (self.id, self.type) < (other.id, other.type)
+
+    def __bool__(self):
+        return self.isvalid
+
+    def __int__(self):
+        return self.tag
+
+    def __index__(self):
+        return self.tag
+
+class MetadataPair:
+    def __init__(self, blocks):
+        if len(blocks) > 1:
+            self.pair = [MetadataPair([block]) for block in blocks]
+            self.pair = sorted(self.pair, reverse=True)
+
+            self.data = self.pair[0].data
+            self.rev  = self.pair[0].rev
+            self.tags = self.pair[0].tags
+            self.ids  = self.pair[0].ids
+            self.log  = self.pair[0].log
+            self.all_ = self.pair[0].all_
+            return
+
+        self.pair = [self]
+        self.data = blocks[0]
+        block = self.data
+
+        self.rev, = struct.unpack('<I', block[0:4])
+        crc = binascii.crc32(block[0:4])
+
+        # parse tags
+        corrupt = False
+        tag = Tag(0xffffffff)
+        off = 4
+        self.log = []
+        self.all_ = []
+        while len(block) - off >= 4:
+            ntag, = struct.unpack('>I', block[off:off+4])
+
+            tag = Tag(int(tag) ^ ntag)
+            tag.off = off + 4
+            tag.data = block[off+4:off+tag.dsize]
+            if tag.is_('crc'):
+                crc = binascii.crc32(block[off:off+4+4], crc)
+            else:
+                crc = binascii.crc32(block[off:off+tag.dsize], crc)
+            tag.crc = crc
+            off += tag.dsize
+
+            self.all_.append(tag)
+
+            if tag.is_('crc'):
+                # is valid commit?
+                if crc != 0xffffffff:
+                    corrupt = True
+                if not corrupt:
+                    self.log = self.all_.copy()
+
+                # reset tag parsing
+                crc = 0
+                tag = Tag(int(tag) ^ ((tag.type & 1) << 31))
+
+        # find active ids
+        self.ids = list(it.takewhile(
+            lambda id: Tag('name', id, 0) in self,
+            it.count()))
+
+        # find most recent tags
+        self.tags = []
+        for tag in self.log:
+            if tag.is_('crc') or tag.is_('splice'):
+                continue
+            elif tag.id == 0x3ff:
+                if tag in self and self[tag] is tag:
+                    self.tags.append(tag)
+            else:
+                # id could have change, I know this is messy and slow
+                # but it works
+                for id in self.ids:
+                    ntag = tag.chid(id)
+                    if ntag in self and self[ntag] is tag:
+                        self.tags.append(ntag)
+
+        self.tags = sorted(self.tags)
+
+    def __bool__(self):
+        return bool(self.log)
+
+    def __lt__(self, other):
+        # corrupt blocks don't count
+        if not self or not other:
+            return bool(other)
+
+        # use sequence arithmetic to avoid overflow
+        return not ((other.rev - self.rev) & 0x80000000)
+
+    def __contains__(self, args):
+        try:
+            self[args]
+            return True
+        except KeyError:
+            return False
+
+    def __getitem__(self, args):
+        if isinstance(args, tuple):
+            gmask, gtag = args
+        else:
+            gmask, gtag = args.mkmask(), args
+
+        gdiff = 0
+        for tag in reversed(self.log):
+            if (gmask.id != 0 and tag.is_('splice') and
+                    tag.id <= gtag.id - gdiff):
+                if tag.is_('create') and tag.id == gtag.id - gdiff:
+                    # creation point
+                    break
+
+                gdiff += tag.schunk
+
+            if ((int(gmask) & int(tag)) ==
+                    (int(gmask) & int(gtag.chid(gtag.id - gdiff)))):
+                if tag.size == 0x3ff:
+                    # deleted
+                    break
+
+                return tag
+
+        raise KeyError(gmask, gtag)
+
+    def _dump_tags(self, tags, f=sys.stdout, truncate=True):
+        f.write("%-8s  %-8s  %-13s %4s %4s" % (
+            'off', 'tag', 'type', 'id', 'len'))
+        if truncate:
+            f.write('  data (truncated)')
+        f.write('\n')
+
+        for tag in tags:
+            f.write("%08x: %08x  %-13s %4s %4s" % (
+                tag.off, tag,
+                tag.typerepr(), tag.idrepr(), tag.sizerepr()))
+            if truncate:
+                f.write("  %-23s  %-8s\n" % (
+                    ' '.join('%02x' % c for c in tag.data[:8]),
+                    ''.join(c if c >= ' ' and c <= '~' else '.'
+                        for c in map(chr, tag.data[:8]))))
+            else:
+                f.write("\n")
+                for i in range(0, len(tag.data), 16):
+                    f.write("  %08x: %-47s  %-16s\n" % (
+                        tag.off+i,
+                        ' '.join('%02x' % c for c in tag.data[i:i+16]),
+                        ''.join(c if c >= ' ' and c <= '~' else '.'
+                            for c in map(chr, tag.data[i:i+16]))))
+
+    def dump_tags(self, f=sys.stdout, truncate=True):
+        self._dump_tags(self.tags, f=f, truncate=truncate)
+
+    def dump_log(self, f=sys.stdout, truncate=True):
+        self._dump_tags(self.log, f=f, truncate=truncate)
+
+    def dump_all(self, f=sys.stdout, truncate=True):
+        self._dump_tags(self.all_, f=f, truncate=truncate)
+
+def main(args):
+    blocks = []
+    with open(args.disk, 'rb') as f:
+        for block in [args.block1, args.block2]:
+            if block is None:
+                continue
+            f.seek(block * args.block_size)
+            blocks.append(f.read(args.block_size)
+                .ljust(args.block_size, b'\xff'))
+
+    # find most recent pair
+    mdir = MetadataPair(blocks)
+
+    try:
+        mdir.tail = mdir[Tag('tail', 0, 0)]
+        if mdir.tail.size != 8 or mdir.tail.data == 8*b'\xff':
+            mdir.tail = None
+    except KeyError:
+        mdir.tail = None
+
+    print("mdir {%s} rev %d%s%s%s" % (
+        ', '.join('%#x' % b
+            for b in [args.block1, args.block2]
+            if b is not None),
+        mdir.rev,
+        ' (was %s)' % ', '.join('%d' % m.rev for m in mdir.pair[1:])
+        if len(mdir.pair) > 1 else '',
+        ' (corrupted!)' if not mdir else '',
+        ' -> {%#x, %#x}' % struct.unpack('<II', mdir.tail.data)
+        if mdir.tail else ''))
+    if args.all:
+        mdir.dump_all(truncate=not args.no_truncate)
+    elif args.log:
+        mdir.dump_log(truncate=not args.no_truncate)
+    else:
+        mdir.dump_tags(truncate=not args.no_truncate)
+
+    return 0 if mdir else 1
+
+if __name__ == "__main__":
+    import argparse
+    import sys
+    parser = argparse.ArgumentParser(
+        description="Dump useful info about metadata pairs in littlefs.")
+    parser.add_argument('disk',
+        help="File representing the block device.")
+    parser.add_argument('block_size', type=lambda x: int(x, 0),
+        help="Size of a block in bytes.")
+    parser.add_argument('block1', type=lambda x: int(x, 0),
+        help="First block address for finding the metadata pair.")
+    parser.add_argument('block2', nargs='?', type=lambda x: int(x, 0),
+        help="Second block address for finding the metadata pair.")
+    parser.add_argument('-l', '--log', action='store_true',
+        help="Show tags in log.")
+    parser.add_argument('-a', '--all', action='store_true',
+        help="Show all tags in log, included tags in corrupted commits.")
+    parser.add_argument('-T', '--no-truncate', action='store_true',
+        help="Don't truncate large amounts of data.")
+    sys.exit(main(parser.parse_args()))

scripts/readtree.py

@@ -0,0 +1,183 @@
+#!/usr/bin/env python3
+
+import struct
+import sys
+import json
+import io
+import itertools as it
+from readmdir import Tag, MetadataPair
+
+def main(args):
+    superblock = None
+    gstate = b'\0\0\0\0\0\0\0\0\0\0\0\0'
+    dirs = []
+    mdirs = []
+    corrupted = []
+    cycle = False
+    with open(args.disk, 'rb') as f:
+        tail = (args.block1, args.block2)
+        hard = False
+        while True:
+            for m in it.chain((m for d in dirs for m in d), mdirs):
+                if set(m.blocks) == set(tail):
+                    # cycle detected
+                    cycle = m.blocks
+            if cycle:
+                break
+
+            # load mdir
+            data = []
+            blocks = {}
+            for block in tail:
+                f.seek(block * args.block_size)
+                data.append(f.read(args.block_size)
+                    .ljust(args.block_size, b'\xff'))
+                blocks[id(data[-1])] = block
+
+            mdir = MetadataPair(data)
+            mdir.blocks = tuple(blocks[id(p.data)] for p in mdir.pair)
+
+            # fetch some key metadata as a we scan
+            try:
+                mdir.tail = mdir[Tag('tail', 0, 0)]
+                if mdir.tail.size != 8 or mdir.tail.data == 8*b'\xff':
+                    mdir.tail = None
+            except KeyError:
+                mdir.tail = None
+
+            # have superblock?
+            try:
+                nsuperblock = mdir[
+                    Tag(0x7ff, 0x3ff, 0), Tag('superblock', 0, 0)]
+                superblock = nsuperblock, mdir[Tag('inlinestruct', 0, 0)]
+            except KeyError:
+                pass
+
+            # have gstate?
+            try:
+                ngstate = mdir[Tag('movestate', 0, 0)]
+                gstate = bytes((a or 0) ^ (b or 0)
+                    for a,b in it.zip_longest(gstate, ngstate.data))
+            except KeyError:
+                pass
+
+            # corrupted?
+            if not mdir:
+                corrupted.append(mdir)
+
+            # add to directories
+            mdirs.append(mdir)
+            if mdir.tail is None or not mdir.tail.is_('hardtail'):
+                dirs.append(mdirs)
+                mdirs = []
+
+            if mdir.tail is None:
+                break
+
+            tail = struct.unpack('<II', mdir.tail.data)
+            hard = mdir.tail.is_('hardtail')
+
+    # find paths
+    dirtable = {}
+    for dir in dirs:
+        dirtable[frozenset(dir[0].blocks)] = dir
+
+    pending = [("/", dirs[0])]
+    while pending:
+        path, dir = pending.pop(0)
+        for mdir in dir:
+            for tag in mdir.tags:
+                if tag.is_('dir'):
+                    try:
+                        npath = tag.data.decode('utf8')
+                        dirstruct = mdir[Tag('dirstruct', tag.id, 0)]
+                        nblocks = struct.unpack('<II', dirstruct.data)
+                        nmdir = dirtable[frozenset(nblocks)]
+                        pending.append(((path + '/' + npath), nmdir))
+                    except KeyError:
+                        pass
+
+        dir[0].path = path.replace('//', '/')
+
+    # print littlefs + version info
+    version = ('?', '?')
+    if superblock:
+        version = tuple(reversed(
+            struct.unpack('<HH', superblock[1].data[0:4].ljust(4, b'\xff'))))
+    print("%-47s%s" % ("littlefs v%s.%s" % version,
+        "data (truncated, if it fits)"
+        if not any([args.no_truncate, args.log, args.all]) else ""))
+
+    # print gstate
+    print("gstate 0x%s" % ''.join('%02x' % c for c in gstate))
+    tag = Tag(struct.unpack('<I', gstate[0:4].ljust(4, b'\xff'))[0])
+    blocks = struct.unpack('<II', gstate[4:4+8].ljust(8, b'\xff'))
+    if tag.size or not tag.isvalid:
+        print("  orphans >=%d" % max(tag.size, 1))
+    if tag.type:
+        print("  move dir {%#x, %#x} id %d" % (
+            blocks[0], blocks[1], tag.id))
+
+    # print mdir info
+    for i, dir in enumerate(dirs):
+        print("dir %s" % (json.dumps(dir[0].path)
+            if hasattr(dir[0], 'path') else '(orphan)'))
+
+        for j, mdir in enumerate(dir):
+            print("mdir {%#x, %#x} rev %d (was %d)%s%s" % (
+                mdir.blocks[0], mdir.blocks[1], mdir.rev, mdir.pair[1].rev,
+                ' (corrupted!)' if not mdir else '',
+                ' -> {%#x, %#x}' % struct.unpack('<II', mdir.tail.data)
+                if mdir.tail else ''))
+
+            f = io.StringIO()
+            if args.log:
+                mdir.dump_log(f, truncate=not args.no_truncate)
+            elif args.all:
+                mdir.dump_all(f, truncate=not args.no_truncate)
+            else:
+                mdir.dump_tags(f, truncate=not args.no_truncate)
+
+            lines = list(filter(None, f.getvalue().split('\n')))
+            for k, line in enumerate(lines):
+                print("%s %s" % (
+                    ' ' if j == len(dir)-1 else
+                    'v' if k == len(lines)-1 else
+                    '|',
+                    line))
+
+    errcode = 0
+    for mdir in corrupted:
+        errcode = errcode or 1
+        print("*** corrupted mdir {%#x, %#x}! ***" % (
+            mdir.blocks[0], mdir.blocks[1]))
+
+    if cycle:
+        errcode = errcode or 2
+        print("*** cycle detected {%#x, %#x}! ***" % (
+            cycle[0], cycle[1]))
+
+    return errcode
+
+if __name__ == "__main__":
+    import argparse
+    import sys
+    parser = argparse.ArgumentParser(
+        description="Dump semantic info about the metadata tree in littlefs")
+    parser.add_argument('disk',
+        help="File representing the block device.")
+    parser.add_argument('block_size', type=lambda x: int(x, 0),
+        help="Size of a block in bytes.")
+    parser.add_argument('block1', nargs='?', default=0,
+        type=lambda x: int(x, 0),
+        help="Optional first block address for finding the superblock.")
+    parser.add_argument('block2', nargs='?', default=1,
+        type=lambda x: int(x, 0),
+        help="Optional second block address for finding the superblock.")
+    parser.add_argument('-l', '--log', action='store_true',
+        help="Show tags in log.")
+    parser.add_argument('-a', '--all', action='store_true',
+        help="Show all tags in log, included tags in corrupted commits.")
+    parser.add_argument('-T', '--no-truncate', action='store_true',
+        help="Show the full contents of files/attrs/tags.")
+    sys.exit(main(parser.parse_args()))

scripts/test.py

@@ -0,0 +1,857 @@
+#!/usr/bin/env python3
+
+# This script manages littlefs tests, which are configured with
+# .toml files stored in the tests directory.
+#
+
+import toml
+import glob
+import re
+import os
+import io
+import itertools as it
+import collections.abc as abc
+import subprocess as sp
+import base64
+import sys
+import copy
+import shlex
+import pty
+import errno
+import signal
+
+TEST_PATHS = 'tests'
+RULES = """
+# add block devices to sources
+TESTSRC ?= $(SRC) $(wildcard bd/*.c)
+
+define FLATTEN
+%(path)s%%$(subst /,.,$(target)): $(target)
+    ./scripts/explode_asserts.py $$< -o $$@
+endef
+$(foreach target,$(TESTSRC),$(eval $(FLATTEN)))
+
+-include %(path)s*.d
+.SECONDARY:
+
+%(path)s.test: %(path)s.test.o \\
+        $(foreach t,$(subst /,.,$(TESTSRC:.c=.o)),%(path)s.$t)
+    $(CC) $(CFLAGS) $^ $(LFLAGS) -o $@
+
+# needed in case builddir is different
+%(path)s%%.o: %(path)s%%.c
+    $(CC) -c -MMD $(CFLAGS) $< -o $@
+"""
+COVERAGE_RULES = """
+%(path)s.test: override CFLAGS += -fprofile-arcs -ftest-coverage
+
+# delete lingering coverage
+%(path)s.test: | %(path)s.info.clean
+.PHONY: %(path)s.info.clean
+%(path)s.info.clean:
+    rm -f %(path)s*.gcda
+
+# accumulate coverage info
+.PHONY: %(path)s.info
+%(path)s.info:
+    $(strip $(LCOV) -c \\
+        $(addprefix -d ,$(wildcard %(path)s*.gcda)) \\
+        --rc 'geninfo_adjust_src_path=$(shell pwd)' \\
+        -o $@)
+    $(LCOV) -e $@ $(addprefix /,$(SRC)) -o $@
+ifdef COVERAGETARGET
+    $(strip $(LCOV) -a $@ \\
+        $(addprefix -a ,$(wildcard $(COVERAGETARGET))) \\
+        -o $(COVERAGETARGET))
+endif
+"""
+GLOBALS = """
+//////////////// AUTOGENERATED TEST ////////////////
+#include "lfs2.h"
+#include "bd/lfs2_testbd.h"
+#include <stdio.h>
+extern const char *lfs2_testbd_path;
+extern uint32_t lfs2_testbd_cycles;
+"""
+DEFINES = {
+    'LFS2_READ_SIZE': 16,
+    'LFS2_PROG_SIZE': 'LFS2_READ_SIZE',
+    'LFS2_BLOCK_SIZE': 512,
+    'LFS2_BLOCK_COUNT': 1024,
+    'LFS2_BLOCK_CYCLES': -1,
+    'LFS2_CACHE_SIZE': '(64 % LFS2_PROG_SIZE == 0 ? 64 : LFS2_PROG_SIZE)',
+    'LFS2_LOOKAHEAD_SIZE': 16,
+    'LFS2_ERASE_VALUE': 0xff,
+    'LFS2_ERASE_CYCLES': 0,
+    'LFS2_BADBLOCK_BEHAVIOR': 'LFS2_TESTBD_BADBLOCK_PROGERROR',
+}
+PROLOGUE = """
+    // prologue
+    __attribute__((unused)) lfs2_t lfs2;
+    __attribute__((unused)) lfs2_testbd_t bd;
+    __attribute__((unused)) lfs2_file_t file;
+    __attribute__((unused)) lfs2_dir_t dir;
+    __attribute__((unused)) struct lfs2_info info;
+    __attribute__((unused)) char path[1024];
+    __attribute__((unused)) uint8_t buffer[1024];
+    __attribute__((unused)) lfs2_size_t size;
+    __attribute__((unused)) int err;
+    
+    __attribute__((unused)) const struct lfs2_config cfg = {
+        .context        = &bd,
+        .read           = lfs2_testbd_read,
+        .prog           = lfs2_testbd_prog,
+        .erase          = lfs2_testbd_erase,
+        .sync           = lfs2_testbd_sync,
+        .read_size      = LFS2_READ_SIZE,
+        .prog_size      = LFS2_PROG_SIZE,
+        .block_size     = LFS2_BLOCK_SIZE,
+        .block_count    = LFS2_BLOCK_COUNT,
+        .block_cycles   = LFS2_BLOCK_CYCLES,
+        .cache_size     = LFS2_CACHE_SIZE,
+        .lookahead_size = LFS2_LOOKAHEAD_SIZE,
+    };
+
+    __attribute__((unused)) const struct lfs2_testbd_config bdcfg = {
+        .erase_value        = LFS2_ERASE_VALUE,
+        .erase_cycles       = LFS2_ERASE_CYCLES,
+        .badblock_behavior  = LFS2_BADBLOCK_BEHAVIOR,
+        .power_cycles       = lfs2_testbd_cycles,
+    };
+
+    lfs2_testbd_createcfg(&cfg, lfs2_testbd_path, &bdcfg) => 0;
+"""
+EPILOGUE = """
+    // epilogue
+    lfs2_testbd_destroy(&cfg) => 0;
+"""
+PASS = '\033[32m✓\033[0m'
+FAIL = '\033[31m✗\033[0m'
+
+class TestFailure(Exception):
+    def __init__(self, case, returncode=None, stdout=None, assert_=None):
+        self.case = case
+        self.returncode = returncode
+        self.stdout = stdout
+        self.assert_ = assert_
+
+class TestCase:
+    def __init__(self, config, filter=filter,
+            suite=None, caseno=None, lineno=None, **_):
+        self.config = config
+        self.filter = filter
+        self.suite = suite
+        self.caseno = caseno
+        self.lineno = lineno
+
+        self.code = config['code']
+        self.code_lineno = config['code_lineno']
+        self.defines = config.get('define', {})
+        self.if_ = config.get('if', None)
+        self.in_ = config.get('in', None)
+
+        self.result = None
+
+    def __str__(self):
+        if hasattr(self, 'permno'):
+            if any(k not in self.case.defines for k in self.defines):
+                return '%s#%d#%d (%s)' % (
+                    self.suite.name, self.caseno, self.permno, ', '.join(
+                        '%s=%s' % (k, v) for k, v in self.defines.items()
+                        if k not in self.case.defines))
+            else:
+                return '%s#%d#%d' % (
+                    self.suite.name, self.caseno, self.permno)
+        else:
+            return '%s#%d' % (
+                self.suite.name, self.caseno)
+
+    def permute(self, class_=None, defines={}, permno=None, **_):
+        ncase = (class_ or type(self))(self.config)
+        for k, v in self.__dict__.items():
+            setattr(ncase, k, v)
+        ncase.case = self
+        ncase.perms = [ncase]
+        ncase.permno = permno
+        ncase.defines = defines
+        return ncase
+
+    def build(self, f, **_):
+        # prologue
+        for k, v in sorted(self.defines.items()):
+            if k not in self.suite.defines:
+                f.write('#define %s %s\n' % (k, v))
+
+        f.write('void test_case%d(%s) {' % (self.caseno, ','.join(
+            '\n'+8*' '+'__attribute__((unused)) intmax_t %s' % k
+            for k in sorted(self.perms[0].defines)
+            if k not in self.defines)))
+
+        f.write(PROLOGUE)
+        f.write('\n')
+        f.write(4*' '+'// test case %d\n' % self.caseno)
+        f.write(4*' '+'#line %d "%s"\n' % (self.code_lineno, self.suite.path))
+
+        # test case goes here
+        f.write(self.code)
+
+        # epilogue
+        f.write(EPILOGUE)
+        f.write('}\n')
+
+        for k, v in sorted(self.defines.items()):
+            if k not in self.suite.defines:
+                f.write('#undef %s\n' % k)
+
+    def shouldtest(self, **args):
+        if (self.filter is not None and
+                len(self.filter) >= 1 and
+                self.filter[0] != self.caseno):
+            return False
+        elif (self.filter is not None and
+                len(self.filter) >= 2 and
+                self.filter[1] != self.permno):
+            return False
+        elif args.get('no_internal') and self.in_ is not None:
+            return False
+        elif self.if_ is not None:
+            if_ = self.if_
+            while True:
+                for k, v in sorted(self.defines.items(),
+                        key=lambda x: len(x[0]), reverse=True):
+                    if k in if_:
+                        if_ = if_.replace(k, '(%s)' % v)
+                        break
+                else:
+                    break
+            if_ = (
+                re.sub('(\&\&|\?)', ' and ',
+                re.sub('(\|\||:)', ' or ',
+                re.sub('!(?!=)', ' not ', if_))))
+            return eval(if_)
+        else:
+            return True
+
+    def test(self, exec=[], persist=False, cycles=None,
+            gdb=False, failure=None, disk=None, **args):
+        # build command
+        cmd = exec + ['./%s.test' % self.suite.path,
+            repr(self.caseno), repr(self.permno)]
+
+        # persist disk or keep in RAM for speed?
+        if persist:
+            if not disk:
+                disk = self.suite.path + '.disk'
+            if persist != 'noerase':
+                try:
+                    with open(disk, 'w') as f:
+                        f.truncate(0)
+                    if args.get('verbose'):
+                        print('truncate --size=0', disk)
+                except FileNotFoundError:
+                    pass
+
+            cmd.append(disk)
+
+        # simulate power-loss after n cycles?
+        if cycles:
+            cmd.append(str(cycles))
+
+        # failed? drop into debugger?
+        if gdb and failure:
+            ncmd = ['gdb']
+            if gdb == 'assert':
+                ncmd.extend(['-ex', 'r'])
+                if failure.assert_:
+                    ncmd.extend(['-ex', 'up 2'])
+            elif gdb == 'main':
+                ncmd.extend([
+                    '-ex', 'b %s:%d' % (self.suite.path, self.code_lineno),
+                    '-ex', 'r'])
+            ncmd.extend(['--args'] + cmd)
+
+            if args.get('verbose'):
+                print(' '.join(shlex.quote(c) for c in ncmd))
+            signal.signal(signal.SIGINT, signal.SIG_IGN)
+            sys.exit(sp.call(ncmd))
+
+        # run test case!
+        mpty, spty = pty.openpty()
+        if args.get('verbose'):
+            print(' '.join(shlex.quote(c) for c in cmd))
+        proc = sp.Popen(cmd, stdout=spty, stderr=spty)
+        os.close(spty)
+        mpty = os.fdopen(mpty, 'r', 1)
+        stdout = []
+        assert_ = None
+        try:
+            while True:
+                try:
+                    line = mpty.readline()
+                except OSError as e:
+                    if e.errno == errno.EIO:
+                        break
+                    raise
+                if not line:
+                    break;
+                stdout.append(line)
+                if args.get('verbose'):
+                    sys.stdout.write(line)
+                # intercept asserts
+                m = re.match(
+                    '^{0}([^:]+):(\d+):(?:\d+:)?{0}{1}:{0}(.*)$'
+                    .format('(?:\033\[[\d;]*.| )*', 'assert'),
+                    line)
+                if m and assert_ is None:
+                    try:
+                        with open(m.group(1)) as f:
+                            lineno = int(m.group(2))
+                            line = (next(it.islice(f, lineno-1, None))
+                                .strip('\n'))
+                        assert_ = {
+                            'path': m.group(1),
+                            'line': line,
+                            'lineno': lineno,
+                            'message': m.group(3)}
+                    except:
+                        pass
+        except KeyboardInterrupt:
+            raise TestFailure(self, 1, stdout, None)
+        proc.wait()
+
+        # did we pass?
+        if proc.returncode != 0:
+            raise TestFailure(self, proc.returncode, stdout, assert_)
+        else:
+            return PASS
+
+class ValgrindTestCase(TestCase):
+    def __init__(self, config, **args):
+        self.leaky = config.get('leaky', False)
+        super().__init__(config, **args)
+
+    def shouldtest(self, **args):
+        return not self.leaky and super().shouldtest(**args)
+
+    def test(self, exec=[], **args):
+        verbose = args.get('verbose')
+        uninit = (self.defines.get('LFS2_ERASE_VALUE', None) == -1)
+        exec = [
+            'valgrind',
+            '--leak-check=full',
+            ] + (['--undef-value-errors=no'] if uninit else []) + [
+            ] + (['--track-origins=yes'] if not uninit else []) + [
+            '--error-exitcode=4',
+            '--error-limit=no',
+            ] + (['--num-callers=1'] if not verbose else []) + [
+            '-q'] + exec
+        return super().test(exec=exec, **args)
+
+class ReentrantTestCase(TestCase):
+    def __init__(self, config, **args):
+        self.reentrant = config.get('reentrant', False)
+        super().__init__(config, **args)
+
+    def shouldtest(self, **args):
+        return self.reentrant and super().shouldtest(**args)
+
+    def test(self, persist=False, gdb=False, failure=None, **args):
+        for cycles in it.count(1):
+            # clear disk first?
+            if cycles == 1 and persist != 'noerase':
+                persist = 'erase'
+            else:
+                persist = 'noerase'
+
+            # exact cycle we should drop into debugger?
+            if gdb and failure and failure.cycleno == cycles:
+                return super().test(gdb=gdb, persist=persist, cycles=cycles,
+                    failure=failure, **args)
+
+            # run tests, but kill the program after prog/erase has
+            # been hit n cycles. We exit with a special return code if the
+            # program has not finished, since this isn't a test failure.
+            try:
+                return super().test(persist=persist, cycles=cycles, **args)
+            except TestFailure as nfailure:
+                if nfailure.returncode == 33:
+                    continue
+                else:
+                    nfailure.cycleno = cycles
+                    raise
+
+class TestSuite:
+    def __init__(self, path, classes=[TestCase], defines={},
+            filter=None, **args):
+        self.name = os.path.basename(path)
+        if self.name.endswith('.toml'):
+            self.name = self.name[:-len('.toml')]
+        if args.get('build_dir'):
+            self.toml = path
+            self.path = args['build_dir'] + '/' + path
+        else:
+            self.toml = path
+            self.path = path
+        self.classes = classes
+        self.defines = defines.copy()
+        self.filter = filter
+
+        with open(self.toml) as f:
+            # load tests
+            config = toml.load(f)
+
+            # find line numbers
+            f.seek(0)
+            linenos = []
+            code_linenos = []
+            for i, line in enumerate(f):
+                if re.match(r'\[\[\s*case\s*\]\]', line):
+                    linenos.append(i+1)
+                if re.match(r'code\s*=\s*(\'\'\'|""")', line):
+                    code_linenos.append(i+2)
+
+            code_linenos.reverse()
+
+        # grab global config
+        for k, v in config.get('define', {}).items():
+            if k not in self.defines:
+                self.defines[k] = v
+        self.code = config.get('code', None)
+        if self.code is not None:
+            self.code_lineno = code_linenos.pop()
+
+        # create initial test cases
+        self.cases = []
+        for i, (case, lineno) in enumerate(zip(config['case'], linenos)):
+            # code lineno?
+            if 'code' in case:
+                case['code_lineno'] = code_linenos.pop()
+            # merge conditions if necessary
+            if 'if' in config and 'if' in case:
+                case['if'] = '(%s) && (%s)' % (config['if'], case['if'])
+            elif 'if' in config:
+                case['if'] = config['if']
+            # initialize test case
+            self.cases.append(TestCase(case, filter=filter,
+                suite=self, caseno=i+1, lineno=lineno, **args))
+
+    def __str__(self):
+        return self.name
+
+    def __lt__(self, other):
+        return self.name < other.name
+
+    def permute(self, **args):
+        for case in self.cases:
+            # lets find all parameterized definitions, in one of [args.D,
+            # suite.defines, case.defines, DEFINES]. Note that each of these
+            # can be either a dict of defines, or a list of dicts, expressing
+            # an initial set of permutations.
+            pending = [{}]
+            for inits in [self.defines, case.defines, DEFINES]:
+                if not isinstance(inits, list):
+                    inits = [inits]
+
+                npending = []
+                for init, pinit in it.product(inits, pending):
+                    ninit = pinit.copy()
+                    for k, v in init.items():
+                        if k not in ninit:
+                            try:
+                                ninit[k] = eval(v)
+                            except:
+                                ninit[k] = v
+                    npending.append(ninit)
+
+                pending = npending
+
+            # expand permutations
+            pending = list(reversed(pending))
+            expanded = []
+            while pending:
+                perm = pending.pop()
+                for k, v in sorted(perm.items()):
+                    if not isinstance(v, str) and isinstance(v, abc.Iterable):
+                        for nv in reversed(v):
+                            nperm = perm.copy()
+                            nperm[k] = nv
+                            pending.append(nperm)
+                        break
+                else:
+                    expanded.append(perm)
+
+            # generate permutations
+            case.perms = []
+            for i, (class_, defines) in enumerate(
+                    it.product(self.classes, expanded)):
+                case.perms.append(case.permute(
+                    class_, defines, permno=i+1, **args))
+
+            # also track non-unique defines
+            case.defines = {}
+            for k, v in case.perms[0].defines.items():
+                if all(perm.defines[k] == v for perm in case.perms):
+                    case.defines[k] = v
+
+        # track all perms and non-unique defines
+        self.perms = []
+        for case in self.cases:
+            self.perms.extend(case.perms)
+
+        self.defines = {}
+        for k, v in self.perms[0].defines.items():
+            if all(perm.defines.get(k, None) == v for perm in self.perms):
+                self.defines[k] = v
+
+        return self.perms
+
+    def build(self, **args):
+        # build test files
+        tf = open(self.path + '.test.tc', 'w')
+        tf.write(GLOBALS)
+        if self.code is not None:
+            tf.write('#line %d "%s"\n' % (self.code_lineno, self.path))
+            tf.write(self.code)
+
+        tfs = {None: tf}
+        for case in self.cases:
+            if case.in_ not in tfs:
+                tfs[case.in_] = open(self.path+'.'+
+                    re.sub('(\.c)?$', '.tc', case.in_.replace('/', '.')), 'w')
+                tfs[case.in_].write('#line 1 "%s"\n' % case.in_)
+                with open(case.in_) as f:
+                    for line in f:
+                        tfs[case.in_].write(line)
+                tfs[case.in_].write('\n')
+                tfs[case.in_].write(GLOBALS)
+
+            tfs[case.in_].write('\n')
+            case.build(tfs[case.in_], **args)
+
+        tf.write('\n')
+        tf.write('const char *lfs2_testbd_path;\n')
+        tf.write('uint32_t lfs2_testbd_cycles;\n')
+        tf.write('int main(int argc, char **argv) {\n')
+        tf.write(4*' '+'int case_         = (argc > 1) ? atoi(argv[1]) : 0;\n')
+        tf.write(4*' '+'int perm          = (argc > 2) ? atoi(argv[2]) : 0;\n')
+        tf.write(4*' '+'lfs2_testbd_path   = (argc > 3) ? argv[3] : NULL;\n')
+        tf.write(4*' '+'lfs2_testbd_cycles = (argc > 4) ? atoi(argv[4]) : 0;\n')
+        for perm in self.perms:
+            # test declaration
+            tf.write(4*' '+'extern void test_case%d(%s);\n' % (
+                perm.caseno, ', '.join(
+                    'intmax_t %s' % k for k in sorted(perm.defines)
+                    if k not in perm.case.defines)))
+            # test call
+            tf.write(4*' '+
+                'if (argc < 3 || (case_ == %d && perm == %d)) {'
+                ' test_case%d(%s); '
+                '}\n' % (perm.caseno, perm.permno, perm.caseno, ', '.join(
+                    str(v) for k, v in sorted(perm.defines.items())
+                    if k not in perm.case.defines)))
+        tf.write('}\n')
+
+        for tf in tfs.values():
+            tf.close()
+
+        # write makefiles
+        with open(self.path + '.mk', 'w') as mk:
+            mk.write(RULES.replace(4*' ', '\t') % dict(path=self.path))
+            mk.write('\n')
+
+            # add coverage hooks?
+            if args.get('coverage'):
+                mk.write(COVERAGE_RULES.replace(4*' ', '\t') % dict(
+                    path=self.path))
+                mk.write('\n')
+
+            # add truly global defines globally
+            for k, v in sorted(self.defines.items()):
+                mk.write('%s.test: override CFLAGS += -D%s=%r\n'
+                    % (self.path, k, v))
+
+            for path in tfs:
+                if path is None:
+                    mk.write('%s: %s | %s\n' % (
+                        self.path+'.test.c',
+                        self.toml,
+                        self.path+'.test.tc'))
+                else:
+                    mk.write('%s: %s %s | %s\n' % (
+                        self.path+'.'+path.replace('/', '.'),
+                        self.toml,
+                        path,
+                        self.path+'.'+re.sub('(\.c)?$', '.tc',
+                            path.replace('/', '.'))))
+                mk.write('\t./scripts/explode_asserts.py $| -o $@\n')
+
+        self.makefile = self.path + '.mk'
+        self.target = self.path + '.test'
+        return self.makefile, self.target
+
+    def test(self, **args):
+        # run test suite!
+        if not args.get('verbose', True):
+            sys.stdout.write(self.name + ' ')
+            sys.stdout.flush()
+        for perm in self.perms:
+            if not perm.shouldtest(**args):
+                continue
+
+            try:
+                result = perm.test(**args)
+            except TestFailure as failure:
+                perm.result = failure
+                if not args.get('verbose', True):
+                    sys.stdout.write(FAIL)
+                    sys.stdout.flush()
+                if not args.get('keep_going'):
+                    if not args.get('verbose', True):
+                        sys.stdout.write('\n')
+                    raise
+            else:
+                perm.result = PASS
+                if not args.get('verbose', True):
+                    sys.stdout.write(PASS)
+                    sys.stdout.flush()
+
+        if not args.get('verbose', True):
+            sys.stdout.write('\n')
+
+def main(**args):
+    # figure out explicit defines
+    defines = {}
+    for define in args['D']:
+        k, v, *_ = define.split('=', 2) + ['']
+        defines[k] = v
+
+    # and what class of TestCase to run
+    classes = []
+    if args.get('normal'):
+        classes.append(TestCase)
+    if args.get('reentrant'):
+        classes.append(ReentrantTestCase)
+    if args.get('valgrind'):
+        classes.append(ValgrindTestCase)
+    if not classes:
+        classes = [TestCase]
+
+    suites = []
+    for testpath in args['test_paths']:
+        # optionally specified test case/perm
+        testpath, *filter = testpath.split('#')
+        filter = [int(f) for f in filter]
+
+        # figure out the suite's toml file
+        if os.path.isdir(testpath):
+            testpath = testpath + '/*.toml'
+        elif os.path.isfile(testpath):
+            testpath = testpath
+        elif testpath.endswith('.toml'):
+            testpath = TEST_PATHS + '/' + testpath
+        else:
+            testpath = TEST_PATHS + '/' + testpath + '.toml'
+
+        # find tests
+        for path in glob.glob(testpath):
+            suites.append(TestSuite(path, classes, defines, filter, **args))
+
+    # sort for reproducibility
+    suites = sorted(suites)
+
+    # generate permutations
+    for suite in suites:
+        suite.permute(**args)
+
+    # build tests in parallel
+    print('====== building ======')
+    makefiles = []
+    targets = []
+    for suite in suites:
+        makefile, target = suite.build(**args)
+        makefiles.append(makefile)
+        targets.append(target)
+
+    cmd = (['make', '-f', 'Makefile'] +
+        list(it.chain.from_iterable(['-f', m] for m in makefiles)) +
+        [target for target in targets])
+    mpty, spty = pty.openpty()
+    if args.get('verbose'):
+        print(' '.join(shlex.quote(c) for c in cmd))
+    proc = sp.Popen(cmd, stdout=spty, stderr=spty)
+    os.close(spty)
+    mpty = os.fdopen(mpty, 'r', 1)
+    stdout = []
+    while True:
+        try:
+            line = mpty.readline()
+        except OSError as e:
+            if e.errno == errno.EIO:
+                break
+            raise
+        if not line:
+            break;
+        stdout.append(line)
+        if args.get('verbose'):
+            sys.stdout.write(line)
+        # intercept warnings
+        m = re.match(
+            '^{0}([^:]+):(\d+):(?:\d+:)?{0}{1}:{0}(.*)$'
+            .format('(?:\033\[[\d;]*.| )*', 'warning'),
+            line)
+        if m and not args.get('verbose'):
+            try:
+                with open(m.group(1)) as f:
+                    lineno = int(m.group(2))
+                    line = next(it.islice(f, lineno-1, None)).strip('\n')
+                sys.stdout.write(
+                    "\033[01m{path}:{lineno}:\033[01;35mwarning:\033[m "
+                    "{message}\n{line}\n\n".format(
+                        path=m.group(1), line=line, lineno=lineno,
+                        message=m.group(3)))
+            except:
+                pass
+    proc.wait()
+    if proc.returncode != 0:
+        if not args.get('verbose'):
+            for line in stdout:
+                sys.stdout.write(line)
+        sys.exit(-1)
+
+    print('built %d test suites, %d test cases, %d permutations' % (
+        len(suites),
+        sum(len(suite.cases) for suite in suites),
+        sum(len(suite.perms) for suite in suites)))
+
+    total = 0
+    for suite in suites:
+        for perm in suite.perms:
+            total += perm.shouldtest(**args)
+    if total != sum(len(suite.perms) for suite in suites):
+        print('filtered down to %d permutations' % total)
+
+    # only requested to build?
+    if args.get('build'):
+        return 0
+
+    print('====== testing ======')
+    try:
+        for suite in suites:
+            suite.test(**args)
+    except TestFailure:
+        pass
+
+    print('====== results ======')
+    passed = 0
+    failed = 0
+    for suite in suites:
+        for perm in suite.perms:
+            if perm.result == PASS:
+                passed += 1
+            elif isinstance(perm.result, TestFailure):
+                sys.stdout.write(
+                    "\033[01m{path}:{lineno}:\033[01;31mfailure:\033[m "
+                    "{perm} failed\n".format(
+                        perm=perm, path=perm.suite.path, lineno=perm.lineno,
+                        returncode=perm.result.returncode or 0))
+                if perm.result.stdout:
+                    if perm.result.assert_:
+                        stdout = perm.result.stdout[:-1]
+                    else:
+                        stdout = perm.result.stdout
+                    for line in stdout[-5:]:
+                        sys.stdout.write(line)
+                if perm.result.assert_:
+                    sys.stdout.write(
+                        "\033[01m{path}:{lineno}:\033[01;31massert:\033[m "
+                        "{message}\n{line}\n".format(
+                            **perm.result.assert_))
+                sys.stdout.write('\n')
+                failed += 1
+
+    if args.get('coverage'):
+        # collect coverage info
+        # why -j1? lcov doesn't work in parallel because of gcov limitations
+        cmd = (['make', '-j1', '-f', 'Makefile'] +
+            list(it.chain.from_iterable(['-f', m] for m in makefiles)) +
+            (['COVERAGETARGET=%s' % args['coverage']]
+                if isinstance(args['coverage'], str) else []) +
+            [suite.path + '.info' for suite in suites
+                if any(perm.result == PASS for perm in suite.perms)])
+        if args.get('verbose'):
+            print(' '.join(shlex.quote(c) for c in cmd))
+        proc = sp.Popen(cmd,
+            stdout=sp.PIPE if not args.get('verbose') else None,
+            stderr=sp.STDOUT if not args.get('verbose') else None,
+            universal_newlines=True)
+        proc.wait()
+        if proc.returncode != 0:
+            if not args.get('verbose'):
+                for line in proc.stdout:
+                    sys.stdout.write(line)
+            sys.exit(-1)
+
+    if args.get('gdb'):
+        failure = None
+        for suite in suites:
+            for perm in suite.perms:
+                if isinstance(perm.result, TestFailure):
+                    failure = perm.result
+        if failure is not None:
+            print('======= gdb ======')
+            # drop into gdb
+            failure.case.test(failure=failure, **args)
+            sys.exit(0)
+
+    print('tests passed %d/%d (%.2f%%)' % (passed, total,
+        100*(passed/total if total else 1.0)))
+    print('tests failed %d/%d (%.2f%%)' % (failed, total,
+        100*(failed/total if total else 1.0)))
+    return 1 if failed > 0 else 0
+
+if __name__ == "__main__":
+    import argparse
+    parser = argparse.ArgumentParser(
+        description="Run parameterized tests in various configurations.")
+    parser.add_argument('test_paths', nargs='*', default=[TEST_PATHS],
+        help="Description of test(s) to run. By default, this is all tests \
+            found in the \"{0}\" directory. Here, you can specify a different \
+            directory of tests, a specific file, a suite by name, and even \
+            specific test cases and permutations. For example \
+            \"test_dirs#1\" or \"{0}/test_dirs.toml#1#1\".".format(TEST_PATHS))
+    parser.add_argument('-D', action='append', default=[],
+        help="Overriding parameter definitions.")
+    parser.add_argument('-v', '--verbose', action='store_true',
+        help="Output everything that is happening.")
+    parser.add_argument('-k', '--keep-going', action='store_true',
+        help="Run all tests instead of stopping on first error. Useful for CI.")
+    parser.add_argument('-p', '--persist', choices=['erase', 'noerase'],
+        nargs='?', const='erase',
+        help="Store disk image in a file.")
+    parser.add_argument('-b', '--build', action='store_true',
+        help="Only build the tests, do not execute.")
+    parser.add_argument('-g', '--gdb', choices=['init', 'main', 'assert'],
+        nargs='?', const='assert',
+        help="Drop into gdb on test failure.")
+    parser.add_argument('--no-internal', action='store_true',
+        help="Don't run tests that require internal knowledge.")
+    parser.add_argument('-n', '--normal', action='store_true',
+        help="Run tests normally.")
+    parser.add_argument('-r', '--reentrant', action='store_true',
+        help="Run reentrant tests with simulated power-loss.")
+    parser.add_argument('--valgrind', action='store_true',
+        help="Run non-leaky tests under valgrind to check for memory leaks.")
+    parser.add_argument('--exec', default=[], type=lambda e: e.split(),
+        help="Run tests with another executable prefixed on the command line.")
+    parser.add_argument('--disk',
+        help="Specify a file to use for persistent/reentrant tests.")
+    parser.add_argument('--coverage', type=lambda x: x if x else True,
+        nargs='?', const='',
+        help="Collect coverage information during testing. This uses lcov/gcov \
+            to accumulate coverage information into *.info files. May also \
+            a path to a *.info file to accumulate coverage info into.")
+    parser.add_argument('--build-dir',
+        help="Build relative to the specified directory instead of the \
+            current directory.")
+
+    sys.exit(main(**vars(parser.parse_args())))

tests/stats.py

@@ -1,30 +0,0 @@
-#!/usr/bin/env python
-
-import struct
-import sys
-import time
-import os
-import re
-
-def main():
-    with open('blocks/config') as file:
-        s = struct.unpack('<LLLL', file.read())
-        print 'read_size: %d' % s[0]
-        print 'prog_size: %d' % s[1]
-        print 'block_size: %d' % s[2]
-        print 'block_size: %d' % s[3]
-
-    print 'real_size: %d' % sum(
-        os.path.getsize(os.path.join('blocks', f))
-        for f in os.listdir('blocks') if re.match('\d+', f))
-
-    with open('blocks/stats') as file:
-        s = struct.unpack('<QQQ', file.read())
-        print 'read_count: %d' % s[0]
-        print 'prog_count: %d' % s[1]
-        print 'erase_count: %d' % s[2]
-
-    print 'runtime: %.3f' % (time.time() - os.stat('blocks').st_ctime)
-
-if __name__ == "__main__":
-    main(*sys.argv[1:])

tests/template.fmt

@@ -1,106 +0,0 @@
-/// AUTOGENERATED TEST ///
-#include "lfs.h"
-#include "emubd/lfs_emubd.h"
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-
-// test stuff
-static void test_log(const char *s, uintmax_t v) {{
-    printf("%s: %jd\n", s, v);
-}}
-
-static void test_assert(const char *file, unsigned line,
-        const char *s, uintmax_t v, uintmax_t e) {{
-    static const char *last[6] = {{0, 0}};
-    if (v != e || !(last[0] == s || last[1] == s ||
-            last[2] == s || last[3] == s ||
-            last[4] == s || last[5] == s)) {{
-        test_log(s, v);
-        last[0] = last[1];
-        last[1] = last[2];
-        last[2] = last[3];
-        last[3] = last[4];
-        last[4] = last[5];
-        last[5] = s;
-    }}
-
-    if (v != e) {{
-        fprintf(stderr, "\033[31m%s:%u: assert %s failed with %jd, "
-                "expected %jd\033[0m\n", file, line, s, v, e);
-        exit(-2);
-    }}
-}}
-
-#define test_assert(s, v, e) test_assert(__FILE__, __LINE__, s, v, e)
-
-
-// utility functions for traversals
-static int __attribute__((used)) test_count(void *p, lfs_block_t b) {{
-    (void)b;
-    unsigned *u = (unsigned*)p;
-    *u += 1;
-    return 0;
-}}
-
-
-// lfs declarations
-lfs_t lfs;
-lfs_emubd_t bd;
-lfs_file_t file[4];
-lfs_dir_t dir[4];
-struct lfs_info info;
-
-uint8_t buffer[1024];
-uint8_t wbuffer[1024];
-uint8_t rbuffer[1024];
-lfs_size_t size;
-lfs_size_t wsize;
-lfs_size_t rsize;
-
-uintmax_t test;
-
-#ifndef LFS_READ_SIZE
-#define LFS_READ_SIZE 16
-#endif
-
-#ifndef LFS_PROG_SIZE
-#define LFS_PROG_SIZE 16
-#endif
-
-#ifndef LFS_BLOCK_SIZE
-#define LFS_BLOCK_SIZE 512
-#endif
-
-#ifndef LFS_BLOCK_COUNT
-#define LFS_BLOCK_COUNT 1024
-#endif
-
-#ifndef LFS_LOOKAHEAD
-#define LFS_LOOKAHEAD 128
-#endif
-
-const struct lfs_config cfg = {{
-    .context = &bd,
-    .read  = &lfs_emubd_read,
-    .prog  = &lfs_emubd_prog,
-    .erase = &lfs_emubd_erase,
-    .sync  = &lfs_emubd_sync,
-
-    .read_size   = LFS_READ_SIZE,
-    .prog_size   = LFS_PROG_SIZE,
-    .block_size  = LFS_BLOCK_SIZE,
-    .block_count = LFS_BLOCK_COUNT,
-    .lookahead   = LFS_LOOKAHEAD,
-}};
-
-
-// Entry point
-int main(void) {{
-    lfs_emubd_create(&cfg, "blocks");
-
-{tests}
-
-    lfs_emubd_destroy(&cfg);
-}}

tests/test.py

@@ -1,61 +0,0 @@
-#!/usr/bin/env python
-
-import re
-import sys
-import subprocess
-import os
-
-def generate(test):
-    with open("tests/template.fmt") as file:
-        template = file.read()
-
-    lines = []
-    for line in re.split('(?<=[;{}])\n', test.read()):
-        match = re.match('(?: *\n)*( *)(.*)=>(.*);', line, re.DOTALL | re.MULTILINE)
-        if match:
-            tab, test, expect = match.groups()
-            lines.append(tab+'test = {test};'.format(test=test.strip()))
-            lines.append(tab+'test_assert("{name}", test, {expect});'.format(
-                    name = re.match('\w*', test.strip()).group(),
-                    expect = expect.strip()))
-        else:
-            lines.append(line)
-
-    # Create test file
-    with open('test.c', 'w') as file:
-        file.write(template.format(tests='\n'.join(lines)))
-
-    # Remove build artifacts to force rebuild
-    try:
-        os.remove('test.o')
-        os.remove('lfs')
-    except OSError:
-        pass
-
-def compile():
-    subprocess.check_call([
-            os.environ.get('MAKE', 'make'),
-            '--no-print-directory', '-s'])
-
-def execute():
-    if 'EXEC' in os.environ:
-        subprocess.check_call([os.environ['EXEC'], "./lfs"])
-    else:
-        subprocess.check_call(["./lfs"])
-
-def main(test=None):
-    if test and not test.startswith('-'):
-        with open(test) as file:
-            generate(file)
-    else:
-        generate(sys.stdin)
-
-    compile()
-
-    if test == '-s':
-        sys.exit(1)
-
-    execute()
-
-if __name__ == "__main__":
-    main(*sys.argv[1:])

tests/test_alloc.sh

@@ -1,428 +0,0 @@
-#!/bin/bash
-set -eu
-
-echo "=== Allocator tests ==="
-rm -rf blocks
-tests/test.py << TEST
-    lfs_format(&lfs, &cfg) => 0;
-TEST
-
-SIZE=15000
-
-lfs_mkdir() {
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_mkdir(&lfs, "$1") => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-}
-
-lfs_remove() {
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_remove(&lfs, "$1/eggs") => 0;
-    lfs_remove(&lfs, "$1/bacon") => 0;
-    lfs_remove(&lfs, "$1/pancakes") => 0;
-    lfs_remove(&lfs, "$1") => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-}
-
-lfs_alloc_singleproc() {
-tests/test.py << TEST
-    const char *names[] = {"bacon", "eggs", "pancakes"};
-    lfs_mount(&lfs, &cfg) => 0;
-    for (int n = 0; n < sizeof(names)/sizeof(names[0]); n++) {
-        sprintf((char*)buffer, "$1/%s", names[n]);
-        lfs_file_open(&lfs, &file[n], (char*)buffer,
-                LFS_O_WRONLY | LFS_O_CREAT | LFS_O_APPEND) => 0;
-    }
-    for (int n = 0; n < sizeof(names)/sizeof(names[0]); n++) {
-        size = strlen(names[n]);
-        for (int i = 0; i < $SIZE; i++) {
-            lfs_file_write(&lfs, &file[n], names[n], size) => size;
-        }
-    }
-    for (int n = 0; n < sizeof(names)/sizeof(names[0]); n++) {
-        lfs_file_close(&lfs, &file[n]) => 0;
-    }
-    lfs_unmount(&lfs) => 0;
-TEST
-}
-
-lfs_alloc_multiproc() {
-for name in bacon eggs pancakes
-do
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_file_open(&lfs, &file[0], "$1/$name",
-            LFS_O_WRONLY | LFS_O_CREAT | LFS_O_APPEND) => 0;
-    size = strlen("$name");
-    memcpy(buffer, "$name", size);
-    for (int i = 0; i < $SIZE; i++) {
-        lfs_file_write(&lfs, &file[0], buffer, size) => size;
-    }
-    lfs_file_close(&lfs, &file[0]) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-done
-}
-
-lfs_verify() {
-for name in bacon eggs pancakes
-do
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_file_open(&lfs, &file[0], "$1/$name", LFS_O_RDONLY) => 0;
-    size = strlen("$name");
-    for (int i = 0; i < $SIZE; i++) {
-        lfs_file_read(&lfs, &file[0], buffer, size) => size;
-        memcmp(buffer, "$name", size) => 0;
-    }
-    lfs_file_close(&lfs, &file[0]) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-done
-}
-
-echo "--- Single-process allocation test ---"
-lfs_mkdir singleproc
-lfs_alloc_singleproc singleproc
-lfs_verify singleproc
-
-echo "--- Multi-process allocation test ---"
-lfs_mkdir multiproc
-lfs_alloc_multiproc multiproc
-lfs_verify multiproc
-lfs_verify singleproc
-
-echo "--- Single-process reuse test ---"
-lfs_remove singleproc
-lfs_mkdir singleprocreuse
-lfs_alloc_singleproc singleprocreuse
-lfs_verify singleprocreuse
-lfs_verify multiproc
-
-echo "--- Multi-process reuse test ---"
-lfs_remove multiproc
-lfs_mkdir multiprocreuse
-lfs_alloc_singleproc multiprocreuse
-lfs_verify multiprocreuse
-lfs_verify singleprocreuse
-
-echo "--- Cleanup ---"
-lfs_remove multiprocreuse
-lfs_remove singleprocreuse
-
-echo "--- Exhaustion test ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_file_open(&lfs, &file[0], "exhaustion", LFS_O_WRONLY | LFS_O_CREAT);
-    size = strlen("exhaustion");
-    memcpy(buffer, "exhaustion", size);
-    lfs_file_write(&lfs, &file[0], buffer, size) => size;
-    lfs_file_sync(&lfs, &file[0]) => 0;
-
-    size = strlen("blahblahblahblah");
-    memcpy(buffer, "blahblahblahblah", size);
-    lfs_ssize_t res;
-    while (true) {
-        res = lfs_file_write(&lfs, &file[0], buffer, size);
-        if (res < 0) {
-            break;
-        }
-
-        res => size;
-    }
-    res => LFS_ERR_NOSPC;
-
-    lfs_file_close(&lfs, &file[0]) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_file_open(&lfs, &file[0], "exhaustion", LFS_O_RDONLY);
-    size = strlen("exhaustion");
-    lfs_file_size(&lfs, &file[0]) => size;
-    lfs_file_read(&lfs, &file[0], buffer, size) => size;
-    memcmp(buffer, "exhaustion", size) => 0;
-    lfs_file_close(&lfs, &file[0]) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Exhaustion wraparound test ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_remove(&lfs, "exhaustion") => 0;
-
-    lfs_file_open(&lfs, &file[0], "padding", LFS_O_WRONLY | LFS_O_CREAT);
-    size = strlen("buffering");
-    memcpy(buffer, "buffering", size);
-    for (int i = 0; i < $SIZE; i++) {
-        lfs_file_write(&lfs, &file[0], buffer, size) => size;
-    }
-    lfs_file_close(&lfs, &file[0]) => 0;
-    lfs_remove(&lfs, "padding") => 0;
-
-    lfs_file_open(&lfs, &file[0], "exhaustion", LFS_O_WRONLY | LFS_O_CREAT);
-    size = strlen("exhaustion");
-    memcpy(buffer, "exhaustion", size);
-    lfs_file_write(&lfs, &file[0], buffer, size) => size;
-    lfs_file_sync(&lfs, &file[0]) => 0;
-
-    size = strlen("blahblahblahblah");
-    memcpy(buffer, "blahblahblahblah", size);
-    lfs_ssize_t res;
-    while (true) {
-        res = lfs_file_write(&lfs, &file[0], buffer, size);
-        if (res < 0) {
-            break;
-        }
-
-        res => size;
-    }
-    res => LFS_ERR_NOSPC;
-
-    lfs_file_close(&lfs, &file[0]) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_file_open(&lfs, &file[0], "exhaustion", LFS_O_RDONLY);
-    size = strlen("exhaustion");
-    lfs_file_size(&lfs, &file[0]) => size;
-    lfs_file_read(&lfs, &file[0], buffer, size) => size;
-    memcmp(buffer, "exhaustion", size) => 0;
-    lfs_file_close(&lfs, &file[0]) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Dir exhaustion test ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_remove(&lfs, "exhaustion") => 0;
-
-    lfs_file_open(&lfs, &file[0], "exhaustion", LFS_O_WRONLY | LFS_O_CREAT);
-    size = strlen("blahblahblahblah");
-    memcpy(buffer, "blahblahblahblah", size);
-    for (lfs_size_t i = 0;
-            i < (cfg.block_count-6)*(cfg.block_size-8);
-            i += size) {
-        lfs_file_write(&lfs, &file[0], buffer, size) => size;
-    }
-    lfs_file_close(&lfs, &file[0]) => 0;
-
-    lfs_mkdir(&lfs, "exhaustiondir") => 0;
-    lfs_remove(&lfs, "exhaustiondir") => 0;
-
-    lfs_file_open(&lfs, &file[0], "exhaustion", LFS_O_WRONLY | LFS_O_APPEND);
-    size = strlen("blahblahblahblah");
-    memcpy(buffer, "blahblahblahblah", size);
-    for (lfs_size_t i = 0;
-            i < (cfg.block_size-8);
-            i += size) {
-        lfs_file_write(&lfs, &file[0], buffer, size) => size;
-    }
-    lfs_file_close(&lfs, &file[0]) => 0;
-
-    lfs_mkdir(&lfs, "exhaustiondir") => LFS_ERR_NOSPC;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Chained dir exhaustion test ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_remove(&lfs, "exhaustion") => 0;
-
-    lfs_file_open(&lfs, &file[0], "exhaustion", LFS_O_WRONLY | LFS_O_CREAT);
-    size = strlen("blahblahblahblah");
-    memcpy(buffer, "blahblahblahblah", size);
-    for (lfs_size_t i = 0;
-            i < (cfg.block_count-24)*(cfg.block_size-8);
-            i += size) {
-        lfs_file_write(&lfs, &file[0], buffer, size) => size;
-    }
-    lfs_file_close(&lfs, &file[0]) => 0;
-
-    for (int i = 0; i < 9; i++) {
-        sprintf((char*)buffer, "dirwithanexhaustivelylongnameforpadding%d", i);
-        lfs_mkdir(&lfs, (char*)buffer) => 0;
-    }
-
-    lfs_mkdir(&lfs, "exhaustiondir") => LFS_ERR_NOSPC;
-
-    lfs_remove(&lfs, "exhaustion") => 0;
-    lfs_file_open(&lfs, &file[0], "exhaustion", LFS_O_WRONLY | LFS_O_CREAT);
-    size = strlen("blahblahblahblah");
-    memcpy(buffer, "blahblahblahblah", size);
-    for (lfs_size_t i = 0;
-            i < (cfg.block_count-26)*(cfg.block_size-8);
-            i += size) {
-        lfs_file_write(&lfs, &file[0], buffer, size) => size;
-    }
-    lfs_file_close(&lfs, &file[0]) => 0;
-
-    lfs_mkdir(&lfs, "exhaustiondir") => 0;
-    lfs_mkdir(&lfs, "exhaustiondir2") => LFS_ERR_NOSPC;
-TEST
-
-echo "--- Split dir test ---"
-rm -rf blocks
-tests/test.py << TEST
-    lfs_format(&lfs, &cfg) => 0;
-TEST
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-
-    // create one block whole for half a directory
-    lfs_file_open(&lfs, &file[0], "bump", LFS_O_WRONLY | LFS_O_CREAT) => 0;
-    lfs_file_write(&lfs, &file[0], (void*)"hi", 2) => 2;
-    lfs_file_close(&lfs, &file[0]) => 0;
-
-    lfs_file_open(&lfs, &file[0], "exhaustion", LFS_O_WRONLY | LFS_O_CREAT);
-    size = strlen("blahblahblahblah");
-    memcpy(buffer, "blahblahblahblah", size);
-    for (lfs_size_t i = 0;
-            i < (cfg.block_count-6)*(cfg.block_size-8);
-            i += size) {
-        lfs_file_write(&lfs, &file[0], buffer, size) => size;
-    }
-    lfs_file_close(&lfs, &file[0]) => 0;
-
-    // open hole
-    lfs_remove(&lfs, "bump") => 0;
-
-    lfs_mkdir(&lfs, "splitdir") => 0;
-    lfs_file_open(&lfs, &file[0], "splitdir/bump",
-            LFS_O_WRONLY | LFS_O_CREAT) => 0;
-    lfs_file_write(&lfs, &file[0], buffer, size) => LFS_ERR_NOSPC;
-    lfs_file_close(&lfs, &file[0]) => 0;
-
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Outdated lookahead test ---"
-rm -rf blocks
-tests/test.py << TEST
-    lfs_format(&lfs, &cfg) => 0;
-
-    lfs_mount(&lfs, &cfg) => 0;
-
-    // fill completely with two files
-    lfs_file_open(&lfs, &file[0], "exhaustion1",
-            LFS_O_WRONLY | LFS_O_CREAT) => 0;
-    size = strlen("blahblahblahblah");
-    memcpy(buffer, "blahblahblahblah", size);
-    for (lfs_size_t i = 0;
-            i < ((cfg.block_count-4)/2)*(cfg.block_size-8);
-            i += size) {
-        lfs_file_write(&lfs, &file[0], buffer, size) => size;
-    }
-    lfs_file_close(&lfs, &file[0]) => 0;
-
-    lfs_file_open(&lfs, &file[0], "exhaustion2",
-            LFS_O_WRONLY | LFS_O_CREAT) => 0;
-    size = strlen("blahblahblahblah");
-    memcpy(buffer, "blahblahblahblah", size);
-    for (lfs_size_t i = 0;
-            i < ((cfg.block_count-4+1)/2)*(cfg.block_size-8);
-            i += size) {
-        lfs_file_write(&lfs, &file[0], buffer, size) => size;
-    }
-    lfs_file_close(&lfs, &file[0]) => 0;
-
-    // remount to force reset of lookahead
-    lfs_unmount(&lfs) => 0;
-
-    lfs_mount(&lfs, &cfg) => 0;
-
-    // rewrite one file
-    lfs_file_open(&lfs, &file[0], "exhaustion1",
-            LFS_O_WRONLY | LFS_O_TRUNC) => 0;
-    lfs_file_sync(&lfs, &file[0]) => 0;
-    size = strlen("blahblahblahblah");
-    memcpy(buffer, "blahblahblahblah", size);
-    for (lfs_size_t i = 0;
-            i < ((cfg.block_count-4)/2)*(cfg.block_size-8);
-            i += size) {
-        lfs_file_write(&lfs, &file[0], buffer, size) => size;
-    }
-    lfs_file_close(&lfs, &file[0]) => 0;
-
-    // rewrite second file, this requires lookahead does not
-    // use old population
-    lfs_file_open(&lfs, &file[0], "exhaustion2",
-            LFS_O_WRONLY | LFS_O_TRUNC) => 0;
-    lfs_file_sync(&lfs, &file[0]) => 0;
-    size = strlen("blahblahblahblah");
-    memcpy(buffer, "blahblahblahblah", size);
-    for (lfs_size_t i = 0;
-            i < ((cfg.block_count-4+1)/2)*(cfg.block_size-8);
-            i += size) {
-        lfs_file_write(&lfs, &file[0], buffer, size) => size;
-    }
-    lfs_file_close(&lfs, &file[0]) => 0;
-TEST
-
-echo "--- Outdated lookahead and split dir test ---"
-rm -rf blocks
-tests/test.py << TEST
-    lfs_format(&lfs, &cfg) => 0;
-
-    lfs_mount(&lfs, &cfg) => 0;
-
-    // fill completely with two files
-    lfs_file_open(&lfs, &file[0], "exhaustion1",
-            LFS_O_WRONLY | LFS_O_CREAT) => 0;
-    size = strlen("blahblahblahblah");
-    memcpy(buffer, "blahblahblahblah", size);
-    for (lfs_size_t i = 0;
-            i < ((cfg.block_count-4)/2)*(cfg.block_size-8);
-            i += size) {
-        lfs_file_write(&lfs, &file[0], buffer, size) => size;
-    }
-    lfs_file_close(&lfs, &file[0]) => 0;
-
-    lfs_file_open(&lfs, &file[0], "exhaustion2",
-            LFS_O_WRONLY | LFS_O_CREAT) => 0;
-    size = strlen("blahblahblahblah");
-    memcpy(buffer, "blahblahblahblah", size);
-    for (lfs_size_t i = 0;
-            i < ((cfg.block_count-4+1)/2)*(cfg.block_size-8);
-            i += size) {
-        lfs_file_write(&lfs, &file[0], buffer, size) => size;
-    }
-    lfs_file_close(&lfs, &file[0]) => 0;
-
-    // remount to force reset of lookahead
-    lfs_unmount(&lfs) => 0;
-
-    lfs_mount(&lfs, &cfg) => 0;
-
-    // rewrite one file with a hole of one block
-    lfs_file_open(&lfs, &file[0], "exhaustion1",
-            LFS_O_WRONLY | LFS_O_TRUNC) => 0;
-    lfs_file_sync(&lfs, &file[0]) => 0;
-    size = strlen("blahblahblahblah");
-    memcpy(buffer, "blahblahblahblah", size);
-    for (lfs_size_t i = 0;
-            i < ((cfg.block_count-4)/2 - 1)*(cfg.block_size-8);
-            i += size) {
-        lfs_file_write(&lfs, &file[0], buffer, size) => size;
-    }
-    lfs_file_close(&lfs, &file[0]) => 0;
-
-    // try to allocate a directory, should fail!
-    lfs_mkdir(&lfs, "split") => LFS_ERR_NOSPC;
-
-    // file should not fail
-    lfs_file_open(&lfs, &file[0], "notasplit",
-            LFS_O_WRONLY | LFS_O_CREAT) => 0;
-    lfs_file_write(&lfs, &file[0], "hi", 2) => 2;
-    lfs_file_close(&lfs, &file[0]) => 0;
-
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Results ---"
-tests/stats.py

tests/test_alloc.toml

@@ -0,0 +1,653 @@
+# allocator tests
+# note for these to work there are a number constraints on the device geometry
+if = 'LFS2_BLOCK_CYCLES == -1'
+
+[[case]] # parallel allocation test
+define.FILES = 3
+define.SIZE = '(((LFS2_BLOCK_SIZE-8)*(LFS2_BLOCK_COUNT-6)) / FILES)'
+code = '''
+    const char *names[FILES] = {"bacon", "eggs", "pancakes"};
+    lfs2_file_t files[FILES];
+
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_mkdir(&lfs2, "breakfast") => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    for (int n = 0; n < FILES; n++) {
+        sprintf(path, "breakfast/%s", names[n]);
+        lfs2_file_open(&lfs2, &files[n], path,
+                LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_APPEND) => 0;
+    }
+    for (int n = 0; n < FILES; n++) {
+        size = strlen(names[n]);
+        for (lfs2_size_t i = 0; i < SIZE; i += size) {
+            lfs2_file_write(&lfs2, &files[n], names[n], size) => size;
+        }
+    }
+    for (int n = 0; n < FILES; n++) {
+        lfs2_file_close(&lfs2, &files[n]) => 0;
+    }
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    for (int n = 0; n < FILES; n++) {
+        sprintf(path, "breakfast/%s", names[n]);
+        lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+        size = strlen(names[n]);
+        for (lfs2_size_t i = 0; i < SIZE; i += size) {
+            lfs2_file_read(&lfs2, &file, buffer, size) => size;
+            assert(memcmp(buffer, names[n], size) == 0);
+        }
+        lfs2_file_close(&lfs2, &file) => 0;
+    }
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # serial allocation test
+define.FILES = 3
+define.SIZE = '(((LFS2_BLOCK_SIZE-8)*(LFS2_BLOCK_COUNT-6)) / FILES)'
+code = '''
+    const char *names[FILES] = {"bacon", "eggs", "pancakes"};
+
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_mkdir(&lfs2, "breakfast") => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    for (int n = 0; n < FILES; n++) {
+        lfs2_mount(&lfs2, &cfg) => 0;
+        sprintf(path, "breakfast/%s", names[n]);
+        lfs2_file_open(&lfs2, &file, path,
+                LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_APPEND) => 0;
+        size = strlen(names[n]);
+        memcpy(buffer, names[n], size);
+        for (int i = 0; i < SIZE; i += size) {
+            lfs2_file_write(&lfs2, &file, buffer, size) => size;
+        }
+        lfs2_file_close(&lfs2, &file) => 0;
+        lfs2_unmount(&lfs2) => 0;
+    }
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    for (int n = 0; n < FILES; n++) {
+        sprintf(path, "breakfast/%s", names[n]);
+        lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+        size = strlen(names[n]);
+        for (int i = 0; i < SIZE; i += size) {
+            lfs2_file_read(&lfs2, &file, buffer, size) => size;
+            assert(memcmp(buffer, names[n], size) == 0);
+        }
+        lfs2_file_close(&lfs2, &file) => 0;
+    }
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # parallel allocation reuse test
+define.FILES = 3
+define.SIZE = '(((LFS2_BLOCK_SIZE-8)*(LFS2_BLOCK_COUNT-6)) / FILES)'
+define.CYCLES = [1, 10]
+code = '''
+    const char *names[FILES] = {"bacon", "eggs", "pancakes"};
+    lfs2_file_t files[FILES];
+
+    lfs2_format(&lfs2, &cfg) => 0;
+
+    for (int c = 0; c < CYCLES; c++) {
+        lfs2_mount(&lfs2, &cfg) => 0;
+        lfs2_mkdir(&lfs2, "breakfast") => 0;
+        lfs2_unmount(&lfs2) => 0;
+
+        lfs2_mount(&lfs2, &cfg) => 0;
+        for (int n = 0; n < FILES; n++) {
+            sprintf(path, "breakfast/%s", names[n]);
+            lfs2_file_open(&lfs2, &files[n], path,
+                    LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_APPEND) => 0;
+        }
+        for (int n = 0; n < FILES; n++) {
+            size = strlen(names[n]);
+            for (int i = 0; i < SIZE; i += size) {
+                lfs2_file_write(&lfs2, &files[n], names[n], size) => size;
+            }
+        }
+        for (int n = 0; n < FILES; n++) {
+            lfs2_file_close(&lfs2, &files[n]) => 0;
+        }
+        lfs2_unmount(&lfs2) => 0;
+
+        lfs2_mount(&lfs2, &cfg) => 0;
+        for (int n = 0; n < FILES; n++) {
+            sprintf(path, "breakfast/%s", names[n]);
+            lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+            size = strlen(names[n]);
+            for (int i = 0; i < SIZE; i += size) {
+                lfs2_file_read(&lfs2, &file, buffer, size) => size;
+                assert(memcmp(buffer, names[n], size) == 0);
+            }
+            lfs2_file_close(&lfs2, &file) => 0;
+        }
+        lfs2_unmount(&lfs2) => 0;
+
+        lfs2_mount(&lfs2, &cfg) => 0;
+        for (int n = 0; n < FILES; n++) {
+            sprintf(path, "breakfast/%s", names[n]);
+            lfs2_remove(&lfs2, path) => 0;
+        }
+        lfs2_remove(&lfs2, "breakfast") => 0;
+        lfs2_unmount(&lfs2) => 0;
+    }
+'''
+
+[[case]] # serial allocation reuse test
+define.FILES = 3
+define.SIZE = '(((LFS2_BLOCK_SIZE-8)*(LFS2_BLOCK_COUNT-6)) / FILES)'
+define.CYCLES = [1, 10]
+code = '''
+    const char *names[FILES] = {"bacon", "eggs", "pancakes"};
+
+    lfs2_format(&lfs2, &cfg) => 0;
+
+    for (int c = 0; c < CYCLES; c++) {
+        lfs2_mount(&lfs2, &cfg) => 0;
+        lfs2_mkdir(&lfs2, "breakfast") => 0;
+        lfs2_unmount(&lfs2) => 0;
+
+        for (int n = 0; n < FILES; n++) {
+            lfs2_mount(&lfs2, &cfg) => 0;
+            sprintf(path, "breakfast/%s", names[n]);
+            lfs2_file_open(&lfs2, &file, path,
+                    LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_APPEND) => 0;
+            size = strlen(names[n]);
+            memcpy(buffer, names[n], size);
+            for (int i = 0; i < SIZE; i += size) {
+                lfs2_file_write(&lfs2, &file, buffer, size) => size;
+            }
+            lfs2_file_close(&lfs2, &file) => 0;
+            lfs2_unmount(&lfs2) => 0;
+        }
+
+        lfs2_mount(&lfs2, &cfg) => 0;
+        for (int n = 0; n < FILES; n++) {
+            sprintf(path, "breakfast/%s", names[n]);
+            lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+            size = strlen(names[n]);
+            for (int i = 0; i < SIZE; i += size) {
+                lfs2_file_read(&lfs2, &file, buffer, size) => size;
+                assert(memcmp(buffer, names[n], size) == 0);
+            }
+            lfs2_file_close(&lfs2, &file) => 0;
+        }
+        lfs2_unmount(&lfs2) => 0;
+
+        lfs2_mount(&lfs2, &cfg) => 0;
+        for (int n = 0; n < FILES; n++) {
+            sprintf(path, "breakfast/%s", names[n]);
+            lfs2_remove(&lfs2, path) => 0;
+        }
+        lfs2_remove(&lfs2, "breakfast") => 0;
+        lfs2_unmount(&lfs2) => 0;
+    }
+'''
+
+[[case]] # exhaustion test
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "exhaustion", LFS2_O_WRONLY | LFS2_O_CREAT);
+    size = strlen("exhaustion");
+    memcpy(buffer, "exhaustion", size);
+    lfs2_file_write(&lfs2, &file, buffer, size) => size;
+    lfs2_file_sync(&lfs2, &file) => 0;
+
+    size = strlen("blahblahblahblah");
+    memcpy(buffer, "blahblahblahblah", size);
+    lfs2_ssize_t res;
+    while (true) {
+        res = lfs2_file_write(&lfs2, &file, buffer, size);
+        if (res < 0) {
+            break;
+        }
+
+        res => size;
+    }
+    res => LFS2_ERR_NOSPC;
+
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "exhaustion", LFS2_O_RDONLY);
+    size = strlen("exhaustion");
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_read(&lfs2, &file, buffer, size) => size;
+    memcmp(buffer, "exhaustion", size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # exhaustion wraparound test
+define.SIZE = '(((LFS2_BLOCK_SIZE-8)*(LFS2_BLOCK_COUNT-4)) / 3)'
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+
+    lfs2_file_open(&lfs2, &file, "padding", LFS2_O_WRONLY | LFS2_O_CREAT);
+    size = strlen("buffering");
+    memcpy(buffer, "buffering", size);
+    for (int i = 0; i < SIZE; i += size) {
+        lfs2_file_write(&lfs2, &file, buffer, size) => size;
+    }
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_remove(&lfs2, "padding") => 0;
+
+    lfs2_file_open(&lfs2, &file, "exhaustion", LFS2_O_WRONLY | LFS2_O_CREAT);
+    size = strlen("exhaustion");
+    memcpy(buffer, "exhaustion", size);
+    lfs2_file_write(&lfs2, &file, buffer, size) => size;
+    lfs2_file_sync(&lfs2, &file) => 0;
+
+    size = strlen("blahblahblahblah");
+    memcpy(buffer, "blahblahblahblah", size);
+    lfs2_ssize_t res;
+    while (true) {
+        res = lfs2_file_write(&lfs2, &file, buffer, size);
+        if (res < 0) {
+            break;
+        }
+
+        res => size;
+    }
+    res => LFS2_ERR_NOSPC;
+
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "exhaustion", LFS2_O_RDONLY);
+    size = strlen("exhaustion");
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_read(&lfs2, &file, buffer, size) => size;
+    memcmp(buffer, "exhaustion", size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_remove(&lfs2, "exhaustion") => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # dir exhaustion test
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+
+    // find out max file size
+    lfs2_mkdir(&lfs2, "exhaustiondir") => 0;
+    size = strlen("blahblahblahblah");
+    memcpy(buffer, "blahblahblahblah", size);
+    lfs2_file_open(&lfs2, &file, "exhaustion", LFS2_O_WRONLY | LFS2_O_CREAT);
+    int count = 0;
+    while (true) {
+        err = lfs2_file_write(&lfs2, &file, buffer, size);
+        if (err < 0) {
+            break;
+        }
+
+        count += 1;
+    }
+    err => LFS2_ERR_NOSPC;
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    lfs2_remove(&lfs2, "exhaustion") => 0;
+    lfs2_remove(&lfs2, "exhaustiondir") => 0;
+
+    // see if dir fits with max file size
+    lfs2_file_open(&lfs2, &file, "exhaustion", LFS2_O_WRONLY | LFS2_O_CREAT);
+    for (int i = 0; i < count; i++) {
+        lfs2_file_write(&lfs2, &file, buffer, size) => size;
+    }
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    lfs2_mkdir(&lfs2, "exhaustiondir") => 0;
+    lfs2_remove(&lfs2, "exhaustiondir") => 0;
+    lfs2_remove(&lfs2, "exhaustion") => 0;
+
+    // see if dir fits with > max file size
+    lfs2_file_open(&lfs2, &file, "exhaustion", LFS2_O_WRONLY | LFS2_O_CREAT);
+    for (int i = 0; i < count+1; i++) {
+        lfs2_file_write(&lfs2, &file, buffer, size) => size;
+    }
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    lfs2_mkdir(&lfs2, "exhaustiondir") => LFS2_ERR_NOSPC;
+
+    lfs2_remove(&lfs2, "exhaustion") => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # what if we have a bad block during an allocation scan?
+in = "lfs2.c"
+define.LFS2_ERASE_CYCLES = 0xffffffff
+define.LFS2_BADBLOCK_BEHAVIOR = 'LFS2_TESTBD_BADBLOCK_READERROR'
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    // first fill to exhaustion to find available space
+    lfs2_file_open(&lfs2, &file, "pacman", LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+    strcpy((char*)buffer, "waka");
+    size = strlen("waka");
+    lfs2_size_t filesize = 0;
+    while (true) {
+        lfs2_ssize_t res = lfs2_file_write(&lfs2, &file, buffer, size);
+        assert(res == (lfs2_ssize_t)size || res == LFS2_ERR_NOSPC);
+        if (res == LFS2_ERR_NOSPC) {
+            break;
+        }
+        filesize += size;
+    }
+    lfs2_file_close(&lfs2, &file) => 0;
+    // now fill all but a couple of blocks of the filesystem with data
+    filesize -= 3*LFS2_BLOCK_SIZE;
+    lfs2_file_open(&lfs2, &file, "pacman", LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+    strcpy((char*)buffer, "waka");
+    size = strlen("waka");
+    for (lfs2_size_t i = 0; i < filesize/size; i++) {
+        lfs2_file_write(&lfs2, &file, buffer, size) => size;
+    }
+    lfs2_file_close(&lfs2, &file) => 0;
+    // also save head of file so we can error during lookahead scan
+    lfs2_block_t fileblock = file.ctz.head;
+    lfs2_unmount(&lfs2) => 0;
+
+    // remount to force an alloc scan
+    lfs2_mount(&lfs2, &cfg) => 0;
+
+    // but mark the head of our file as a "bad block", this is force our
+    // scan to bail early
+    lfs2_testbd_setwear(&cfg, fileblock, 0xffffffff) => 0;
+    lfs2_file_open(&lfs2, &file, "ghost", LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+    strcpy((char*)buffer, "chomp");
+    size = strlen("chomp");
+    while (true) {
+        lfs2_ssize_t res = lfs2_file_write(&lfs2, &file, buffer, size);
+        assert(res == (lfs2_ssize_t)size || res == LFS2_ERR_CORRUPT);
+        if (res == LFS2_ERR_CORRUPT) {
+            break;
+        }
+    }
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    // now reverse the "bad block" and try to write the file again until we
+    // run out of space
+    lfs2_testbd_setwear(&cfg, fileblock, 0) => 0;
+    lfs2_file_open(&lfs2, &file, "ghost", LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+    strcpy((char*)buffer, "chomp");
+    size = strlen("chomp");
+    while (true) {
+        lfs2_ssize_t res = lfs2_file_write(&lfs2, &file, buffer, size);
+        assert(res == (lfs2_ssize_t)size || res == LFS2_ERR_NOSPC);
+        if (res == LFS2_ERR_NOSPC) {
+            break;
+        }
+    }
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    lfs2_unmount(&lfs2) => 0;
+
+    // check that the disk isn't hurt
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "pacman", LFS2_O_RDONLY) => 0;
+    strcpy((char*)buffer, "waka");
+    size = strlen("waka");
+    for (lfs2_size_t i = 0; i < filesize/size; i++) {
+        uint8_t rbuffer[4];
+        lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+        assert(memcmp(rbuffer, buffer, size) == 0);
+    }
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+
+# Below, I don't like these tests. They're fragile and depend _heavily_
+# on the geometry of the block device. But they are valuable. Eventually they
+# should be removed and replaced with generalized tests.
+
+[[case]] # chained dir exhaustion test
+define.LFS2_BLOCK_SIZE = 512
+define.LFS2_BLOCK_COUNT = 1024
+if = 'LFS2_BLOCK_SIZE == 512 && LFS2_BLOCK_COUNT == 1024'
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+
+    // find out max file size
+    lfs2_mkdir(&lfs2, "exhaustiondir") => 0;
+    for (int i = 0; i < 10; i++) {
+        sprintf(path, "dirwithanexhaustivelylongnameforpadding%d", i);
+        lfs2_mkdir(&lfs2, path) => 0;
+    }
+    size = strlen("blahblahblahblah");
+    memcpy(buffer, "blahblahblahblah", size);
+    lfs2_file_open(&lfs2, &file, "exhaustion", LFS2_O_WRONLY | LFS2_O_CREAT);
+    int count = 0;
+    while (true) {
+        err = lfs2_file_write(&lfs2, &file, buffer, size);
+        if (err < 0) {
+            break;
+        }
+
+        count += 1;
+    }
+    err => LFS2_ERR_NOSPC;
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    lfs2_remove(&lfs2, "exhaustion") => 0;
+    lfs2_remove(&lfs2, "exhaustiondir") => 0;
+    for (int i = 0; i < 10; i++) {
+        sprintf(path, "dirwithanexhaustivelylongnameforpadding%d", i);
+        lfs2_remove(&lfs2, path) => 0;
+    }
+
+    // see that chained dir fails
+    lfs2_file_open(&lfs2, &file, "exhaustion", LFS2_O_WRONLY | LFS2_O_CREAT);
+    for (int i = 0; i < count+1; i++) {
+        lfs2_file_write(&lfs2, &file, buffer, size) => size;
+    }
+    lfs2_file_sync(&lfs2, &file) => 0;
+
+    for (int i = 0; i < 10; i++) {
+        sprintf(path, "dirwithanexhaustivelylongnameforpadding%d", i);
+        lfs2_mkdir(&lfs2, path) => 0;
+    }
+
+    lfs2_mkdir(&lfs2, "exhaustiondir") => LFS2_ERR_NOSPC;
+
+    // shorten file to try a second chained dir
+    while (true) {
+        err = lfs2_mkdir(&lfs2, "exhaustiondir");
+        if (err != LFS2_ERR_NOSPC) {
+            break;
+        }
+
+        lfs2_ssize_t filesize = lfs2_file_size(&lfs2, &file);
+        filesize > 0 => true;
+
+        lfs2_file_truncate(&lfs2, &file, filesize - size) => 0;
+        lfs2_file_sync(&lfs2, &file) => 0;
+    }
+    err => 0;
+
+    lfs2_mkdir(&lfs2, "exhaustiondir2") => LFS2_ERR_NOSPC;
+
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # split dir test
+define.LFS2_BLOCK_SIZE = 512
+define.LFS2_BLOCK_COUNT = 1024
+if = 'LFS2_BLOCK_SIZE == 512 && LFS2_BLOCK_COUNT == 1024'
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+
+    // create one block hole for half a directory
+    lfs2_file_open(&lfs2, &file, "bump", LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+    for (lfs2_size_t i = 0; i < cfg.block_size; i += 2) {
+        memcpy(&buffer[i], "hi", 2);
+    }
+    lfs2_file_write(&lfs2, &file, buffer, cfg.block_size) => cfg.block_size;
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    lfs2_file_open(&lfs2, &file, "exhaustion", LFS2_O_WRONLY | LFS2_O_CREAT);
+    size = strlen("blahblahblahblah");
+    memcpy(buffer, "blahblahblahblah", size);
+    for (lfs2_size_t i = 0;
+            i < (cfg.block_count-4)*(cfg.block_size-8);
+            i += size) {
+        lfs2_file_write(&lfs2, &file, buffer, size) => size;
+    }
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    // remount to force reset of lookahead
+    lfs2_unmount(&lfs2) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+
+    // open hole
+    lfs2_remove(&lfs2, "bump") => 0;
+
+    lfs2_mkdir(&lfs2, "splitdir") => 0;
+    lfs2_file_open(&lfs2, &file, "splitdir/bump",
+            LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+    for (lfs2_size_t i = 0; i < cfg.block_size; i += 2) {
+        memcpy(&buffer[i], "hi", 2);
+    }
+    lfs2_file_write(&lfs2, &file, buffer, 2*cfg.block_size) => LFS2_ERR_NOSPC;
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # outdated lookahead test
+define.LFS2_BLOCK_SIZE = 512
+define.LFS2_BLOCK_COUNT = 1024
+if = 'LFS2_BLOCK_SIZE == 512 && LFS2_BLOCK_COUNT == 1024'
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+
+    // fill completely with two files
+    lfs2_file_open(&lfs2, &file, "exhaustion1",
+            LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+    size = strlen("blahblahblahblah");
+    memcpy(buffer, "blahblahblahblah", size);
+    for (lfs2_size_t i = 0;
+            i < ((cfg.block_count-2)/2)*(cfg.block_size-8);
+            i += size) {
+        lfs2_file_write(&lfs2, &file, buffer, size) => size;
+    }
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    lfs2_file_open(&lfs2, &file, "exhaustion2",
+            LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+    size = strlen("blahblahblahblah");
+    memcpy(buffer, "blahblahblahblah", size);
+    for (lfs2_size_t i = 0;
+            i < ((cfg.block_count-2+1)/2)*(cfg.block_size-8);
+            i += size) {
+        lfs2_file_write(&lfs2, &file, buffer, size) => size;
+    }
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    // remount to force reset of lookahead
+    lfs2_unmount(&lfs2) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+
+    // rewrite one file
+    lfs2_file_open(&lfs2, &file, "exhaustion1",
+            LFS2_O_WRONLY | LFS2_O_TRUNC) => 0;
+    lfs2_file_sync(&lfs2, &file) => 0;
+    size = strlen("blahblahblahblah");
+    memcpy(buffer, "blahblahblahblah", size);
+    for (lfs2_size_t i = 0;
+            i < ((cfg.block_count-2)/2)*(cfg.block_size-8);
+            i += size) {
+        lfs2_file_write(&lfs2, &file, buffer, size) => size;
+    }
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    // rewrite second file, this requires lookahead does not
+    // use old population
+    lfs2_file_open(&lfs2, &file, "exhaustion2",
+            LFS2_O_WRONLY | LFS2_O_TRUNC) => 0;
+    lfs2_file_sync(&lfs2, &file) => 0;
+    size = strlen("blahblahblahblah");
+    memcpy(buffer, "blahblahblahblah", size);
+    for (lfs2_size_t i = 0;
+            i < ((cfg.block_count-2+1)/2)*(cfg.block_size-8);
+            i += size) {
+        lfs2_file_write(&lfs2, &file, buffer, size) => size;
+    }
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # outdated lookahead and split dir test
+define.LFS2_BLOCK_SIZE = 512
+define.LFS2_BLOCK_COUNT = 1024
+if = 'LFS2_BLOCK_SIZE == 512 && LFS2_BLOCK_COUNT == 1024'
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+
+    // fill completely with two files
+    lfs2_file_open(&lfs2, &file, "exhaustion1",
+            LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+    size = strlen("blahblahblahblah");
+    memcpy(buffer, "blahblahblahblah", size);
+    for (lfs2_size_t i = 0;
+            i < ((cfg.block_count-2)/2)*(cfg.block_size-8);
+            i += size) {
+        lfs2_file_write(&lfs2, &file, buffer, size) => size;
+    }
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    lfs2_file_open(&lfs2, &file, "exhaustion2",
+            LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+    size = strlen("blahblahblahblah");
+    memcpy(buffer, "blahblahblahblah", size);
+    for (lfs2_size_t i = 0;
+            i < ((cfg.block_count-2+1)/2)*(cfg.block_size-8);
+            i += size) {
+        lfs2_file_write(&lfs2, &file, buffer, size) => size;
+    }
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    // remount to force reset of lookahead
+    lfs2_unmount(&lfs2) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+
+    // rewrite one file with a hole of one block
+    lfs2_file_open(&lfs2, &file, "exhaustion1",
+            LFS2_O_WRONLY | LFS2_O_TRUNC) => 0;
+    lfs2_file_sync(&lfs2, &file) => 0;
+    size = strlen("blahblahblahblah");
+    memcpy(buffer, "blahblahblahblah", size);
+    for (lfs2_size_t i = 0;
+            i < ((cfg.block_count-2)/2 - 1)*(cfg.block_size-8);
+            i += size) {
+        lfs2_file_write(&lfs2, &file, buffer, size) => size;
+    }
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    // try to allocate a directory, should fail!
+    lfs2_mkdir(&lfs2, "split") => LFS2_ERR_NOSPC;
+
+    // file should not fail
+    lfs2_file_open(&lfs2, &file, "notasplit",
+            LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+    lfs2_file_write(&lfs2, &file, "hi", 2) => 2;
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    lfs2_unmount(&lfs2) => 0;
+'''

tests/test_attrs.toml

@@ -0,0 +1,304 @@
+[[case]] # set/get attribute
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_mkdir(&lfs2, "hello") => 0;
+    lfs2_file_open(&lfs2, &file, "hello/hello", LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+    lfs2_file_write(&lfs2, &file, "hello", strlen("hello")) => strlen("hello");
+    lfs2_file_close(&lfs2, &file);
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    memset(buffer, 0, sizeof(buffer));
+    lfs2_setattr(&lfs2, "hello", 'A', "aaaa",   4) => 0;
+    lfs2_setattr(&lfs2, "hello", 'B', "bbbbbb", 6) => 0;
+    lfs2_setattr(&lfs2, "hello", 'C', "ccccc",  5) => 0;
+    lfs2_getattr(&lfs2, "hello", 'A', buffer,    4) => 4;
+    lfs2_getattr(&lfs2, "hello", 'B', buffer+4,  6) => 6;
+    lfs2_getattr(&lfs2, "hello", 'C', buffer+10, 5) => 5;
+    memcmp(buffer,    "aaaa",   4) => 0;
+    memcmp(buffer+4,  "bbbbbb", 6) => 0;
+    memcmp(buffer+10, "ccccc",  5) => 0;
+
+    lfs2_setattr(&lfs2, "hello", 'B', "", 0) => 0;
+    lfs2_getattr(&lfs2, "hello", 'A', buffer,    4) => 4;
+    lfs2_getattr(&lfs2, "hello", 'B', buffer+4,  6) => 0;
+    lfs2_getattr(&lfs2, "hello", 'C', buffer+10, 5) => 5;
+    memcmp(buffer,    "aaaa",         4) => 0;
+    memcmp(buffer+4,  "\0\0\0\0\0\0", 6) => 0;
+    memcmp(buffer+10, "ccccc",        5) => 0;
+
+    lfs2_removeattr(&lfs2, "hello", 'B') => 0;
+    lfs2_getattr(&lfs2, "hello", 'A', buffer,    4) => 4;
+    lfs2_getattr(&lfs2, "hello", 'B', buffer+4,  6) => LFS2_ERR_NOATTR;
+    lfs2_getattr(&lfs2, "hello", 'C', buffer+10, 5) => 5;
+    memcmp(buffer,    "aaaa",         4) => 0;
+    memcmp(buffer+4,  "\0\0\0\0\0\0", 6) => 0;
+    memcmp(buffer+10, "ccccc",        5) => 0;
+
+    lfs2_setattr(&lfs2, "hello", 'B', "dddddd", 6) => 0;
+    lfs2_getattr(&lfs2, "hello", 'A', buffer,    4) => 4;
+    lfs2_getattr(&lfs2, "hello", 'B', buffer+4,  6) => 6;
+    lfs2_getattr(&lfs2, "hello", 'C', buffer+10, 5) => 5;
+    memcmp(buffer,    "aaaa",   4) => 0;
+    memcmp(buffer+4,  "dddddd", 6) => 0;
+    memcmp(buffer+10, "ccccc",  5) => 0;
+
+    lfs2_setattr(&lfs2, "hello", 'B', "eee", 3) => 0;
+    lfs2_getattr(&lfs2, "hello", 'A', buffer,    4) => 4;
+    lfs2_getattr(&lfs2, "hello", 'B', buffer+4,  6) => 3;
+    lfs2_getattr(&lfs2, "hello", 'C', buffer+10, 5) => 5;
+    memcmp(buffer,    "aaaa",      4) => 0;
+    memcmp(buffer+4,  "eee\0\0\0", 6) => 0;
+    memcmp(buffer+10, "ccccc",     5) => 0;
+
+    lfs2_setattr(&lfs2, "hello", 'A', buffer, LFS2_ATTR_MAX+1) => LFS2_ERR_NOSPC;
+    lfs2_setattr(&lfs2, "hello", 'B', "fffffffff", 9) => 0;
+    lfs2_getattr(&lfs2, "hello", 'A', buffer,    4) => 4;
+    lfs2_getattr(&lfs2, "hello", 'B', buffer+4,  6) => 9;
+    lfs2_getattr(&lfs2, "hello", 'C', buffer+10, 5) => 5;
+
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    memset(buffer, 0, sizeof(buffer));
+    lfs2_getattr(&lfs2, "hello", 'A', buffer,    4) => 4;
+    lfs2_getattr(&lfs2, "hello", 'B', buffer+4,  9) => 9;
+    lfs2_getattr(&lfs2, "hello", 'C', buffer+13, 5) => 5;
+    memcmp(buffer,    "aaaa",      4) => 0;
+    memcmp(buffer+4,  "fffffffff", 9) => 0;
+    memcmp(buffer+13, "ccccc",     5) => 0;
+
+    lfs2_file_open(&lfs2, &file, "hello/hello", LFS2_O_RDONLY) => 0;
+    lfs2_file_read(&lfs2, &file, buffer, sizeof(buffer)) => strlen("hello");
+    memcmp(buffer, "hello", strlen("hello")) => 0;
+    lfs2_file_close(&lfs2, &file);
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # set/get root attribute
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_mkdir(&lfs2, "hello") => 0;
+    lfs2_file_open(&lfs2, &file, "hello/hello", LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+    lfs2_file_write(&lfs2, &file, "hello", strlen("hello")) => strlen("hello");
+    lfs2_file_close(&lfs2, &file);
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    memset(buffer, 0, sizeof(buffer));
+    lfs2_setattr(&lfs2, "/", 'A', "aaaa",   4) => 0;
+    lfs2_setattr(&lfs2, "/", 'B', "bbbbbb", 6) => 0;
+    lfs2_setattr(&lfs2, "/", 'C', "ccccc",  5) => 0;
+    lfs2_getattr(&lfs2, "/", 'A', buffer,    4) => 4;
+    lfs2_getattr(&lfs2, "/", 'B', buffer+4,  6) => 6;
+    lfs2_getattr(&lfs2, "/", 'C', buffer+10, 5) => 5;
+    memcmp(buffer,    "aaaa",   4) => 0;
+    memcmp(buffer+4,  "bbbbbb", 6) => 0;
+    memcmp(buffer+10, "ccccc",  5) => 0;
+
+    lfs2_setattr(&lfs2, "/", 'B', "", 0) => 0;
+    lfs2_getattr(&lfs2, "/", 'A', buffer,    4) => 4;
+    lfs2_getattr(&lfs2, "/", 'B', buffer+4,  6) => 0;
+    lfs2_getattr(&lfs2, "/", 'C', buffer+10, 5) => 5;
+    memcmp(buffer,    "aaaa",         4) => 0;
+    memcmp(buffer+4,  "\0\0\0\0\0\0", 6) => 0;
+    memcmp(buffer+10, "ccccc",        5) => 0;
+
+    lfs2_removeattr(&lfs2, "/", 'B') => 0;
+    lfs2_getattr(&lfs2, "/", 'A', buffer,    4) => 4;
+    lfs2_getattr(&lfs2, "/", 'B', buffer+4,  6) => LFS2_ERR_NOATTR;
+    lfs2_getattr(&lfs2, "/", 'C', buffer+10, 5) => 5;
+    memcmp(buffer,    "aaaa",         4) => 0;
+    memcmp(buffer+4,  "\0\0\0\0\0\0", 6) => 0;
+    memcmp(buffer+10, "ccccc",        5) => 0;
+
+    lfs2_setattr(&lfs2, "/", 'B', "dddddd", 6) => 0;
+    lfs2_getattr(&lfs2, "/", 'A', buffer,    4) => 4;
+    lfs2_getattr(&lfs2, "/", 'B', buffer+4,  6) => 6;
+    lfs2_getattr(&lfs2, "/", 'C', buffer+10, 5) => 5;
+    memcmp(buffer,    "aaaa",   4) => 0;
+    memcmp(buffer+4,  "dddddd", 6) => 0;
+    memcmp(buffer+10, "ccccc",  5) => 0;
+
+    lfs2_setattr(&lfs2, "/", 'B', "eee", 3) => 0;
+    lfs2_getattr(&lfs2, "/", 'A', buffer,    4) => 4;
+    lfs2_getattr(&lfs2, "/", 'B', buffer+4,  6) => 3;
+    lfs2_getattr(&lfs2, "/", 'C', buffer+10, 5) => 5;
+    memcmp(buffer,    "aaaa",      4) => 0;
+    memcmp(buffer+4,  "eee\0\0\0", 6) => 0;
+    memcmp(buffer+10, "ccccc",     5) => 0;
+
+    lfs2_setattr(&lfs2, "/", 'A', buffer, LFS2_ATTR_MAX+1) => LFS2_ERR_NOSPC;
+    lfs2_setattr(&lfs2, "/", 'B', "fffffffff", 9) => 0;
+    lfs2_getattr(&lfs2, "/", 'A', buffer,    4) => 4;
+    lfs2_getattr(&lfs2, "/", 'B', buffer+4,  6) => 9;
+    lfs2_getattr(&lfs2, "/", 'C', buffer+10, 5) => 5;
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    memset(buffer, 0, sizeof(buffer));
+    lfs2_getattr(&lfs2, "/", 'A', buffer,    4) => 4;
+    lfs2_getattr(&lfs2, "/", 'B', buffer+4,  9) => 9;
+    lfs2_getattr(&lfs2, "/", 'C', buffer+13, 5) => 5;
+    memcmp(buffer,    "aaaa",      4) => 0;
+    memcmp(buffer+4,  "fffffffff", 9) => 0;
+    memcmp(buffer+13, "ccccc",     5) => 0;
+
+    lfs2_file_open(&lfs2, &file, "hello/hello", LFS2_O_RDONLY) => 0;
+    lfs2_file_read(&lfs2, &file, buffer, sizeof(buffer)) => strlen("hello");
+    memcmp(buffer, "hello", strlen("hello")) => 0;
+    lfs2_file_close(&lfs2, &file);
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # set/get file attribute
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_mkdir(&lfs2, "hello") => 0;
+    lfs2_file_open(&lfs2, &file, "hello/hello", LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+    lfs2_file_write(&lfs2, &file, "hello", strlen("hello")) => strlen("hello");
+    lfs2_file_close(&lfs2, &file);
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    memset(buffer, 0, sizeof(buffer));
+    struct lfs2_attr attrs1[] = {
+        {'A', buffer,    4},
+        {'B', buffer+4,  6},
+        {'C', buffer+10, 5},
+    };
+    struct lfs2_file_config cfg1 = {.attrs=attrs1, .attr_count=3};
+
+    lfs2_file_opencfg(&lfs2, &file, "hello/hello", LFS2_O_WRONLY, &cfg1) => 0;
+    memcpy(buffer,    "aaaa",   4);
+    memcpy(buffer+4,  "bbbbbb", 6);
+    memcpy(buffer+10, "ccccc",  5);
+    lfs2_file_close(&lfs2, &file) => 0;
+    memset(buffer, 0, 15);
+    lfs2_file_opencfg(&lfs2, &file, "hello/hello", LFS2_O_RDONLY, &cfg1) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    memcmp(buffer,    "aaaa",   4) => 0;
+    memcmp(buffer+4,  "bbbbbb", 6) => 0;
+    memcmp(buffer+10, "ccccc",  5) => 0;
+
+    attrs1[1].size = 0;
+    lfs2_file_opencfg(&lfs2, &file, "hello/hello", LFS2_O_WRONLY, &cfg1) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    memset(buffer, 0, 15);
+    attrs1[1].size = 6;
+    lfs2_file_opencfg(&lfs2, &file, "hello/hello", LFS2_O_RDONLY, &cfg1) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    memcmp(buffer,    "aaaa",         4) => 0;
+    memcmp(buffer+4,  "\0\0\0\0\0\0", 6) => 0;
+    memcmp(buffer+10, "ccccc",        5) => 0;
+
+    attrs1[1].size = 6;
+    lfs2_file_opencfg(&lfs2, &file, "hello/hello", LFS2_O_WRONLY, &cfg1) => 0;
+    memcpy(buffer+4,  "dddddd", 6);
+    lfs2_file_close(&lfs2, &file) => 0;
+    memset(buffer, 0, 15);
+    attrs1[1].size = 6;
+    lfs2_file_opencfg(&lfs2, &file, "hello/hello", LFS2_O_RDONLY, &cfg1) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    memcmp(buffer,    "aaaa",   4) => 0;
+    memcmp(buffer+4,  "dddddd", 6) => 0;
+    memcmp(buffer+10, "ccccc",  5) => 0;
+
+    attrs1[1].size = 3;
+    lfs2_file_opencfg(&lfs2, &file, "hello/hello", LFS2_O_WRONLY, &cfg1) => 0;
+    memcpy(buffer+4,  "eee", 3);
+    lfs2_file_close(&lfs2, &file) => 0;
+    memset(buffer, 0, 15);
+    attrs1[1].size = 6;
+    lfs2_file_opencfg(&lfs2, &file, "hello/hello", LFS2_O_RDONLY, &cfg1) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    memcmp(buffer,    "aaaa",      4) => 0;
+    memcmp(buffer+4,  "eee\0\0\0", 6) => 0;
+    memcmp(buffer+10, "ccccc",     5) => 0;
+
+    attrs1[0].size = LFS2_ATTR_MAX+1;
+    lfs2_file_opencfg(&lfs2, &file, "hello/hello", LFS2_O_WRONLY, &cfg1)
+        => LFS2_ERR_NOSPC;
+
+    struct lfs2_attr attrs2[] = {
+        {'A', buffer,    4},
+        {'B', buffer+4,  9},
+        {'C', buffer+13, 5},
+    };
+    struct lfs2_file_config cfg2 = {.attrs=attrs2, .attr_count=3};
+    lfs2_file_opencfg(&lfs2, &file, "hello/hello", LFS2_O_RDWR, &cfg2) => 0;
+    memcpy(buffer+4,  "fffffffff", 9);
+    lfs2_file_close(&lfs2, &file) => 0;
+    attrs1[0].size = 4;
+    lfs2_file_opencfg(&lfs2, &file, "hello/hello", LFS2_O_RDONLY, &cfg1) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    memset(buffer, 0, sizeof(buffer));
+    struct lfs2_attr attrs3[] = {
+        {'A', buffer,    4},
+        {'B', buffer+4,  9},
+        {'C', buffer+13, 5},
+    };
+    struct lfs2_file_config cfg3 = {.attrs=attrs3, .attr_count=3};
+
+    lfs2_file_opencfg(&lfs2, &file, "hello/hello", LFS2_O_RDONLY, &cfg3) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    memcmp(buffer,    "aaaa",      4) => 0;
+    memcmp(buffer+4,  "fffffffff", 9) => 0;
+    memcmp(buffer+13, "ccccc",     5) => 0;
+
+    lfs2_file_open(&lfs2, &file, "hello/hello", LFS2_O_RDONLY) => 0;
+    lfs2_file_read(&lfs2, &file, buffer, sizeof(buffer)) => strlen("hello");
+    memcmp(buffer, "hello", strlen("hello")) => 0;
+    lfs2_file_close(&lfs2, &file);
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # deferred file attributes
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_mkdir(&lfs2, "hello") => 0;
+    lfs2_file_open(&lfs2, &file, "hello/hello", LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+    lfs2_file_write(&lfs2, &file, "hello", strlen("hello")) => strlen("hello");
+    lfs2_file_close(&lfs2, &file);
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_setattr(&lfs2, "hello/hello", 'B', "fffffffff",  9) => 0;
+    lfs2_setattr(&lfs2, "hello/hello", 'C', "ccccc",      5) => 0;
+
+    memset(buffer, 0, sizeof(buffer));
+    struct lfs2_attr attrs1[] = {
+        {'B', "gggg", 4},
+        {'C', "",     0},
+        {'D', "hhhh", 4},
+    };
+    struct lfs2_file_config cfg1 = {.attrs=attrs1, .attr_count=3};
+
+    lfs2_file_opencfg(&lfs2, &file, "hello/hello", LFS2_O_WRONLY, &cfg1) => 0;
+
+    lfs2_getattr(&lfs2, "hello/hello", 'B', buffer,    9) => 9;
+    lfs2_getattr(&lfs2, "hello/hello", 'C', buffer+9,  9) => 5;
+    lfs2_getattr(&lfs2, "hello/hello", 'D', buffer+18, 9) => LFS2_ERR_NOATTR;
+    memcmp(buffer,    "fffffffff",          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;
+
+    lfs2_file_sync(&lfs2, &file) => 0;
+    lfs2_getattr(&lfs2, "hello/hello", 'B', buffer,    9) => 4;
+    lfs2_getattr(&lfs2, "hello/hello", 'C', buffer+9,  9) => 0;
+    lfs2_getattr(&lfs2, "hello/hello", 'D', buffer+18, 9) => 4;
+    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+18, "hhhh\0\0\0\0\0",     9) => 0;
+
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''

tests/test_badblocks.toml

@@ -0,0 +1,241 @@
+# bad blocks with block cycles should be tested in test_relocations
+if = 'LFS2_BLOCK_CYCLES == -1'
+
+[[case]] # single bad blocks
+define.LFS2_BLOCK_COUNT = 256 # small bd so test runs faster
+define.LFS2_ERASE_CYCLES = 0xffffffff
+define.LFS2_ERASE_VALUE = [0x00, 0xff, -1]
+define.LFS2_BADBLOCK_BEHAVIOR = [
+    'LFS2_TESTBD_BADBLOCK_PROGERROR',
+    'LFS2_TESTBD_BADBLOCK_ERASEERROR',
+    'LFS2_TESTBD_BADBLOCK_READERROR',
+    'LFS2_TESTBD_BADBLOCK_PROGNOOP',
+    'LFS2_TESTBD_BADBLOCK_ERASENOOP',
+]
+define.NAMEMULT = 64
+define.FILEMULT = 1
+code = '''
+    for (lfs2_block_t badblock = 2; badblock < LFS2_BLOCK_COUNT; badblock++) {
+        lfs2_testbd_setwear(&cfg, badblock-1, 0) => 0;
+        lfs2_testbd_setwear(&cfg, badblock, 0xffffffff) => 0;
+        
+        lfs2_format(&lfs2, &cfg) => 0;
+
+        lfs2_mount(&lfs2, &cfg) => 0;
+        for (int i = 1; i < 10; i++) {
+            for (int j = 0; j < NAMEMULT; j++) {
+                buffer[j] = '0'+i;
+            }
+            buffer[NAMEMULT] = '\0';
+            lfs2_mkdir(&lfs2, (char*)buffer) => 0;
+
+            buffer[NAMEMULT] = '/';
+            for (int j = 0; j < NAMEMULT; j++) {
+                buffer[j+NAMEMULT+1] = '0'+i;
+            }
+            buffer[2*NAMEMULT+1] = '\0';
+            lfs2_file_open(&lfs2, &file, (char*)buffer,
+                    LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+            
+            size = NAMEMULT;
+            for (int j = 0; j < i*FILEMULT; j++) {
+                lfs2_file_write(&lfs2, &file, buffer, size) => size;
+            }
+
+            lfs2_file_close(&lfs2, &file) => 0;
+        }
+        lfs2_unmount(&lfs2) => 0;
+
+        lfs2_mount(&lfs2, &cfg) => 0;
+        for (int i = 1; i < 10; i++) {
+            for (int j = 0; j < NAMEMULT; j++) {
+                buffer[j] = '0'+i;
+            }
+            buffer[NAMEMULT] = '\0';
+            lfs2_stat(&lfs2, (char*)buffer, &info) => 0;
+            info.type => LFS2_TYPE_DIR;
+
+            buffer[NAMEMULT] = '/';
+            for (int j = 0; j < NAMEMULT; j++) {
+                buffer[j+NAMEMULT+1] = '0'+i;
+            }
+            buffer[2*NAMEMULT+1] = '\0';
+            lfs2_file_open(&lfs2, &file, (char*)buffer, LFS2_O_RDONLY) => 0;
+            
+            size = NAMEMULT;
+            for (int j = 0; j < i*FILEMULT; j++) {
+                uint8_t rbuffer[1024];
+                lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+                memcmp(buffer, rbuffer, size) => 0;
+            }
+
+            lfs2_file_close(&lfs2, &file) => 0;
+        }
+        lfs2_unmount(&lfs2) => 0;
+    }
+'''
+
+[[case]] # region corruption (causes cascading failures)
+define.LFS2_BLOCK_COUNT = 256 # small bd so test runs faster
+define.LFS2_ERASE_CYCLES = 0xffffffff
+define.LFS2_ERASE_VALUE = [0x00, 0xff, -1]
+define.LFS2_BADBLOCK_BEHAVIOR = [
+    'LFS2_TESTBD_BADBLOCK_PROGERROR',
+    'LFS2_TESTBD_BADBLOCK_ERASEERROR',
+    'LFS2_TESTBD_BADBLOCK_READERROR',
+    'LFS2_TESTBD_BADBLOCK_PROGNOOP',
+    'LFS2_TESTBD_BADBLOCK_ERASENOOP',
+]
+define.NAMEMULT = 64
+define.FILEMULT = 1
+code = '''
+    for (lfs2_block_t i = 0; i < (LFS2_BLOCK_COUNT-2)/2; i++) {
+        lfs2_testbd_setwear(&cfg, i+2, 0xffffffff) => 0;
+    }
+    
+    lfs2_format(&lfs2, &cfg) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    for (int i = 1; i < 10; i++) {
+        for (int j = 0; j < NAMEMULT; j++) {
+            buffer[j] = '0'+i;
+        }
+        buffer[NAMEMULT] = '\0';
+        lfs2_mkdir(&lfs2, (char*)buffer) => 0;
+
+        buffer[NAMEMULT] = '/';
+        for (int j = 0; j < NAMEMULT; j++) {
+            buffer[j+NAMEMULT+1] = '0'+i;
+        }
+        buffer[2*NAMEMULT+1] = '\0';
+        lfs2_file_open(&lfs2, &file, (char*)buffer,
+                LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+        
+        size = NAMEMULT;
+        for (int j = 0; j < i*FILEMULT; j++) {
+            lfs2_file_write(&lfs2, &file, buffer, size) => size;
+        }
+
+        lfs2_file_close(&lfs2, &file) => 0;
+    }
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    for (int i = 1; i < 10; i++) {
+        for (int j = 0; j < NAMEMULT; j++) {
+            buffer[j] = '0'+i;
+        }
+        buffer[NAMEMULT] = '\0';
+        lfs2_stat(&lfs2, (char*)buffer, &info) => 0;
+        info.type => LFS2_TYPE_DIR;
+
+        buffer[NAMEMULT] = '/';
+        for (int j = 0; j < NAMEMULT; j++) {
+            buffer[j+NAMEMULT+1] = '0'+i;
+        }
+        buffer[2*NAMEMULT+1] = '\0';
+        lfs2_file_open(&lfs2, &file, (char*)buffer, LFS2_O_RDONLY) => 0;
+        
+        size = NAMEMULT;
+        for (int j = 0; j < i*FILEMULT; j++) {
+            uint8_t rbuffer[1024];
+            lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+            memcmp(buffer, rbuffer, size) => 0;
+        }
+
+        lfs2_file_close(&lfs2, &file) => 0;
+    }
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # alternating corruption (causes cascading failures)
+define.LFS2_BLOCK_COUNT = 256 # small bd so test runs faster
+define.LFS2_ERASE_CYCLES = 0xffffffff
+define.LFS2_ERASE_VALUE = [0x00, 0xff, -1]
+define.LFS2_BADBLOCK_BEHAVIOR = [
+    'LFS2_TESTBD_BADBLOCK_PROGERROR',
+    'LFS2_TESTBD_BADBLOCK_ERASEERROR',
+    'LFS2_TESTBD_BADBLOCK_READERROR',
+    'LFS2_TESTBD_BADBLOCK_PROGNOOP',
+    'LFS2_TESTBD_BADBLOCK_ERASENOOP',
+]
+define.NAMEMULT = 64
+define.FILEMULT = 1
+code = '''
+    for (lfs2_block_t i = 0; i < (LFS2_BLOCK_COUNT-2)/2; i++) {
+        lfs2_testbd_setwear(&cfg, (2*i) + 2, 0xffffffff) => 0;
+    }
+    
+    lfs2_format(&lfs2, &cfg) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    for (int i = 1; i < 10; i++) {
+        for (int j = 0; j < NAMEMULT; j++) {
+            buffer[j] = '0'+i;
+        }
+        buffer[NAMEMULT] = '\0';
+        lfs2_mkdir(&lfs2, (char*)buffer) => 0;
+
+        buffer[NAMEMULT] = '/';
+        for (int j = 0; j < NAMEMULT; j++) {
+            buffer[j+NAMEMULT+1] = '0'+i;
+        }
+        buffer[2*NAMEMULT+1] = '\0';
+        lfs2_file_open(&lfs2, &file, (char*)buffer,
+                LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+        
+        size = NAMEMULT;
+        for (int j = 0; j < i*FILEMULT; j++) {
+            lfs2_file_write(&lfs2, &file, buffer, size) => size;
+        }
+
+        lfs2_file_close(&lfs2, &file) => 0;
+    }
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    for (int i = 1; i < 10; i++) {
+        for (int j = 0; j < NAMEMULT; j++) {
+            buffer[j] = '0'+i;
+        }
+        buffer[NAMEMULT] = '\0';
+        lfs2_stat(&lfs2, (char*)buffer, &info) => 0;
+        info.type => LFS2_TYPE_DIR;
+
+        buffer[NAMEMULT] = '/';
+        for (int j = 0; j < NAMEMULT; j++) {
+            buffer[j+NAMEMULT+1] = '0'+i;
+        }
+        buffer[2*NAMEMULT+1] = '\0';
+        lfs2_file_open(&lfs2, &file, (char*)buffer, LFS2_O_RDONLY) => 0;
+        
+        size = NAMEMULT;
+        for (int j = 0; j < i*FILEMULT; j++) {
+            uint8_t rbuffer[1024];
+            lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+            memcmp(buffer, rbuffer, size) => 0;
+        }
+
+        lfs2_file_close(&lfs2, &file) => 0;
+    }
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+# other corner cases
+[[case]] # bad superblocks (corrupt 1 or 0)
+define.LFS2_ERASE_CYCLES = 0xffffffff
+define.LFS2_ERASE_VALUE = [0x00, 0xff, -1]
+define.LFS2_BADBLOCK_BEHAVIOR = [
+    'LFS2_TESTBD_BADBLOCK_PROGERROR',
+    'LFS2_TESTBD_BADBLOCK_ERASEERROR',
+    'LFS2_TESTBD_BADBLOCK_READERROR',
+    'LFS2_TESTBD_BADBLOCK_PROGNOOP',
+    'LFS2_TESTBD_BADBLOCK_ERASENOOP',
+]
+code = '''
+    lfs2_testbd_setwear(&cfg, 0, 0xffffffff) => 0;
+    lfs2_testbd_setwear(&cfg, 1, 0xffffffff) => 0;
+
+    lfs2_format(&lfs2, &cfg) => LFS2_ERR_NOSPC;
+    lfs2_mount(&lfs2, &cfg) => LFS2_ERR_CORRUPT;
+'''

tests/test_corrupt.sh

@@ -1,117 +0,0 @@
-#!/bin/bash
-set -eu
-
-echo "=== Corrupt tests ==="
-
-NAMEMULT=64
-FILEMULT=1
-
-lfs_mktree() {
-tests/test.py ${1:-} << TEST
-    lfs_format(&lfs, &cfg) => 0;
-
-    lfs_mount(&lfs, &cfg) => 0;
-    for (int i = 1; i < 10; i++) {
-        for (int j = 0; j < $NAMEMULT; j++) {
-            buffer[j] = '0'+i;
-        }
-        buffer[$NAMEMULT] = '\0';
-        lfs_mkdir(&lfs, (char*)buffer) => 0;
-
-        buffer[$NAMEMULT] = '/';
-        for (int j = 0; j < $NAMEMULT; j++) {
-            buffer[j+$NAMEMULT+1] = '0'+i;
-        }
-        buffer[2*$NAMEMULT+1] = '\0';
-        lfs_file_open(&lfs, &file[0], (char*)buffer,
-                LFS_O_WRONLY | LFS_O_CREAT) => 0;
-        
-        size = $NAMEMULT;
-        for (int j = 0; j < i*$FILEMULT; j++) {
-            lfs_file_write(&lfs, &file[0], buffer, size) => size;
-        }
-
-        lfs_file_close(&lfs, &file[0]) => 0;
-    }
-    lfs_unmount(&lfs) => 0;
-TEST
-}
-
-lfs_chktree() {
-tests/test.py ${1:-} << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    for (int i = 1; i < 10; i++) {
-        for (int j = 0; j < $NAMEMULT; j++) {
-            buffer[j] = '0'+i;
-        }
-        buffer[$NAMEMULT] = '\0';
-        lfs_stat(&lfs, (char*)buffer, &info) => 0;
-        info.type => LFS_TYPE_DIR;
-
-        buffer[$NAMEMULT] = '/';
-        for (int j = 0; j < $NAMEMULT; j++) {
-            buffer[j+$NAMEMULT+1] = '0'+i;
-        }
-        buffer[2*$NAMEMULT+1] = '\0';
-        lfs_file_open(&lfs, &file[0], (char*)buffer, LFS_O_RDONLY) => 0;
-        
-        size = $NAMEMULT;
-        for (int j = 0; j < i*$FILEMULT; j++) {
-            lfs_file_read(&lfs, &file[0], rbuffer, size) => size;
-            memcmp(buffer, rbuffer, size) => 0;
-        }
-
-        lfs_file_close(&lfs, &file[0]) => 0;
-    }
-    lfs_unmount(&lfs) => 0;
-TEST
-}
-
-echo "--- Sanity check ---"
-rm -rf blocks
-lfs_mktree
-lfs_chktree
-
-echo "--- Block corruption ---"
-for i in {0..33}
-do 
-    rm -rf blocks
-    mkdir blocks
-    ln -s /dev/zero blocks/$(printf '%x' $i)
-    lfs_mktree
-    lfs_chktree
-done
-
-echo "--- Block persistance ---"
-for i in {0..33}
-do 
-    rm -rf blocks
-    mkdir blocks
-    lfs_mktree
-    chmod a-w blocks/$(printf '%x' $i)
-    lfs_mktree
-    lfs_chktree
-done
-
-echo "--- Big region corruption ---"
-rm -rf blocks
-mkdir blocks
-for i in {2..255}
-do
-    ln -s /dev/zero blocks/$(printf '%x' $i)
-done
-lfs_mktree
-lfs_chktree
-
-echo "--- Alternating corruption ---"
-rm -rf blocks
-mkdir blocks
-for i in {2..511..2}
-do
-    ln -s /dev/zero blocks/$(printf '%x' $i)
-done
-lfs_mktree
-lfs_chktree
-
-echo "--- Results ---"
-tests/stats.py

tests/test_dirs.sh

@@ -1,425 +0,0 @@
-#!/bin/bash
-set -eu
-
-LARGESIZE=128
-
-echo "=== Directory tests ==="
-rm -rf blocks
-tests/test.py << TEST
-    lfs_format(&lfs, &cfg) => 0;
-TEST
-
-echo "--- Root directory ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_dir_open(&lfs, &dir[0], "/") => 0;
-    lfs_dir_close(&lfs, &dir[0]) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Directory creation ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_mkdir(&lfs, "potato") => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- File creation ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_file_open(&lfs, &file[0], "burito", LFS_O_CREAT | LFS_O_WRONLY) => 0;
-    lfs_file_close(&lfs, &file[0]) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Directory iteration ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_dir_open(&lfs, &dir[0], "/") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, ".") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "..") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "potato") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "burito") => 0;
-    info.type => LFS_TYPE_REG;
-    lfs_dir_read(&lfs, &dir[0], &info) => 0;
-    lfs_dir_close(&lfs, &dir[0]) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Directory failures ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_mkdir(&lfs, "potato") => LFS_ERR_EXIST;
-    lfs_dir_open(&lfs, &dir[0], "tomato") => LFS_ERR_NOENT;
-    lfs_dir_open(&lfs, &dir[0], "burito") => LFS_ERR_NOTDIR;
-    lfs_file_open(&lfs, &file[0], "tomato", LFS_O_RDONLY) => LFS_ERR_NOENT;
-    lfs_file_open(&lfs, &file[0], "potato", LFS_O_RDONLY) => LFS_ERR_ISDIR;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Nested directories ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_mkdir(&lfs, "potato/baked") => 0;
-    lfs_mkdir(&lfs, "potato/sweet") => 0;
-    lfs_mkdir(&lfs, "potato/fried") => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_dir_open(&lfs, &dir[0], "potato") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, ".") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "..") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "baked") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "sweet") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "fried") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 0;
-    lfs_dir_close(&lfs, &dir[0]) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Multi-block directory ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_mkdir(&lfs, "cactus") => 0;
-    for (int i = 0; i < $LARGESIZE; i++) {
-        sprintf((char*)buffer, "cactus/test%d", i);
-        lfs_mkdir(&lfs, (char*)buffer) => 0;
-    }
-    lfs_unmount(&lfs) => 0;
-TEST
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_dir_open(&lfs, &dir[0], "cactus") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, ".") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "..") => 0;
-    info.type => LFS_TYPE_DIR;
-    for (int i = 0; i < $LARGESIZE; i++) {
-        sprintf((char*)buffer, "test%d", i);
-        lfs_dir_read(&lfs, &dir[0], &info) => 1;
-        strcmp(info.name, (char*)buffer) => 0;
-        info.type => LFS_TYPE_DIR;
-    }
-    lfs_dir_read(&lfs, &dir[0], &info) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Directory remove ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_remove(&lfs, "potato") => LFS_ERR_NOTEMPTY;
-    lfs_remove(&lfs, "potato/sweet") => 0;
-    lfs_remove(&lfs, "potato/baked") => 0;
-    lfs_remove(&lfs, "potato/fried") => 0;
-
-    lfs_dir_open(&lfs, &dir[0], "potato") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, ".") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "..") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 0;
-    lfs_dir_close(&lfs, &dir[0]) => 0;
-
-    lfs_remove(&lfs, "potato") => 0;
-
-    lfs_dir_open(&lfs, &dir[0], "/") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, ".") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "..") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "burito") => 0;
-    info.type => LFS_TYPE_REG;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "cactus") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 0;
-    lfs_dir_close(&lfs, &dir[0]) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_dir_open(&lfs, &dir[0], "/") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, ".") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "..") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "burito") => 0;
-    info.type => LFS_TYPE_REG;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "cactus") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 0;
-    lfs_dir_close(&lfs, &dir[0]) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Directory rename ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_mkdir(&lfs, "coldpotato") => 0;
-    lfs_mkdir(&lfs, "coldpotato/baked") => 0;
-    lfs_mkdir(&lfs, "coldpotato/sweet") => 0;
-    lfs_mkdir(&lfs, "coldpotato/fried") => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_rename(&lfs, "coldpotato", "hotpotato") => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_dir_open(&lfs, &dir[0], "hotpotato") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, ".") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "..") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "baked") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "sweet") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "fried") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 0;
-    lfs_dir_close(&lfs, &dir[0]) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_mkdir(&lfs, "warmpotato") => 0;
-    lfs_mkdir(&lfs, "warmpotato/mushy") => 0;
-    lfs_rename(&lfs, "hotpotato", "warmpotato") => LFS_ERR_NOTEMPTY;
-
-    lfs_remove(&lfs, "warmpotato/mushy") => 0;
-    lfs_rename(&lfs, "hotpotato", "warmpotato") => 0;
-
-    lfs_unmount(&lfs) => 0;
-TEST
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_dir_open(&lfs, &dir[0], "warmpotato") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, ".") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "..") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "baked") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "sweet") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "fried") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 0;
-    lfs_dir_close(&lfs, &dir[0]) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_mkdir(&lfs, "coldpotato") => 0;
-    lfs_rename(&lfs, "warmpotato/baked", "coldpotato/baked") => 0;
-    lfs_rename(&lfs, "warmpotato/sweet", "coldpotato/sweet") => 0;
-    lfs_rename(&lfs, "warmpotato/fried", "coldpotato/fried") => 0;
-    lfs_remove(&lfs, "coldpotato") => LFS_ERR_NOTEMPTY;
-    lfs_remove(&lfs, "warmpotato") => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_dir_open(&lfs, &dir[0], "coldpotato") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, ".") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "..") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "baked") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "sweet") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "fried") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 0;
-    lfs_dir_close(&lfs, &dir[0]) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Recursive remove ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_remove(&lfs, "coldpotato") => LFS_ERR_NOTEMPTY;
-
-    lfs_dir_open(&lfs, &dir[0], "coldpotato") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-
-    while (true) {
-        int err = lfs_dir_read(&lfs, &dir[0], &info);
-        err >= 0 => 1;
-        if (err == 0) {
-            break;
-        }
-
-        strcpy((char*)buffer, "coldpotato/");
-        strcat((char*)buffer, info.name);
-        lfs_remove(&lfs, (char*)buffer) => 0;
-    }
-
-    lfs_remove(&lfs, "coldpotato") => 0;
-TEST
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_dir_open(&lfs, &dir[0], "/") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, ".") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "..") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "burito") => 0;
-    info.type => LFS_TYPE_REG;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "cactus") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 0;
-    lfs_dir_close(&lfs, &dir[0]) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Multi-block remove ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_remove(&lfs, "cactus") => LFS_ERR_NOTEMPTY;
-
-    for (int i = 0; i < $LARGESIZE; i++) {
-        sprintf((char*)buffer, "cactus/test%d", i);
-        lfs_remove(&lfs, (char*)buffer) => 0;
-    }
-
-    lfs_remove(&lfs, "cactus") => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_dir_open(&lfs, &dir[0], "/") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, ".") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "..") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "burito") => 0;
-    info.type => LFS_TYPE_REG;
-    lfs_dir_read(&lfs, &dir[0], &info) => 0;
-    lfs_dir_close(&lfs, &dir[0]) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Multi-block directory with files ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_mkdir(&lfs, "prickly-pear") => 0;
-    for (int i = 0; i < $LARGESIZE; i++) {
-        sprintf((char*)buffer, "prickly-pear/test%d", i);
-        lfs_file_open(&lfs, &file[0], (char*)buffer,
-                LFS_O_WRONLY | LFS_O_CREAT) => 0;
-        size = 6;
-        memcpy(wbuffer, "Hello", size);
-        lfs_file_write(&lfs, &file[0], wbuffer, size) => size;
-        lfs_file_close(&lfs, &file[0]) => 0;
-    }
-    lfs_unmount(&lfs) => 0;
-TEST
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_dir_open(&lfs, &dir[0], "prickly-pear") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, ".") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "..") => 0;
-    info.type => LFS_TYPE_DIR;
-    for (int i = 0; i < $LARGESIZE; i++) {
-        sprintf((char*)buffer, "test%d", i);
-        lfs_dir_read(&lfs, &dir[0], &info) => 1;
-        strcmp(info.name, (char*)buffer) => 0;
-        info.type => LFS_TYPE_REG;
-        info.size => 6;
-    }
-    lfs_dir_read(&lfs, &dir[0], &info) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Multi-block remove with files ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_remove(&lfs, "prickly-pear") => LFS_ERR_NOTEMPTY;
-
-    for (int i = 0; i < $LARGESIZE; i++) {
-        sprintf((char*)buffer, "prickly-pear/test%d", i);
-        lfs_remove(&lfs, (char*)buffer) => 0;
-    }
-
-    lfs_remove(&lfs, "prickly-pear") => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_dir_open(&lfs, &dir[0], "/") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, ".") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "..") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "burito") => 0;
-    info.type => LFS_TYPE_REG;
-    lfs_dir_read(&lfs, &dir[0], &info) => 0;
-    lfs_dir_close(&lfs, &dir[0]) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Results ---"
-tests/stats.py

tests/test_dirs.toml

@@ -0,0 +1,838 @@
+[[case]] # root
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_dir_open(&lfs2, &dir, "/") => 0;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, ".") == 0);
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, "..") == 0);
+    lfs2_dir_read(&lfs2, &dir, &info) => 0;
+    lfs2_dir_close(&lfs2, &dir) => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # many directory creation
+define.N = 'range(0, 100, 3)'
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    for (int i = 0; i < N; i++) {
+        sprintf(path, "dir%03d", i);
+        lfs2_mkdir(&lfs2, path) => 0;
+    }
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_dir_open(&lfs2, &dir, "/") => 0;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, ".") == 0);
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, "..") == 0);
+    for (int i = 0; i < N; i++) {
+        sprintf(path, "dir%03d", i);
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        assert(info.type == LFS2_TYPE_DIR);
+        assert(strcmp(info.name, path) == 0);
+    }
+    lfs2_dir_read(&lfs2, &dir, &info) => 0;
+    lfs2_dir_close(&lfs2, &dir) => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # many directory removal
+define.N = 'range(3, 100, 11)'
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    for (int i = 0; i < N; i++) {
+        sprintf(path, "removeme%03d", i);
+        lfs2_mkdir(&lfs2, path) => 0;
+    }
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_dir_open(&lfs2, &dir, "/") => 0;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, ".") == 0);
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, "..") == 0);
+    for (int i = 0; i < N; i++) {
+        sprintf(path, "removeme%03d", i);
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        assert(info.type == LFS2_TYPE_DIR);
+        assert(strcmp(info.name, path) == 0);
+    }
+    lfs2_dir_read(&lfs2, &dir, &info) => 0;
+    lfs2_dir_close(&lfs2, &dir) => 0;
+    lfs2_unmount(&lfs2);
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    for (int i = 0; i < N; i++) {
+        sprintf(path, "removeme%03d", i);
+        lfs2_remove(&lfs2, path) => 0;
+    }
+    lfs2_unmount(&lfs2);
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_dir_open(&lfs2, &dir, "/") => 0;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, ".") == 0);
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, "..") == 0);
+    lfs2_dir_read(&lfs2, &dir, &info) => 0;
+    lfs2_dir_close(&lfs2, &dir) => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # many directory rename
+define.N = 'range(3, 100, 11)'
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    for (int i = 0; i < N; i++) {
+        sprintf(path, "test%03d", i);
+        lfs2_mkdir(&lfs2, path) => 0;
+    }
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_dir_open(&lfs2, &dir, "/") => 0;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, ".") == 0);
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, "..") == 0);
+    for (int i = 0; i < N; i++) {
+        sprintf(path, "test%03d", i);
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        assert(info.type == LFS2_TYPE_DIR);
+        assert(strcmp(info.name, path) == 0);
+    }
+    lfs2_dir_read(&lfs2, &dir, &info) => 0;
+    lfs2_dir_close(&lfs2, &dir) => 0;
+    lfs2_unmount(&lfs2);
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    for (int i = 0; i < N; i++) {
+        char oldpath[128];
+        char newpath[128];
+        sprintf(oldpath, "test%03d", i);
+        sprintf(newpath, "tedd%03d", i);
+        lfs2_rename(&lfs2, oldpath, newpath) => 0;
+    }
+    lfs2_unmount(&lfs2);
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_dir_open(&lfs2, &dir, "/") => 0;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, ".") == 0);
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, "..") == 0);
+    for (int i = 0; i < N; i++) {
+        sprintf(path, "tedd%03d", i);
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        assert(info.type == LFS2_TYPE_DIR);
+        assert(strcmp(info.name, path) == 0);
+    }
+    lfs2_dir_read(&lfs2, &dir, &info) => 0;
+    lfs2_dir_close(&lfs2, &dir) => 0;
+    lfs2_unmount(&lfs2);
+'''
+
+[[case]] # reentrant many directory creation/rename/removal
+define.N = [5, 11]
+reentrant = true
+code = '''
+    err = lfs2_mount(&lfs2, &cfg);
+    if (err) {
+        lfs2_format(&lfs2, &cfg) => 0;
+        lfs2_mount(&lfs2, &cfg) => 0;
+    }
+
+    for (int i = 0; i < N; i++) {
+        sprintf(path, "hi%03d", i);
+        err = lfs2_mkdir(&lfs2, path);
+        assert(err == 0 || err == LFS2_ERR_EXIST);
+    }
+
+    for (int i = 0; i < N; i++) {
+        sprintf(path, "hello%03d", i);
+        err = lfs2_remove(&lfs2, path);
+        assert(err == 0 || err == LFS2_ERR_NOENT);
+    }
+
+    lfs2_dir_open(&lfs2, &dir, "/") => 0;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, ".") == 0);
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, "..") == 0);
+    for (int i = 0; i < N; i++) {
+        sprintf(path, "hi%03d", i);
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        assert(info.type == LFS2_TYPE_DIR);
+        assert(strcmp(info.name, path) == 0);
+    }
+    lfs2_dir_read(&lfs2, &dir, &info) => 0;
+    lfs2_dir_close(&lfs2, &dir) => 0;
+
+    for (int i = 0; i < N; i++) {
+        char oldpath[128];
+        char newpath[128];
+        sprintf(oldpath, "hi%03d", i);
+        sprintf(newpath, "hello%03d", i);
+        // YES this can overwrite an existing newpath
+        lfs2_rename(&lfs2, oldpath, newpath) => 0;
+    }
+
+    lfs2_dir_open(&lfs2, &dir, "/") => 0;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, ".") == 0);
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, "..") == 0);
+    for (int i = 0; i < N; i++) {
+        sprintf(path, "hello%03d", i);
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        assert(info.type == LFS2_TYPE_DIR);
+        assert(strcmp(info.name, path) == 0);
+    }
+    lfs2_dir_read(&lfs2, &dir, &info) => 0;
+    lfs2_dir_close(&lfs2, &dir) => 0;
+
+    for (int i = 0; i < N; i++) {
+        sprintf(path, "hello%03d", i);
+        lfs2_remove(&lfs2, path) => 0;
+    }
+
+    lfs2_dir_open(&lfs2, &dir, "/") => 0;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, ".") == 0);
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, "..") == 0);
+    lfs2_dir_read(&lfs2, &dir, &info) => 0;
+    lfs2_dir_close(&lfs2, &dir) => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # file creation
+define.N = 'range(3, 100, 11)'
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    for (int i = 0; i < N; i++) {
+        sprintf(path, "file%03d", i);
+        lfs2_file_open(&lfs2, &file, path,
+                LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_EXCL) => 0;
+        lfs2_file_close(&lfs2, &file) => 0;
+    }
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_dir_open(&lfs2, &dir, "/") => 0;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, ".") == 0);
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, "..") == 0);
+    for (int i = 0; i < N; i++) {
+        sprintf(path, "file%03d", i);
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        assert(info.type == LFS2_TYPE_REG);
+        assert(strcmp(info.name, path) == 0);
+    }
+    lfs2_dir_read(&lfs2, &dir, &info) => 0;
+    lfs2_dir_close(&lfs2, &dir) => 0;
+    lfs2_unmount(&lfs2);
+'''
+
+[[case]] # file removal
+define.N = 'range(0, 100, 3)'
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    for (int i = 0; i < N; i++) {
+        sprintf(path, "removeme%03d", i);
+        lfs2_file_open(&lfs2, &file, path,
+                LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_EXCL) => 0;
+        lfs2_file_close(&lfs2, &file) => 0;
+    }
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_dir_open(&lfs2, &dir, "/") => 0;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, ".") == 0);
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, "..") == 0);
+    for (int i = 0; i < N; i++) {
+        sprintf(path, "removeme%03d", i);
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        assert(info.type == LFS2_TYPE_REG);
+        assert(strcmp(info.name, path) == 0);
+    }
+    lfs2_dir_read(&lfs2, &dir, &info) => 0;
+    lfs2_dir_close(&lfs2, &dir) => 0;
+    lfs2_unmount(&lfs2);
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    for (int i = 0; i < N; i++) {
+        sprintf(path, "removeme%03d", i);
+        lfs2_remove(&lfs2, path) => 0;
+    }
+    lfs2_unmount(&lfs2);
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_dir_open(&lfs2, &dir, "/") => 0;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, ".") == 0);
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, "..") == 0);
+    lfs2_dir_read(&lfs2, &dir, &info) => 0;
+    lfs2_dir_close(&lfs2, &dir) => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # file rename
+define.N = 'range(0, 100, 3)'
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    for (int i = 0; i < N; i++) {
+        sprintf(path, "test%03d", i);
+        lfs2_file_open(&lfs2, &file, path,
+                LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_EXCL) => 0;
+        lfs2_file_close(&lfs2, &file) => 0;
+    }
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_dir_open(&lfs2, &dir, "/") => 0;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, ".") == 0);
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, "..") == 0);
+    for (int i = 0; i < N; i++) {
+        sprintf(path, "test%03d", i);
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        assert(info.type == LFS2_TYPE_REG);
+        assert(strcmp(info.name, path) == 0);
+    }
+    lfs2_dir_read(&lfs2, &dir, &info) => 0;
+    lfs2_dir_close(&lfs2, &dir) => 0;
+    lfs2_unmount(&lfs2);
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    for (int i = 0; i < N; i++) {
+        char oldpath[128];
+        char newpath[128];
+        sprintf(oldpath, "test%03d", i);
+        sprintf(newpath, "tedd%03d", i);
+        lfs2_rename(&lfs2, oldpath, newpath) => 0;
+    }
+    lfs2_unmount(&lfs2);
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_dir_open(&lfs2, &dir, "/") => 0;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, ".") == 0);
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, "..") == 0);
+    for (int i = 0; i < N; i++) {
+        sprintf(path, "tedd%03d", i);
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        assert(info.type == LFS2_TYPE_REG);
+        assert(strcmp(info.name, path) == 0);
+    }
+    lfs2_dir_read(&lfs2, &dir, &info) => 0;
+    lfs2_dir_close(&lfs2, &dir) => 0;
+    lfs2_unmount(&lfs2);
+'''
+
+[[case]] # reentrant file creation/rename/removal
+define.N = [5, 25]
+reentrant = true
+code = '''
+    err = lfs2_mount(&lfs2, &cfg);
+    if (err) {
+        lfs2_format(&lfs2, &cfg) => 0;
+        lfs2_mount(&lfs2, &cfg) => 0;
+    }
+
+    for (int i = 0; i < N; i++) {
+        sprintf(path, "hi%03d", i);
+        lfs2_file_open(&lfs2, &file, path, LFS2_O_CREAT | LFS2_O_WRONLY) => 0;
+        lfs2_file_close(&lfs2, &file) => 0;
+    }
+
+    for (int i = 0; i < N; i++) {
+        sprintf(path, "hello%03d", i);
+        err = lfs2_remove(&lfs2, path);
+        assert(err == 0 || err == LFS2_ERR_NOENT);
+    }
+
+    lfs2_dir_open(&lfs2, &dir, "/") => 0;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, ".") == 0);
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, "..") == 0);
+    for (int i = 0; i < N; i++) {
+        sprintf(path, "hi%03d", i);
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        assert(info.type == LFS2_TYPE_REG);
+        assert(strcmp(info.name, path) == 0);
+    }
+    lfs2_dir_read(&lfs2, &dir, &info) => 0;
+    lfs2_dir_close(&lfs2, &dir) => 0;
+
+    for (int i = 0; i < N; i++) {
+        char oldpath[128];
+        char newpath[128];
+        sprintf(oldpath, "hi%03d", i);
+        sprintf(newpath, "hello%03d", i);
+        // YES this can overwrite an existing newpath
+        lfs2_rename(&lfs2, oldpath, newpath) => 0;
+    }
+
+    lfs2_dir_open(&lfs2, &dir, "/") => 0;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, ".") == 0);
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, "..") == 0);
+    for (int i = 0; i < N; i++) {
+        sprintf(path, "hello%03d", i);
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        assert(info.type == LFS2_TYPE_REG);
+        assert(strcmp(info.name, path) == 0);
+    }
+    lfs2_dir_read(&lfs2, &dir, &info) => 0;
+    lfs2_dir_close(&lfs2, &dir) => 0;
+
+    for (int i = 0; i < N; i++) {
+        sprintf(path, "hello%03d", i);
+        lfs2_remove(&lfs2, path) => 0;
+    }
+
+    lfs2_dir_open(&lfs2, &dir, "/") => 0;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, ".") == 0);
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, "..") == 0);
+    lfs2_dir_read(&lfs2, &dir, &info) => 0;
+    lfs2_dir_close(&lfs2, &dir) => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # nested directories
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_mkdir(&lfs2, "potato") => 0;
+    lfs2_file_open(&lfs2, &file, "burito",
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_EXCL) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_mkdir(&lfs2, "potato/baked") => 0;
+    lfs2_mkdir(&lfs2, "potato/sweet") => 0;
+    lfs2_mkdir(&lfs2, "potato/fried") => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_dir_open(&lfs2, &dir, "potato") => 0;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(strcmp(info.name, ".") == 0);
+    info.type => LFS2_TYPE_DIR;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(strcmp(info.name, "..") == 0);
+    info.type => LFS2_TYPE_DIR;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(strcmp(info.name, "baked") == 0);
+    info.type => LFS2_TYPE_DIR;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(strcmp(info.name, "fried") == 0);
+    info.type => LFS2_TYPE_DIR;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(strcmp(info.name, "sweet") == 0);
+    info.type => LFS2_TYPE_DIR;
+    lfs2_dir_read(&lfs2, &dir, &info) => 0;
+    lfs2_dir_close(&lfs2, &dir) => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    // try removing?
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_remove(&lfs2, "potato") => LFS2_ERR_NOTEMPTY;
+    lfs2_unmount(&lfs2) => 0;
+
+    // try renaming?
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_rename(&lfs2, "potato", "coldpotato") => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_rename(&lfs2, "coldpotato", "warmpotato") => 0;
+    lfs2_rename(&lfs2, "warmpotato", "hotpotato") => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_remove(&lfs2, "potato") => LFS2_ERR_NOENT;
+    lfs2_remove(&lfs2, "coldpotato") => LFS2_ERR_NOENT;
+    lfs2_remove(&lfs2, "warmpotato") => LFS2_ERR_NOENT;
+    lfs2_remove(&lfs2, "hotpotato") => LFS2_ERR_NOTEMPTY;
+    lfs2_unmount(&lfs2) => 0;
+
+    // try cross-directory renaming
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_mkdir(&lfs2, "coldpotato") => 0;
+    lfs2_rename(&lfs2, "hotpotato/baked", "coldpotato/baked") => 0;
+    lfs2_rename(&lfs2, "coldpotato", "hotpotato") => LFS2_ERR_NOTEMPTY;
+    lfs2_remove(&lfs2, "coldpotato") => LFS2_ERR_NOTEMPTY;
+    lfs2_remove(&lfs2, "hotpotato") => LFS2_ERR_NOTEMPTY;
+    lfs2_rename(&lfs2, "hotpotato/fried", "coldpotato/fried") => 0;
+    lfs2_rename(&lfs2, "coldpotato", "hotpotato") => LFS2_ERR_NOTEMPTY;
+    lfs2_remove(&lfs2, "coldpotato") => LFS2_ERR_NOTEMPTY;
+    lfs2_remove(&lfs2, "hotpotato") => LFS2_ERR_NOTEMPTY;
+    lfs2_rename(&lfs2, "hotpotato/sweet", "coldpotato/sweet") => 0;
+    lfs2_rename(&lfs2, "coldpotato", "hotpotato") => 0;
+    lfs2_remove(&lfs2, "coldpotato") => LFS2_ERR_NOENT;
+    lfs2_remove(&lfs2, "hotpotato") => LFS2_ERR_NOTEMPTY;
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_dir_open(&lfs2, &dir, "hotpotato") => 0;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(strcmp(info.name, ".") == 0);
+    info.type => LFS2_TYPE_DIR;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(strcmp(info.name, "..") == 0);
+    info.type => LFS2_TYPE_DIR;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(strcmp(info.name, "baked") == 0);
+    info.type => LFS2_TYPE_DIR;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(strcmp(info.name, "fried") == 0);
+    info.type => LFS2_TYPE_DIR;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(strcmp(info.name, "sweet") == 0);
+    info.type => LFS2_TYPE_DIR;
+    lfs2_dir_read(&lfs2, &dir, &info) => 0;
+    lfs2_dir_close(&lfs2, &dir) => 0;
+    lfs2_unmount(&lfs2) => 0;
+    
+    // final remove
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_remove(&lfs2, "hotpotato") => LFS2_ERR_NOTEMPTY;
+    lfs2_remove(&lfs2, "hotpotato/baked") => 0;
+    lfs2_remove(&lfs2, "hotpotato") => LFS2_ERR_NOTEMPTY;
+    lfs2_remove(&lfs2, "hotpotato/fried") => 0;
+    lfs2_remove(&lfs2, "hotpotato") => LFS2_ERR_NOTEMPTY;
+    lfs2_remove(&lfs2, "hotpotato/sweet") => 0;
+    lfs2_remove(&lfs2, "hotpotato") => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_dir_open(&lfs2, &dir, "/") => 0;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(strcmp(info.name, ".") == 0);
+    info.type => LFS2_TYPE_DIR;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(strcmp(info.name, "..") == 0);
+    info.type => LFS2_TYPE_DIR;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(strcmp(info.name, "burito") == 0);
+    info.type => LFS2_TYPE_REG;
+    lfs2_dir_read(&lfs2, &dir, &info) => 0;
+    lfs2_dir_close(&lfs2, &dir) => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # recursive remove
+define.N = [10, 100]
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_mkdir(&lfs2, "prickly-pear") => 0;
+    for (int i = 0; i < N; i++) {
+        sprintf(path, "prickly-pear/cactus%03d", i);
+        lfs2_mkdir(&lfs2, path) => 0;
+    }
+    lfs2_dir_open(&lfs2, &dir, "prickly-pear") => 0;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, ".") == 0);
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, "..") == 0);
+    for (int i = 0; i < N; i++) {
+        sprintf(path, "cactus%03d", i);
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        assert(info.type == LFS2_TYPE_DIR);
+        assert(strcmp(info.name, path) == 0);
+    }
+    lfs2_dir_read(&lfs2, &dir, &info) => 0;
+    lfs2_dir_close(&lfs2, &dir) => 0;
+    lfs2_unmount(&lfs2);
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_remove(&lfs2, "prickly-pear") => LFS2_ERR_NOTEMPTY;
+
+    lfs2_dir_open(&lfs2, &dir, "prickly-pear") => 0;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, ".") == 0);
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, "..") == 0);
+    for (int i = 0; i < N; i++) {
+        sprintf(path, "cactus%03d", i);
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        assert(info.type == LFS2_TYPE_DIR);
+        assert(strcmp(info.name, path) == 0);
+        sprintf(path, "prickly-pear/%s", info.name);
+        lfs2_remove(&lfs2, path) => 0;
+    }
+    lfs2_dir_read(&lfs2, &dir, &info) => 0;
+    lfs2_dir_close(&lfs2, &dir) => 0;
+
+    lfs2_remove(&lfs2, "prickly-pear") => 0;
+    lfs2_remove(&lfs2, "prickly-pear") => LFS2_ERR_NOENT;
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_remove(&lfs2, "prickly-pear") => LFS2_ERR_NOENT;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # other error cases
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_mkdir(&lfs2, "potato") => 0;
+    lfs2_file_open(&lfs2, &file, "burito",
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_EXCL) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+
+    lfs2_mkdir(&lfs2, "potato") => LFS2_ERR_EXIST;
+    lfs2_mkdir(&lfs2, "burito") => LFS2_ERR_EXIST;
+    lfs2_file_open(&lfs2, &file, "burito",
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_EXCL) => LFS2_ERR_EXIST;
+    lfs2_file_open(&lfs2, &file, "potato",
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_EXCL) => LFS2_ERR_EXIST;
+    lfs2_dir_open(&lfs2, &dir, "tomato") => LFS2_ERR_NOENT;
+    lfs2_dir_open(&lfs2, &dir, "burito") => LFS2_ERR_NOTDIR;
+    lfs2_file_open(&lfs2, &file, "tomato", LFS2_O_RDONLY) => LFS2_ERR_NOENT;
+    lfs2_file_open(&lfs2, &file, "potato", LFS2_O_RDONLY) => LFS2_ERR_ISDIR;
+    lfs2_file_open(&lfs2, &file, "tomato", LFS2_O_WRONLY) => LFS2_ERR_NOENT;
+    lfs2_file_open(&lfs2, &file, "potato", LFS2_O_WRONLY) => LFS2_ERR_ISDIR;
+    lfs2_file_open(&lfs2, &file, "potato",
+            LFS2_O_WRONLY | LFS2_O_CREAT) => LFS2_ERR_ISDIR;
+
+    lfs2_mkdir(&lfs2, "/") => LFS2_ERR_EXIST;
+    lfs2_file_open(&lfs2, &file, "/",
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_EXCL) => LFS2_ERR_EXIST;
+    lfs2_file_open(&lfs2, &file, "/", LFS2_O_RDONLY) => LFS2_ERR_ISDIR;
+    lfs2_file_open(&lfs2, &file, "/", LFS2_O_WRONLY) => LFS2_ERR_ISDIR;
+    lfs2_file_open(&lfs2, &file, "/",
+            LFS2_O_WRONLY | LFS2_O_CREAT) => LFS2_ERR_ISDIR;
+
+    // check that errors did not corrupt directory
+    lfs2_dir_open(&lfs2, &dir, "/") => 0;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, ".") == 0);
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, "..") == 0);
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_REG);
+    assert(strcmp(info.name, "burito") == 0);
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, "potato") == 0);
+    lfs2_dir_read(&lfs2, &dir, &info) => 0;
+    lfs2_dir_close(&lfs2, &dir) => 0;
+
+    lfs2_unmount(&lfs2) => 0;
+
+    // or on disk
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_dir_open(&lfs2, &dir, "/") => 0;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, ".") == 0);
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, "..") == 0);
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_REG);
+    assert(strcmp(info.name, "burito") == 0);
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(info.type == LFS2_TYPE_DIR);
+    assert(strcmp(info.name, "potato") == 0);
+    lfs2_dir_read(&lfs2, &dir, &info) => 0;
+    lfs2_dir_close(&lfs2, &dir) => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # directory seek
+define.COUNT = [4, 128, 132]
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_mkdir(&lfs2, "hello") => 0;
+    for (int i = 0; i < COUNT; i++) {
+        sprintf(path, "hello/kitty%03d", i);
+        lfs2_mkdir(&lfs2, path) => 0;
+    }
+    lfs2_unmount(&lfs2) => 0;
+
+    for (int j = 2; j < COUNT; j++) {
+        lfs2_mount(&lfs2, &cfg) => 0;
+        lfs2_dir_open(&lfs2, &dir, "hello") => 0;
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        assert(strcmp(info.name, ".") == 0);
+        assert(info.type == LFS2_TYPE_DIR);
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        assert(strcmp(info.name, "..") == 0);
+        assert(info.type == LFS2_TYPE_DIR);
+
+        lfs2_soff_t pos;
+        for (int i = 0; i < j; i++) {
+            sprintf(path, "kitty%03d", i);
+            lfs2_dir_read(&lfs2, &dir, &info) => 1;
+            assert(strcmp(info.name, path) == 0);
+            assert(info.type == LFS2_TYPE_DIR);
+            pos = lfs2_dir_tell(&lfs2, &dir);
+            assert(pos >= 0);
+        }
+
+        lfs2_dir_seek(&lfs2, &dir, pos) => 0;
+        sprintf(path, "kitty%03d", j);
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        assert(strcmp(info.name, path) == 0);
+        assert(info.type == LFS2_TYPE_DIR);
+
+        lfs2_dir_rewind(&lfs2, &dir) => 0;
+        sprintf(path, "kitty%03d", 0);
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        assert(strcmp(info.name, ".") == 0);
+        assert(info.type == LFS2_TYPE_DIR);
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        assert(strcmp(info.name, "..") == 0);
+        assert(info.type == LFS2_TYPE_DIR);
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        assert(strcmp(info.name, path) == 0);
+        assert(info.type == LFS2_TYPE_DIR);
+
+        lfs2_dir_seek(&lfs2, &dir, pos) => 0;
+        sprintf(path, "kitty%03d", j);
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        assert(strcmp(info.name, path) == 0);
+        assert(info.type == LFS2_TYPE_DIR);
+
+        lfs2_dir_close(&lfs2, &dir) => 0;
+        lfs2_unmount(&lfs2) => 0;
+    }
+'''
+
+[[case]] # root seek
+define.COUNT = [4, 128, 132]
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    for (int i = 0; i < COUNT; i++) {
+        sprintf(path, "hi%03d", i);
+        lfs2_mkdir(&lfs2, path) => 0;
+    }
+    lfs2_unmount(&lfs2) => 0;
+
+    for (int j = 2; j < COUNT; j++) {
+        lfs2_mount(&lfs2, &cfg) => 0;
+        lfs2_dir_open(&lfs2, &dir, "/") => 0;
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        assert(strcmp(info.name, ".") == 0);
+        assert(info.type == LFS2_TYPE_DIR);
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        assert(strcmp(info.name, "..") == 0);
+        assert(info.type == LFS2_TYPE_DIR);
+
+        lfs2_soff_t pos;
+        for (int i = 0; i < j; i++) {
+            sprintf(path, "hi%03d", i);
+            lfs2_dir_read(&lfs2, &dir, &info) => 1;
+            assert(strcmp(info.name, path) == 0);
+            assert(info.type == LFS2_TYPE_DIR);
+            pos = lfs2_dir_tell(&lfs2, &dir);
+            assert(pos >= 0);
+        }
+
+        lfs2_dir_seek(&lfs2, &dir, pos) => 0;
+        sprintf(path, "hi%03d", j);
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        assert(strcmp(info.name, path) == 0);
+        assert(info.type == LFS2_TYPE_DIR);
+
+        lfs2_dir_rewind(&lfs2, &dir) => 0;
+        sprintf(path, "hi%03d", 0);
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        assert(strcmp(info.name, ".") == 0);
+        assert(info.type == LFS2_TYPE_DIR);
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        assert(strcmp(info.name, "..") == 0);
+        assert(info.type == LFS2_TYPE_DIR);
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        assert(strcmp(info.name, path) == 0);
+        assert(info.type == LFS2_TYPE_DIR);
+
+        lfs2_dir_seek(&lfs2, &dir, pos) => 0;
+        sprintf(path, "hi%03d", j);
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        assert(strcmp(info.name, path) == 0);
+        assert(info.type == LFS2_TYPE_DIR);
+
+        lfs2_dir_close(&lfs2, &dir) => 0;
+        lfs2_unmount(&lfs2) => 0;
+    }
+'''
+

tests/test_entries.toml

@@ -0,0 +1,611 @@
+# These tests are for some specific corner cases with neighboring inline files.
+# Note that these tests are intended for 512 byte inline sizes. They should
+# still pass with other inline sizes but wouldn't be testing anything.
+
+define.LFS2_CACHE_SIZE = 512
+if = 'LFS2_CACHE_SIZE % LFS2_PROG_SIZE == 0 && LFS2_CACHE_SIZE == 512'
+
+[[case]] # entry grow test
+code = '''
+    uint8_t wbuffer[1024];
+    uint8_t rbuffer[1024];
+
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+
+    // write hi0 20
+    sprintf(path, "hi0"); size = 20;
+    lfs2_file_open(&lfs2, &file, path,
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    memset(wbuffer, 'c', size);
+    lfs2_file_write(&lfs2, &file, wbuffer, size) => size;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // write hi1 20
+    sprintf(path, "hi1"); size = 20;
+    lfs2_file_open(&lfs2, &file, path,
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    memset(wbuffer, 'c', size);
+    lfs2_file_write(&lfs2, &file, wbuffer, size) => size;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // write hi2 20
+    sprintf(path, "hi2"); size = 20;
+    lfs2_file_open(&lfs2, &file, path,
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    memset(wbuffer, 'c', size);
+    lfs2_file_write(&lfs2, &file, wbuffer, size) => size;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // write hi3 20
+    sprintf(path, "hi3"); size = 20;
+    lfs2_file_open(&lfs2, &file, path,
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    memset(wbuffer, 'c', size);
+    lfs2_file_write(&lfs2, &file, wbuffer, size) => size;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    // read hi1 20
+    sprintf(path, "hi1"); size = 20;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+    memcmp(rbuffer, wbuffer, size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // write hi1 200
+    sprintf(path, "hi1"); size = 200;
+    lfs2_file_open(&lfs2, &file, path,
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    memset(wbuffer, 'c', size);
+    lfs2_file_write(&lfs2, &file, wbuffer, size) => size;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    // read hi0 20
+    sprintf(path, "hi0"); size = 20;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+    memcmp(rbuffer, wbuffer, size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // read hi1 200
+    sprintf(path, "hi1"); size = 200;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+    memcmp(rbuffer, wbuffer, size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // read hi2 20
+    sprintf(path, "hi2"); size = 20;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+    memcmp(rbuffer, wbuffer, size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // read hi3 20
+    sprintf(path, "hi3"); size = 20;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+    memcmp(rbuffer, wbuffer, size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # entry shrink test
+code = '''
+    uint8_t wbuffer[1024];
+    uint8_t rbuffer[1024];
+
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+
+    // write hi0 20
+    sprintf(path, "hi0"); size = 20;
+    lfs2_file_open(&lfs2, &file, path,
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    memset(wbuffer, 'c', size);
+    lfs2_file_write(&lfs2, &file, wbuffer, size) => size;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // write hi1 200
+    sprintf(path, "hi1"); size = 200;
+    lfs2_file_open(&lfs2, &file, path,
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    memset(wbuffer, 'c', size);
+    lfs2_file_write(&lfs2, &file, wbuffer, size) => size;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // write hi2 20
+    sprintf(path, "hi2"); size = 20;
+    lfs2_file_open(&lfs2, &file, path,
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    memset(wbuffer, 'c', size);
+    lfs2_file_write(&lfs2, &file, wbuffer, size) => size;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // write hi3 20
+    sprintf(path, "hi3"); size = 20;
+    lfs2_file_open(&lfs2, &file, path,
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    memset(wbuffer, 'c', size);
+    lfs2_file_write(&lfs2, &file, wbuffer, size) => size;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    // read hi1 200
+    sprintf(path, "hi1"); size = 200;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+    memcmp(rbuffer, wbuffer, size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // write hi1 20
+    sprintf(path, "hi1"); size = 20;
+    lfs2_file_open(&lfs2, &file, path,
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    memset(wbuffer, 'c', size);
+    lfs2_file_write(&lfs2, &file, wbuffer, size) => size;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    // read hi0 20
+    sprintf(path, "hi0"); size = 20;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+    memcmp(rbuffer, wbuffer, size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // read hi1 20
+    sprintf(path, "hi1"); size = 20;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+    memcmp(rbuffer, wbuffer, size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // read hi2 20
+    sprintf(path, "hi2"); size = 20;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+    memcmp(rbuffer, wbuffer, size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // read hi3 20
+    sprintf(path, "hi3"); size = 20;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+    memcmp(rbuffer, wbuffer, size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # entry spill test
+code = '''
+    uint8_t wbuffer[1024];
+    uint8_t rbuffer[1024];
+
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+
+    // write hi0 200
+    sprintf(path, "hi0"); size = 200;
+    lfs2_file_open(&lfs2, &file, path,
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    memset(wbuffer, 'c', size);
+    lfs2_file_write(&lfs2, &file, wbuffer, size) => size;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // write hi1 200
+    sprintf(path, "hi1"); size = 200;
+    lfs2_file_open(&lfs2, &file, path,
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    memset(wbuffer, 'c', size);
+    lfs2_file_write(&lfs2, &file, wbuffer, size) => size;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // write hi2 200
+    sprintf(path, "hi2"); size = 200;
+    lfs2_file_open(&lfs2, &file, path,
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    memset(wbuffer, 'c', size);
+    lfs2_file_write(&lfs2, &file, wbuffer, size) => size;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // write hi3 200
+    sprintf(path, "hi3"); size = 200;
+    lfs2_file_open(&lfs2, &file, path,
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    memset(wbuffer, 'c', size);
+    lfs2_file_write(&lfs2, &file, wbuffer, size) => size;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    // read hi0 200
+    sprintf(path, "hi0"); size = 200;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+    memcmp(rbuffer, wbuffer, size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // read hi1 200
+    sprintf(path, "hi1"); size = 200;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+    memcmp(rbuffer, wbuffer, size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // read hi2 200
+    sprintf(path, "hi2"); size = 200;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+    memcmp(rbuffer, wbuffer, size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // read hi3 200
+    sprintf(path, "hi3"); size = 200;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+    memcmp(rbuffer, wbuffer, size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # entry push spill test
+code = '''
+    uint8_t wbuffer[1024];
+    uint8_t rbuffer[1024];
+
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+
+    // write hi0 200
+    sprintf(path, "hi0"); size = 200;
+    lfs2_file_open(&lfs2, &file, path,
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    memset(wbuffer, 'c', size);
+    lfs2_file_write(&lfs2, &file, wbuffer, size) => size;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // write hi1 20
+    sprintf(path, "hi1"); size = 20;
+    lfs2_file_open(&lfs2, &file, path,
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    memset(wbuffer, 'c', size);
+    lfs2_file_write(&lfs2, &file, wbuffer, size) => size;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // write hi2 200
+    sprintf(path, "hi2"); size = 200;
+    lfs2_file_open(&lfs2, &file, path,
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    memset(wbuffer, 'c', size);
+    lfs2_file_write(&lfs2, &file, wbuffer, size) => size;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // write hi3 200
+    sprintf(path, "hi3"); size = 200;
+    lfs2_file_open(&lfs2, &file, path,
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    memset(wbuffer, 'c', size);
+    lfs2_file_write(&lfs2, &file, wbuffer, size) => size;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    // read hi1 20
+    sprintf(path, "hi1"); size = 20;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+    memcmp(rbuffer, wbuffer, size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // write hi1 200
+    sprintf(path, "hi1"); size = 200;
+    lfs2_file_open(&lfs2, &file, path,
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    memset(wbuffer, 'c', size);
+    lfs2_file_write(&lfs2, &file, wbuffer, size) => size;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    // read hi0 200
+    sprintf(path, "hi0"); size = 200;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+    memcmp(rbuffer, wbuffer, size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // read hi1 200
+    sprintf(path, "hi1"); size = 200;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+    memcmp(rbuffer, wbuffer, size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // read hi2 200
+    sprintf(path, "hi2"); size = 200;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+    memcmp(rbuffer, wbuffer, size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // read hi3 200
+    sprintf(path, "hi3"); size = 200;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+    memcmp(rbuffer, wbuffer, size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # entry push spill two test
+code = '''
+    uint8_t wbuffer[1024];
+    uint8_t rbuffer[1024];
+
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+
+    // write hi0 200
+    sprintf(path, "hi0"); size = 200;
+    lfs2_file_open(&lfs2, &file, path,
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    memset(wbuffer, 'c', size);
+    lfs2_file_write(&lfs2, &file, wbuffer, size) => size;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // write hi1 20
+    sprintf(path, "hi1"); size = 20;
+    lfs2_file_open(&lfs2, &file, path,
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    memset(wbuffer, 'c', size);
+    lfs2_file_write(&lfs2, &file, wbuffer, size) => size;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // write hi2 200
+    sprintf(path, "hi2"); size = 200;
+    lfs2_file_open(&lfs2, &file, path,
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    memset(wbuffer, 'c', size);
+    lfs2_file_write(&lfs2, &file, wbuffer, size) => size;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // write hi3 200
+    sprintf(path, "hi3"); size = 200;
+    lfs2_file_open(&lfs2, &file, path,
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    memset(wbuffer, 'c', size);
+    lfs2_file_write(&lfs2, &file, wbuffer, size) => size;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // write hi4 200
+    sprintf(path, "hi4"); size = 200;
+    lfs2_file_open(&lfs2, &file, path,
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    memset(wbuffer, 'c', size);
+    lfs2_file_write(&lfs2, &file, wbuffer, size) => size;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    // read hi1 20
+    sprintf(path, "hi1"); size = 20;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+    memcmp(rbuffer, wbuffer, size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // write hi1 200
+    sprintf(path, "hi1"); size = 200;
+    lfs2_file_open(&lfs2, &file, path,
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    memset(wbuffer, 'c', size);
+    lfs2_file_write(&lfs2, &file, wbuffer, size) => size;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    // read hi0 200
+    sprintf(path, "hi0"); size = 200;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+    memcmp(rbuffer, wbuffer, size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // read hi1 200
+    sprintf(path, "hi1"); size = 200;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+    memcmp(rbuffer, wbuffer, size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // read hi2 200
+    sprintf(path, "hi2"); size = 200;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+    memcmp(rbuffer, wbuffer, size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // read hi3 200
+    sprintf(path, "hi3"); size = 200;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+    memcmp(rbuffer, wbuffer, size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // read hi4 200
+    sprintf(path, "hi4"); size = 200;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+    memcmp(rbuffer, wbuffer, size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # entry drop test
+code = '''
+    uint8_t wbuffer[1024];
+    uint8_t rbuffer[1024];
+
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+
+    // write hi0 200
+    sprintf(path, "hi0"); size = 200;
+    lfs2_file_open(&lfs2, &file, path,
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    memset(wbuffer, 'c', size);
+    lfs2_file_write(&lfs2, &file, wbuffer, size) => size;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // write hi1 200
+    sprintf(path, "hi1"); size = 200;
+    lfs2_file_open(&lfs2, &file, path,
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    memset(wbuffer, 'c', size);
+    lfs2_file_write(&lfs2, &file, wbuffer, size) => size;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // write hi2 200
+    sprintf(path, "hi2"); size = 200;
+    lfs2_file_open(&lfs2, &file, path,
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    memset(wbuffer, 'c', size);
+    lfs2_file_write(&lfs2, &file, wbuffer, size) => size;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // write hi3 200
+    sprintf(path, "hi3"); size = 200;
+    lfs2_file_open(&lfs2, &file, path,
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    memset(wbuffer, 'c', size);
+    lfs2_file_write(&lfs2, &file, wbuffer, size) => size;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    lfs2_remove(&lfs2, "hi1") => 0;
+    lfs2_stat(&lfs2, "hi1", &info) => LFS2_ERR_NOENT;
+    // read hi0 200
+    sprintf(path, "hi0"); size = 200;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+    memcmp(rbuffer, wbuffer, size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // read hi2 200
+    sprintf(path, "hi2"); size = 200;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+    memcmp(rbuffer, wbuffer, size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // read hi3 200
+    sprintf(path, "hi3"); size = 200;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+    memcmp(rbuffer, wbuffer, size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    lfs2_remove(&lfs2, "hi2") => 0;
+    lfs2_stat(&lfs2, "hi2", &info) => LFS2_ERR_NOENT;
+    // read hi0 200
+    sprintf(path, "hi0"); size = 200;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+    memcmp(rbuffer, wbuffer, size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    // read hi3 200
+    sprintf(path, "hi3"); size = 200;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+    memcmp(rbuffer, wbuffer, size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    lfs2_remove(&lfs2, "hi3") => 0;
+    lfs2_stat(&lfs2, "hi3", &info) => LFS2_ERR_NOENT;
+    // read hi0 200
+    sprintf(path, "hi0"); size = 200;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+    memcmp(rbuffer, wbuffer, size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    lfs2_remove(&lfs2, "hi0") => 0;
+    lfs2_stat(&lfs2, "hi0", &info) => LFS2_ERR_NOENT;
+
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # create too big
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    memset(path, 'm', 200);
+    path[200] = '\0';
+
+    size = 400;
+    lfs2_file_open(&lfs2, &file, path,
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    uint8_t wbuffer[1024];
+    memset(wbuffer, 'c', size);
+    lfs2_file_write(&lfs2, &file, wbuffer, size) => size;
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    size = 400;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+    uint8_t rbuffer[1024];
+    lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+    memcmp(rbuffer, wbuffer, size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # resize too big
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    memset(path, 'm', 200);
+    path[200] = '\0';
+
+    size = 40;
+    lfs2_file_open(&lfs2, &file, path,
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    uint8_t wbuffer[1024];
+    memset(wbuffer, 'c', size);
+    lfs2_file_write(&lfs2, &file, wbuffer, size) => size;
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    size = 40;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+    uint8_t rbuffer[1024];
+    lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+    memcmp(rbuffer, wbuffer, size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    size = 400;
+    lfs2_file_open(&lfs2, &file, path,
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    memset(wbuffer, 'c', size);
+    lfs2_file_write(&lfs2, &file, wbuffer, size) => size;
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    size = 400;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+    lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+    memcmp(rbuffer, wbuffer, size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''

tests/test_evil.toml

@@ -0,0 +1,288 @@
+# Tests for recovering from conditions which shouldn't normally
+# happen during normal operation of littlefs
+
+# invalid pointer tests (outside of block_count)
+
+[[case]] # invalid tail-pointer test
+define.TAIL_TYPE = ['LFS2_TYPE_HARDTAIL', 'LFS2_TYPE_SOFTTAIL']
+define.INVALSET = [0x3, 0x1, 0x2]
+in = "lfs2.c"
+code = '''
+    // create littlefs
+    lfs2_format(&lfs2, &cfg) => 0;
+
+    // change tail-pointer to invalid pointers
+    lfs2_init(&lfs2, &cfg) => 0;
+    lfs2_mdir_t mdir;
+    lfs2_dir_fetch(&lfs2, &mdir, (lfs2_block_t[2]){0, 1}) => 0;
+    lfs2_dir_commit(&lfs2, &mdir, LFS2_MKATTRS(
+            {LFS2_MKTAG(LFS2_TYPE_HARDTAIL, 0x3ff, 8),
+                (lfs2_block_t[2]){
+                    (INVALSET & 0x1) ? 0xcccccccc : 0,
+                    (INVALSET & 0x2) ? 0xcccccccc : 0}})) => 0;
+    lfs2_deinit(&lfs2) => 0;
+
+    // test that mount fails gracefully
+    lfs2_mount(&lfs2, &cfg) => LFS2_ERR_CORRUPT;
+'''
+
+[[case]] # invalid dir pointer test
+define.INVALSET = [0x3, 0x1, 0x2]
+in = "lfs2.c"
+code = '''
+    // create littlefs
+    lfs2_format(&lfs2, &cfg) => 0;
+    // make a dir
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_mkdir(&lfs2, "dir_here") => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    // change the dir pointer to be invalid
+    lfs2_init(&lfs2, &cfg) => 0;
+    lfs2_mdir_t mdir;
+    lfs2_dir_fetch(&lfs2, &mdir, (lfs2_block_t[2]){0, 1}) => 0;
+    // make sure id 1 == our directory
+    lfs2_dir_get(&lfs2, &mdir,
+            LFS2_MKTAG(0x700, 0x3ff, 0),
+            LFS2_MKTAG(LFS2_TYPE_NAME, 1, strlen("dir_here")), buffer)
+                => LFS2_MKTAG(LFS2_TYPE_DIR, 1, strlen("dir_here"));
+    assert(memcmp((char*)buffer, "dir_here", strlen("dir_here")) == 0);
+    // change dir pointer
+    lfs2_dir_commit(&lfs2, &mdir, LFS2_MKATTRS(
+            {LFS2_MKTAG(LFS2_TYPE_DIRSTRUCT, 1, 8),
+                (lfs2_block_t[2]){
+                    (INVALSET & 0x1) ? 0xcccccccc : 0,
+                    (INVALSET & 0x2) ? 0xcccccccc : 0}})) => 0;
+    lfs2_deinit(&lfs2) => 0;
+
+    // test that accessing our bad dir fails, note there's a number
+    // of ways to access the dir, some can fail, but some don't
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_stat(&lfs2, "dir_here", &info) => 0;
+    assert(strcmp(info.name, "dir_here") == 0);
+    assert(info.type == LFS2_TYPE_DIR);
+
+    lfs2_dir_open(&lfs2, &dir, "dir_here") => LFS2_ERR_CORRUPT;
+    lfs2_stat(&lfs2, "dir_here/file_here", &info) => LFS2_ERR_CORRUPT;
+    lfs2_dir_open(&lfs2, &dir, "dir_here/dir_here") => LFS2_ERR_CORRUPT;
+    lfs2_file_open(&lfs2, &file, "dir_here/file_here",
+            LFS2_O_RDONLY) => LFS2_ERR_CORRUPT;
+    lfs2_file_open(&lfs2, &file, "dir_here/file_here",
+            LFS2_O_WRONLY | LFS2_O_CREAT) => LFS2_ERR_CORRUPT;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # invalid file pointer test
+in = "lfs2.c"
+define.SIZE = [10, 1000, 100000] # faked file size
+code = '''
+    // create littlefs
+    lfs2_format(&lfs2, &cfg) => 0;
+    // make a file
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "file_here",
+            LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    // change the file pointer to be invalid
+    lfs2_init(&lfs2, &cfg) => 0;
+    lfs2_mdir_t mdir;
+    lfs2_dir_fetch(&lfs2, &mdir, (lfs2_block_t[2]){0, 1}) => 0;
+    // make sure id 1 == our file
+    lfs2_dir_get(&lfs2, &mdir,
+            LFS2_MKTAG(0x700, 0x3ff, 0),
+            LFS2_MKTAG(LFS2_TYPE_NAME, 1, strlen("file_here")), buffer)
+                => LFS2_MKTAG(LFS2_TYPE_REG, 1, strlen("file_here"));
+    assert(memcmp((char*)buffer, "file_here", strlen("file_here")) == 0);
+    // change file pointer
+    lfs2_dir_commit(&lfs2, &mdir, LFS2_MKATTRS(
+            {LFS2_MKTAG(LFS2_TYPE_CTZSTRUCT, 1, sizeof(struct lfs2_ctz)),
+                &(struct lfs2_ctz){0xcccccccc, lfs2_tole32(SIZE)}})) => 0;
+    lfs2_deinit(&lfs2) => 0;
+
+    // test that accessing our bad file fails, note there's a number
+    // of ways to access the dir, some can fail, but some don't
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_stat(&lfs2, "file_here", &info) => 0;
+    assert(strcmp(info.name, "file_here") == 0);
+    assert(info.type == LFS2_TYPE_REG);
+    assert(info.size == SIZE);
+
+    lfs2_file_open(&lfs2, &file, "file_here", LFS2_O_RDONLY) => 0;
+    lfs2_file_read(&lfs2, &file, buffer, SIZE) => LFS2_ERR_CORRUPT;
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    // any allocs that traverse CTZ must unfortunately must fail
+    if (SIZE > 2*LFS2_BLOCK_SIZE) {
+        lfs2_mkdir(&lfs2, "dir_here") => LFS2_ERR_CORRUPT;
+    }
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # invalid pointer in CTZ skip-list test
+define.SIZE = ['2*LFS2_BLOCK_SIZE', '3*LFS2_BLOCK_SIZE', '4*LFS2_BLOCK_SIZE']
+in = "lfs2.c"
+code = '''
+    // create littlefs
+    lfs2_format(&lfs2, &cfg) => 0;
+    // make a file
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "file_here",
+            LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+    for (int i = 0; i < SIZE; i++) {
+        char c = 'c';
+        lfs2_file_write(&lfs2, &file, &c, 1) => 1;
+    }
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+    // change pointer in CTZ skip-list to be invalid
+    lfs2_init(&lfs2, &cfg) => 0;
+    lfs2_mdir_t mdir;
+    lfs2_dir_fetch(&lfs2, &mdir, (lfs2_block_t[2]){0, 1}) => 0;
+    // make sure id 1 == our file and get our CTZ structure
+    lfs2_dir_get(&lfs2, &mdir,
+            LFS2_MKTAG(0x700, 0x3ff, 0),
+            LFS2_MKTAG(LFS2_TYPE_NAME, 1, strlen("file_here")), buffer)
+                => LFS2_MKTAG(LFS2_TYPE_REG, 1, strlen("file_here"));
+    assert(memcmp((char*)buffer, "file_here", strlen("file_here")) == 0);
+    struct lfs2_ctz ctz;
+    lfs2_dir_get(&lfs2, &mdir,
+            LFS2_MKTAG(0x700, 0x3ff, 0),
+            LFS2_MKTAG(LFS2_TYPE_STRUCT, 1, sizeof(struct lfs2_ctz)), &ctz)
+                => LFS2_MKTAG(LFS2_TYPE_CTZSTRUCT, 1, sizeof(struct lfs2_ctz));
+    lfs2_ctz_fromle32(&ctz);
+    // rewrite block to contain bad pointer
+    uint8_t bbuffer[LFS2_BLOCK_SIZE];
+    cfg.read(&cfg, ctz.head, 0, bbuffer, LFS2_BLOCK_SIZE) => 0;
+    uint32_t bad = lfs2_tole32(0xcccccccc);
+    memcpy(&bbuffer[0], &bad, sizeof(bad));
+    memcpy(&bbuffer[4], &bad, sizeof(bad));
+    cfg.erase(&cfg, ctz.head) => 0;
+    cfg.prog(&cfg, ctz.head, 0, bbuffer, LFS2_BLOCK_SIZE) => 0;
+    lfs2_deinit(&lfs2) => 0;
+
+    // test that accessing our bad file fails, note there's a number
+    // of ways to access the dir, some can fail, but some don't
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_stat(&lfs2, "file_here", &info) => 0;
+    assert(strcmp(info.name, "file_here") == 0);
+    assert(info.type == LFS2_TYPE_REG);
+    assert(info.size == SIZE);
+
+    lfs2_file_open(&lfs2, &file, "file_here", LFS2_O_RDONLY) => 0;
+    lfs2_file_read(&lfs2, &file, buffer, SIZE) => LFS2_ERR_CORRUPT;
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    // any allocs that traverse CTZ must unfortunately must fail
+    if (SIZE > 2*LFS2_BLOCK_SIZE) {
+        lfs2_mkdir(&lfs2, "dir_here") => LFS2_ERR_CORRUPT;
+    }
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+
+[[case]] # invalid gstate pointer
+define.INVALSET = [0x3, 0x1, 0x2]
+in = "lfs2.c"
+code = '''
+    // create littlefs
+    lfs2_format(&lfs2, &cfg) => 0;
+
+    // create an invalid gstate
+    lfs2_init(&lfs2, &cfg) => 0;
+    lfs2_mdir_t mdir;
+    lfs2_dir_fetch(&lfs2, &mdir, (lfs2_block_t[2]){0, 1}) => 0;
+    lfs2_fs_prepmove(&lfs2, 1, (lfs2_block_t [2]){
+            (INVALSET & 0x1) ? 0xcccccccc : 0,
+            (INVALSET & 0x2) ? 0xcccccccc : 0});
+    lfs2_dir_commit(&lfs2, &mdir, NULL, 0) => 0;
+    lfs2_deinit(&lfs2) => 0;
+
+    // test that mount fails gracefully
+    // mount may not fail, but our first alloc should fail when
+    // we try to fix the gstate
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_mkdir(&lfs2, "should_fail") => LFS2_ERR_CORRUPT;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+# cycle detection/recovery tests
+
+[[case]] # metadata-pair threaded-list loop test
+in = "lfs2.c"
+code = '''
+    // create littlefs
+    lfs2_format(&lfs2, &cfg) => 0;
+
+    // change tail-pointer to point to ourself
+    lfs2_init(&lfs2, &cfg) => 0;
+    lfs2_mdir_t mdir;
+    lfs2_dir_fetch(&lfs2, &mdir, (lfs2_block_t[2]){0, 1}) => 0;
+    lfs2_dir_commit(&lfs2, &mdir, LFS2_MKATTRS(
+            {LFS2_MKTAG(LFS2_TYPE_HARDTAIL, 0x3ff, 8),
+                (lfs2_block_t[2]){0, 1}})) => 0;
+    lfs2_deinit(&lfs2) => 0;
+
+    // test that mount fails gracefully
+    lfs2_mount(&lfs2, &cfg) => LFS2_ERR_CORRUPT;
+'''
+
+[[case]] # metadata-pair threaded-list 2-length loop test
+in = "lfs2.c"
+code = '''
+    // create littlefs with child dir
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_mkdir(&lfs2, "child") => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    // find child
+    lfs2_init(&lfs2, &cfg) => 0;
+    lfs2_mdir_t mdir;
+    lfs2_block_t pair[2];
+    lfs2_dir_fetch(&lfs2, &mdir, (lfs2_block_t[2]){0, 1}) => 0;
+    lfs2_dir_get(&lfs2, &mdir,
+            LFS2_MKTAG(0x7ff, 0x3ff, 0),
+            LFS2_MKTAG(LFS2_TYPE_DIRSTRUCT, 1, sizeof(pair)), pair)
+                => LFS2_MKTAG(LFS2_TYPE_DIRSTRUCT, 1, sizeof(pair));
+    lfs2_pair_fromle32(pair);
+    // change tail-pointer to point to root
+    lfs2_dir_fetch(&lfs2, &mdir, pair) => 0;
+    lfs2_dir_commit(&lfs2, &mdir, LFS2_MKATTRS(
+            {LFS2_MKTAG(LFS2_TYPE_HARDTAIL, 0x3ff, 8),
+                (lfs2_block_t[2]){0, 1}})) => 0;
+    lfs2_deinit(&lfs2) => 0;
+
+    // test that mount fails gracefully
+    lfs2_mount(&lfs2, &cfg) => LFS2_ERR_CORRUPT;
+'''
+
+[[case]] # metadata-pair threaded-list 1-length child loop test
+in = "lfs2.c"
+code = '''
+    // create littlefs with child dir
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_mkdir(&lfs2, "child") => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    // find child
+    lfs2_init(&lfs2, &cfg) => 0;
+    lfs2_mdir_t mdir;
+    lfs2_block_t pair[2];
+    lfs2_dir_fetch(&lfs2, &mdir, (lfs2_block_t[2]){0, 1}) => 0;
+    lfs2_dir_get(&lfs2, &mdir,
+            LFS2_MKTAG(0x7ff, 0x3ff, 0),
+            LFS2_MKTAG(LFS2_TYPE_DIRSTRUCT, 1, sizeof(pair)), pair)
+                => LFS2_MKTAG(LFS2_TYPE_DIRSTRUCT, 1, sizeof(pair));
+    lfs2_pair_fromle32(pair);
+    // change tail-pointer to point to ourself
+    lfs2_dir_fetch(&lfs2, &mdir, pair) => 0;
+    lfs2_dir_commit(&lfs2, &mdir, LFS2_MKATTRS(
+            {LFS2_MKTAG(LFS2_TYPE_HARDTAIL, 0x3ff, 8), pair})) => 0;
+    lfs2_deinit(&lfs2) => 0;
+
+    // test that mount fails gracefully
+    lfs2_mount(&lfs2, &cfg) => LFS2_ERR_CORRUPT;
+'''

tests/test_exhaustion.toml

@@ -0,0 +1,465 @@
+[[case]] # test running a filesystem to exhaustion
+define.LFS2_ERASE_CYCLES = 10
+define.LFS2_BLOCK_COUNT = 256 # small bd so test runs faster
+define.LFS2_BLOCK_CYCLES = 'LFS2_ERASE_CYCLES / 2'
+define.LFS2_BADBLOCK_BEHAVIOR = [
+    'LFS2_TESTBD_BADBLOCK_PROGERROR',
+    'LFS2_TESTBD_BADBLOCK_ERASEERROR',
+    'LFS2_TESTBD_BADBLOCK_READERROR',
+    'LFS2_TESTBD_BADBLOCK_PROGNOOP',
+    'LFS2_TESTBD_BADBLOCK_ERASENOOP',
+]
+define.FILES = 10
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_mkdir(&lfs2, "roadrunner") => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    uint32_t cycle = 0;
+    while (true) {
+        lfs2_mount(&lfs2, &cfg) => 0;
+        for (uint32_t i = 0; i < FILES; i++) {
+            // chose name, roughly random seed, and random 2^n size
+            sprintf(path, "roadrunner/test%d", i);
+            srand(cycle * i);
+            size = 1 << ((rand() % 10)+2);
+
+            lfs2_file_open(&lfs2, &file, path,
+                    LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+
+            for (lfs2_size_t j = 0; j < size; j++) {
+                char c = 'a' + (rand() % 26);
+                lfs2_ssize_t res = lfs2_file_write(&lfs2, &file, &c, 1);
+                assert(res == 1 || res == LFS2_ERR_NOSPC);
+                if (res == LFS2_ERR_NOSPC) {
+                    err = lfs2_file_close(&lfs2, &file);
+                    assert(err == 0 || err == LFS2_ERR_NOSPC);
+                    lfs2_unmount(&lfs2) => 0;
+                    goto exhausted;
+                }
+            }
+
+            err = lfs2_file_close(&lfs2, &file);
+            assert(err == 0 || err == LFS2_ERR_NOSPC);
+            if (err == LFS2_ERR_NOSPC) {
+                lfs2_unmount(&lfs2) => 0;
+                goto exhausted;
+            }
+        }
+
+        for (uint32_t i = 0; i < FILES; i++) {
+            // check for errors
+            sprintf(path, "roadrunner/test%d", i);
+            srand(cycle * i);
+            size = 1 << ((rand() % 10)+2);
+
+            lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+            for (lfs2_size_t j = 0; j < size; j++) {
+                char c = 'a' + (rand() % 26);
+                char r;
+                lfs2_file_read(&lfs2, &file, &r, 1) => 1;
+                assert(r == c);
+            }
+
+            lfs2_file_close(&lfs2, &file) => 0;
+        }
+        lfs2_unmount(&lfs2) => 0;
+
+        cycle += 1;
+    }
+
+exhausted:
+    // should still be readable
+    lfs2_mount(&lfs2, &cfg) => 0;
+    for (uint32_t i = 0; i < FILES; i++) {
+        // check for errors
+        sprintf(path, "roadrunner/test%d", i);
+        lfs2_stat(&lfs2, path, &info) => 0;
+    }
+    lfs2_unmount(&lfs2) => 0;
+
+    LFS2_WARN("completed %d cycles", cycle);
+'''
+
+[[case]] # test running a filesystem to exhaustion
+         # which also requires expanding superblocks
+define.LFS2_ERASE_CYCLES = 10
+define.LFS2_BLOCK_COUNT = 256 # small bd so test runs faster
+define.LFS2_BLOCK_CYCLES = 'LFS2_ERASE_CYCLES / 2'
+define.LFS2_BADBLOCK_BEHAVIOR = [
+    'LFS2_TESTBD_BADBLOCK_PROGERROR',
+    'LFS2_TESTBD_BADBLOCK_ERASEERROR',
+    'LFS2_TESTBD_BADBLOCK_READERROR',
+    'LFS2_TESTBD_BADBLOCK_PROGNOOP',
+    'LFS2_TESTBD_BADBLOCK_ERASENOOP',
+]
+define.FILES = 10
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+
+    uint32_t cycle = 0;
+    while (true) {
+        lfs2_mount(&lfs2, &cfg) => 0;
+        for (uint32_t i = 0; i < FILES; i++) {
+            // chose name, roughly random seed, and random 2^n size
+            sprintf(path, "test%d", i);
+            srand(cycle * i);
+            size = 1 << ((rand() % 10)+2);
+
+            lfs2_file_open(&lfs2, &file, path,
+                    LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+
+            for (lfs2_size_t j = 0; j < size; j++) {
+                char c = 'a' + (rand() % 26);
+                lfs2_ssize_t res = lfs2_file_write(&lfs2, &file, &c, 1);
+                assert(res == 1 || res == LFS2_ERR_NOSPC);
+                if (res == LFS2_ERR_NOSPC) {
+                    err = lfs2_file_close(&lfs2, &file);
+                    assert(err == 0 || err == LFS2_ERR_NOSPC);
+                    lfs2_unmount(&lfs2) => 0;
+                    goto exhausted;
+                }
+            }
+
+            err = lfs2_file_close(&lfs2, &file);
+            assert(err == 0 || err == LFS2_ERR_NOSPC);
+            if (err == LFS2_ERR_NOSPC) {
+                lfs2_unmount(&lfs2) => 0;
+                goto exhausted;
+            }
+        }
+
+        for (uint32_t i = 0; i < FILES; i++) {
+            // check for errors
+            sprintf(path, "test%d", i);
+            srand(cycle * i);
+            size = 1 << ((rand() % 10)+2);
+
+            lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+            for (lfs2_size_t j = 0; j < size; j++) {
+                char c = 'a' + (rand() % 26);
+                char r;
+                lfs2_file_read(&lfs2, &file, &r, 1) => 1;
+                assert(r == c);
+            }
+
+            lfs2_file_close(&lfs2, &file) => 0;
+        }
+        lfs2_unmount(&lfs2) => 0;
+
+        cycle += 1;
+    }
+
+exhausted:
+    // should still be readable
+    lfs2_mount(&lfs2, &cfg) => 0;
+    for (uint32_t i = 0; i < FILES; i++) {
+        // check for errors
+        sprintf(path, "test%d", i);
+        lfs2_stat(&lfs2, path, &info) => 0;
+    }
+    lfs2_unmount(&lfs2) => 0;
+
+    LFS2_WARN("completed %d cycles", cycle);
+'''
+
+# These are a sort of high-level litmus test for wear-leveling. One definition
+# of wear-leveling is that increasing a block device's space translates directly
+# into increasing the block devices lifetime. This is something we can actually
+# check for.
+
+[[case]] # wear-level test running a filesystem to exhaustion
+define.LFS2_ERASE_CYCLES = 20
+define.LFS2_BLOCK_COUNT = 256 # small bd so test runs faster
+define.LFS2_BLOCK_CYCLES = 'LFS2_ERASE_CYCLES / 2'
+define.FILES = 10
+code = '''
+    uint32_t run_cycles[2];
+    const uint32_t run_block_count[2] = {LFS2_BLOCK_COUNT/2, LFS2_BLOCK_COUNT};
+
+    for (int run = 0; run < 2; run++) {
+        for (lfs2_block_t b = 0; b < LFS2_BLOCK_COUNT; b++) {
+            lfs2_testbd_setwear(&cfg, b,
+                    (b < run_block_count[run]) ? 0 : LFS2_ERASE_CYCLES) => 0;
+        }
+
+        lfs2_format(&lfs2, &cfg) => 0;
+        lfs2_mount(&lfs2, &cfg) => 0;
+        lfs2_mkdir(&lfs2, "roadrunner") => 0;
+        lfs2_unmount(&lfs2) => 0;
+
+        uint32_t cycle = 0;
+        while (true) {
+            lfs2_mount(&lfs2, &cfg) => 0;
+            for (uint32_t i = 0; i < FILES; i++) {
+                // chose name, roughly random seed, and random 2^n size
+                sprintf(path, "roadrunner/test%d", i);
+                srand(cycle * i);
+                size = 1 << ((rand() % 10)+2);
+
+                lfs2_file_open(&lfs2, &file, path,
+                        LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+
+                for (lfs2_size_t j = 0; j < size; j++) {
+                    char c = 'a' + (rand() % 26);
+                    lfs2_ssize_t res = lfs2_file_write(&lfs2, &file, &c, 1);
+                    assert(res == 1 || res == LFS2_ERR_NOSPC);
+                    if (res == LFS2_ERR_NOSPC) {
+                        err = lfs2_file_close(&lfs2, &file);
+                        assert(err == 0 || err == LFS2_ERR_NOSPC);
+                        lfs2_unmount(&lfs2) => 0;
+                        goto exhausted;
+                    }
+                }
+
+                err = lfs2_file_close(&lfs2, &file);
+                assert(err == 0 || err == LFS2_ERR_NOSPC);
+                if (err == LFS2_ERR_NOSPC) {
+                    lfs2_unmount(&lfs2) => 0;
+                    goto exhausted;
+                }
+            }
+
+            for (uint32_t i = 0; i < FILES; i++) {
+                // check for errors
+                sprintf(path, "roadrunner/test%d", i);
+                srand(cycle * i);
+                size = 1 << ((rand() % 10)+2);
+
+                lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+                for (lfs2_size_t j = 0; j < size; j++) {
+                    char c = 'a' + (rand() % 26);
+                    char r;
+                    lfs2_file_read(&lfs2, &file, &r, 1) => 1;
+                    assert(r == c);
+                }
+
+                lfs2_file_close(&lfs2, &file) => 0;
+            }
+            lfs2_unmount(&lfs2) => 0;
+
+            cycle += 1;
+        }
+
+exhausted:
+        // should still be readable
+        lfs2_mount(&lfs2, &cfg) => 0;
+        for (uint32_t i = 0; i < FILES; i++) {
+            // check for errors
+            sprintf(path, "roadrunner/test%d", i);
+            lfs2_stat(&lfs2, path, &info) => 0;
+        }
+        lfs2_unmount(&lfs2) => 0;
+
+        run_cycles[run] = cycle;
+        LFS2_WARN("completed %d blocks %d cycles",
+                run_block_count[run], run_cycles[run]);
+    }
+
+    // check we increased the lifetime by 2x with ~10% error
+    LFS2_ASSERT(run_cycles[1]*110/100 > 2*run_cycles[0]);
+'''
+
+[[case]] # wear-level test + expanding superblock
+define.LFS2_ERASE_CYCLES = 20
+define.LFS2_BLOCK_COUNT = 256 # small bd so test runs faster
+define.LFS2_BLOCK_CYCLES = 'LFS2_ERASE_CYCLES / 2'
+define.FILES = 10
+code = '''
+    uint32_t run_cycles[2];
+    const uint32_t run_block_count[2] = {LFS2_BLOCK_COUNT/2, LFS2_BLOCK_COUNT};
+
+    for (int run = 0; run < 2; run++) {
+        for (lfs2_block_t b = 0; b < LFS2_BLOCK_COUNT; b++) {
+            lfs2_testbd_setwear(&cfg, b,
+                    (b < run_block_count[run]) ? 0 : LFS2_ERASE_CYCLES) => 0;
+        }
+
+        lfs2_format(&lfs2, &cfg) => 0;
+
+        uint32_t cycle = 0;
+        while (true) {
+            lfs2_mount(&lfs2, &cfg) => 0;
+            for (uint32_t i = 0; i < FILES; i++) {
+                // chose name, roughly random seed, and random 2^n size
+                sprintf(path, "test%d", i);
+                srand(cycle * i);
+                size = 1 << ((rand() % 10)+2);
+
+                lfs2_file_open(&lfs2, &file, path,
+                        LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+
+                for (lfs2_size_t j = 0; j < size; j++) {
+                    char c = 'a' + (rand() % 26);
+                    lfs2_ssize_t res = lfs2_file_write(&lfs2, &file, &c, 1);
+                    assert(res == 1 || res == LFS2_ERR_NOSPC);
+                    if (res == LFS2_ERR_NOSPC) {
+                        err = lfs2_file_close(&lfs2, &file);
+                        assert(err == 0 || err == LFS2_ERR_NOSPC);
+                        lfs2_unmount(&lfs2) => 0;
+                        goto exhausted;
+                    }
+                }
+
+                err = lfs2_file_close(&lfs2, &file);
+                assert(err == 0 || err == LFS2_ERR_NOSPC);
+                if (err == LFS2_ERR_NOSPC) {
+                    lfs2_unmount(&lfs2) => 0;
+                    goto exhausted;
+                }
+            }
+
+            for (uint32_t i = 0; i < FILES; i++) {
+                // check for errors
+                sprintf(path, "test%d", i);
+                srand(cycle * i);
+                size = 1 << ((rand() % 10)+2);
+
+                lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+                for (lfs2_size_t j = 0; j < size; j++) {
+                    char c = 'a' + (rand() % 26);
+                    char r;
+                    lfs2_file_read(&lfs2, &file, &r, 1) => 1;
+                    assert(r == c);
+                }
+
+                lfs2_file_close(&lfs2, &file) => 0;
+            }
+            lfs2_unmount(&lfs2) => 0;
+
+            cycle += 1;
+        }
+
+exhausted:
+        // should still be readable
+        lfs2_mount(&lfs2, &cfg) => 0;
+        for (uint32_t i = 0; i < FILES; i++) {
+            // check for errors
+            sprintf(path, "test%d", i);
+            lfs2_stat(&lfs2, path, &info) => 0;
+        }
+        lfs2_unmount(&lfs2) => 0;
+
+        run_cycles[run] = cycle;
+        LFS2_WARN("completed %d blocks %d cycles",
+                run_block_count[run], run_cycles[run]);
+    }
+
+    // check we increased the lifetime by 2x with ~10% error
+    LFS2_ASSERT(run_cycles[1]*110/100 > 2*run_cycles[0]);
+'''
+
+[[case]] # test that we wear blocks roughly evenly
+define.LFS2_ERASE_CYCLES = 0xffffffff
+define.LFS2_BLOCK_COUNT = 256 # small bd so test runs faster
+define.LFS2_BLOCK_CYCLES = [5, 4, 3, 2, 1]
+define.CYCLES = 100
+define.FILES = 10
+if = 'LFS2_BLOCK_CYCLES < CYCLES/10'
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_mkdir(&lfs2, "roadrunner") => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    uint32_t cycle = 0;
+    while (cycle < CYCLES) {
+        lfs2_mount(&lfs2, &cfg) => 0;
+        for (uint32_t i = 0; i < FILES; i++) {
+            // chose name, roughly random seed, and random 2^n size
+            sprintf(path, "roadrunner/test%d", i);
+            srand(cycle * i);
+            size = 1 << 4; //((rand() % 10)+2);
+
+            lfs2_file_open(&lfs2, &file, path,
+                    LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+
+            for (lfs2_size_t j = 0; j < size; j++) {
+                char c = 'a' + (rand() % 26);
+                lfs2_ssize_t res = lfs2_file_write(&lfs2, &file, &c, 1);
+                assert(res == 1 || res == LFS2_ERR_NOSPC);
+                if (res == LFS2_ERR_NOSPC) {
+                    err = lfs2_file_close(&lfs2, &file);
+                    assert(err == 0 || err == LFS2_ERR_NOSPC);
+                    lfs2_unmount(&lfs2) => 0;
+                    goto exhausted;
+                }
+            }
+
+            err = lfs2_file_close(&lfs2, &file);
+            assert(err == 0 || err == LFS2_ERR_NOSPC);
+            if (err == LFS2_ERR_NOSPC) {
+                lfs2_unmount(&lfs2) => 0;
+                goto exhausted;
+            }
+        }
+
+        for (uint32_t i = 0; i < FILES; i++) {
+            // check for errors
+            sprintf(path, "roadrunner/test%d", i);
+            srand(cycle * i);
+            size = 1 << 4; //((rand() % 10)+2);
+
+            lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+            for (lfs2_size_t j = 0; j < size; j++) {
+                char c = 'a' + (rand() % 26);
+                char r;
+                lfs2_file_read(&lfs2, &file, &r, 1) => 1;
+                assert(r == c);
+            }
+
+            lfs2_file_close(&lfs2, &file) => 0;
+        }
+        lfs2_unmount(&lfs2) => 0;
+
+        cycle += 1;
+    }
+
+exhausted:
+    // should still be readable
+    lfs2_mount(&lfs2, &cfg) => 0;
+    for (uint32_t i = 0; i < FILES; i++) {
+        // check for errors
+        sprintf(path, "roadrunner/test%d", i);
+        lfs2_stat(&lfs2, path, &info) => 0;
+    }
+    lfs2_unmount(&lfs2) => 0;
+
+    LFS2_WARN("completed %d cycles", cycle);
+
+    // check the wear on our block device
+    lfs2_testbd_wear_t minwear = -1;
+    lfs2_testbd_wear_t totalwear = 0;
+    lfs2_testbd_wear_t maxwear = 0;
+    // skip 0 and 1 as superblock movement is intentionally avoided
+    for (lfs2_block_t b = 2; b < LFS2_BLOCK_COUNT; b++) {
+        lfs2_testbd_wear_t wear = lfs2_testbd_getwear(&cfg, b);
+        printf("%08x: wear %d\n", b, wear);
+        assert(wear >= 0);
+        if (wear < minwear) {
+            minwear = wear;
+        }
+        if (wear > maxwear) {
+            maxwear = wear;
+        }
+        totalwear += wear;
+    }
+    lfs2_testbd_wear_t avgwear = totalwear / LFS2_BLOCK_COUNT;
+    LFS2_WARN("max wear: %d cycles", maxwear);
+    LFS2_WARN("avg wear: %d cycles", totalwear / LFS2_BLOCK_COUNT);
+    LFS2_WARN("min wear: %d cycles", minwear);
+
+    // find standard deviation^2
+    lfs2_testbd_wear_t dev2 = 0;
+    for (lfs2_block_t b = 2; b < LFS2_BLOCK_COUNT; b++) {
+        lfs2_testbd_wear_t wear = lfs2_testbd_getwear(&cfg, b);
+        assert(wear >= 0);
+        lfs2_testbd_swear_t diff = wear - avgwear;
+        dev2 += diff*diff;
+    }
+    dev2 /= totalwear;
+    LFS2_WARN("std dev^2: %d", dev2);
+    assert(dev2 < 8);
+'''
+

tests/test_files.sh

@@ -1,158 +0,0 @@
-#!/bin/bash
-set -eu
-
-SMALLSIZE=32
-MEDIUMSIZE=8192
-LARGESIZE=262144
-
-echo "=== File tests ==="
-rm -rf blocks
-tests/test.py << TEST
-    lfs_format(&lfs, &cfg) => 0;
-TEST
-
-echo "--- Simple file test ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_file_open(&lfs, &file[0], "hello", LFS_O_WRONLY | LFS_O_CREAT) => 0;
-    size = strlen("Hello World!\n");
-    memcpy(wbuffer, "Hello World!\n", size);
-    lfs_file_write(&lfs, &file[0], wbuffer, size) => size;
-    lfs_file_close(&lfs, &file[0]) => 0;
-
-    lfs_file_open(&lfs, &file[0], "hello", LFS_O_RDONLY) => 0;
-    size = strlen("Hello World!\n");
-    lfs_file_read(&lfs, &file[0], rbuffer, size) => size;
-    memcmp(rbuffer, wbuffer, size) => 0;
-    lfs_file_close(&lfs, &file[0]) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-w_test() {
-tests/test.py << TEST
-    size = $1;
-    lfs_size_t chunk = 31;
-    srand(0);
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_file_open(&lfs, &file[0], "$2",
-        ${3:-LFS_O_WRONLY | LFS_O_CREAT | LFS_O_TRUNC}) => 0;
-    for (lfs_size_t i = 0; i < size; i += chunk) {
-        chunk = (chunk < size - i) ? chunk : size - i;
-        for (lfs_size_t b = 0; b < chunk; b++) {
-            buffer[b] = rand() & 0xff;
-        }
-        lfs_file_write(&lfs, &file[0], buffer, chunk) => chunk;
-    }
-    lfs_file_close(&lfs, &file[0]) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-}
-
-r_test() {
-tests/test.py << TEST
-    size = $1;
-    lfs_size_t chunk = 29;
-    srand(0);
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_stat(&lfs, "$2", &info) => 0;
-    info.type => LFS_TYPE_REG;
-    info.size => size;
-    lfs_file_open(&lfs, &file[0], "$2", ${3:-LFS_O_RDONLY}) => 0;
-    for (lfs_size_t i = 0; i < size; i += chunk) {
-        chunk = (chunk < size - i) ? chunk : size - i;
-        lfs_file_read(&lfs, &file[0], buffer, chunk) => chunk;
-        for (lfs_size_t b = 0; b < chunk && i+b < size; b++) {
-            buffer[b] => rand() & 0xff;
-        }
-    }
-    lfs_file_close(&lfs, &file[0]) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-}
-
-echo "--- Small file test ---"
-w_test $SMALLSIZE smallavacado
-r_test $SMALLSIZE smallavacado
-
-echo "--- Medium file test ---"
-w_test $MEDIUMSIZE mediumavacado
-r_test $MEDIUMSIZE mediumavacado
-
-echo "--- Large file test ---"
-w_test $LARGESIZE largeavacado
-r_test $LARGESIZE largeavacado
-
-echo "--- Zero file test ---"
-w_test 0 noavacado
-r_test 0 noavacado
-
-echo "--- Truncate small test ---"
-w_test $SMALLSIZE mediumavacado
-r_test $SMALLSIZE mediumavacado
-w_test $MEDIUMSIZE mediumavacado
-r_test $MEDIUMSIZE mediumavacado
-
-echo "--- Truncate zero test ---"
-w_test $SMALLSIZE noavacado
-r_test $SMALLSIZE noavacado
-w_test 0 noavacado
-r_test 0 noavacado
-
-echo "--- Non-overlap check ---"
-r_test $SMALLSIZE smallavacado
-r_test $MEDIUMSIZE mediumavacado
-r_test $LARGESIZE largeavacado
-r_test 0 noavacado
-
-echo "--- Dir check ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_dir_open(&lfs, &dir[0], "/") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "hello") => 0;
-    info.type => LFS_TYPE_REG;
-    info.size => strlen("Hello World!\n");
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "smallavacado") => 0;
-    info.type => LFS_TYPE_REG;
-    info.size => $SMALLSIZE;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "mediumavacado") => 0;
-    info.type => LFS_TYPE_REG;
-    info.size => $MEDIUMSIZE;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "largeavacado") => 0;
-    info.type => LFS_TYPE_REG;
-    info.size => $LARGESIZE;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "noavacado") => 0;
-    info.type => LFS_TYPE_REG;
-    info.size => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 0;
-    lfs_dir_close(&lfs, &dir[0]) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Many file test ---"
-tests/test.py << TEST
-    lfs_format(&lfs, &cfg) => 0;
-TEST
-tests/test.py << TEST
-    // Create 300 files of 6 bytes
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_mkdir(&lfs, "directory") => 0;
-    for (unsigned i = 0; i < 300; i++) {
-        snprintf((char*)buffer, sizeof(buffer), "file_%03d", i);
-        lfs_file_open(&lfs, &file[0], (char*)buffer, LFS_O_WRONLY | LFS_O_CREAT) => 0;
-        size = 6;
-        memcpy(wbuffer, "Hello", size);
-        lfs_file_write(&lfs, &file[0], wbuffer, size) => size;
-        lfs_file_close(&lfs, &file[0]) => 0;
-    }
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Results ---"
-tests/stats.py

tests/test_files.toml

@@ -0,0 +1,486 @@
+
+[[case]] # simple file test
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "hello",
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_EXCL) => 0;
+    size = strlen("Hello World!")+1;
+    strcpy((char*)buffer, "Hello World!");
+    lfs2_file_write(&lfs2, &file, buffer, size) => size;
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "hello", LFS2_O_RDONLY) => 0;
+    lfs2_file_read(&lfs2, &file, buffer, size) => size;
+    assert(strcmp((char*)buffer, "Hello World!") == 0);
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # larger files
+define.SIZE = [32, 8192, 262144, 0, 7, 8193]
+define.CHUNKSIZE = [31, 16, 33, 1, 1023]
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+
+    // write
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "avacado",
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_EXCL) => 0;
+    srand(1);
+    for (lfs2_size_t i = 0; i < SIZE; i += CHUNKSIZE) {
+        lfs2_size_t chunk = lfs2_min(CHUNKSIZE, SIZE-i);
+        for (lfs2_size_t b = 0; b < chunk; b++) {
+            buffer[b] = rand() & 0xff;
+        }
+        lfs2_file_write(&lfs2, &file, buffer, chunk) => chunk;
+    }
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    // read
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "avacado", LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => SIZE;
+    srand(1);
+    for (lfs2_size_t i = 0; i < SIZE; i += CHUNKSIZE) {
+        lfs2_size_t chunk = lfs2_min(CHUNKSIZE, SIZE-i);
+        lfs2_file_read(&lfs2, &file, buffer, chunk) => chunk;
+        for (lfs2_size_t b = 0; b < chunk; b++) {
+            assert(buffer[b] == (rand() & 0xff));
+        }
+    }
+    lfs2_file_read(&lfs2, &file, buffer, CHUNKSIZE) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # rewriting files
+define.SIZE1 = [32, 8192, 131072, 0, 7, 8193]
+define.SIZE2 = [32, 8192, 131072, 0, 7, 8193]
+define.CHUNKSIZE = [31, 16, 1]
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+
+    // write
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "avacado",
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_EXCL) => 0;
+    srand(1);
+    for (lfs2_size_t i = 0; i < SIZE1; i += CHUNKSIZE) {
+        lfs2_size_t chunk = lfs2_min(CHUNKSIZE, SIZE1-i);
+        for (lfs2_size_t b = 0; b < chunk; b++) {
+            buffer[b] = rand() & 0xff;
+        }
+        lfs2_file_write(&lfs2, &file, buffer, chunk) => chunk;
+    }
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    // read
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "avacado", LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => SIZE1;
+    srand(1);
+    for (lfs2_size_t i = 0; i < SIZE1; i += CHUNKSIZE) {
+        lfs2_size_t chunk = lfs2_min(CHUNKSIZE, SIZE1-i);
+        lfs2_file_read(&lfs2, &file, buffer, chunk) => chunk;
+        for (lfs2_size_t b = 0; b < chunk; b++) {
+            assert(buffer[b] == (rand() & 0xff));
+        }
+    }
+    lfs2_file_read(&lfs2, &file, buffer, CHUNKSIZE) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    // rewrite
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "avacado", LFS2_O_WRONLY) => 0;
+    srand(2);
+    for (lfs2_size_t i = 0; i < SIZE2; i += CHUNKSIZE) {
+        lfs2_size_t chunk = lfs2_min(CHUNKSIZE, SIZE2-i);
+        for (lfs2_size_t b = 0; b < chunk; b++) {
+            buffer[b] = rand() & 0xff;
+        }
+        lfs2_file_write(&lfs2, &file, buffer, chunk) => chunk;
+    }
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    // read
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "avacado", LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => lfs2_max(SIZE1, SIZE2);
+    srand(2);
+    for (lfs2_size_t i = 0; i < SIZE2; i += CHUNKSIZE) {
+        lfs2_size_t chunk = lfs2_min(CHUNKSIZE, SIZE2-i);
+        lfs2_file_read(&lfs2, &file, buffer, chunk) => chunk;
+        for (lfs2_size_t b = 0; b < chunk; b++) {
+            assert(buffer[b] == (rand() & 0xff));
+        }
+    }
+    if (SIZE1 > SIZE2) {
+        srand(1);
+        for (lfs2_size_t b = 0; b < SIZE2; b++) {
+            rand();
+        }
+        for (lfs2_size_t i = SIZE2; i < SIZE1; i += CHUNKSIZE) {
+            lfs2_size_t chunk = lfs2_min(CHUNKSIZE, SIZE1-i);
+            lfs2_file_read(&lfs2, &file, buffer, chunk) => chunk;
+            for (lfs2_size_t b = 0; b < chunk; b++) {
+                assert(buffer[b] == (rand() & 0xff));
+            }
+        }
+    }
+    lfs2_file_read(&lfs2, &file, buffer, CHUNKSIZE) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # appending files
+define.SIZE1 = [32, 8192, 131072, 0, 7, 8193]
+define.SIZE2 = [32, 8192, 131072, 0, 7, 8193]
+define.CHUNKSIZE = [31, 16, 1]
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+
+    // write
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "avacado",
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_EXCL) => 0;
+    srand(1);
+    for (lfs2_size_t i = 0; i < SIZE1; i += CHUNKSIZE) {
+        lfs2_size_t chunk = lfs2_min(CHUNKSIZE, SIZE1-i);
+        for (lfs2_size_t b = 0; b < chunk; b++) {
+            buffer[b] = rand() & 0xff;
+        }
+        lfs2_file_write(&lfs2, &file, buffer, chunk) => chunk;
+    }
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    // read
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "avacado", LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => SIZE1;
+    srand(1);
+    for (lfs2_size_t i = 0; i < SIZE1; i += CHUNKSIZE) {
+        lfs2_size_t chunk = lfs2_min(CHUNKSIZE, SIZE1-i);
+        lfs2_file_read(&lfs2, &file, buffer, chunk) => chunk;
+        for (lfs2_size_t b = 0; b < chunk; b++) {
+            assert(buffer[b] == (rand() & 0xff));
+        }
+    }
+    lfs2_file_read(&lfs2, &file, buffer, CHUNKSIZE) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    // append
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "avacado", LFS2_O_WRONLY | LFS2_O_APPEND) => 0;
+    srand(2);
+    for (lfs2_size_t i = 0; i < SIZE2; i += CHUNKSIZE) {
+        lfs2_size_t chunk = lfs2_min(CHUNKSIZE, SIZE2-i);
+        for (lfs2_size_t b = 0; b < chunk; b++) {
+            buffer[b] = rand() & 0xff;
+        }
+        lfs2_file_write(&lfs2, &file, buffer, chunk) => chunk;
+    }
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    // read
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "avacado", LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => SIZE1 + SIZE2;
+    srand(1);
+    for (lfs2_size_t i = 0; i < SIZE1; i += CHUNKSIZE) {
+        lfs2_size_t chunk = lfs2_min(CHUNKSIZE, SIZE1-i);
+        lfs2_file_read(&lfs2, &file, buffer, chunk) => chunk;
+        for (lfs2_size_t b = 0; b < chunk; b++) {
+            assert(buffer[b] == (rand() & 0xff));
+        }
+    }
+    srand(2);
+    for (lfs2_size_t i = 0; i < SIZE2; i += CHUNKSIZE) {
+        lfs2_size_t chunk = lfs2_min(CHUNKSIZE, SIZE2-i);
+        lfs2_file_read(&lfs2, &file, buffer, chunk) => chunk;
+        for (lfs2_size_t b = 0; b < chunk; b++) {
+            assert(buffer[b] == (rand() & 0xff));
+        }
+    }
+    lfs2_file_read(&lfs2, &file, buffer, CHUNKSIZE) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # truncating files
+define.SIZE1 = [32, 8192, 131072, 0, 7, 8193]
+define.SIZE2 = [32, 8192, 131072, 0, 7, 8193]
+define.CHUNKSIZE = [31, 16, 1]
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+
+    // write
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "avacado",
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_EXCL) => 0;
+    srand(1);
+    for (lfs2_size_t i = 0; i < SIZE1; i += CHUNKSIZE) {
+        lfs2_size_t chunk = lfs2_min(CHUNKSIZE, SIZE1-i);
+        for (lfs2_size_t b = 0; b < chunk; b++) {
+            buffer[b] = rand() & 0xff;
+        }
+        lfs2_file_write(&lfs2, &file, buffer, chunk) => chunk;
+    }
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    // read
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "avacado", LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => SIZE1;
+    srand(1);
+    for (lfs2_size_t i = 0; i < SIZE1; i += CHUNKSIZE) {
+        lfs2_size_t chunk = lfs2_min(CHUNKSIZE, SIZE1-i);
+        lfs2_file_read(&lfs2, &file, buffer, chunk) => chunk;
+        for (lfs2_size_t b = 0; b < chunk; b++) {
+            assert(buffer[b] == (rand() & 0xff));
+        }
+    }
+    lfs2_file_read(&lfs2, &file, buffer, CHUNKSIZE) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    // truncate
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "avacado", LFS2_O_WRONLY | LFS2_O_TRUNC) => 0;
+    srand(2);
+    for (lfs2_size_t i = 0; i < SIZE2; i += CHUNKSIZE) {
+        lfs2_size_t chunk = lfs2_min(CHUNKSIZE, SIZE2-i);
+        for (lfs2_size_t b = 0; b < chunk; b++) {
+            buffer[b] = rand() & 0xff;
+        }
+        lfs2_file_write(&lfs2, &file, buffer, chunk) => chunk;
+    }
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    // read
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "avacado", LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => SIZE2;
+    srand(2);
+    for (lfs2_size_t i = 0; i < SIZE2; i += CHUNKSIZE) {
+        lfs2_size_t chunk = lfs2_min(CHUNKSIZE, SIZE2-i);
+        lfs2_file_read(&lfs2, &file, buffer, chunk) => chunk;
+        for (lfs2_size_t b = 0; b < chunk; b++) {
+            assert(buffer[b] == (rand() & 0xff));
+        }
+    }
+    lfs2_file_read(&lfs2, &file, buffer, CHUNKSIZE) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # reentrant file writing
+define.SIZE = [32, 0, 7, 2049]
+define.CHUNKSIZE = [31, 16, 65]
+reentrant = true
+code = '''
+    err = lfs2_mount(&lfs2, &cfg);
+    if (err) {
+        lfs2_format(&lfs2, &cfg) => 0;
+        lfs2_mount(&lfs2, &cfg) => 0;
+    }
+
+    err = lfs2_file_open(&lfs2, &file, "avacado", LFS2_O_RDONLY);
+    assert(err == LFS2_ERR_NOENT || err == 0);
+    if (err == 0) {
+        // can only be 0 (new file) or full size
+        size = lfs2_file_size(&lfs2, &file);
+        assert(size == 0 || size == SIZE);
+        lfs2_file_close(&lfs2, &file) => 0;
+    }
+
+    // write
+    lfs2_file_open(&lfs2, &file, "avacado", LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+    srand(1);
+    for (lfs2_size_t i = 0; i < SIZE; i += CHUNKSIZE) {
+        lfs2_size_t chunk = lfs2_min(CHUNKSIZE, SIZE-i);
+        for (lfs2_size_t b = 0; b < chunk; b++) {
+            buffer[b] = rand() & 0xff;
+        }
+        lfs2_file_write(&lfs2, &file, buffer, chunk) => chunk;
+    }
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    // read
+    lfs2_file_open(&lfs2, &file, "avacado", LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => SIZE;
+    srand(1);
+    for (lfs2_size_t i = 0; i < SIZE; i += CHUNKSIZE) {
+        lfs2_size_t chunk = lfs2_min(CHUNKSIZE, SIZE-i);
+        lfs2_file_read(&lfs2, &file, buffer, chunk) => chunk;
+        for (lfs2_size_t b = 0; b < chunk; b++) {
+            assert(buffer[b] == (rand() & 0xff));
+        }
+    }
+    lfs2_file_read(&lfs2, &file, buffer, CHUNKSIZE) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # reentrant file writing with syncs
+define = [
+    # append (O(n))
+    {MODE='LFS2_O_APPEND',   SIZE=[32, 0, 7, 2049],  CHUNKSIZE=[31, 16, 65]},
+    # truncate (O(n^2))
+    {MODE='LFS2_O_TRUNC',    SIZE=[32, 0, 7, 200],   CHUNKSIZE=[31, 16, 65]},
+    # rewrite (O(n^2))
+    {MODE=0,                SIZE=[32, 0, 7, 200],   CHUNKSIZE=[31, 16, 65]},
+]
+reentrant = true
+code = '''
+    err = lfs2_mount(&lfs2, &cfg);
+    if (err) {
+        lfs2_format(&lfs2, &cfg) => 0;
+        lfs2_mount(&lfs2, &cfg) => 0;
+    }
+
+    err = lfs2_file_open(&lfs2, &file, "avacado", LFS2_O_RDONLY);
+    assert(err == LFS2_ERR_NOENT || err == 0);
+    if (err == 0) {
+        // with syncs we could be any size, but it at least must be valid data
+        size = lfs2_file_size(&lfs2, &file);
+        assert(size <= SIZE);
+        srand(1);
+        for (lfs2_size_t i = 0; i < size; i += CHUNKSIZE) {
+            lfs2_size_t chunk = lfs2_min(CHUNKSIZE, size-i);
+            lfs2_file_read(&lfs2, &file, buffer, chunk) => chunk;
+            for (lfs2_size_t b = 0; b < chunk; b++) {
+                assert(buffer[b] == (rand() & 0xff));
+            }
+        }
+        lfs2_file_close(&lfs2, &file) => 0;
+    }
+
+    // write
+    lfs2_file_open(&lfs2, &file, "avacado",
+        LFS2_O_WRONLY | LFS2_O_CREAT | MODE) => 0;
+    size = lfs2_file_size(&lfs2, &file);
+    assert(size <= SIZE);
+    srand(1);
+    lfs2_size_t skip = (MODE == LFS2_O_APPEND) ? size : 0;
+    for (lfs2_size_t b = 0; b < skip; b++) {
+        rand();
+    }
+    for (lfs2_size_t i = skip; i < SIZE; i += CHUNKSIZE) {
+        lfs2_size_t chunk = lfs2_min(CHUNKSIZE, SIZE-i);
+        for (lfs2_size_t b = 0; b < chunk; b++) {
+            buffer[b] = rand() & 0xff;
+        }
+        lfs2_file_write(&lfs2, &file, buffer, chunk) => chunk;
+        lfs2_file_sync(&lfs2, &file) => 0;
+    }
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    // read
+    lfs2_file_open(&lfs2, &file, "avacado", LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => SIZE;
+    srand(1);
+    for (lfs2_size_t i = 0; i < SIZE; i += CHUNKSIZE) {
+        lfs2_size_t chunk = lfs2_min(CHUNKSIZE, SIZE-i);
+        lfs2_file_read(&lfs2, &file, buffer, chunk) => chunk;
+        for (lfs2_size_t b = 0; b < chunk; b++) {
+            assert(buffer[b] == (rand() & 0xff));
+        }
+    }
+    lfs2_file_read(&lfs2, &file, buffer, CHUNKSIZE) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # many files
+define.N = 300
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    // create N files of 7 bytes
+    lfs2_mount(&lfs2, &cfg) => 0;
+    for (int i = 0; i < N; i++) {
+        sprintf(path, "file_%03d", i);
+        lfs2_file_open(&lfs2, &file, path,
+                LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_EXCL) => 0;
+        char wbuffer[1024];
+        size = 7;
+        snprintf(wbuffer, size, "Hi %03d", i);
+        lfs2_file_write(&lfs2, &file, wbuffer, size) => size;
+        lfs2_file_close(&lfs2, &file) => 0;
+
+        char rbuffer[1024];
+        lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+        lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+        assert(strcmp(rbuffer, wbuffer) == 0);
+        lfs2_file_close(&lfs2, &file) => 0;
+    }
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # many files with power cycle
+define.N = 300
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    // create N files of 7 bytes
+    lfs2_mount(&lfs2, &cfg) => 0;
+    for (int i = 0; i < N; i++) {
+        sprintf(path, "file_%03d", i);
+        lfs2_file_open(&lfs2, &file, path,
+                LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_EXCL) => 0;
+        char wbuffer[1024];
+        size = 7;
+        snprintf(wbuffer, size, "Hi %03d", i);
+        lfs2_file_write(&lfs2, &file, wbuffer, size) => size;
+        lfs2_file_close(&lfs2, &file) => 0;
+        lfs2_unmount(&lfs2) => 0;
+
+        char rbuffer[1024];
+        lfs2_mount(&lfs2, &cfg) => 0;
+        lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+        lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+        assert(strcmp(rbuffer, wbuffer) == 0);
+        lfs2_file_close(&lfs2, &file) => 0;
+    }
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # many files with power loss
+define.N = 300
+reentrant = true
+code = '''
+    err = lfs2_mount(&lfs2, &cfg);
+    if (err) {
+        lfs2_format(&lfs2, &cfg) => 0;
+        lfs2_mount(&lfs2, &cfg) => 0;
+    }
+    // create N files of 7 bytes
+    for (int i = 0; i < N; i++) {
+        sprintf(path, "file_%03d", i);
+        err = lfs2_file_open(&lfs2, &file, path, LFS2_O_WRONLY | LFS2_O_CREAT);
+        char wbuffer[1024];
+        size = 7;
+        snprintf(wbuffer, size, "Hi %03d", i);
+        if ((lfs2_size_t)lfs2_file_size(&lfs2, &file) != size) {
+            lfs2_file_write(&lfs2, &file, wbuffer, size) => size;
+        }
+        lfs2_file_close(&lfs2, &file) => 0;
+
+        char rbuffer[1024];
+        lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+        lfs2_file_read(&lfs2, &file, rbuffer, size) => size;
+        assert(strcmp(rbuffer, wbuffer) == 0);
+        lfs2_file_close(&lfs2, &file) => 0;
+    }
+    lfs2_unmount(&lfs2) => 0;
+'''

tests/test_format.sh

@@ -1,49 +0,0 @@
-#!/bin/bash
-set -eu
-
-echo "=== Formatting tests ==="
-rm -rf blocks
-
-echo "--- Basic formatting ---"
-tests/test.py << TEST
-    lfs_format(&lfs, &cfg) => 0;
-TEST
-
-echo "--- Invalid superblocks ---"
-ln -f -s /dev/zero blocks/0
-ln -f -s /dev/zero blocks/1
-tests/test.py << TEST
-    lfs_format(&lfs, &cfg) => LFS_ERR_CORRUPT;
-TEST
-rm blocks/0 blocks/1
-
-echo "--- Basic mounting ---"
-tests/test.py << TEST
-    lfs_format(&lfs, &cfg) => 0;
-TEST
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Invalid mount ---"
-tests/test.py << TEST
-    lfs_format(&lfs, &cfg) => 0;
-TEST
-rm blocks/0 blocks/1
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => LFS_ERR_CORRUPT;
-TEST
-
-echo "--- Valid corrupt mount ---"
-tests/test.py << TEST
-    lfs_format(&lfs, &cfg) => 0;
-TEST
-rm blocks/0
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Results ---"
-tests/stats.py

tests/test_interspersed.sh

@@ -1,186 +0,0 @@
-#!/bin/bash
-set -eu
-
-echo "=== Interspersed tests ==="
-rm -rf blocks
-tests/test.py << TEST
-    lfs_format(&lfs, &cfg) => 0;
-TEST
-
-echo "--- Interspersed file test ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_file_open(&lfs, &file[0], "a", LFS_O_WRONLY | LFS_O_CREAT) => 0;
-    lfs_file_open(&lfs, &file[1], "b", LFS_O_WRONLY | LFS_O_CREAT) => 0;
-    lfs_file_open(&lfs, &file[2], "c", LFS_O_WRONLY | LFS_O_CREAT) => 0;
-    lfs_file_open(&lfs, &file[3], "d", LFS_O_WRONLY | LFS_O_CREAT) => 0;
-
-    for (int i = 0; i < 10; i++) {
-        lfs_file_write(&lfs, &file[0], (const void*)"a", 1) => 1;
-        lfs_file_write(&lfs, &file[1], (const void*)"b", 1) => 1;
-        lfs_file_write(&lfs, &file[2], (const void*)"c", 1) => 1;
-        lfs_file_write(&lfs, &file[3], (const void*)"d", 1) => 1;
-    }
-
-    lfs_file_close(&lfs, &file[0]);
-    lfs_file_close(&lfs, &file[1]);
-    lfs_file_close(&lfs, &file[2]);
-    lfs_file_close(&lfs, &file[3]);
-
-    lfs_dir_open(&lfs, &dir[0], "/") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, ".") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "..") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "a") => 0;
-    info.type => LFS_TYPE_REG;
-    info.size => 10;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "b") => 0;
-    info.type => LFS_TYPE_REG;
-    info.size => 10;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "c") => 0;
-    info.type => LFS_TYPE_REG;
-    info.size => 10;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "d") => 0;
-    info.type => LFS_TYPE_REG;
-    info.size => 10;
-    lfs_dir_read(&lfs, &dir[0], &info) => 0;
-    lfs_dir_close(&lfs, &dir[0]) => 0;
-
-    lfs_file_open(&lfs, &file[0], "a", LFS_O_RDONLY) => 0;
-    lfs_file_open(&lfs, &file[1], "b", LFS_O_RDONLY) => 0;
-    lfs_file_open(&lfs, &file[2], "c", LFS_O_RDONLY) => 0;
-    lfs_file_open(&lfs, &file[3], "d", LFS_O_RDONLY) => 0;
-
-    for (int i = 0; i < 10; i++) {
-        lfs_file_read(&lfs, &file[0], buffer, 1) => 1;
-        buffer[0] => 'a';
-        lfs_file_read(&lfs, &file[1], buffer, 1) => 1;
-        buffer[0] => 'b';
-        lfs_file_read(&lfs, &file[2], buffer, 1) => 1;
-        buffer[0] => 'c';
-        lfs_file_read(&lfs, &file[3], buffer, 1) => 1;
-        buffer[0] => 'd';
-    }
-
-    lfs_file_close(&lfs, &file[0]);
-    lfs_file_close(&lfs, &file[1]);
-    lfs_file_close(&lfs, &file[2]);
-    lfs_file_close(&lfs, &file[3]);
-    
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Interspersed remove file test ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_file_open(&lfs, &file[0], "e", LFS_O_WRONLY | LFS_O_CREAT) => 0;
-
-    for (int i = 0; i < 5; i++) {
-        lfs_file_write(&lfs, &file[0], (const void*)"e", 1) => 1;
-    }
-
-    lfs_remove(&lfs, "a") => 0;
-    lfs_remove(&lfs, "b") => 0;
-    lfs_remove(&lfs, "c") => 0;
-    lfs_remove(&lfs, "d") => 0;
-
-    for (int i = 0; i < 5; i++) {
-        lfs_file_write(&lfs, &file[0], (const void*)"e", 1) => 1;
-    }
-
-    lfs_file_close(&lfs, &file[0]);
-
-    lfs_dir_open(&lfs, &dir[0], "/") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, ".") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "..") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "e") => 0;
-    info.type => LFS_TYPE_REG;
-    info.size => 10;
-    lfs_dir_read(&lfs, &dir[0], &info) => 0;
-    lfs_dir_close(&lfs, &dir[0]) => 0;
-
-    lfs_file_open(&lfs, &file[0], "e", LFS_O_RDONLY) => 0;
-
-    for (int i = 0; i < 10; i++) {
-        lfs_file_read(&lfs, &file[0], buffer, 1) => 1;
-        buffer[0] => 'e';
-    }
-
-    lfs_file_close(&lfs, &file[0]);
-    
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Remove inconveniently test ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_file_open(&lfs, &file[0], "e", LFS_O_WRONLY | LFS_O_TRUNC) => 0;
-    lfs_file_open(&lfs, &file[1], "f", LFS_O_WRONLY | LFS_O_CREAT) => 0;
-    lfs_file_open(&lfs, &file[2], "g", LFS_O_WRONLY | LFS_O_CREAT) => 0;
-
-    for (int i = 0; i < 5; i++) {
-        lfs_file_write(&lfs, &file[0], (const void*)"e", 1) => 1;
-        lfs_file_write(&lfs, &file[1], (const void*)"f", 1) => 1;
-        lfs_file_write(&lfs, &file[2], (const void*)"g", 1) => 1;
-    }
-
-    lfs_remove(&lfs, "f") => 0;
-
-    for (int i = 0; i < 5; i++) {
-        lfs_file_write(&lfs, &file[0], (const void*)"e", 1) => 1;
-        lfs_file_write(&lfs, &file[1], (const void*)"f", 1) => 1;
-        lfs_file_write(&lfs, &file[2], (const void*)"g", 1) => 1;
-    }
-
-    lfs_file_close(&lfs, &file[0]);
-    lfs_file_close(&lfs, &file[1]);
-    lfs_file_close(&lfs, &file[2]);
-
-    lfs_dir_open(&lfs, &dir[0], "/") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, ".") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "..") => 0;
-    info.type => LFS_TYPE_DIR;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "e") => 0;
-    info.type => LFS_TYPE_REG;
-    info.size => 10;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "g") => 0;
-    info.type => LFS_TYPE_REG;
-    info.size => 10;
-    lfs_dir_read(&lfs, &dir[0], &info) => 0;
-    lfs_dir_close(&lfs, &dir[0]) => 0;
-
-    lfs_file_open(&lfs, &file[0], "e", LFS_O_RDONLY) => 0;
-    lfs_file_open(&lfs, &file[1], "g", LFS_O_RDONLY) => 0;
-
-    for (int i = 0; i < 10; i++) {
-        lfs_file_read(&lfs, &file[0], buffer, 1) => 1;
-        buffer[0] => 'e';
-        lfs_file_read(&lfs, &file[1], buffer, 1) => 1;
-        buffer[0] => 'g';
-    }
-
-    lfs_file_close(&lfs, &file[0]);
-    lfs_file_close(&lfs, &file[1]);
-    
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Results ---"
-tests/stats.py

tests/test_interspersed.toml

@@ -0,0 +1,244 @@
+
+[[case]] # interspersed file test
+define.SIZE = [10, 100]
+define.FILES = [4, 10, 26] 
+code = '''
+    lfs2_file_t files[FILES];
+    const char alphas[] = "abcdefghijklmnopqrstuvwxyz";
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    for (int j = 0; j < FILES; j++) {
+        sprintf(path, "%c", alphas[j]);
+        lfs2_file_open(&lfs2, &files[j], path,
+                LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_EXCL) => 0;
+    }
+
+    for (int i = 0; i < SIZE; i++) {
+        for (int j = 0; j < FILES; j++) {
+            lfs2_file_write(&lfs2, &files[j], &alphas[j], 1) => 1;
+        }
+    }
+
+    for (int j = 0; j < FILES; j++) {
+        lfs2_file_close(&lfs2, &files[j]);
+    }
+
+    lfs2_dir_open(&lfs2, &dir, "/") => 0;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(strcmp(info.name, ".") == 0);
+    assert(info.type == LFS2_TYPE_DIR);
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(strcmp(info.name, "..") == 0);
+    assert(info.type == LFS2_TYPE_DIR);
+    for (int j = 0; j < FILES; j++) {
+        sprintf(path, "%c", alphas[j]);
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        assert(strcmp(info.name, path) == 0);
+        assert(info.type == LFS2_TYPE_REG);
+        assert(info.size == SIZE);
+    }
+    lfs2_dir_read(&lfs2, &dir, &info) => 0;
+    lfs2_dir_close(&lfs2, &dir) => 0;
+
+    for (int j = 0; j < FILES; j++) {
+        sprintf(path, "%c", alphas[j]);
+        lfs2_file_open(&lfs2, &files[j], path, LFS2_O_RDONLY) => 0;
+    }
+
+    for (int i = 0; i < 10; i++) {
+        for (int j = 0; j < FILES; j++) {
+            lfs2_file_read(&lfs2, &files[j], buffer, 1) => 1;
+            assert(buffer[0] == alphas[j]);
+        }
+    }
+
+    for (int j = 0; j < FILES; j++) {
+        lfs2_file_close(&lfs2, &files[j]);
+    }
+    
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # interspersed remove file test
+define.SIZE = [10, 100]
+define.FILES = [4, 10, 26]
+code = '''
+    const char alphas[] = "abcdefghijklmnopqrstuvwxyz";
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    for (int j = 0; j < FILES; j++) {
+        sprintf(path, "%c", alphas[j]);
+        lfs2_file_open(&lfs2, &file, path,
+                LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_EXCL) => 0;
+        for (int i = 0; i < SIZE; i++) {
+            lfs2_file_write(&lfs2, &file, &alphas[j], 1) => 1;
+        }
+        lfs2_file_close(&lfs2, &file);
+    }
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "zzz", LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+    for (int j = 0; j < FILES; j++) {
+        lfs2_file_write(&lfs2, &file, (const void*)"~", 1) => 1;
+        lfs2_file_sync(&lfs2, &file) => 0;
+
+        sprintf(path, "%c", alphas[j]);
+        lfs2_remove(&lfs2, path) => 0;
+    }
+    lfs2_file_close(&lfs2, &file);
+
+    lfs2_dir_open(&lfs2, &dir, "/") => 0;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(strcmp(info.name, ".") == 0);
+    assert(info.type == LFS2_TYPE_DIR);
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(strcmp(info.name, "..") == 0);
+    assert(info.type == LFS2_TYPE_DIR);
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(strcmp(info.name, "zzz") == 0);
+    assert(info.type == LFS2_TYPE_REG);
+    assert(info.size == FILES);
+    lfs2_dir_read(&lfs2, &dir, &info) => 0;
+    lfs2_dir_close(&lfs2, &dir) => 0;
+
+    lfs2_file_open(&lfs2, &file, "zzz", LFS2_O_RDONLY) => 0;
+    for (int i = 0; i < FILES; i++) {
+        lfs2_file_read(&lfs2, &file, buffer, 1) => 1;
+        assert(buffer[0] == '~');
+    }
+    lfs2_file_close(&lfs2, &file);
+    
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # remove inconveniently test
+define.SIZE = [10, 100]
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_t files[3];
+    lfs2_file_open(&lfs2, &files[0], "e", LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+    lfs2_file_open(&lfs2, &files[1], "f", LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+    lfs2_file_open(&lfs2, &files[2], "g", LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+
+    for (int i = 0; i < SIZE/2; i++) {
+        lfs2_file_write(&lfs2, &files[0], (const void*)"e", 1) => 1;
+        lfs2_file_write(&lfs2, &files[1], (const void*)"f", 1) => 1;
+        lfs2_file_write(&lfs2, &files[2], (const void*)"g", 1) => 1;
+    }
+
+    lfs2_remove(&lfs2, "f") => 0;
+
+    for (int i = 0; i < SIZE/2; i++) {
+        lfs2_file_write(&lfs2, &files[0], (const void*)"e", 1) => 1;
+        lfs2_file_write(&lfs2, &files[1], (const void*)"f", 1) => 1;
+        lfs2_file_write(&lfs2, &files[2], (const void*)"g", 1) => 1;
+    }
+
+    lfs2_file_close(&lfs2, &files[0]);
+    lfs2_file_close(&lfs2, &files[1]);
+    lfs2_file_close(&lfs2, &files[2]);
+
+    lfs2_dir_open(&lfs2, &dir, "/") => 0;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(strcmp(info.name, ".") == 0);
+    assert(info.type == LFS2_TYPE_DIR);
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(strcmp(info.name, "..") == 0);
+    assert(info.type == LFS2_TYPE_DIR);
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(strcmp(info.name, "e") == 0);
+    assert(info.type == LFS2_TYPE_REG);
+    assert(info.size == SIZE);
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(strcmp(info.name, "g") == 0);
+    assert(info.type == LFS2_TYPE_REG);
+    assert(info.size == SIZE);
+    lfs2_dir_read(&lfs2, &dir, &info) => 0;
+    lfs2_dir_close(&lfs2, &dir) => 0;
+
+    lfs2_file_open(&lfs2, &files[0], "e", LFS2_O_RDONLY) => 0;
+    lfs2_file_open(&lfs2, &files[1], "g", LFS2_O_RDONLY) => 0;
+    for (int i = 0; i < SIZE; i++) {
+        lfs2_file_read(&lfs2, &files[0], buffer, 1) => 1;
+        assert(buffer[0] == 'e');
+        lfs2_file_read(&lfs2, &files[1], buffer, 1) => 1;
+        assert(buffer[0] == 'g');
+    }
+    lfs2_file_close(&lfs2, &files[0]);
+    lfs2_file_close(&lfs2, &files[1]);
+    
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # reentrant interspersed file test
+define.SIZE = [10, 100]
+define.FILES = [4, 10, 26] 
+reentrant = true
+code = '''
+    lfs2_file_t files[FILES];
+    const char alphas[] = "abcdefghijklmnopqrstuvwxyz";
+
+    err = lfs2_mount(&lfs2, &cfg);
+    if (err) {
+        lfs2_format(&lfs2, &cfg) => 0;
+        lfs2_mount(&lfs2, &cfg) => 0;
+    }
+
+    for (int j = 0; j < FILES; j++) {
+        sprintf(path, "%c", alphas[j]);
+        lfs2_file_open(&lfs2, &files[j], path,
+                LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_APPEND) => 0;
+    }
+
+    for (int i = 0; i < SIZE; i++) {
+        for (int j = 0; j < FILES; j++) {
+            size = lfs2_file_size(&lfs2, &files[j]);
+            assert((int)size >= 0);
+            if ((int)size <= i) {
+                lfs2_file_write(&lfs2, &files[j], &alphas[j], 1) => 1;
+                lfs2_file_sync(&lfs2, &files[j]) => 0;
+            }
+        }
+    }
+
+    for (int j = 0; j < FILES; j++) {
+        lfs2_file_close(&lfs2, &files[j]);
+    }
+
+    lfs2_dir_open(&lfs2, &dir, "/") => 0;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(strcmp(info.name, ".") == 0);
+    assert(info.type == LFS2_TYPE_DIR);
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    assert(strcmp(info.name, "..") == 0);
+    assert(info.type == LFS2_TYPE_DIR);
+    for (int j = 0; j < FILES; j++) {
+        sprintf(path, "%c", alphas[j]);
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        assert(strcmp(info.name, path) == 0);
+        assert(info.type == LFS2_TYPE_REG);
+        assert(info.size == SIZE);
+    }
+    lfs2_dir_read(&lfs2, &dir, &info) => 0;
+    lfs2_dir_close(&lfs2, &dir) => 0;
+
+    for (int j = 0; j < FILES; j++) {
+        sprintf(path, "%c", alphas[j]);
+        lfs2_file_open(&lfs2, &files[j], path, LFS2_O_RDONLY) => 0;
+    }
+
+    for (int i = 0; i < 10; i++) {
+        for (int j = 0; j < FILES; j++) {
+            lfs2_file_read(&lfs2, &files[j], buffer, 1) => 1;
+            assert(buffer[0] == alphas[j]);
+        }
+    }
+
+    for (int j = 0; j < FILES; j++) {
+        lfs2_file_close(&lfs2, &files[j]);
+    }
+    
+    lfs2_unmount(&lfs2) => 0;
+'''

tests/test_move.sh

@@ -1,236 +0,0 @@
-#!/bin/bash
-set -eu
-
-echo "=== Move tests ==="
-rm -rf blocks
-tests/test.py << TEST
-    lfs_format(&lfs, &cfg) => 0;
-
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_mkdir(&lfs, "a") => 0;
-    lfs_mkdir(&lfs, "b") => 0;
-    lfs_mkdir(&lfs, "c") => 0;
-    lfs_mkdir(&lfs, "d") => 0;
-
-    lfs_mkdir(&lfs, "a/hi") => 0;
-    lfs_mkdir(&lfs, "a/hi/hola") => 0;
-    lfs_mkdir(&lfs, "a/hi/bonjour") => 0;
-    lfs_mkdir(&lfs, "a/hi/ohayo") => 0;
-
-    lfs_file_open(&lfs, &file[0], "a/hello", LFS_O_CREAT | LFS_O_WRONLY) => 0;
-    lfs_file_write(&lfs, &file[0], "hola\n", 5) => 5;
-    lfs_file_write(&lfs, &file[0], "bonjour\n", 8) => 8;
-    lfs_file_write(&lfs, &file[0], "ohayo\n", 6) => 6;
-    lfs_file_close(&lfs, &file[0]) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Move file ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_rename(&lfs, "a/hello", "b/hello") => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_dir_open(&lfs, &dir[0], "a") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, ".") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "..") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "hi") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 0;
-    lfs_dir_close(&lfs, &dir[0]) => 0;
-    lfs_dir_open(&lfs, &dir[0], "b") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, ".") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "..") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "hello") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Move file corrupt source ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_rename(&lfs, "b/hello", "c/hello") => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-rm -v blocks/7
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_dir_open(&lfs, &dir[0], "b") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, ".") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "..") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 0;
-    lfs_dir_close(&lfs, &dir[0]) => 0;
-    lfs_dir_open(&lfs, &dir[0], "c") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, ".") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "..") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "hello") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Move file corrupt source and dest ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_rename(&lfs, "c/hello", "d/hello") => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-rm -v blocks/8
-rm -v blocks/a
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_dir_open(&lfs, &dir[0], "c") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, ".") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "..") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "hello") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 0;
-    lfs_dir_close(&lfs, &dir[0]) => 0;
-    lfs_dir_open(&lfs, &dir[0], "d") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, ".") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "..") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Move dir ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_rename(&lfs, "a/hi", "b/hi") => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_dir_open(&lfs, &dir[0], "a") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, ".") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "..") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 0;
-    lfs_dir_close(&lfs, &dir[0]) => 0;
-    lfs_dir_open(&lfs, &dir[0], "b") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, ".") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "..") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "hi") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Move dir corrupt source ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_rename(&lfs, "b/hi", "c/hi") => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-rm -v blocks/7
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_dir_open(&lfs, &dir[0], "b") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, ".") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "..") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 0;
-    lfs_dir_close(&lfs, &dir[0]) => 0;
-    lfs_dir_open(&lfs, &dir[0], "c") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, ".") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "..") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "hello") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "hi") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Move dir corrupt source and dest ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_rename(&lfs, "c/hi", "d/hi") => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-rm -v blocks/9
-rm -v blocks/a
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_dir_open(&lfs, &dir[0], "c") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, ".") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "..") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "hello") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "hi") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 0;
-    lfs_dir_close(&lfs, &dir[0]) => 0;
-    lfs_dir_open(&lfs, &dir[0], "d") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, ".") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "..") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Move check ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-
-    lfs_dir_open(&lfs, &dir[0], "a/hi") => LFS_ERR_NOENT;
-    lfs_dir_open(&lfs, &dir[0], "b/hi") => LFS_ERR_NOENT;
-    lfs_dir_open(&lfs, &dir[0], "d/hi") => LFS_ERR_NOENT;
-
-    lfs_dir_open(&lfs, &dir[0], "c/hi") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, ".") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "..") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "hola") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "bonjour") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "ohayo") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 0;
-    lfs_dir_close(&lfs, &dir[0]) => 0;
-
-    lfs_dir_open(&lfs, &dir[0], "a/hello") => LFS_ERR_NOENT;
-    lfs_dir_open(&lfs, &dir[0], "b/hello") => LFS_ERR_NOENT;
-    lfs_dir_open(&lfs, &dir[0], "d/hello") => LFS_ERR_NOENT;
-
-    lfs_file_open(&lfs, &file[0], "c/hello", LFS_O_RDONLY) => 0;
-    lfs_file_read(&lfs, &file[0], buffer, 5) => 5;
-    memcmp(buffer, "hola\n", 5) => 0;
-    lfs_file_read(&lfs, &file[0], buffer, 8) => 8;
-    memcmp(buffer, "bonjour\n", 8) => 0;
-    lfs_file_read(&lfs, &file[0], buffer, 6) => 6;
-    memcmp(buffer, "ohayo\n", 6) => 0;
-    lfs_file_close(&lfs, &file[0]) => 0;
-
-    lfs_unmount(&lfs) => 0;
-TEST
-
-
-echo "--- Results ---"
-tests/stats.py

tests/test_orphan.sh

@@ -1,41 +0,0 @@
-#!/bin/bash
-set -eu
-
-echo "=== Orphan tests ==="
-rm -rf blocks
-tests/test.py << TEST
-    lfs_format(&lfs, &cfg) => 0;
-TEST
-
-echo "--- Orphan test ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_mkdir(&lfs, "parent") => 0;
-    lfs_mkdir(&lfs, "parent/orphan") => 0;
-    lfs_mkdir(&lfs, "parent/child") => 0;
-    lfs_remove(&lfs, "parent/orphan") => 0;
-TEST
-# remove most recent file, this should be the update to the previous
-# linked-list entry and should orphan the child
-rm -v blocks/8
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_stat(&lfs, "parent/orphan", &info) => LFS_ERR_NOENT;
-    unsigned before = 0;
-    lfs_traverse(&lfs, test_count, &before) => 0;
-    test_log("before", before);
-
-    lfs_deorphan(&lfs) => 0;
-
-    lfs_stat(&lfs, "parent/orphan", &info) => LFS_ERR_NOENT;
-    unsigned after = 0;
-    lfs_traverse(&lfs, test_count, &after) => 0;
-    test_log("after", after);
-
-    int diff = before - after;
-    diff => 2;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Results ---"
-tests/stats.py

tests/test_orphans.toml

@@ -0,0 +1,120 @@
+[[case]] # orphan test
+in = "lfs2.c"
+if = 'LFS2_PROG_SIZE <= 0x3fe' # only works with one crc per commit
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_mkdir(&lfs2, "parent") => 0;
+    lfs2_mkdir(&lfs2, "parent/orphan") => 0;
+    lfs2_mkdir(&lfs2, "parent/child") => 0;
+    lfs2_remove(&lfs2, "parent/orphan") => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    // corrupt the child's most recent commit, this should be the update
+    // to the linked-list entry, which should orphan the orphan. Note this
+    // makes a lot of assumptions about the remove operation.
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_dir_open(&lfs2, &dir, "parent/child") => 0;
+    lfs2_block_t block = dir.m.pair[0];
+    lfs2_dir_close(&lfs2, &dir) => 0;
+    lfs2_unmount(&lfs2) => 0;
+    uint8_t bbuffer[LFS2_BLOCK_SIZE];
+    cfg.read(&cfg, block, 0, bbuffer, LFS2_BLOCK_SIZE) => 0;
+    int off = LFS2_BLOCK_SIZE-1;
+    while (off >= 0 && bbuffer[off] == LFS2_ERASE_VALUE) {
+        off -= 1;
+    }
+    memset(&bbuffer[off-3], LFS2_BLOCK_SIZE, 3);
+    cfg.erase(&cfg, block) => 0;
+    cfg.prog(&cfg, block, 0, bbuffer, LFS2_BLOCK_SIZE) => 0;
+    cfg.sync(&cfg) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_stat(&lfs2, "parent/orphan", &info) => LFS2_ERR_NOENT;
+    lfs2_stat(&lfs2, "parent/child", &info) => 0;
+    lfs2_fs_size(&lfs2) => 8;
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_stat(&lfs2, "parent/orphan", &info) => LFS2_ERR_NOENT;
+    lfs2_stat(&lfs2, "parent/child", &info) => 0;
+    lfs2_fs_size(&lfs2) => 8;
+    // this mkdir should both create a dir and deorphan, so size
+    // should be unchanged
+    lfs2_mkdir(&lfs2, "parent/otherchild") => 0;
+    lfs2_stat(&lfs2, "parent/orphan", &info) => LFS2_ERR_NOENT;
+    lfs2_stat(&lfs2, "parent/child", &info) => 0;
+    lfs2_stat(&lfs2, "parent/otherchild", &info) => 0;
+    lfs2_fs_size(&lfs2) => 8;
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_stat(&lfs2, "parent/orphan", &info) => LFS2_ERR_NOENT;
+    lfs2_stat(&lfs2, "parent/child", &info) => 0;
+    lfs2_stat(&lfs2, "parent/otherchild", &info) => 0;
+    lfs2_fs_size(&lfs2) => 8;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # reentrant testing for orphans, basically just spam mkdir/remove
+reentrant = true
+# TODO fix this case, caused by non-DAG trees
+if = '!(DEPTH == 3 && LFS2_CACHE_SIZE != 64)'
+define = [
+    {FILES=6,  DEPTH=1, CYCLES=20},
+    {FILES=26, DEPTH=1, CYCLES=20},
+    {FILES=3,  DEPTH=3, CYCLES=20},
+]
+code = '''
+    err = lfs2_mount(&lfs2, &cfg);
+    if (err) {
+        lfs2_format(&lfs2, &cfg) => 0;
+        lfs2_mount(&lfs2, &cfg) => 0;
+    }
+
+    srand(1);
+    const char alpha[] = "abcdefghijklmnopqrstuvwxyz";
+    for (int i = 0; i < CYCLES; i++) {
+        // create random path
+        char full_path[256];
+        for (int d = 0; d < DEPTH; d++) {
+            sprintf(&full_path[2*d], "/%c", alpha[rand() % FILES]);
+        }
+
+        // if it does not exist, we create it, else we destroy
+        int res = lfs2_stat(&lfs2, full_path, &info);
+        if (res == LFS2_ERR_NOENT) {
+            // create each directory in turn, ignore if dir already exists
+            for (int d = 0; d < DEPTH; d++) {
+                strcpy(path, full_path);
+                path[2*d+2] = '\0';
+                err = lfs2_mkdir(&lfs2, path);
+                assert(!err || err == LFS2_ERR_EXIST);
+            }
+
+            for (int d = 0; d < DEPTH; d++) {
+                strcpy(path, full_path);
+                path[2*d+2] = '\0';
+                lfs2_stat(&lfs2, path, &info) => 0;
+                assert(strcmp(info.name, &path[2*d+1]) == 0);
+                assert(info.type == LFS2_TYPE_DIR);
+            }
+        } else {
+            // is valid dir?
+            assert(strcmp(info.name, &full_path[2*(DEPTH-1)+1]) == 0);
+            assert(info.type == LFS2_TYPE_DIR);
+
+            // try to delete path in reverse order, ignore if dir is not empty
+            for (int d = DEPTH-1; d >= 0; d--) {
+                strcpy(path, full_path);
+                path[2*d+2] = '\0';
+                err = lfs2_remove(&lfs2, path);
+                assert(!err || err == LFS2_ERR_NOTEMPTY);
+            }
+
+            lfs2_stat(&lfs2, full_path, &info) => LFS2_ERR_NOENT;
+        }
+    }
+    lfs2_unmount(&lfs2) => 0;
+'''
+

tests/test_paths.sh

@@ -1,143 +0,0 @@
-#!/bin/bash
-set -eu
-
-echo "=== Path tests ==="
-rm -rf blocks
-tests/test.py << TEST
-    lfs_format(&lfs, &cfg) => 0;
-TEST
-
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_mkdir(&lfs, "tea") => 0;
-    lfs_mkdir(&lfs, "coffee") => 0;
-    lfs_mkdir(&lfs, "soda") => 0;
-    lfs_mkdir(&lfs, "tea/hottea") => 0;
-    lfs_mkdir(&lfs, "tea/warmtea") => 0;
-    lfs_mkdir(&lfs, "tea/coldtea") => 0;
-    lfs_mkdir(&lfs, "coffee/hotcoffee") => 0;
-    lfs_mkdir(&lfs, "coffee/warmcoffee") => 0;
-    lfs_mkdir(&lfs, "coffee/coldcoffee") => 0;
-    lfs_mkdir(&lfs, "soda/hotsoda") => 0;
-    lfs_mkdir(&lfs, "soda/warmsoda") => 0;
-    lfs_mkdir(&lfs, "soda/coldsoda") => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Root path tests ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_stat(&lfs, "tea/hottea", &info) => 0;
-    strcmp(info.name, "hottea") => 0;
-    lfs_stat(&lfs, "/tea/hottea", &info) => 0;
-    strcmp(info.name, "hottea") => 0;
-
-    lfs_mkdir(&lfs, "/milk1") => 0;
-    lfs_stat(&lfs, "/milk1", &info) => 0;
-    strcmp(info.name, "milk1") => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Redundant slash path tests ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_stat(&lfs, "/tea/hottea", &info) => 0;
-    strcmp(info.name, "hottea") => 0;
-    lfs_stat(&lfs, "//tea//hottea", &info) => 0;
-    strcmp(info.name, "hottea") => 0;
-    lfs_stat(&lfs, "///tea///hottea", &info) => 0;
-    strcmp(info.name, "hottea") => 0;
-
-    lfs_mkdir(&lfs, "///milk2") => 0;
-    lfs_stat(&lfs, "///milk2", &info) => 0;
-    strcmp(info.name, "milk2") => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Dot path tests ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_stat(&lfs, "./tea/hottea", &info) => 0;
-    strcmp(info.name, "hottea") => 0;
-    lfs_stat(&lfs, "/./tea/hottea", &info) => 0;
-    strcmp(info.name, "hottea") => 0;
-    lfs_stat(&lfs, "/././tea/hottea", &info) => 0;
-    strcmp(info.name, "hottea") => 0;
-    lfs_stat(&lfs, "/./tea/./hottea", &info) => 0;
-    strcmp(info.name, "hottea") => 0;
-
-    lfs_mkdir(&lfs, "/./milk3") => 0;
-    lfs_stat(&lfs, "/./milk3", &info) => 0;
-    strcmp(info.name, "milk3") => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Dot dot path tests ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_stat(&lfs, "coffee/../tea/hottea", &info) => 0;
-    strcmp(info.name, "hottea") => 0;
-    lfs_stat(&lfs, "tea/coldtea/../hottea", &info) => 0;
-    strcmp(info.name, "hottea") => 0;
-    lfs_stat(&lfs, "coffee/coldcoffee/../../tea/hottea", &info) => 0;
-    strcmp(info.name, "hottea") => 0;
-    lfs_stat(&lfs, "coffee/../soda/../tea/hottea", &info) => 0;
-    strcmp(info.name, "hottea") => 0;
-
-    lfs_mkdir(&lfs, "coffee/../milk4") => 0;
-    lfs_stat(&lfs, "coffee/../milk4", &info) => 0;
-    strcmp(info.name, "milk4") => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Trailing dot path tests ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_stat(&lfs, "tea/hottea/", &info) => 0;
-    strcmp(info.name, "hottea") => 0;
-    lfs_stat(&lfs, "tea/hottea/.", &info) => 0;
-    strcmp(info.name, "hottea") => 0;
-    lfs_stat(&lfs, "tea/hottea/./.", &info) => 0;
-    strcmp(info.name, "hottea") => 0;
-    lfs_stat(&lfs, "tea/hottea/..", &info) => 0;
-    strcmp(info.name, "tea") => 0;
-    lfs_stat(&lfs, "tea/hottea/../.", &info) => 0;
-    strcmp(info.name, "tea") => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Root dot dot path tests ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_stat(&lfs, "coffee/../../../../../../tea/hottea", &info) => 0;
-    strcmp(info.name, "hottea") => 0;
-
-    lfs_mkdir(&lfs, "coffee/../../../../../../milk5") => 0;
-    lfs_stat(&lfs, "coffee/../../../../../../milk5", &info) => 0;
-    strcmp(info.name, "milk5") => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Root tests ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_stat(&lfs, "/", &info) => 0;
-    info.type => LFS_TYPE_DIR;
-    strcmp(info.name, "/") => 0;
-
-    lfs_mkdir(&lfs, "/") => LFS_ERR_EXIST;
-    lfs_file_open(&lfs, &file[0], "/", LFS_O_WRONLY | LFS_O_CREAT)
-        => LFS_ERR_ISDIR;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Sketchy path tests ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_mkdir(&lfs, "dirt/ground") => LFS_ERR_NOENT;
-    lfs_mkdir(&lfs, "dirt/ground/earth") => LFS_ERR_NOENT;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Results ---"
-tests/stats.py

tests/test_paths.toml

@@ -0,0 +1,293 @@
+
+[[case]] # simple path test
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_mkdir(&lfs2, "tea") => 0;
+    lfs2_mkdir(&lfs2, "tea/hottea") => 0;
+    lfs2_mkdir(&lfs2, "tea/warmtea") => 0;
+    lfs2_mkdir(&lfs2, "tea/coldtea") => 0;
+
+    lfs2_stat(&lfs2, "tea/hottea", &info) => 0;
+    assert(strcmp(info.name, "hottea") == 0);
+    lfs2_stat(&lfs2, "/tea/hottea", &info) => 0;
+    assert(strcmp(info.name, "hottea") == 0);
+
+    lfs2_mkdir(&lfs2, "/milk") => 0;
+    lfs2_stat(&lfs2, "/milk", &info) => 0;
+    assert(strcmp(info.name, "milk") == 0);
+    lfs2_stat(&lfs2, "milk", &info) => 0;
+    assert(strcmp(info.name, "milk") == 0);
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # redundant slashes
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_mkdir(&lfs2, "tea") => 0;
+    lfs2_mkdir(&lfs2, "tea/hottea") => 0;
+    lfs2_mkdir(&lfs2, "tea/warmtea") => 0;
+    lfs2_mkdir(&lfs2, "tea/coldtea") => 0;
+
+    lfs2_stat(&lfs2, "/tea/hottea", &info) => 0;
+    assert(strcmp(info.name, "hottea") == 0);
+    lfs2_stat(&lfs2, "//tea//hottea", &info) => 0;
+    assert(strcmp(info.name, "hottea") == 0);
+    lfs2_stat(&lfs2, "///tea///hottea", &info) => 0;
+    assert(strcmp(info.name, "hottea") == 0);
+
+    lfs2_mkdir(&lfs2, "////milk") => 0;
+    lfs2_stat(&lfs2, "////milk", &info) => 0;
+    assert(strcmp(info.name, "milk") == 0);
+    lfs2_stat(&lfs2, "milk", &info) => 0;
+    assert(strcmp(info.name, "milk") == 0);
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # dot path test
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_mkdir(&lfs2, "tea") => 0;
+    lfs2_mkdir(&lfs2, "tea/hottea") => 0;
+    lfs2_mkdir(&lfs2, "tea/warmtea") => 0;
+    lfs2_mkdir(&lfs2, "tea/coldtea") => 0;
+
+    lfs2_stat(&lfs2, "./tea/hottea", &info) => 0;
+    assert(strcmp(info.name, "hottea") == 0);
+    lfs2_stat(&lfs2, "/./tea/hottea", &info) => 0;
+    assert(strcmp(info.name, "hottea") == 0);
+    lfs2_stat(&lfs2, "/././tea/hottea", &info) => 0;
+    assert(strcmp(info.name, "hottea") == 0);
+    lfs2_stat(&lfs2, "/./tea/./hottea", &info) => 0;
+    assert(strcmp(info.name, "hottea") == 0);
+
+    lfs2_mkdir(&lfs2, "/./milk") => 0;
+    lfs2_stat(&lfs2, "/./milk", &info) => 0;
+    assert(strcmp(info.name, "milk") == 0);
+    lfs2_stat(&lfs2, "milk", &info) => 0;
+    assert(strcmp(info.name, "milk") == 0);
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # dot dot path test
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_mkdir(&lfs2, "tea") => 0;
+    lfs2_mkdir(&lfs2, "tea/hottea") => 0;
+    lfs2_mkdir(&lfs2, "tea/warmtea") => 0;
+    lfs2_mkdir(&lfs2, "tea/coldtea") => 0;
+    lfs2_mkdir(&lfs2, "coffee") => 0;
+    lfs2_mkdir(&lfs2, "coffee/hotcoffee") => 0;
+    lfs2_mkdir(&lfs2, "coffee/warmcoffee") => 0;
+    lfs2_mkdir(&lfs2, "coffee/coldcoffee") => 0;
+
+    lfs2_stat(&lfs2, "coffee/../tea/hottea", &info) => 0;
+    assert(strcmp(info.name, "hottea") == 0);
+    lfs2_stat(&lfs2, "tea/coldtea/../hottea", &info) => 0;
+    assert(strcmp(info.name, "hottea") == 0);
+    lfs2_stat(&lfs2, "coffee/coldcoffee/../../tea/hottea", &info) => 0;
+    assert(strcmp(info.name, "hottea") == 0);
+    lfs2_stat(&lfs2, "coffee/../coffee/../tea/hottea", &info) => 0;
+    assert(strcmp(info.name, "hottea") == 0);
+
+    lfs2_mkdir(&lfs2, "coffee/../milk") => 0;
+    lfs2_stat(&lfs2, "coffee/../milk", &info) => 0;
+    strcmp(info.name, "milk") => 0;
+    lfs2_stat(&lfs2, "milk", &info) => 0;
+    strcmp(info.name, "milk") => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # trailing dot path test
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_mkdir(&lfs2, "tea") => 0;
+    lfs2_mkdir(&lfs2, "tea/hottea") => 0;
+    lfs2_mkdir(&lfs2, "tea/warmtea") => 0;
+    lfs2_mkdir(&lfs2, "tea/coldtea") => 0;
+
+    lfs2_stat(&lfs2, "tea/hottea/", &info) => 0;
+    assert(strcmp(info.name, "hottea") == 0);
+    lfs2_stat(&lfs2, "tea/hottea/.", &info) => 0;
+    assert(strcmp(info.name, "hottea") == 0);
+    lfs2_stat(&lfs2, "tea/hottea/./.", &info) => 0;
+    assert(strcmp(info.name, "hottea") == 0);
+    lfs2_stat(&lfs2, "tea/hottea/..", &info) => 0;
+    assert(strcmp(info.name, "tea") == 0);
+    lfs2_stat(&lfs2, "tea/hottea/../.", &info) => 0;
+    assert(strcmp(info.name, "tea") == 0);
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # leading dot path test
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_mkdir(&lfs2, ".milk") => 0;
+    lfs2_stat(&lfs2, ".milk", &info) => 0;
+    strcmp(info.name, ".milk") => 0;
+    lfs2_stat(&lfs2, "tea/.././.milk", &info) => 0;
+    strcmp(info.name, ".milk") => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # root dot dot path test
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_mkdir(&lfs2, "tea") => 0;
+    lfs2_mkdir(&lfs2, "tea/hottea") => 0;
+    lfs2_mkdir(&lfs2, "tea/warmtea") => 0;
+    lfs2_mkdir(&lfs2, "tea/coldtea") => 0;
+    lfs2_mkdir(&lfs2, "coffee") => 0;
+    lfs2_mkdir(&lfs2, "coffee/hotcoffee") => 0;
+    lfs2_mkdir(&lfs2, "coffee/warmcoffee") => 0;
+    lfs2_mkdir(&lfs2, "coffee/coldcoffee") => 0;
+
+    lfs2_stat(&lfs2, "coffee/../../../../../../tea/hottea", &info) => 0;
+    strcmp(info.name, "hottea") => 0;
+
+    lfs2_mkdir(&lfs2, "coffee/../../../../../../milk") => 0;
+    lfs2_stat(&lfs2, "coffee/../../../../../../milk", &info) => 0;
+    strcmp(info.name, "milk") => 0;
+    lfs2_stat(&lfs2, "milk", &info) => 0;
+    strcmp(info.name, "milk") => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # invalid path tests
+code = '''
+    lfs2_format(&lfs2, &cfg);
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_stat(&lfs2, "dirt", &info) => LFS2_ERR_NOENT;
+    lfs2_stat(&lfs2, "dirt/ground", &info) => LFS2_ERR_NOENT;
+    lfs2_stat(&lfs2, "dirt/ground/earth", &info) => LFS2_ERR_NOENT;
+
+    lfs2_remove(&lfs2, "dirt") => LFS2_ERR_NOENT;
+    lfs2_remove(&lfs2, "dirt/ground") => LFS2_ERR_NOENT;
+    lfs2_remove(&lfs2, "dirt/ground/earth") => LFS2_ERR_NOENT;
+
+    lfs2_mkdir(&lfs2, "dirt/ground") => LFS2_ERR_NOENT;
+    lfs2_file_open(&lfs2, &file, "dirt/ground", LFS2_O_WRONLY | LFS2_O_CREAT)
+            => LFS2_ERR_NOENT;
+    lfs2_mkdir(&lfs2, "dirt/ground/earth") => LFS2_ERR_NOENT;
+    lfs2_file_open(&lfs2, &file, "dirt/ground/earth", LFS2_O_WRONLY | LFS2_O_CREAT)
+            => LFS2_ERR_NOENT;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # root operations
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_stat(&lfs2, "/", &info) => 0;
+    assert(strcmp(info.name, "/") == 0);
+    assert(info.type == LFS2_TYPE_DIR);
+
+    lfs2_mkdir(&lfs2, "/") => LFS2_ERR_EXIST;
+    lfs2_file_open(&lfs2, &file, "/", LFS2_O_WRONLY | LFS2_O_CREAT)
+            => LFS2_ERR_ISDIR;
+
+    lfs2_remove(&lfs2, "/") => LFS2_ERR_INVAL;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # root representations
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_stat(&lfs2, "/", &info) => 0;
+    assert(strcmp(info.name, "/") == 0);
+    assert(info.type == LFS2_TYPE_DIR);
+    lfs2_stat(&lfs2, "", &info) => 0;
+    assert(strcmp(info.name, "/") == 0);
+    assert(info.type == LFS2_TYPE_DIR);
+    lfs2_stat(&lfs2, ".", &info) => 0;
+    assert(strcmp(info.name, "/") == 0);
+    assert(info.type == LFS2_TYPE_DIR);
+    lfs2_stat(&lfs2, "..", &info) => 0;
+    assert(strcmp(info.name, "/") == 0);
+    assert(info.type == LFS2_TYPE_DIR);
+    lfs2_stat(&lfs2, "//", &info) => 0;
+    assert(strcmp(info.name, "/") == 0);
+    assert(info.type == LFS2_TYPE_DIR);
+    lfs2_stat(&lfs2, "./", &info) => 0;
+    assert(strcmp(info.name, "/") == 0);
+    assert(info.type == LFS2_TYPE_DIR);
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # superblock conflict test
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_stat(&lfs2, "littlefs", &info) => LFS2_ERR_NOENT;
+    lfs2_remove(&lfs2, "littlefs") => LFS2_ERR_NOENT;
+
+    lfs2_mkdir(&lfs2, "littlefs") => 0;
+    lfs2_stat(&lfs2, "littlefs", &info) => 0;
+    assert(strcmp(info.name, "littlefs") == 0);
+    assert(info.type == LFS2_TYPE_DIR);
+    lfs2_remove(&lfs2, "littlefs") => 0;
+    lfs2_stat(&lfs2, "littlefs", &info) => LFS2_ERR_NOENT;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # max path test
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_mkdir(&lfs2, "coffee") => 0;
+    lfs2_mkdir(&lfs2, "coffee/hotcoffee") => 0;
+    lfs2_mkdir(&lfs2, "coffee/warmcoffee") => 0;
+    lfs2_mkdir(&lfs2, "coffee/coldcoffee") => 0;
+
+    memset(path, 'w', LFS2_NAME_MAX+1);
+    path[LFS2_NAME_MAX+1] = '\0';
+    lfs2_mkdir(&lfs2, path) => LFS2_ERR_NAMETOOLONG;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_WRONLY | LFS2_O_CREAT)
+            => LFS2_ERR_NAMETOOLONG;
+
+    memcpy(path, "coffee/", strlen("coffee/"));
+    memset(path+strlen("coffee/"), 'w', LFS2_NAME_MAX+1);
+    path[strlen("coffee/")+LFS2_NAME_MAX+1] = '\0';
+    lfs2_mkdir(&lfs2, path) => LFS2_ERR_NAMETOOLONG;
+    lfs2_file_open(&lfs2, &file, path, LFS2_O_WRONLY | LFS2_O_CREAT)
+            => LFS2_ERR_NAMETOOLONG;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # really big path test
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_mkdir(&lfs2, "coffee") => 0;
+    lfs2_mkdir(&lfs2, "coffee/hotcoffee") => 0;
+    lfs2_mkdir(&lfs2, "coffee/warmcoffee") => 0;
+    lfs2_mkdir(&lfs2, "coffee/coldcoffee") => 0;
+
+    memset(path, 'w', LFS2_NAME_MAX);
+    path[LFS2_NAME_MAX] = '\0';
+    lfs2_mkdir(&lfs2, path) => 0;
+    lfs2_remove(&lfs2, path) => 0;
+    lfs2_file_open(&lfs2, &file, path,
+            LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_remove(&lfs2, path) => 0;
+
+    memcpy(path, "coffee/", strlen("coffee/"));
+    memset(path+strlen("coffee/"), 'w', LFS2_NAME_MAX);
+    path[strlen("coffee/")+LFS2_NAME_MAX] = '\0';
+    lfs2_mkdir(&lfs2, path) => 0;
+    lfs2_remove(&lfs2, path) => 0;
+    lfs2_file_open(&lfs2, &file, path,
+            LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_remove(&lfs2, path) => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''
+

tests/test_relocations.toml

@@ -0,0 +1,305 @@
+# specific corner cases worth explicitly testing for
+[[case]] # dangling split dir test
+define.ITERATIONS = 20
+define.COUNT = 10
+define.LFS2_BLOCK_CYCLES = [8, 1]
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    // fill up filesystem so only ~16 blocks are left
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "padding", LFS2_O_CREAT | LFS2_O_WRONLY) => 0;
+    memset(buffer, 0, 512);
+    while (LFS2_BLOCK_COUNT - lfs2_fs_size(&lfs2) > 16) {
+        lfs2_file_write(&lfs2, &file, buffer, 512) => 512;
+    }
+    lfs2_file_close(&lfs2, &file) => 0;
+    // make a child dir to use in bounded space
+    lfs2_mkdir(&lfs2, "child") => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    for (int j = 0; j < ITERATIONS; j++) {
+        for (int i = 0; i < COUNT; i++) {
+            sprintf(path, "child/test%03d_loooooooooooooooooong_name", i);
+            lfs2_file_open(&lfs2, &file, path, LFS2_O_CREAT | LFS2_O_WRONLY) => 0;
+            lfs2_file_close(&lfs2, &file) => 0;
+        }
+
+        lfs2_dir_open(&lfs2, &dir, "child") => 0;
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        for (int i = 0; i < COUNT; i++) {
+            sprintf(path, "test%03d_loooooooooooooooooong_name", i);
+            lfs2_dir_read(&lfs2, &dir, &info) => 1;
+            strcmp(info.name, path) => 0;
+        }
+        lfs2_dir_read(&lfs2, &dir, &info) => 0;
+        lfs2_dir_close(&lfs2, &dir) => 0;
+
+        if (j == ITERATIONS-1) {
+            break;
+        }
+
+        for (int i = 0; i < COUNT; i++) {
+            sprintf(path, "child/test%03d_loooooooooooooooooong_name", i);
+            lfs2_remove(&lfs2, path) => 0;
+        }
+    }
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_dir_open(&lfs2, &dir, "child") => 0;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    lfs2_dir_read(&lfs2, &dir, &info) => 1;
+    for (int i = 0; i < COUNT; i++) {
+        sprintf(path, "test%03d_loooooooooooooooooong_name", i);
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        strcmp(info.name, path) => 0;
+    }
+    lfs2_dir_read(&lfs2, &dir, &info) => 0;
+    lfs2_dir_close(&lfs2, &dir) => 0;
+    for (int i = 0; i < COUNT; i++) {
+        sprintf(path, "child/test%03d_loooooooooooooooooong_name", i);
+        lfs2_remove(&lfs2, path) => 0;
+    }
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # outdated head test
+define.ITERATIONS = 20
+define.COUNT = 10
+define.LFS2_BLOCK_CYCLES = [8, 1]
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    // fill up filesystem so only ~16 blocks are left
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "padding", LFS2_O_CREAT | LFS2_O_WRONLY) => 0;
+    memset(buffer, 0, 512);
+    while (LFS2_BLOCK_COUNT - lfs2_fs_size(&lfs2) > 16) {
+        lfs2_file_write(&lfs2, &file, buffer, 512) => 512;
+    }
+    lfs2_file_close(&lfs2, &file) => 0;
+    // make a child dir to use in bounded space
+    lfs2_mkdir(&lfs2, "child") => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    for (int j = 0; j < ITERATIONS; j++) {
+        for (int i = 0; i < COUNT; i++) {
+            sprintf(path, "child/test%03d_loooooooooooooooooong_name", i);
+            lfs2_file_open(&lfs2, &file, path, LFS2_O_CREAT | LFS2_O_WRONLY) => 0;
+            lfs2_file_close(&lfs2, &file) => 0;
+        }
+
+        lfs2_dir_open(&lfs2, &dir, "child") => 0;
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        for (int i = 0; i < COUNT; i++) {
+            sprintf(path, "test%03d_loooooooooooooooooong_name", i);
+            lfs2_dir_read(&lfs2, &dir, &info) => 1;
+            strcmp(info.name, path) => 0;
+            info.size => 0;
+
+            sprintf(path, "child/test%03d_loooooooooooooooooong_name", i);
+            lfs2_file_open(&lfs2, &file, path, LFS2_O_WRONLY) => 0;
+            lfs2_file_write(&lfs2, &file, "hi", 2) => 2;
+            lfs2_file_close(&lfs2, &file) => 0;
+        }
+        lfs2_dir_read(&lfs2, &dir, &info) => 0;
+
+        lfs2_dir_rewind(&lfs2, &dir) => 0;
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        for (int i = 0; i < COUNT; i++) {
+            sprintf(path, "test%03d_loooooooooooooooooong_name", i);
+            lfs2_dir_read(&lfs2, &dir, &info) => 1;
+            strcmp(info.name, path) => 0;
+            info.size => 2;
+
+            sprintf(path, "child/test%03d_loooooooooooooooooong_name", i);
+            lfs2_file_open(&lfs2, &file, path, LFS2_O_WRONLY) => 0;
+            lfs2_file_write(&lfs2, &file, "hi", 2) => 2;
+            lfs2_file_close(&lfs2, &file) => 0;
+        }
+        lfs2_dir_read(&lfs2, &dir, &info) => 0;
+
+        lfs2_dir_rewind(&lfs2, &dir) => 0;
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        lfs2_dir_read(&lfs2, &dir, &info) => 1;
+        for (int i = 0; i < COUNT; i++) {
+            sprintf(path, "test%03d_loooooooooooooooooong_name", i);
+            lfs2_dir_read(&lfs2, &dir, &info) => 1;
+            strcmp(info.name, path) => 0;
+            info.size => 2;
+        }
+        lfs2_dir_read(&lfs2, &dir, &info) => 0;
+        lfs2_dir_close(&lfs2, &dir) => 0;
+
+        for (int i = 0; i < COUNT; i++) {
+            sprintf(path, "child/test%03d_loooooooooooooooooong_name", i);
+            lfs2_remove(&lfs2, path) => 0;
+        }
+    }
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # reentrant testing for relocations, this is the same as the
+         # orphan testing, except here we also set block_cycles so that
+         # almost every tree operation needs a relocation
+reentrant = true
+# TODO fix this case, caused by non-DAG trees
+if = '!(DEPTH == 3 && LFS2_CACHE_SIZE != 64)'
+define = [
+    {FILES=6,  DEPTH=1, CYCLES=20, LFS2_BLOCK_CYCLES=1},
+    {FILES=26, DEPTH=1, CYCLES=20, LFS2_BLOCK_CYCLES=1},
+    {FILES=3,  DEPTH=3, CYCLES=20, LFS2_BLOCK_CYCLES=1},
+]
+code = '''
+    err = lfs2_mount(&lfs2, &cfg);
+    if (err) {
+        lfs2_format(&lfs2, &cfg) => 0;
+        lfs2_mount(&lfs2, &cfg) => 0;
+    }
+
+    srand(1);
+    const char alpha[] = "abcdefghijklmnopqrstuvwxyz";
+    for (int i = 0; i < CYCLES; i++) {
+        // create random path
+        char full_path[256];
+        for (int d = 0; d < DEPTH; d++) {
+            sprintf(&full_path[2*d], "/%c", alpha[rand() % FILES]);
+        }
+
+        // if it does not exist, we create it, else we destroy
+        int res = lfs2_stat(&lfs2, full_path, &info);
+        if (res == LFS2_ERR_NOENT) {
+            // create each directory in turn, ignore if dir already exists
+            for (int d = 0; d < DEPTH; d++) {
+                strcpy(path, full_path);
+                path[2*d+2] = '\0';
+                err = lfs2_mkdir(&lfs2, path);
+                assert(!err || err == LFS2_ERR_EXIST);
+            }
+
+            for (int d = 0; d < DEPTH; d++) {
+                strcpy(path, full_path);
+                path[2*d+2] = '\0';
+                lfs2_stat(&lfs2, path, &info) => 0;
+                assert(strcmp(info.name, &path[2*d+1]) == 0);
+                assert(info.type == LFS2_TYPE_DIR);
+            }
+        } else {
+            // is valid dir?
+            assert(strcmp(info.name, &full_path[2*(DEPTH-1)+1]) == 0);
+            assert(info.type == LFS2_TYPE_DIR);
+
+            // try to delete path in reverse order, ignore if dir is not empty
+            for (int d = DEPTH-1; d >= 0; d--) {
+                strcpy(path, full_path);
+                path[2*d+2] = '\0';
+                err = lfs2_remove(&lfs2, path);
+                assert(!err || err == LFS2_ERR_NOTEMPTY);
+            }
+
+            lfs2_stat(&lfs2, full_path, &info) => LFS2_ERR_NOENT;
+        }
+    }
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # reentrant testing for relocations, but now with random renames!
+reentrant = true
+# TODO fix this case, caused by non-DAG trees
+if = '!(DEPTH == 3 && LFS2_CACHE_SIZE != 64)'
+define = [
+    {FILES=6,  DEPTH=1, CYCLES=20, LFS2_BLOCK_CYCLES=1},
+    {FILES=26, DEPTH=1, CYCLES=20, LFS2_BLOCK_CYCLES=1},
+    {FILES=3,  DEPTH=3, CYCLES=20, LFS2_BLOCK_CYCLES=1},
+]
+code = '''
+    err = lfs2_mount(&lfs2, &cfg);
+    if (err) {
+        lfs2_format(&lfs2, &cfg) => 0;
+        lfs2_mount(&lfs2, &cfg) => 0;
+    }
+
+    srand(1);
+    const char alpha[] = "abcdefghijklmnopqrstuvwxyz";
+    for (int i = 0; i < CYCLES; i++) {
+        // create random path
+        char full_path[256];
+        for (int d = 0; d < DEPTH; d++) {
+            sprintf(&full_path[2*d], "/%c", alpha[rand() % FILES]);
+        }
+
+        // if it does not exist, we create it, else we destroy
+        int res = lfs2_stat(&lfs2, full_path, &info);
+        assert(!res || res == LFS2_ERR_NOENT);
+        if (res == LFS2_ERR_NOENT) {
+            // create each directory in turn, ignore if dir already exists
+            for (int d = 0; d < DEPTH; d++) {
+                strcpy(path, full_path);
+                path[2*d+2] = '\0';
+                err = lfs2_mkdir(&lfs2, path);
+                assert(!err || err == LFS2_ERR_EXIST);
+            }
+
+            for (int d = 0; d < DEPTH; d++) {
+                strcpy(path, full_path);
+                path[2*d+2] = '\0';
+                lfs2_stat(&lfs2, path, &info) => 0;
+                assert(strcmp(info.name, &path[2*d+1]) == 0);
+                assert(info.type == LFS2_TYPE_DIR);
+            }
+        } else {
+            assert(strcmp(info.name, &full_path[2*(DEPTH-1)+1]) == 0);
+            assert(info.type == LFS2_TYPE_DIR);
+
+            // create new random path
+            char new_path[256];
+            for (int d = 0; d < DEPTH; d++) {
+                sprintf(&new_path[2*d], "/%c", alpha[rand() % FILES]);
+            }
+
+            // if new path does not exist, rename, otherwise destroy
+            res = lfs2_stat(&lfs2, new_path, &info);
+            assert(!res || res == LFS2_ERR_NOENT);
+            if (res == LFS2_ERR_NOENT) {
+                // stop once some dir is renamed
+                for (int d = 0; d < DEPTH; d++) {
+                    strcpy(&path[2*d], &full_path[2*d]);
+                    path[2*d+2] = '\0';
+                    strcpy(&path[128+2*d], &new_path[2*d]);
+                    path[128+2*d+2] = '\0';
+                    err = lfs2_rename(&lfs2, path, path+128);
+                    assert(!err || err == LFS2_ERR_NOTEMPTY);
+                    if (!err) {
+                        strcpy(path, path+128);
+                    }
+                }
+
+                for (int d = 0; d < DEPTH; d++) {
+                    strcpy(path, new_path);
+                    path[2*d+2] = '\0';
+                    lfs2_stat(&lfs2, path, &info) => 0;
+                    assert(strcmp(info.name, &path[2*d+1]) == 0);
+                    assert(info.type == LFS2_TYPE_DIR);
+                }
+                
+                lfs2_stat(&lfs2, full_path, &info) => LFS2_ERR_NOENT;
+            } else {
+                // try to delete path in reverse order,
+                // ignore if dir is not empty
+                for (int d = DEPTH-1; d >= 0; d--) {
+                    strcpy(path, full_path);
+                    path[2*d+2] = '\0';
+                    err = lfs2_remove(&lfs2, path);
+                    assert(!err || err == LFS2_ERR_NOTEMPTY);
+                }
+
+                lfs2_stat(&lfs2, full_path, &info) => LFS2_ERR_NOENT;
+            }
+        }
+    }
+    lfs2_unmount(&lfs2) => 0;
+'''

tests/test_seek.sh

@@ -1,361 +0,0 @@
-#!/bin/bash
-set -eu
-
-SMALLSIZE=4
-MEDIUMSIZE=128
-LARGESIZE=132
-
-echo "=== Seek tests ==="
-rm -rf blocks
-tests/test.py << TEST
-    lfs_format(&lfs, &cfg) => 0;
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_mkdir(&lfs, "hello") => 0;
-    for (int i = 0; i < $LARGESIZE; i++) {
-        sprintf((char*)buffer, "hello/kitty%d", i);
-        lfs_file_open(&lfs, &file[0], (char*)buffer,
-                LFS_O_WRONLY | LFS_O_CREAT | LFS_O_APPEND) => 0;
-
-        size = strlen("kittycatcat");
-        memcpy(buffer, "kittycatcat", size);
-        for (int j = 0; j < $LARGESIZE; j++) {
-            lfs_file_write(&lfs, &file[0], buffer, size);
-        }
-
-        lfs_file_close(&lfs, &file[0]) => 0;
-    }
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Simple dir seek ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_dir_open(&lfs, &dir[0], "hello") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, ".") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "..") => 0;
-
-    lfs_soff_t pos;
-    int i;
-    for (i = 0; i < $SMALLSIZE; i++) {
-        sprintf((char*)buffer, "kitty%d", i);
-        lfs_dir_read(&lfs, &dir[0], &info) => 1;
-        strcmp(info.name, (char*)buffer) => 0;
-        pos = lfs_dir_tell(&lfs, &dir[0]);
-    }
-    pos >= 0 => 1;
-
-    lfs_dir_seek(&lfs, &dir[0], pos) => 0;
-    sprintf((char*)buffer, "kitty%d", i);
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, (char*)buffer) => 0;
-
-    lfs_dir_rewind(&lfs, &dir[0]) => 0;
-    sprintf((char*)buffer, "kitty%d", 0);
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, ".") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "..") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, (char*)buffer) => 0;
-
-    lfs_dir_seek(&lfs, &dir[0], pos) => 0;
-    sprintf((char*)buffer, "kitty%d", i);
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, (char*)buffer) => 0;
-
-    lfs_dir_close(&lfs, &dir[0]) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Large dir seek ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_dir_open(&lfs, &dir[0], "hello") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, ".") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "..") => 0;
-
-    lfs_soff_t pos;
-    int i;
-    for (i = 0; i < $MEDIUMSIZE; i++) {
-        sprintf((char*)buffer, "kitty%d", i);
-        lfs_dir_read(&lfs, &dir[0], &info) => 1;
-        strcmp(info.name, (char*)buffer) => 0;
-        pos = lfs_dir_tell(&lfs, &dir[0]);
-    }
-    pos >= 0 => 1;
-
-    lfs_dir_seek(&lfs, &dir[0], pos) => 0;
-    sprintf((char*)buffer, "kitty%d", i);
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, (char*)buffer) => 0;
-
-    lfs_dir_rewind(&lfs, &dir[0]) => 0;
-    sprintf((char*)buffer, "kitty%d", 0);
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, ".") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, "..") => 0;
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, (char*)buffer) => 0;
-
-    lfs_dir_seek(&lfs, &dir[0], pos) => 0;
-    sprintf((char*)buffer, "kitty%d", i);
-    lfs_dir_read(&lfs, &dir[0], &info) => 1;
-    strcmp(info.name, (char*)buffer) => 0;
-
-    lfs_dir_close(&lfs, &dir[0]) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Simple file seek ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_file_open(&lfs, &file[0], "hello/kitty42", LFS_O_RDONLY) => 0;
-
-    lfs_soff_t pos;
-    size = strlen("kittycatcat");
-    for (int i = 0; i < $SMALLSIZE; i++) {
-        lfs_file_read(&lfs, &file[0], buffer, size) => size;
-        memcmp(buffer, "kittycatcat", size) => 0;
-        pos = lfs_file_tell(&lfs, &file[0]);
-    }
-    pos >= 0 => 1;
-
-    lfs_file_seek(&lfs, &file[0], pos, LFS_SEEK_SET) => pos;
-    lfs_file_read(&lfs, &file[0], buffer, size) => size;
-    memcmp(buffer, "kittycatcat", size) => 0;
-
-    lfs_file_rewind(&lfs, &file[0]) => 0;
-    lfs_file_read(&lfs, &file[0], buffer, size) => size;
-    memcmp(buffer, "kittycatcat", size) => 0;
-
-    lfs_file_seek(&lfs, &file[0], 0, LFS_SEEK_CUR) => size;
-    lfs_file_read(&lfs, &file[0], buffer, size) => size;
-    memcmp(buffer, "kittycatcat", size) => 0;
-
-    lfs_file_seek(&lfs, &file[0], size, LFS_SEEK_CUR) => 3*size;
-    lfs_file_read(&lfs, &file[0], buffer, size) => size;
-    memcmp(buffer, "kittycatcat", size) => 0;
-
-    lfs_file_seek(&lfs, &file[0], pos, LFS_SEEK_SET) => pos;
-    lfs_file_read(&lfs, &file[0], buffer, size) => size;
-    memcmp(buffer, "kittycatcat", size) => 0;
-
-    lfs_file_seek(&lfs, &file[0], -size, LFS_SEEK_CUR) => pos;
-    lfs_file_read(&lfs, &file[0], buffer, size) => size;
-    memcmp(buffer, "kittycatcat", size) => 0;
-
-    lfs_file_seek(&lfs, &file[0], -size, LFS_SEEK_END) >= 0 => 1;
-    lfs_file_read(&lfs, &file[0], buffer, size) => size;
-    memcmp(buffer, "kittycatcat", size) => 0;
-
-    size = lfs_file_size(&lfs, &file[0]);
-    lfs_file_seek(&lfs, &file[0], 0, LFS_SEEK_CUR) => size;
-
-    lfs_file_close(&lfs, &file[0]) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Large file seek ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_file_open(&lfs, &file[0], "hello/kitty42", LFS_O_RDONLY) => 0;
-
-    lfs_soff_t pos;
-    size = strlen("kittycatcat");
-    for (int i = 0; i < $MEDIUMSIZE; i++) {
-        lfs_file_read(&lfs, &file[0], buffer, size) => size;
-        memcmp(buffer, "kittycatcat", size) => 0;
-        pos = lfs_file_tell(&lfs, &file[0]);
-    }
-    pos >= 0 => 1;
-
-    lfs_file_seek(&lfs, &file[0], pos, LFS_SEEK_SET) => pos;
-    lfs_file_read(&lfs, &file[0], buffer, size) => size;
-    memcmp(buffer, "kittycatcat", size) => 0;
-
-    lfs_file_rewind(&lfs, &file[0]) => 0;
-    lfs_file_read(&lfs, &file[0], buffer, size) => size;
-    memcmp(buffer, "kittycatcat", size) => 0;
-
-    lfs_file_seek(&lfs, &file[0], 0, LFS_SEEK_CUR) => size;
-    lfs_file_read(&lfs, &file[0], buffer, size) => size;
-    memcmp(buffer, "kittycatcat", size) => 0;
-
-    lfs_file_seek(&lfs, &file[0], size, LFS_SEEK_CUR) => 3*size;
-    lfs_file_read(&lfs, &file[0], buffer, size) => size;
-    memcmp(buffer, "kittycatcat", size) => 0;
-
-    lfs_file_seek(&lfs, &file[0], pos, LFS_SEEK_SET) => pos;
-    lfs_file_read(&lfs, &file[0], buffer, size) => size;
-    memcmp(buffer, "kittycatcat", size) => 0;
-
-    lfs_file_seek(&lfs, &file[0], -size, LFS_SEEK_CUR) => pos;
-    lfs_file_read(&lfs, &file[0], buffer, size) => size;
-    memcmp(buffer, "kittycatcat", size) => 0;
-
-    lfs_file_seek(&lfs, &file[0], -size, LFS_SEEK_END) >= 0 => 1;
-    lfs_file_read(&lfs, &file[0], buffer, size) => size;
-    memcmp(buffer, "kittycatcat", size) => 0;
-
-    size = lfs_file_size(&lfs, &file[0]);
-    lfs_file_seek(&lfs, &file[0], 0, LFS_SEEK_CUR) => size;
-
-    lfs_file_close(&lfs, &file[0]) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Simple file seek and write ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_file_open(&lfs, &file[0], "hello/kitty42", LFS_O_RDWR) => 0;
-
-    lfs_soff_t pos;
-    size = strlen("kittycatcat");
-    for (int i = 0; i < $SMALLSIZE; i++) {
-        lfs_file_read(&lfs, &file[0], buffer, size) => size;
-        memcmp(buffer, "kittycatcat", size) => 0;
-        pos = lfs_file_tell(&lfs, &file[0]);
-    }
-    pos >= 0 => 1;
-
-    memcpy(buffer, "doggodogdog", size);
-    lfs_file_seek(&lfs, &file[0], pos, LFS_SEEK_SET) => pos;
-    lfs_file_write(&lfs, &file[0], buffer, size) => size;
-
-    lfs_file_seek(&lfs, &file[0], pos, LFS_SEEK_SET) => pos;
-    lfs_file_read(&lfs, &file[0], buffer, size) => size;
-    memcmp(buffer, "doggodogdog", size) => 0;
-
-    lfs_file_rewind(&lfs, &file[0]) => 0;
-    lfs_file_read(&lfs, &file[0], buffer, size) => size;
-    memcmp(buffer, "kittycatcat", size) => 0;
-
-    lfs_file_seek(&lfs, &file[0], pos, LFS_SEEK_SET) => pos;
-    lfs_file_read(&lfs, &file[0], buffer, size) => size;
-    memcmp(buffer, "doggodogdog", size) => 0;
-
-    lfs_file_seek(&lfs, &file[0], -size, LFS_SEEK_END) >= 0 => 1;
-    lfs_file_read(&lfs, &file[0], buffer, size) => size;
-    memcmp(buffer, "kittycatcat", size) => 0;
-
-    size = lfs_file_size(&lfs, &file[0]);
-    lfs_file_seek(&lfs, &file[0], 0, LFS_SEEK_CUR) => size;
-
-    lfs_file_close(&lfs, &file[0]) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Large file seek and write ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_file_open(&lfs, &file[0], "hello/kitty42", LFS_O_RDWR) => 0;
-
-    lfs_soff_t pos;
-    size = strlen("kittycatcat");
-    for (int i = 0; i < $MEDIUMSIZE; i++) {
-        lfs_file_read(&lfs, &file[0], buffer, size) => size;
-        if (i != $SMALLSIZE) {
-            memcmp(buffer, "kittycatcat", size) => 0;
-        }
-        pos = lfs_file_tell(&lfs, &file[0]);
-    }
-    pos >= 0 => 1;
-
-    memcpy(buffer, "doggodogdog", size);
-    lfs_file_seek(&lfs, &file[0], pos, LFS_SEEK_SET) => pos;
-    lfs_file_write(&lfs, &file[0], buffer, size) => size;
-
-    lfs_file_seek(&lfs, &file[0], pos, LFS_SEEK_SET) => pos;
-    lfs_file_read(&lfs, &file[0], buffer, size) => size;
-    memcmp(buffer, "doggodogdog", size) => 0;
-
-    lfs_file_rewind(&lfs, &file[0]) => 0;
-    lfs_file_read(&lfs, &file[0], buffer, size) => size;
-    memcmp(buffer, "kittycatcat", size) => 0;
-
-    lfs_file_seek(&lfs, &file[0], pos, LFS_SEEK_SET) => pos;
-    lfs_file_read(&lfs, &file[0], buffer, size) => size;
-    memcmp(buffer, "doggodogdog", size) => 0;
-
-    lfs_file_seek(&lfs, &file[0], -size, LFS_SEEK_END) >= 0 => 1;
-    lfs_file_read(&lfs, &file[0], buffer, size) => size;
-    memcmp(buffer, "kittycatcat", size) => 0;
-
-    size = lfs_file_size(&lfs, &file[0]);
-    lfs_file_seek(&lfs, &file[0], 0, LFS_SEEK_CUR) => size;
-
-    lfs_file_close(&lfs, &file[0]) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Boundary seek and write ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_file_open(&lfs, &file[0], "hello/kitty42", LFS_O_RDWR) => 0;
-
-    size = strlen("hedgehoghog");
-    const lfs_soff_t offsets[] = {512, 1020, 513, 1021, 511, 1019};
-
-    for (int i = 0; i < sizeof(offsets) / sizeof(offsets[0]); i++) {
-        lfs_soff_t off = offsets[i];
-        memcpy(buffer, "hedgehoghog", size);
-        lfs_file_seek(&lfs, &file[0], off, LFS_SEEK_SET) => off;
-        lfs_file_write(&lfs, &file[0], buffer, size) => size;
-        lfs_file_seek(&lfs, &file[0], off, LFS_SEEK_SET) => off;
-        lfs_file_read(&lfs, &file[0], buffer, size) => size;
-        memcmp(buffer, "hedgehoghog", size) => 0;
-
-        lfs_file_seek(&lfs, &file[0], 0, LFS_SEEK_SET) => 0;
-        lfs_file_read(&lfs, &file[0], buffer, size) => size;
-        memcmp(buffer, "kittycatcat", size) => 0;
-
-        lfs_file_sync(&lfs, &file[0]) => 0;
-    }
-
-    lfs_file_close(&lfs, &file[0]) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Out-of-bounds seek ---"
-tests/test.py << TEST
-    lfs_mount(&lfs, &cfg) => 0;
-    lfs_file_open(&lfs, &file[0], "hello/kitty42", LFS_O_RDWR) => 0;
-
-    size = strlen("kittycatcat");
-    lfs_file_size(&lfs, &file[0]) => $LARGESIZE*size;
-    lfs_file_seek(&lfs, &file[0], ($LARGESIZE+$SMALLSIZE)*size,
-            LFS_SEEK_SET) => ($LARGESIZE+$SMALLSIZE)*size;
-    lfs_file_read(&lfs, &file[0], buffer, size) => 0;
-
-    memcpy(buffer, "porcupineee", size);
-    lfs_file_write(&lfs, &file[0], buffer, size) => size;
-
-    lfs_file_seek(&lfs, &file[0], ($LARGESIZE+$SMALLSIZE)*size,
-            LFS_SEEK_SET) => ($LARGESIZE+$SMALLSIZE)*size;
-    lfs_file_read(&lfs, &file[0], buffer, size) => size;
-    memcmp(buffer, "porcupineee", size) => 0;
-
-    lfs_file_seek(&lfs, &file[0], $LARGESIZE*size,
-            LFS_SEEK_SET) => $LARGESIZE*size;
-    lfs_file_read(&lfs, &file[0], buffer, size) => size;
-    memcmp(buffer, "\0\0\0\0\0\0\0\0\0\0\0", size) => 0;
-
-    lfs_file_seek(&lfs, &file[0], -(($LARGESIZE+$SMALLSIZE)*size),
-            LFS_SEEK_CUR) => LFS_ERR_INVAL;
-    lfs_file_tell(&lfs, &file[0]) => ($LARGESIZE+1)*size;
-
-    lfs_file_seek(&lfs, &file[0], -(($LARGESIZE+2*$SMALLSIZE)*size),
-            LFS_SEEK_END) => LFS_ERR_INVAL;
-    lfs_file_tell(&lfs, &file[0]) => ($LARGESIZE+1)*size;
-
-    lfs_file_close(&lfs, &file[0]) => 0;
-    lfs_unmount(&lfs) => 0;
-TEST
-
-echo "--- Results ---"
-tests/stats.py

tests/test_seek.toml

@@ -0,0 +1,380 @@
+
+[[case]] # simple file seek
+define = [
+    {COUNT=132, SKIP=4},
+    {COUNT=132, SKIP=128},
+    {COUNT=200, SKIP=10},
+    {COUNT=200, SKIP=100},
+    {COUNT=4,   SKIP=1},
+    {COUNT=4,   SKIP=2},
+]
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "kitty",
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_APPEND) => 0;
+    size = strlen("kittycatcat");
+    memcpy(buffer, "kittycatcat", size);
+    for (int j = 0; j < COUNT; j++) {
+        lfs2_file_write(&lfs2, &file, buffer, size);
+    }
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "kitty", LFS2_O_RDONLY) => 0;
+
+    lfs2_soff_t pos = -1;
+    size = strlen("kittycatcat");
+    for (int i = 0; i < SKIP; i++) {
+        lfs2_file_read(&lfs2, &file, buffer, size) => size;
+        memcmp(buffer, "kittycatcat", size) => 0;
+        pos = lfs2_file_tell(&lfs2, &file);
+    }
+    assert(pos >= 0);
+
+    lfs2_file_seek(&lfs2, &file, pos, LFS2_SEEK_SET) => pos;
+    lfs2_file_read(&lfs2, &file, buffer, size) => size;
+    memcmp(buffer, "kittycatcat", size) => 0;
+
+    lfs2_file_rewind(&lfs2, &file) => 0;
+    lfs2_file_read(&lfs2, &file, buffer, size) => size;
+    memcmp(buffer, "kittycatcat", size) => 0;
+
+    lfs2_file_seek(&lfs2, &file, 0, LFS2_SEEK_CUR) => size;
+    lfs2_file_read(&lfs2, &file, buffer, size) => size;
+    memcmp(buffer, "kittycatcat", size) => 0;
+
+    lfs2_file_seek(&lfs2, &file, size, LFS2_SEEK_CUR) => 3*size;
+    lfs2_file_read(&lfs2, &file, buffer, size) => size;
+    memcmp(buffer, "kittycatcat", size) => 0;
+
+    lfs2_file_seek(&lfs2, &file, pos, LFS2_SEEK_SET) => pos;
+    lfs2_file_read(&lfs2, &file, buffer, size) => size;
+    memcmp(buffer, "kittycatcat", size) => 0;
+
+    lfs2_file_seek(&lfs2, &file, -size, LFS2_SEEK_CUR) => pos;
+    lfs2_file_read(&lfs2, &file, buffer, size) => size;
+    memcmp(buffer, "kittycatcat", size) => 0;
+
+    lfs2_file_seek(&lfs2, &file, -size, LFS2_SEEK_END) >= 0 => 1;
+    lfs2_file_read(&lfs2, &file, buffer, size) => size;
+    memcmp(buffer, "kittycatcat", size) => 0;
+
+    size = lfs2_file_size(&lfs2, &file);
+    lfs2_file_seek(&lfs2, &file, 0, LFS2_SEEK_CUR) => size;
+
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # simple file seek and write
+define = [
+    {COUNT=132, SKIP=4},
+    {COUNT=132, SKIP=128},
+    {COUNT=200, SKIP=10},
+    {COUNT=200, SKIP=100},
+    {COUNT=4,   SKIP=1},
+    {COUNT=4,   SKIP=2},
+]
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "kitty",
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_APPEND) => 0;
+    size = strlen("kittycatcat");
+    memcpy(buffer, "kittycatcat", size);
+    for (int j = 0; j < COUNT; j++) {
+        lfs2_file_write(&lfs2, &file, buffer, size);
+    }
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "kitty", LFS2_O_RDWR) => 0;
+
+    lfs2_soff_t pos = -1;
+    size = strlen("kittycatcat");
+    for (int i = 0; i < SKIP; i++) {
+        lfs2_file_read(&lfs2, &file, buffer, size) => size;
+        memcmp(buffer, "kittycatcat", size) => 0;
+        pos = lfs2_file_tell(&lfs2, &file);
+    }
+    assert(pos >= 0);
+
+    memcpy(buffer, "doggodogdog", size);
+    lfs2_file_seek(&lfs2, &file, pos, LFS2_SEEK_SET) => pos;
+    lfs2_file_write(&lfs2, &file, buffer, size) => size;
+
+    lfs2_file_seek(&lfs2, &file, pos, LFS2_SEEK_SET) => pos;
+    lfs2_file_read(&lfs2, &file, buffer, size) => size;
+    memcmp(buffer, "doggodogdog", size) => 0;
+
+    lfs2_file_rewind(&lfs2, &file) => 0;
+    lfs2_file_read(&lfs2, &file, buffer, size) => size;
+    memcmp(buffer, "kittycatcat", size) => 0;
+
+    lfs2_file_seek(&lfs2, &file, pos, LFS2_SEEK_SET) => pos;
+    lfs2_file_read(&lfs2, &file, buffer, size) => size;
+    memcmp(buffer, "doggodogdog", size) => 0;
+
+    lfs2_file_seek(&lfs2, &file, -size, LFS2_SEEK_END) >= 0 => 1;
+    lfs2_file_read(&lfs2, &file, buffer, size) => size;
+    memcmp(buffer, "kittycatcat", size) => 0;
+
+    size = lfs2_file_size(&lfs2, &file);
+    lfs2_file_seek(&lfs2, &file, 0, LFS2_SEEK_CUR) => size;
+
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # boundary seek and writes
+define.COUNT = 132
+define.OFFSETS = '"{512, 1020, 513, 1021, 511, 1019, 1441}"'
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "kitty",
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_APPEND) => 0;
+    size = strlen("kittycatcat");
+    memcpy(buffer, "kittycatcat", size);
+    for (int j = 0; j < COUNT; j++) {
+        lfs2_file_write(&lfs2, &file, buffer, size);
+    }
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "kitty", LFS2_O_RDWR) => 0;
+
+    size = strlen("hedgehoghog");
+    const lfs2_soff_t offsets[] = OFFSETS;
+
+    for (unsigned i = 0; i < sizeof(offsets) / sizeof(offsets[0]); i++) {
+        lfs2_soff_t off = offsets[i];
+        memcpy(buffer, "hedgehoghog", size);
+        lfs2_file_seek(&lfs2, &file, off, LFS2_SEEK_SET) => off;
+        lfs2_file_write(&lfs2, &file, buffer, size) => size;
+        lfs2_file_seek(&lfs2, &file, off, LFS2_SEEK_SET) => off;
+        lfs2_file_read(&lfs2, &file, buffer, size) => size;
+        memcmp(buffer, "hedgehoghog", size) => 0;
+
+        lfs2_file_seek(&lfs2, &file, 0, LFS2_SEEK_SET) => 0;
+        lfs2_file_read(&lfs2, &file, buffer, size) => size;
+        memcmp(buffer, "kittycatcat", size) => 0;
+
+        lfs2_file_seek(&lfs2, &file, off, LFS2_SEEK_SET) => off;
+        lfs2_file_read(&lfs2, &file, buffer, size) => size;
+        memcmp(buffer, "hedgehoghog", size) => 0;
+
+        lfs2_file_sync(&lfs2, &file) => 0;
+
+        lfs2_file_seek(&lfs2, &file, 0, LFS2_SEEK_SET) => 0;
+        lfs2_file_read(&lfs2, &file, buffer, size) => size;
+        memcmp(buffer, "kittycatcat", size) => 0;
+
+        lfs2_file_seek(&lfs2, &file, off, LFS2_SEEK_SET) => off;
+        lfs2_file_read(&lfs2, &file, buffer, size) => size;
+        memcmp(buffer, "hedgehoghog", size) => 0;
+    }
+
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # out of bounds seek
+define = [
+    {COUNT=132, SKIP=4},
+    {COUNT=132, SKIP=128},
+    {COUNT=200, SKIP=10},
+    {COUNT=200, SKIP=100},
+    {COUNT=4,   SKIP=2},
+    {COUNT=4,   SKIP=3},
+]
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "kitty",
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_APPEND) => 0;
+    size = strlen("kittycatcat");
+    memcpy(buffer, "kittycatcat", size);
+    for (int j = 0; j < COUNT; j++) {
+        lfs2_file_write(&lfs2, &file, buffer, size);
+    }
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "kitty", LFS2_O_RDWR) => 0;
+
+    size = strlen("kittycatcat");
+    lfs2_file_size(&lfs2, &file) => COUNT*size;
+    lfs2_file_seek(&lfs2, &file, (COUNT+SKIP)*size,
+            LFS2_SEEK_SET) => (COUNT+SKIP)*size;
+    lfs2_file_read(&lfs2, &file, buffer, size) => 0;
+
+    memcpy(buffer, "porcupineee", size);
+    lfs2_file_write(&lfs2, &file, buffer, size) => size;
+
+    lfs2_file_seek(&lfs2, &file, (COUNT+SKIP)*size,
+            LFS2_SEEK_SET) => (COUNT+SKIP)*size;
+    lfs2_file_read(&lfs2, &file, buffer, size) => size;
+    memcmp(buffer, "porcupineee", size) => 0;
+
+    lfs2_file_seek(&lfs2, &file, COUNT*size,
+            LFS2_SEEK_SET) => COUNT*size;
+    lfs2_file_read(&lfs2, &file, buffer, size) => size;
+    memcmp(buffer, "\0\0\0\0\0\0\0\0\0\0\0", size) => 0;
+
+    lfs2_file_seek(&lfs2, &file, -((COUNT+SKIP)*size),
+            LFS2_SEEK_CUR) => LFS2_ERR_INVAL;
+    lfs2_file_tell(&lfs2, &file) => (COUNT+1)*size;
+
+    lfs2_file_seek(&lfs2, &file, -((COUNT+2*SKIP)*size),
+            LFS2_SEEK_END) => LFS2_ERR_INVAL;
+    lfs2_file_tell(&lfs2, &file) => (COUNT+1)*size;
+
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # inline write and seek
+define.SIZE = [2, 4, 128, 132]
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "tinykitty",
+            LFS2_O_RDWR | LFS2_O_CREAT) => 0;
+    int j = 0;
+    int k = 0;
+
+    memcpy(buffer, "abcdefghijklmnopqrstuvwxyz", 26);
+    for (unsigned i = 0; i < SIZE; i++) {
+        lfs2_file_write(&lfs2, &file, &buffer[j++ % 26], 1) => 1;
+        lfs2_file_tell(&lfs2, &file) => i+1;
+        lfs2_file_size(&lfs2, &file) => i+1;
+    }
+
+    lfs2_file_seek(&lfs2, &file, 0, LFS2_SEEK_SET) => 0;
+    lfs2_file_tell(&lfs2, &file) => 0;
+    lfs2_file_size(&lfs2, &file) => SIZE;
+    for (unsigned i = 0; i < SIZE; i++) {
+        uint8_t c;
+        lfs2_file_read(&lfs2, &file, &c, 1) => 1;
+        c => buffer[k++ % 26];
+    }
+
+    lfs2_file_sync(&lfs2, &file) => 0;
+    lfs2_file_tell(&lfs2, &file) => SIZE;
+    lfs2_file_size(&lfs2, &file) => SIZE;
+
+    lfs2_file_seek(&lfs2, &file, 0, LFS2_SEEK_SET) => 0;
+    for (unsigned i = 0; i < SIZE; i++) {
+        lfs2_file_write(&lfs2, &file, &buffer[j++ % 26], 1) => 1;
+        lfs2_file_tell(&lfs2, &file) => i+1;
+        lfs2_file_size(&lfs2, &file) => SIZE;
+        lfs2_file_sync(&lfs2, &file) => 0;
+        lfs2_file_tell(&lfs2, &file) => i+1;
+        lfs2_file_size(&lfs2, &file) => SIZE;
+        if (i < SIZE-2) {
+            uint8_t c[3];
+            lfs2_file_seek(&lfs2, &file, -1, LFS2_SEEK_CUR) => i;
+            lfs2_file_read(&lfs2, &file, &c, 3) => 3;
+            lfs2_file_tell(&lfs2, &file) => i+3;
+            lfs2_file_size(&lfs2, &file) => SIZE;
+            lfs2_file_seek(&lfs2, &file, i+1, LFS2_SEEK_SET) => i+1;
+            lfs2_file_tell(&lfs2, &file) => i+1;
+            lfs2_file_size(&lfs2, &file) => SIZE;
+        }
+    }
+
+    lfs2_file_seek(&lfs2, &file, 0, LFS2_SEEK_SET) => 0;
+    lfs2_file_tell(&lfs2, &file) => 0;
+    lfs2_file_size(&lfs2, &file) => SIZE;
+    for (unsigned i = 0; i < SIZE; i++) {
+        uint8_t c;
+        lfs2_file_read(&lfs2, &file, &c, 1) => 1;
+        c => buffer[k++ % 26];
+    }
+
+    lfs2_file_sync(&lfs2, &file) => 0;
+    lfs2_file_tell(&lfs2, &file) => SIZE;
+    lfs2_file_size(&lfs2, &file) => SIZE;
+
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # file seek and write with power-loss
+# must be power-of-2 for quadratic probing to be exhaustive
+define.COUNT = [4, 64, 128]
+reentrant = true
+code = '''
+    err = lfs2_mount(&lfs2, &cfg);
+    if (err) {
+        lfs2_format(&lfs2, &cfg) => 0;
+        lfs2_mount(&lfs2, &cfg) => 0;
+    }
+    err = lfs2_file_open(&lfs2, &file, "kitty", LFS2_O_RDONLY);
+    assert(!err || err == LFS2_ERR_NOENT);
+    if (!err) {
+        if (lfs2_file_size(&lfs2, &file) != 0) {
+            lfs2_file_size(&lfs2, &file) => 11*COUNT;
+            for (int j = 0; j < COUNT; j++) {
+                memset(buffer, 0, 11+1);
+                lfs2_file_read(&lfs2, &file, buffer, 11) => 11;
+                assert(memcmp(buffer, "kittycatcat", 11) == 0 ||
+                       memcmp(buffer, "doggodogdog", 11) == 0);
+            }
+        }
+        lfs2_file_close(&lfs2, &file) => 0;
+    }
+
+    lfs2_file_open(&lfs2, &file, "kitty", LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+    if (lfs2_file_size(&lfs2, &file) == 0) {
+        for (int j = 0; j < COUNT; j++) {
+            strcpy((char*)buffer, "kittycatcat");
+            size = strlen((char*)buffer);
+            lfs2_file_write(&lfs2, &file, buffer, size) => size;
+        }
+    }
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    strcpy((char*)buffer, "doggodogdog");
+    size = strlen((char*)buffer);
+
+    lfs2_file_open(&lfs2, &file, "kitty", LFS2_O_RDWR) => 0;
+    lfs2_file_size(&lfs2, &file) => COUNT*size;
+    // seek and write using quadratic probing to touch all
+    // 11-byte words in the file
+    lfs2_off_t off = 0;
+    for (int j = 0; j < COUNT; j++) {
+        off = (5*off + 1) % COUNT;
+        lfs2_file_seek(&lfs2, &file, off*size, LFS2_SEEK_SET) => off*size;
+        lfs2_file_read(&lfs2, &file, buffer, size) => size;
+        assert(memcmp(buffer, "kittycatcat", size) == 0 ||
+               memcmp(buffer, "doggodogdog", size) == 0);
+        if (memcmp(buffer, "doggodogdog", size) != 0) {
+            lfs2_file_seek(&lfs2, &file, off*size, LFS2_SEEK_SET) => off*size;
+            strcpy((char*)buffer, "doggodogdog");
+            lfs2_file_write(&lfs2, &file, buffer, size) => size;
+            lfs2_file_seek(&lfs2, &file, off*size, LFS2_SEEK_SET) => off*size;
+            lfs2_file_read(&lfs2, &file, buffer, size) => size;
+            assert(memcmp(buffer, "doggodogdog", size) == 0);
+            lfs2_file_sync(&lfs2, &file) => 0;
+            lfs2_file_seek(&lfs2, &file, off*size, LFS2_SEEK_SET) => off*size;
+            lfs2_file_read(&lfs2, &file, buffer, size) => size;
+            assert(memcmp(buffer, "doggodogdog", size) == 0);
+        }
+    }
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    lfs2_file_open(&lfs2, &file, "kitty", LFS2_O_RDWR) => 0;
+    lfs2_file_size(&lfs2, &file) => COUNT*size;
+    for (int j = 0; j < COUNT; j++) {
+        lfs2_file_read(&lfs2, &file, buffer, size) => size;
+        assert(memcmp(buffer, "doggodogdog", size) == 0);
+    }
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''

tests/test_superblocks.toml

@@ -0,0 +1,127 @@
+[[case]] # simple formatting test
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+'''
+
+[[case]] # mount/unmount
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # reentrant format
+reentrant = true
+code = '''
+    err = lfs2_mount(&lfs2, &cfg);
+    if (err) {
+        lfs2_format(&lfs2, &cfg) => 0;
+        lfs2_mount(&lfs2, &cfg) => 0;
+    }
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # invalid mount
+code = '''
+    lfs2_mount(&lfs2, &cfg) => LFS2_ERR_CORRUPT;
+'''
+
+[[case]] # expanding superblock
+define.LFS2_BLOCK_CYCLES = [32, 33, 1]
+define.N = [10, 100, 1000]
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    for (int i = 0; i < N; i++) {
+        lfs2_file_open(&lfs2, &file, "dummy",
+                LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_EXCL) => 0;
+        lfs2_file_close(&lfs2, &file) => 0;
+        lfs2_stat(&lfs2, "dummy", &info) => 0;
+        assert(strcmp(info.name, "dummy") == 0);
+        assert(info.type == LFS2_TYPE_REG);
+        lfs2_remove(&lfs2, "dummy") => 0;
+    }
+    lfs2_unmount(&lfs2) => 0;
+
+    // one last check after power-cycle
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "dummy",
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_EXCL) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_stat(&lfs2, "dummy", &info) => 0;
+    assert(strcmp(info.name, "dummy") == 0);
+    assert(info.type == LFS2_TYPE_REG);
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # expanding superblock with power cycle
+define.LFS2_BLOCK_CYCLES = [32, 33, 1]
+define.N = [10, 100, 1000]
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    for (int i = 0; i < N; i++) {
+        lfs2_mount(&lfs2, &cfg) => 0;
+        // remove lingering dummy?
+        err = lfs2_stat(&lfs2, "dummy", &info);
+        assert(err == 0 || (err == LFS2_ERR_NOENT && i == 0));
+        if (!err) {
+            assert(strcmp(info.name, "dummy") == 0);
+            assert(info.type == LFS2_TYPE_REG);
+            lfs2_remove(&lfs2, "dummy") => 0;
+        }
+
+        lfs2_file_open(&lfs2, &file, "dummy",
+                LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_EXCL) => 0;
+        lfs2_file_close(&lfs2, &file) => 0;
+        lfs2_stat(&lfs2, "dummy", &info) => 0;
+        assert(strcmp(info.name, "dummy") == 0);
+        assert(info.type == LFS2_TYPE_REG);
+        lfs2_unmount(&lfs2) => 0;
+    }
+
+    // one last check after power-cycle
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_stat(&lfs2, "dummy", &info) => 0;
+    assert(strcmp(info.name, "dummy") == 0);
+    assert(info.type == LFS2_TYPE_REG);
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # reentrant expanding superblock
+define.LFS2_BLOCK_CYCLES = [2, 1]
+define.N = 24
+reentrant = true
+code = '''
+    err = lfs2_mount(&lfs2, &cfg);
+    if (err) {
+        lfs2_format(&lfs2, &cfg) => 0;
+        lfs2_mount(&lfs2, &cfg) => 0;
+    }
+
+    for (int i = 0; i < N; i++) {
+        // remove lingering dummy?
+        err = lfs2_stat(&lfs2, "dummy", &info);
+        assert(err == 0 || (err == LFS2_ERR_NOENT && i == 0));
+        if (!err) {
+            assert(strcmp(info.name, "dummy") == 0);
+            assert(info.type == LFS2_TYPE_REG);
+            lfs2_remove(&lfs2, "dummy") => 0;
+        }
+
+        lfs2_file_open(&lfs2, &file, "dummy",
+                LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_EXCL) => 0;
+        lfs2_file_close(&lfs2, &file) => 0;
+        lfs2_stat(&lfs2, "dummy", &info) => 0;
+        assert(strcmp(info.name, "dummy") == 0);
+        assert(info.type == LFS2_TYPE_REG);
+    }
+
+    lfs2_unmount(&lfs2) => 0;
+
+    // one last check after power-cycle
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_stat(&lfs2, "dummy", &info) => 0;
+    assert(strcmp(info.name, "dummy") == 0);
+    assert(info.type == LFS2_TYPE_REG);
+    lfs2_unmount(&lfs2) => 0;
+'''

tests/test_truncate.sh

@@ -1,158 +0,0 @@
-#!/bin/bash
-set -eu
-
-SMALLSIZE=32
-MEDIUMSIZE=2048
-LARGESIZE=8192
-
-echo "=== Truncate tests ==="
-rm -rf blocks
-tests/test.py << TEST
-    lfs_format(&lfs, &cfg) => 0;
-TEST
-
-truncate_test() {
-STARTSIZES="$1"
-STARTSEEKS="$2"
-HOTSIZES="$3"
-COLDSIZES="$4"
-tests/test.py << TEST
-    static const lfs_off_t startsizes[] = {$STARTSIZES};
-    static const lfs_off_t startseeks[] = {$STARTSEEKS};
-    static const lfs_off_t hotsizes[]   = {$HOTSIZES};
-
-    lfs_mount(&lfs, &cfg) => 0;
-
-    for (int i = 0; i < sizeof(startsizes)/sizeof(startsizes[0]); i++) {
-        sprintf((char*)buffer, "hairyhead%d", i);
-        lfs_file_open(&lfs, &file[0], (const char*)buffer,
-                LFS_O_WRONLY | LFS_O_CREAT | LFS_O_TRUNC) => 0;
-
-        strcpy((char*)buffer, "hair");
-        size = strlen((char*)buffer);
-        for (int j = 0; j < startsizes[i]; j += size) {
-            lfs_file_write(&lfs, &file[0], buffer, size) => size;
-        }
-        lfs_file_size(&lfs, &file[0]) => startsizes[i];
-
-        if (startseeks[i] != startsizes[i]) {
-            lfs_file_seek(&lfs, &file[0],
-                    startseeks[i], LFS_SEEK_SET) => startseeks[i];
-        }
-
-        lfs_file_truncate(&lfs, &file[0], hotsizes[i]) => 0;
-        lfs_file_size(&lfs, &file[0]) => hotsizes[i];
-
-        lfs_file_close(&lfs, &file[0]) => 0;
-    }
-
-    lfs_unmount(&lfs) => 0;
-TEST
-tests/test.py << TEST
-    static const lfs_off_t startsizes[] = {$STARTSIZES};
-    static const lfs_off_t hotsizes[]   = {$HOTSIZES};
-    static const lfs_off_t coldsizes[]  = {$COLDSIZES};
-
-    lfs_mount(&lfs, &cfg) => 0;
-
-    for (int i = 0; i < sizeof(startsizes)/sizeof(startsizes[0]); i++) {
-        sprintf((char*)buffer, "hairyhead%d", i);
-        lfs_file_open(&lfs, &file[0], (const char*)buffer, LFS_O_RDWR) => 0;
-        lfs_file_size(&lfs, &file[0]) => hotsizes[i];
-
-        size = strlen("hair");
-        int j = 0;
-        for (; j < startsizes[i] && j < hotsizes[i]; j += size) {
-            lfs_file_read(&lfs, &file[0], buffer, size) => size;
-            memcmp(buffer, "hair", size) => 0;
-        }
-
-        for (; j < hotsizes[i]; j += size) {
-            lfs_file_read(&lfs, &file[0], buffer, size) => size;
-            memcmp(buffer, "\0\0\0\0", size) => 0;
-        }
-
-        lfs_file_truncate(&lfs, &file[0], coldsizes[i]) => 0;
-        lfs_file_size(&lfs, &file[0]) => coldsizes[i];
-
-        lfs_file_close(&lfs, &file[0]) => 0;
-    }
-
-    lfs_unmount(&lfs) => 0;
-TEST
-tests/test.py << TEST
-    static const lfs_off_t startsizes[] = {$STARTSIZES};
-    static const lfs_off_t hotsizes[]   = {$HOTSIZES};
-    static const lfs_off_t coldsizes[]  = {$COLDSIZES};
-
-    lfs_mount(&lfs, &cfg) => 0;
-
-    for (int i = 0; i < sizeof(startsizes)/sizeof(startsizes[0]); i++) {
-        sprintf((char*)buffer, "hairyhead%d", i);
-        lfs_file_open(&lfs, &file[0], (const char*)buffer, LFS_O_RDONLY) => 0;
-        lfs_file_size(&lfs, &file[0]) => coldsizes[i];
-
-        size = strlen("hair");
-        int j = 0;
-        for (; j < startsizes[i] && j < hotsizes[i] && j < coldsizes[i];
-                j += size) {
-            lfs_file_read(&lfs, &file[0], buffer, size) => size;
-            memcmp(buffer, "hair", size) => 0;
-        }
-
-        for (; j < coldsizes[i]; j += size) {
-            lfs_file_read(&lfs, &file[0], buffer, size) => size;
-            memcmp(buffer, "\0\0\0\0", size) => 0;
-        }
-
-        lfs_file_close(&lfs, &file[0]) => 0;
-    }
-
-    lfs_unmount(&lfs) => 0;
-TEST
-}
-
-echo "--- Cold shrinking truncate ---"
-truncate_test \
-    "2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE" \
-    "2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE" \
-    "2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE" \
-    "           0,   $SMALLSIZE,  $MEDIUMSIZE,   $LARGESIZE, 2*$LARGESIZE"
-
-echo "--- Cold expanding truncate ---"
-truncate_test \
-    "           0,   $SMALLSIZE,  $MEDIUMSIZE,   $LARGESIZE, 2*$LARGESIZE" \
-    "           0,   $SMALLSIZE,  $MEDIUMSIZE,   $LARGESIZE, 2*$LARGESIZE" \
-    "           0,   $SMALLSIZE,  $MEDIUMSIZE,   $LARGESIZE, 2*$LARGESIZE" \
-    "2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE"
-
-echo "--- Warm shrinking truncate ---"
-truncate_test \
-    "2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE" \
-    "2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE" \
-    "           0,   $SMALLSIZE,  $MEDIUMSIZE,   $LARGESIZE, 2*$LARGESIZE" \
-    "           0,            0,            0,            0,            0"
-
-echo "--- Warm expanding truncate ---"
-truncate_test \
-    "           0,   $SMALLSIZE,  $MEDIUMSIZE,   $LARGESIZE, 2*$LARGESIZE" \
-    "           0,   $SMALLSIZE,  $MEDIUMSIZE,   $LARGESIZE, 2*$LARGESIZE" \
-    "2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE" \
-    "2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE"
-
-echo "--- Mid-file shrinking truncate ---"
-truncate_test \
-    "2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE" \
-    "  $LARGESIZE,   $LARGESIZE,   $LARGESIZE,   $LARGESIZE,   $LARGESIZE" \
-    "           0,   $SMALLSIZE,  $MEDIUMSIZE,   $LARGESIZE, 2*$LARGESIZE" \
-    "           0,            0,            0,            0,            0"
-
-echo "--- Mid-file expanding truncate ---"
-truncate_test \
-    "           0,   $SMALLSIZE,  $MEDIUMSIZE,   $LARGESIZE, 2*$LARGESIZE" \
-    "           0,            0,   $SMALLSIZE,  $MEDIUMSIZE,   $LARGESIZE" \
-    "2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE" \
-    "2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE, 2*$LARGESIZE"
-
-echo "--- Results ---"
-tests/stats.py

tests/test_truncate.toml

@@ -0,0 +1,439 @@
+[[case]] # simple truncate
+define.MEDIUMSIZE = [32, 2048]
+define.LARGESIZE = 8192
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "baldynoop",
+            LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+
+    strcpy((char*)buffer, "hair");
+    size = strlen((char*)buffer);
+    for (lfs2_off_t j = 0; j < LARGESIZE; j += size) {
+        lfs2_file_write(&lfs2, &file, buffer, size) => size;
+    }
+    lfs2_file_size(&lfs2, &file) => LARGESIZE;
+
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+    
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "baldynoop", LFS2_O_RDWR) => 0;
+    lfs2_file_size(&lfs2, &file) => LARGESIZE;
+
+    lfs2_file_truncate(&lfs2, &file, MEDIUMSIZE) => 0;
+    lfs2_file_size(&lfs2, &file) => MEDIUMSIZE;
+
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "baldynoop", LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => MEDIUMSIZE;
+
+    size = strlen("hair");
+    for (lfs2_off_t j = 0; j < MEDIUMSIZE; j += size) {
+        lfs2_file_read(&lfs2, &file, buffer, size) => size;
+        memcmp(buffer, "hair", size) => 0;
+    }
+    lfs2_file_read(&lfs2, &file, buffer, size) => 0;
+
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # truncate and read
+define.MEDIUMSIZE = [32, 2048]
+define.LARGESIZE = 8192
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "baldyread",
+            LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+
+    strcpy((char*)buffer, "hair");
+    size = strlen((char*)buffer);
+    for (lfs2_off_t j = 0; j < LARGESIZE; j += size) {
+        lfs2_file_write(&lfs2, &file, buffer, size) => size;
+    }
+    lfs2_file_size(&lfs2, &file) => LARGESIZE;
+
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "baldyread", LFS2_O_RDWR) => 0;
+    lfs2_file_size(&lfs2, &file) => LARGESIZE;
+
+    lfs2_file_truncate(&lfs2, &file, MEDIUMSIZE) => 0;
+    lfs2_file_size(&lfs2, &file) => MEDIUMSIZE;
+
+    size = strlen("hair");
+    for (lfs2_off_t j = 0; j < MEDIUMSIZE; j += size) {
+        lfs2_file_read(&lfs2, &file, buffer, size) => size;
+        memcmp(buffer, "hair", size) => 0;
+    }
+    lfs2_file_read(&lfs2, &file, buffer, size) => 0;
+
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "baldyread", LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => MEDIUMSIZE;
+
+    size = strlen("hair");
+    for (lfs2_off_t j = 0; j < MEDIUMSIZE; j += size) {
+        lfs2_file_read(&lfs2, &file, buffer, size) => size;
+        memcmp(buffer, "hair", size) => 0;
+    }
+    lfs2_file_read(&lfs2, &file, buffer, size) => 0;
+
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # write, truncate, and read
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "sequence",
+            LFS2_O_RDWR | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+
+    size = lfs2_min(lfs2.cfg->cache_size, sizeof(buffer)/2);
+    lfs2_size_t qsize = size / 4;
+    uint8_t *wb = buffer;
+    uint8_t *rb = buffer + size;
+    for (lfs2_off_t j = 0; j < size; ++j) {
+        wb[j] = j;
+    }
+
+    /* Spread sequence over size */
+    lfs2_file_write(&lfs2, &file, wb, size) => size;
+    lfs2_file_size(&lfs2, &file) => size;
+    lfs2_file_tell(&lfs2, &file) => size;
+
+    lfs2_file_seek(&lfs2, &file, 0, LFS2_SEEK_SET) => 0;
+    lfs2_file_tell(&lfs2, &file) => 0;
+
+    /* Chop off the last quarter */
+    lfs2_size_t trunc = size - qsize;
+    lfs2_file_truncate(&lfs2, &file, trunc) => 0;
+    lfs2_file_tell(&lfs2, &file) => 0;
+    lfs2_file_size(&lfs2, &file) => trunc;
+
+    /* Read should produce first 3/4 */
+    lfs2_file_read(&lfs2, &file, rb, size) => trunc;
+    memcmp(rb, wb, trunc) => 0;
+
+    /* Move to 1/4 */
+    lfs2_file_size(&lfs2, &file) => trunc;
+    lfs2_file_seek(&lfs2, &file, qsize, LFS2_SEEK_SET) => qsize;
+    lfs2_file_tell(&lfs2, &file) => qsize;
+
+    /* Chop to 1/2 */
+    trunc -= qsize;
+    lfs2_file_truncate(&lfs2, &file, trunc) => 0;
+    lfs2_file_tell(&lfs2, &file) => qsize;
+    lfs2_file_size(&lfs2, &file) => trunc;
+    
+    /* Read should produce second quarter */
+    lfs2_file_read(&lfs2, &file, rb, size) => trunc - qsize;
+    memcmp(rb, wb + qsize, trunc - qsize) => 0;
+
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # truncate and write
+define.MEDIUMSIZE = [32, 2048]
+define.LARGESIZE = 8192
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "baldywrite",
+            LFS2_O_WRONLY | LFS2_O_CREAT) => 0;
+
+    strcpy((char*)buffer, "hair");
+    size = strlen((char*)buffer);
+    for (lfs2_off_t j = 0; j < LARGESIZE; j += size) {
+        lfs2_file_write(&lfs2, &file, buffer, size) => size;
+    }
+    lfs2_file_size(&lfs2, &file) => LARGESIZE;
+
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "baldywrite", LFS2_O_RDWR) => 0;
+    lfs2_file_size(&lfs2, &file) => LARGESIZE;
+
+    lfs2_file_truncate(&lfs2, &file, MEDIUMSIZE) => 0;
+    lfs2_file_size(&lfs2, &file) => MEDIUMSIZE;
+
+    strcpy((char*)buffer, "bald");
+    size = strlen((char*)buffer);
+    for (lfs2_off_t j = 0; j < MEDIUMSIZE; j += size) {
+        lfs2_file_write(&lfs2, &file, buffer, size) => size;
+    }
+    lfs2_file_size(&lfs2, &file) => MEDIUMSIZE;
+
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "baldywrite", LFS2_O_RDONLY) => 0;
+    lfs2_file_size(&lfs2, &file) => MEDIUMSIZE;
+
+    size = strlen("bald");
+    for (lfs2_off_t j = 0; j < MEDIUMSIZE; j += size) {
+        lfs2_file_read(&lfs2, &file, buffer, size) => size;
+        memcmp(buffer, "bald", size) => 0;
+    }
+    lfs2_file_read(&lfs2, &file, buffer, size) => 0;
+
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # truncate write under powerloss
+define.SMALLSIZE = [4, 512]
+define.MEDIUMSIZE = [32, 1024]
+define.LARGESIZE = 2048
+reentrant = true
+code = '''
+    err = lfs2_mount(&lfs2, &cfg);
+    if (err) {
+        lfs2_format(&lfs2, &cfg) => 0;
+        lfs2_mount(&lfs2, &cfg) => 0;
+    }
+    err = lfs2_file_open(&lfs2, &file, "baldy", LFS2_O_RDONLY);
+    assert(!err || err == LFS2_ERR_NOENT);
+    if (!err) {
+        size = lfs2_file_size(&lfs2, &file);
+        assert(size == 0 ||
+                size == LARGESIZE ||
+                size == MEDIUMSIZE ||
+                size == SMALLSIZE);
+        for (lfs2_off_t j = 0; j < size; j += 4) {
+            lfs2_file_read(&lfs2, &file, buffer, 4) => 4;
+            assert(memcmp(buffer, "hair", 4) == 0 ||
+                   memcmp(buffer, "bald", 4) == 0 ||
+                   memcmp(buffer, "comb", 4) == 0);
+        }
+        lfs2_file_close(&lfs2, &file) => 0;
+    }
+
+    lfs2_file_open(&lfs2, &file, "baldy",
+            LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+    lfs2_file_size(&lfs2, &file) => 0;
+    strcpy((char*)buffer, "hair");
+    size = strlen((char*)buffer);
+    for (lfs2_off_t j = 0; j < LARGESIZE; j += size) {
+        lfs2_file_write(&lfs2, &file, buffer, size) => size;
+    }
+    lfs2_file_size(&lfs2, &file) => LARGESIZE;
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    lfs2_file_open(&lfs2, &file, "baldy", LFS2_O_RDWR) => 0;
+    lfs2_file_size(&lfs2, &file) => LARGESIZE;
+    lfs2_file_truncate(&lfs2, &file, MEDIUMSIZE) => 0;
+    lfs2_file_size(&lfs2, &file) => MEDIUMSIZE;
+    strcpy((char*)buffer, "bald");
+    size = strlen((char*)buffer);
+    for (lfs2_off_t j = 0; j < MEDIUMSIZE; j += size) {
+        lfs2_file_write(&lfs2, &file, buffer, size) => size;
+    }
+    lfs2_file_size(&lfs2, &file) => MEDIUMSIZE;
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    lfs2_file_open(&lfs2, &file, "baldy", LFS2_O_RDWR) => 0;
+    lfs2_file_size(&lfs2, &file) => MEDIUMSIZE;
+    lfs2_file_truncate(&lfs2, &file, SMALLSIZE) => 0;
+    lfs2_file_size(&lfs2, &file) => SMALLSIZE;
+    strcpy((char*)buffer, "comb");
+    size = strlen((char*)buffer);
+    for (lfs2_off_t j = 0; j < SMALLSIZE; j += size) {
+        lfs2_file_write(&lfs2, &file, buffer, size) => size;
+    }
+    lfs2_file_size(&lfs2, &file) => SMALLSIZE;
+    lfs2_file_close(&lfs2, &file) => 0;
+
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # more aggressive general truncation tests
+define.CONFIG = 'range(6)'
+define.SMALLSIZE = 32
+define.MEDIUMSIZE = 2048
+define.LARGESIZE = 8192
+code = '''
+    #define COUNT 5
+    const struct {
+        lfs2_off_t startsizes[COUNT];
+        lfs2_off_t startseeks[COUNT];
+        lfs2_off_t hotsizes[COUNT];
+        lfs2_off_t coldsizes[COUNT];
+    } configs[] = {
+        // cold shrinking
+        {{2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE},
+         {2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE},
+         {2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE},
+         {          0,   SMALLSIZE,  MEDIUMSIZE,   LARGESIZE, 2*LARGESIZE}},
+        // cold expanding
+        {{2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE},
+         {2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE},
+         {2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE},
+         {          0,   SMALLSIZE,  MEDIUMSIZE,   LARGESIZE, 2*LARGESIZE}},
+        // warm shrinking truncate
+        {{2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE},
+         {2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE},
+         {          0,   SMALLSIZE,  MEDIUMSIZE,   LARGESIZE, 2*LARGESIZE},
+         {          0,           0,           0,           0,           0}},
+        // warm expanding truncate
+        {{          0,   SMALLSIZE,  MEDIUMSIZE,   LARGESIZE, 2*LARGESIZE},
+         {          0,   SMALLSIZE,  MEDIUMSIZE,   LARGESIZE, 2*LARGESIZE},
+         {2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE},
+         {2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE}},
+        // mid-file shrinking truncate
+        {{2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE},
+         {  LARGESIZE,   LARGESIZE,   LARGESIZE,   LARGESIZE,   LARGESIZE},
+         {          0,   SMALLSIZE,  MEDIUMSIZE,   LARGESIZE, 2*LARGESIZE},
+         {          0,           0,           0,           0,           0}},
+        // mid-file expanding truncate
+        {{          0,   SMALLSIZE,   MEDIUMSIZE,  LARGESIZE, 2*LARGESIZE},
+         {          0,           0,   SMALLSIZE,  MEDIUMSIZE,   LARGESIZE},
+         {2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE},
+         {2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE, 2*LARGESIZE}},
+    };
+
+    const lfs2_off_t *startsizes = configs[CONFIG].startsizes;
+    const lfs2_off_t *startseeks = configs[CONFIG].startseeks;
+    const lfs2_off_t *hotsizes   = configs[CONFIG].hotsizes;
+    const lfs2_off_t *coldsizes  = configs[CONFIG].coldsizes;
+
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+
+    for (unsigned i = 0; i < COUNT; i++) {
+        sprintf(path, "hairyhead%d", i);
+        lfs2_file_open(&lfs2, &file, path,
+                LFS2_O_WRONLY | LFS2_O_CREAT | LFS2_O_TRUNC) => 0;
+
+        strcpy((char*)buffer, "hair");
+        size = strlen((char*)buffer);
+        for (lfs2_off_t j = 0; j < startsizes[i]; j += size) {
+            lfs2_file_write(&lfs2, &file, buffer, size) => size;
+        }
+        lfs2_file_size(&lfs2, &file) => startsizes[i];
+
+        if (startseeks[i] != startsizes[i]) {
+            lfs2_file_seek(&lfs2, &file,
+                    startseeks[i], LFS2_SEEK_SET) => startseeks[i];
+        }
+
+        lfs2_file_truncate(&lfs2, &file, hotsizes[i]) => 0;
+        lfs2_file_size(&lfs2, &file) => hotsizes[i];
+
+        lfs2_file_close(&lfs2, &file) => 0;
+    }
+
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+
+    for (unsigned i = 0; i < COUNT; i++) {
+        sprintf(path, "hairyhead%d", i);
+        lfs2_file_open(&lfs2, &file, path, LFS2_O_RDWR) => 0;
+        lfs2_file_size(&lfs2, &file) => hotsizes[i];
+
+        size = strlen("hair");
+        lfs2_off_t j = 0;
+        for (; j < startsizes[i] && j < hotsizes[i]; j += size) {
+            lfs2_file_read(&lfs2, &file, buffer, size) => size;
+            memcmp(buffer, "hair", size) => 0;
+        }
+
+        for (; j < hotsizes[i]; j += size) {
+            lfs2_file_read(&lfs2, &file, buffer, size) => size;
+            memcmp(buffer, "\0\0\0\0", size) => 0;
+        }
+
+        lfs2_file_truncate(&lfs2, &file, coldsizes[i]) => 0;
+        lfs2_file_size(&lfs2, &file) => coldsizes[i];
+
+        lfs2_file_close(&lfs2, &file) => 0;
+    }
+
+    lfs2_unmount(&lfs2) => 0;
+
+    lfs2_mount(&lfs2, &cfg) => 0;
+
+    for (unsigned i = 0; i < COUNT; i++) {
+        sprintf(path, "hairyhead%d", i);
+        lfs2_file_open(&lfs2, &file, path, LFS2_O_RDONLY) => 0;
+        lfs2_file_size(&lfs2, &file) => coldsizes[i];
+
+        size = strlen("hair");
+        lfs2_off_t j = 0;
+        for (; j < startsizes[i] && j < hotsizes[i] && j < coldsizes[i];
+                j += size) {
+            lfs2_file_read(&lfs2, &file, buffer, size) => size;
+            memcmp(buffer, "hair", size) => 0;
+        }
+
+        for (; j < coldsizes[i]; j += size) {
+            lfs2_file_read(&lfs2, &file, buffer, size) => size;
+            memcmp(buffer, "\0\0\0\0", size) => 0;
+        }
+
+        lfs2_file_close(&lfs2, &file) => 0;
+    }
+
+    lfs2_unmount(&lfs2) => 0;
+'''
+
+[[case]] # noop truncate
+define.MEDIUMSIZE = [32, 2048]
+code = '''
+    lfs2_format(&lfs2, &cfg) => 0;
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "baldynoop",
+            LFS2_O_RDWR | LFS2_O_CREAT) => 0;
+
+    strcpy((char*)buffer, "hair");
+    size = strlen((char*)buffer);
+    for (lfs2_off_t j = 0; j < MEDIUMSIZE; j += size) {
+        lfs2_file_write(&lfs2, &file, buffer, size) => size;
+
+        // this truncate should do nothing
+        lfs2_file_truncate(&lfs2, &file, j+size) => 0;
+    }
+    lfs2_file_size(&lfs2, &file) => MEDIUMSIZE;
+
+    lfs2_file_seek(&lfs2, &file, 0, LFS2_SEEK_SET) => 0;
+    // should do nothing again
+    lfs2_file_truncate(&lfs2, &file, MEDIUMSIZE) => 0;
+    lfs2_file_size(&lfs2, &file) => MEDIUMSIZE;
+
+    for (lfs2_off_t j = 0; j < MEDIUMSIZE; j += size) {
+        lfs2_file_read(&lfs2, &file, buffer, size) => size;
+        memcmp(buffer, "hair", size) => 0;
+    }
+    lfs2_file_read(&lfs2, &file, buffer, size) => 0;
+
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+
+    // still there after reboot?
+    lfs2_mount(&lfs2, &cfg) => 0;
+    lfs2_file_open(&lfs2, &file, "baldynoop", LFS2_O_RDWR) => 0;
+    lfs2_file_size(&lfs2, &file) => MEDIUMSIZE;
+    for (lfs2_off_t j = 0; j < MEDIUMSIZE; j += size) {
+        lfs2_file_read(&lfs2, &file, buffer, size) => size;
+        memcmp(buffer, "hair", size) => 0;
+    }
+    lfs2_file_read(&lfs2, &file, buffer, size) => 0;
+    lfs2_file_close(&lfs2, &file) => 0;
+    lfs2_unmount(&lfs2) => 0;
+'''