diff --git a/.github/release.yml b/.github/release.yml
new file mode 100644
index 000000000..8e22b33a9
--- /dev/null
+++ b/.github/release.yml
@@ -0,0 +1,21 @@
+changelog:
+ exclude:
+ authors:
+ - dependabot
+ categories:
+ - title: ๐ช Improvements
+ labels:
+ - kind/feature
+ - title: ๐ Bug Fixes
+ labels:
+ - kind/bug
+ - title: ๐ Documentation improvements
+ labels:
+ - kind/documentation
+ - title: ๐งช Test improvements and Misc Fixes
+ labels:
+ - kind/test
+ - kind/cleanup
+ - title: Other Changes
+ labels:
+ - "*"
diff --git a/.github/workflows/benchmark_execution_time.yml b/.github/workflows/benchmark_execution_time.yml
index 87b177b6c..2a0373171 100644
--- a/.github/workflows/benchmark_execution_time.yml
+++ b/.github/workflows/benchmark_execution_time.yml
@@ -14,20 +14,17 @@ jobs:
- name: Checkout to PR branch
uses: actions/checkout@v3
- - name: Setup Linux env
- run: |
- sudo apt -y update
- sudo apt install libsystemd-dev librust-libdbus-sys-dev libseccomp-dev
+ - name: Install requirements
+ run: sudo ./.github/scripts/dependency.sh
- - name: Setting rust toolchain
- uses: actions-rs/toolchain@v1
- with:
- toolchain: stable
- override: true
- profile: minimal
+ - name: Setup Rust toolchain and cache
+ uses: actions-rust-lang/setup-rust-toolchain@v1.3.7
+
+ - name: Install Just
+ uses: taiki-e/install-action@just
- name: Building PR branch
- run: make youki-release
+ run: just youki-release
- name: Uploading PR build to artifact
uses: actions/upload-artifact@v2
@@ -46,20 +43,16 @@ jobs:
with:
ref: main
- - name: Setup Linux env
- run: |
- sudo apt -y update
- sudo apt install libsystemd-dev librust-libdbus-sys-dev libseccomp-dev
+ - name: Install requirements
+ run: sudo ./.github/scripts/dependency.sh
- - name: Setting rust toolchain
- uses: actions-rs/toolchain@v1
- with:
- toolchain: stable
- override: true
- profile: minimal
+ - name: Setup Rust toolchain and cache
+ uses: actions-rust-lang/setup-rust-toolchain@v1.3.7
+ - name: Install just
+ uses: taiki-e/install-action@just
- name: Building main branch
- run: make youki-release
+ run: just youki-release
- name: Uploading main build to artifact
uses: actions/upload-artifact@v2
diff --git a/.github/workflows/containerd_integration_tests.yaml b/.github/workflows/containerd_integration_tests.yaml
deleted file mode 100644
index 3978e3e6d..000000000
--- a/.github/workflows/containerd_integration_tests.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-on:
- push:
- branches:
- - main
- pull_request:
- branches:
- - main
-
-jobs:
- youki-build:
- runs-on: ubuntu-22.04
- timeout-minutes: 15
- steps:
- - uses: actions/checkout@v3
- - uses: actions-rs/toolchain@v1
- with:
- toolchain: '1.67.0'
- override: true
- - name: Cache youki
- uses: Swatinem/rust-cache@v1
- - run: sudo apt-get -y update
- - run: sudo apt-get install -y pkg-config libsystemd-dev libdbus-glib-1-dev libelf-dev libseccomp-dev
- - name: Build youki
- run: make youki-release
- - name: Upload youki binary
- uses: actions/upload-artifact@v3
- with:
- name: youki
- path: youki
-
- containerd-integration-tests:
- runs-on: ubuntu-22.04
- needs: [youki-build]
- timeout-minutes: 40
- steps:
- - uses: actions/checkout@v3
- with:
- repository: containerd/containerd
- ref: v1.6.9
- - uses: actions/setup-go@v3
- with:
- go-version: '1.18.3'
- - run: sudo apt-get -y update
- - run: sudo apt-get install -y pkg-config libsystemd-dev libdbus-glib-1-dev libelf-dev libseccomp-dev btrfs-progs libbtrfs-dev
- - name: Build containerd
- run: |
- make build
- make binaries
- - name: Download youki binary
- uses: actions/download-artifact@v3
- with:
- name: youki
- - name: Replace runc to youki
- run: |
- sudo rm -f /usr/bin/runc /usr/local/bin/runc /usr/sbin/runc
- sudo chmod 755 youki
- sudo cp youki /usr/bin/runc
- runc --version
- - name: Integration Test
- run: sudo make TEST_RUNTIME=io.containerd.runc.v2 TESTFLAGS="-timeout 40m" integration
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
new file mode 100644
index 000000000..e7a277f48
--- /dev/null
+++ b/.github/workflows/e2e.yaml
@@ -0,0 +1,129 @@
+name: ๐งช e2e test
+
+on:
+ push:
+ branches:
+ - main
+ pull_request:
+ branches:
+ - main
+
+jobs:
+ youki-build:
+ runs-on: ubuntu-22.04
+ timeout-minutes: 15
+ steps:
+ - uses: actions/checkout@v3
+ - name: Setup Rust toolchain and cache
+ uses: actions-rust-lang/setup-rust-toolchain@v1.3.7
+ - name: Install just
+ uses: taiki-e/install-action@just
+ - name: Install requirements
+ run: sudo env PATH=$PATH just ci-prepare
+ - name: Build youki
+ run: just youki-release
+ - name: Upload youki binary
+ uses: actions/upload-artifact@v3
+ with:
+ name: youki
+ path: youki
+
+ containerd-integration-tests:
+ runs-on: ubuntu-22.04
+ needs: [youki-build]
+ timeout-minutes: 40
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ repository: containerd/containerd
+ ref: v1.6.20
+ - uses: actions/setup-go@v3
+ with:
+ go-version: '1.19.9'
+ cache: true
+ - run: sudo apt-get -y update
+ - run: sudo apt-get install -y pkg-config libsystemd-dev libdbus-glib-1-dev libelf-dev libseccomp-dev btrfs-progs libbtrfs-dev
+ - name: Build containerd
+ run: |
+ make build
+ make binaries
+ - name: Download youki binary
+ uses: actions/download-artifact@v3
+ with:
+ name: youki
+ - name: Replace runc to youki
+ run: |
+ sudo rm -f /usr/bin/runc /usr/local/bin/runc /usr/sbin/runc
+ sudo chmod 755 youki
+ sudo cp youki /usr/bin/runc
+ runc --version
+ - name: Integration Test
+ run: sudo make TEST_RUNTIME=io.containerd.runc.v2 TESTFLAGS="-timeout 40m" integration
+
+ k8s-tests:
+ runs-on: ubuntu-22.04
+ needs: [youki-build]
+ timeout-minutes: 40
+ steps:
+ - uses: actions/checkout@v3
+ - name: Download youki binary
+ uses: actions/download-artifact@v3
+ with:
+ name: youki
+ - name: Add the permission to run
+ run: chmod +x ./youki
+ - name: Install just
+ uses: taiki-e/install-action@just
+ - name: test/k8s/deploy
+ run: just test-kind
+
+ oci-validation-go:
+ runs-on: ubuntu-22.04
+ needs: [youki-build]
+ timeout-minutes: 15
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ submodules: recursive
+ - name: Setup Rust toolchain and cache
+ uses: actions-rust-lang/setup-rust-toolchain@v1
+ - name: Install just
+ uses: taiki-e/install-action@just
+ - uses: actions/setup-go@v3
+ with:
+ go-version: '1.19.9'
+ cache: true
+ cache-dependency-path: tests/oci-runtime-tests/src/github.com/opencontainers/runtime-tools/go.sum
+ - name: Download youki binary
+ uses: actions/download-artifact@v3
+ with:
+ name: youki
+ - name: Add the permission to run
+ run: chmod +x ./youki
+ - name: Run integration tests
+ run: just oci-tests
+
+ oci-validation-rust:
+ runs-on: ubuntu-22.04
+ needs: [youki-build]
+ timeout-minutes: 15
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ submodules: recursive
+ - name: Setup Rust toolchain and cache
+ uses: actions-rust-lang/setup-rust-toolchain@v1
+ - name: Install just
+ uses: taiki-e/install-action@just
+ - name: Install requirements
+ run: sudo env PATH=$PATH just ci-prepare
+ - name: Download youki binary
+ uses: actions/download-artifact@v3
+ with:
+ name: youki
+ - name: Add the permission to run
+ run: chmod +x ./youki
+ - name: Build
+ run: just runtimetest rust-oci-tests-bin
+ - name: Validate tests on youki
+ run: just rust-oci-tests
diff --git a/.github/workflows/integration_tests_validation.yaml b/.github/workflows/integration_tests_validation.yaml
index 32867349e..8961a6406 100644
--- a/.github/workflows/integration_tests_validation.yaml
+++ b/.github/workflows/integration_tests_validation.yaml
@@ -5,46 +5,48 @@ on:
pull_request:
branches:
- main
+ workflow_dispatch:
jobs:
changes:
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-22.04
timeout-minutes: 15
outputs:
- dirs: ${{ steps.filter.outputs.changes }}
+ any_modified: ${{ steps.filter.outputs.any_modified }}
steps:
- uses: actions/checkout@v3
- - uses: dorny/paths-filter@v2
+ - uses: tj-actions/changed-files@v36
id: filter
with:
- filters: |
- ./integration_test: ./tests/rust-integration-tests/**
+ files: |
+ .github/workflows/integration_tests_validation.yaml
+ tests/rust-integration-tests/**
+ files_ignore: |
+ **.md
+ - name: List all changed files
+ run: |
+ for file in ${{ steps.filter.outputs.all_modified_files }}; do
+ echo "$file was changed"
+ done
validate:
needs: [changes]
- if: ${{ !contains(needs.changes.outputs.dirs, '[]') }}
+ if: needs.changes.outputs.any_modified == 'true'
runs-on: ubuntu-20.04
- timeout-minutes: 15
- strategy:
- matrix:
- rust: [1.66.0, 1.67.0]
+ timeout-minutes: 30
steps:
- uses: actions/checkout@v3
- - uses: actions-rs/toolchain@v1
- with:
- toolchain: ${{ matrix.rust }}
- override: true
- - name: Cache youki
- uses: Swatinem/rust-cache@v1
- - run: sudo apt-get -y update
- - run: sudo apt-get install -y pkg-config libsystemd-dev libdbus-glib-1-dev libelf-dev libseccomp-dev
+ - name: Setup Rust toolchain and cache
+ uses: actions-rust-lang/setup-rust-toolchain@v1.3.7
+ - name: Install just
+ uses: taiki-e/install-action@just
+ - name: Install requirements
+ run: sudo env PATH=$PATH just ci-prepare
- name: Install runc 1.1.0
run: |
wget -q https://github.com/opencontainers/runc/releases/download/v1.1.0/runc.amd64
sudo mv runc.amd64 /usr/bin/runc
sudo chmod 755 /usr/bin/runc
- name: Build
- run: make youki-release runtimetest rust-oci-tests-bin
+ run: just runtimetest rust-oci-tests-bin
- name: Validate tests on runc
- run: make validate-rust-oci-runc
- - name: Validate tests on youki
- run: make rust-oci-tests
+ run: just validate-rust-oci-runc
diff --git a/.github/workflows/label.yaml b/.github/workflows/label.yaml
new file mode 100644
index 000000000..9538bfddc
--- /dev/null
+++ b/.github/workflows/label.yaml
@@ -0,0 +1,17 @@
+name: ๐ท๏ธ Pull Request Labels
+
+on:
+ pull_request:
+ types: [opened, labeled, unlabeled, synchronize]
+jobs:
+ label:
+ runs-on: ubuntu-latest
+ permissions:
+ issues: write
+ pull-requests: write
+ steps:
+ - uses: mheap/github-action-required-labels@v5
+ with:
+ mode: exactly
+ count: 1
+ labels: "kind/feature, kind/bug, kind/documentation, kind/test, kind/cleanup, dependencies"
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 62ac1d1d7..36a5d0b94 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -5,125 +5,124 @@ on:
pull_request:
branches:
- main
+ workflow_dispatch:
jobs:
changes:
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-22.04
timeout-minutes: 15
outputs:
- dirs: ${{ steps.filter.outputs.changes }}
+ any_modified: ${{ steps.filter.outputs.any_modified }}
steps:
- uses: actions/checkout@v3
- - uses: dorny/paths-filter@v2
+ - uses: tj-actions/changed-files@v36
id: filter
with:
- filters: |
- crates/youki: crates/youki/**
- crates/libcontainer: crates/libcontainer/**
- crates/libcgroups: crates/libcgroups/**
- tests/rust-integration-tests/runtimetest: ./tests/rust-integration-tests/runtimetest
- tests/rust-integration-tests/integration_test: ./tests/rust-integration-tests/integration_test
- tests/rust-integration-tests/test_framework: ./tests/rust-integration-tests/test_framework
+ files_ignore: |
+ docs
+ LICENSE
+ **.md
+ - name: List all changed files
+ run: |
+ for file in ${{ steps.filter.outputs.all_modified_files }}; do
+ echo "$file was changed"
+ done
+
check:
needs: [changes]
- if: ${{ !contains(needs.changes.outputs.dirs, '[]') }}
- runs-on: ubuntu-20.04
+ if: needs.changes.outputs.any_modified == 'true'
+ runs-on: ubuntu-22.04
timeout-minutes: 15
- strategy:
- matrix:
- rust: [1.66.0, 1.67.0]
- dirs: ${{ fromJSON(needs.changes.outputs.dirs) }}
steps:
- uses: actions/checkout@v3
- - uses: actions-rs/toolchain@v1
+ - name: Setup Rust toolchain and cache
+ uses: actions-rust-lang/setup-rust-toolchain@v1
with:
- toolchain: ${{ matrix.rust }}
- override: true
- - name: Cache youki
- uses: Swatinem/rust-cache@v1
- - run: rustup component add rustfmt clippy
- - run: sudo apt-get -y update
- - run: sudo apt-get install -y pkg-config libsystemd-dev libdbus-glib-1-dev libelf-dev libseccomp-dev
- - name: Check formatting
- run: cargo fmt --all -- --check
- working-directory: ${{matrix.dirs}}
- - name: Check clippy lints
- working-directory: ${{matrix.dirs}}
- run: cargo clippy --all-targets --all-features -- -D warnings
+ components: rustfmt, clippy
+
+ - name: typos-action
+ uses: crate-ci/typos@v1.14.12
+
+ - uses: taiki-e/install-action@just
+
+ - name: Install requirements
+ run: sudo env PATH=$PATH just ci-prepare
+
+ - name: Check formatting and lints
+ run: just lint
+
tests:
- runs-on: ubuntu-20.04
+ needs: [changes]
+ if: needs.changes.outputs.any_modified == 'true'
+ runs-on: ubuntu-22.04
timeout-minutes: 15
- strategy:
- matrix:
- rust: [1.66.0, 1.67.0]
steps:
- uses: actions/checkout@v3
- - uses: actions-rs/toolchain@v1
- with:
- toolchain: ${{ matrix.rust }}
- override: true
- - name: Cache youki
- uses: Swatinem/rust-cache@v1
- - run: sudo apt-get -y update
- - run: sudo apt-get install -y pkg-config libsystemd-dev libdbus-glib-1-dev libelf-dev libseccomp-dev
+ - name: Setup Rust toolchain and cache
+ uses: actions-rust-lang/setup-rust-toolchain@v1
+ - uses: taiki-e/install-action@just
+ - name: Install requirements
+ run: sudo env PATH=$PATH just ci-prepare
- name: Run tests
run: |
export LD_LIBRARY_PATH=$HOME/.wasmedge/lib
cd ./crates && cargo test --all --all-features --no-fail-fast
+ - name: Run feature tests
+ run: just test-features
+
+ # TODO: musl testing is flaky. Turn it back on when we can resolve it.
+ # # musl target testing is religated to a separate job because our current build
+ # # for musl requires nightly. It is difficult to mix stable and nightly
+ # # toolchains in the same job.
+ # musl:
+ # needs: [changes]
+ # if: needs.changes.outputs.any_modified == 'true'
+ # runs-on: ubuntu-22.04
+ # timeout-minutes: 20
+ # steps:
+ # - uses: actions/checkout@v3
+ # # We do not use `actions-rust-lang/setup-rust-toolchain` here because we
+ # # want to override the default toolchain file to use nightly toolchains.
+ # # The `setup-rust-toolchain` action will always choose toolchain file with
+ # # no way to override.
+ # - name: Setup Rust toolchain and cache
+ # uses: dtolnay/rust-toolchain@v1
+ # with:
+ # toolchain: nightly
+ # target: x86_64-unknown-linux-musl
+ # components: rust-src
+ # - uses: taiki-e/install-action@just
+ # - name: Install requirements
+ # run: sudo env PATH=$PATH just ci-musl-prepare
+ # - name: Run test against musl target
+ # run: just test-musl
+
+
coverage:
- runs-on: ubuntu-20.04
+ needs: [changes]
+ if: needs.changes.outputs.any_modified == 'true'
+ runs-on: ubuntu-22.04
timeout-minutes: 15
name: Run test coverage
steps:
- uses: actions/checkout@v3
- - name: Toolchain setup
- uses: actions-rs/toolchain@v1
- with:
- toolchain: 1.67.0
- override: true
- profile: minimal
- components: llvm-tools-preview
- - name: Cache youki
- uses: Swatinem/rust-cache@v1
+ - name: Setup Rust toolchain and cache
+ uses: actions-rust-lang/setup-rust-toolchain@v1.3.7
+ - name: Install llvm-tools-preview
+ run: rustup component add llvm-tools-preview
- name: install cargo-llvm-cov
uses: taiki-e/install-action@v1
with:
tool: cargo-llvm-cov@0.4.0
- - name: Update System Libraries
- run: sudo apt-get -y update
- - name: Install System Libraries
- run: sudo apt-get install -y pkg-config libsystemd-dev libdbus-glib-1-dev libelf-dev libseccomp-dev
+ - uses: taiki-e/install-action@just
+ - name: Install requirements
+ run: sudo env PATH=$PATH just ci-prepare
- name: Run Test Coverage for youki
run: |
cargo llvm-cov clean --workspace
cargo llvm-cov --no-report
cargo llvm-cov --no-run --lcov --ignore-filename-regex "libcgroups/src/systemd/dbus/systemd_api.rs" --output-path ./coverage.lcov
- name: Upload Youki Code Coverage Results
- uses: codecov/codecov-action@v2
+ uses: codecov/codecov-action@v3
with:
file: ./coverage.lcov
- integration_tests:
- runs-on: ubuntu-20.04
- timeout-minutes: 15
- strategy:
- matrix:
- rust: [1.66.0, 1.67.0]
- steps:
- - uses: actions/checkout@v3
- with:
- submodules: recursive
- - uses: actions-rs/toolchain@v1
- with:
- toolchain: ${{ matrix.rust }}
- override: true
- - name: Cache youki
- uses: Swatinem/rust-cache@v1
- - run: sudo apt-get -y update
- - run: sudo apt-get install -y pkg-config libsystemd-dev libdbus-glib-1-dev libelf-dev libseccomp-dev
- - uses: actions/setup-go@v2
- with:
- go-version: "1.17.6"
- - name: Build
- run: make youki-release
- - name: Run integration tests
- run: make oci-tests
diff --git a/.github/workflows/podman_tests.yaml b/.github/workflows/podman_tests.yaml
index 77735ebeb..a189bd9a1 100644
--- a/.github/workflows/podman_tests.yaml
+++ b/.github/workflows/podman_tests.yaml
@@ -1,3 +1,5 @@
+name: Test for podman
+
on:
schedule:
- cron: "0 0 * * *"
@@ -7,15 +9,19 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- - run: sudo apt-get -y update
- - run: sudo apt-get install -y pkg-config libsystemd-dev libdbus-glib-1-dev libelf-dev libseccomp-dev libgpgme-dev bats
- - run: make youki-dev
+ - name: Install just
+ uses: taiki-e/install-action@just
+ - name: Install requirements
+ run: sudo env PATH=$PATH just ci-prepare
+ - run: just youki-dev
- run: sudo cp youki /usr/local/bin
+ - name: Install requirements for Podman
+ run: sudo apt-get install -y pkg-config libsystemd-dev libdbus-glib-1-dev libelf-dev libseccomp-dev libgpgme-dev bats
- name: Clone podman repository
uses: actions/checkout@v3
with:
repository: containers/podman
- - uses: actions/setup-go@v2
+ - uses: actions/setup-go@v4
with:
go-version: '1.18'
- name: Build podman
@@ -26,4 +32,4 @@ jobs:
run: sudo OCI_RUNTIME=/usr/local/bin/youki ./hack/bats 2>&1 | tee build.log
- name: Adding Summary
run: |
- echo "Total tests: 360 Failed tests: $(cat build.log | grep " ok " | wc -l)" >> $GITHUB_STEP_SUMMARY
+ echo "Total tests: 577 Failed tests: $(cat build.log | grep " ok " | wc -l)" >> $GITHUB_STEP_SUMMARY
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 70f950e29..32aacd59f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,17 +12,18 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: recursive
- - run: sudo apt-get -y update
- - run: sudo apt-get install -y pkg-config libsystemd-dev libdbus-glib-1-dev libelf-dev libseccomp-dev libclang-dev
- - name: Set up cargo
- uses: actions-rs/toolchain@v1
- with:
- toolchain: stable
- override: true
+ - name: Setup Rust toolchain and cache
+ uses: actions-rust-lang/setup-rust-toolchain@v1.3.7
+ - name: Install just
+ uses: taiki-e/install-action@just
+ - name: Install requirements
+ run: sudo env PATH=$PATH just ci-prepare
- name: Build
- run: make youki-release
+ run: just youki-release
- name: test
- run: make unittest featuretest oci-tests
+ # TODO(utam0k): The feature test needs nightly
+ # run: just unittest featuretest oci-tests
+ run: just unittest oci-tests
upload:
name: Upload
@@ -30,15 +31,13 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- - run: sudo apt-get -y update
- - run: sudo apt-get install -y pkg-config libsystemd-dev libdbus-glib-1-dev libelf-dev libseccomp-dev
- - name: Set up cargo
- uses: actions-rs/toolchain@v1
- with:
- toolchain: stable
- override: true
+ - name: Setup Rust toolchain and cache
+ uses: actions-rust-lang/setup-rust-toolchain@v1.3.7
+ - uses: taiki-e/install-action@just
+ - name: Install requirements
+ run: sudo env PATH=$PATH just ci-prepare
- name: Release build
- run: make youki-release
+ run: just youki-release
- name: Create output directory
run: mkdir output
- name: Copy files to output
@@ -104,11 +103,8 @@ jobs:
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
steps:
- uses: actions/checkout@v3
- - name: Set up cargo
- uses: actions-rs/toolchain@v1
- with:
- toolchain: stable
- override: true
+ - name: Setup Rust toolchain and cache
+ uses: actions-rust-lang/setup-rust-toolchain@v1.3.7
- name: Publish libcgroups
run: cargo publish -p libcgroups --no-verify
- name: Publish libcontainer
diff --git a/.gitignore b/.gitignore
index 0dd74a3f7..fdeed4a22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,5 @@ tags.temp
/bundle.tar.gz
/test.log
+
+/tests/k8s/_out/
diff --git a/.typos.toml b/.typos.toml
new file mode 100644
index 000000000..a40007f8f
--- /dev/null
+++ b/.typos.toml
@@ -0,0 +1,21 @@
+# Configuration Reference:
+# - https://github.com/crate-ci/typos/blob/927308c726b1fba730f7aaa8bde602148b82004d/docs/reference.md
+
+[files]
+extend-exclude = [
+ "**/*.svg",
+ "tests/oci-runtime-tests/**"
+]
+
+[default.extend-identifiers]
+# This is a cgroup slice ID used in examples. It is easier to ignore this
+# instance than write a regex.
+569d5ce3afe1074769f67 = "569d5ce3afe1074769f67"
+
+[type.rust.extend-words]
+ser = "ser"
+flate = "flate"
+clos = "clos"
+Setted = "Setted"
+hve = "hve"
+
diff --git a/Cargo.lock b/Cargo.lock
index 555ad7542..03ffc12be 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,20 +4,20 @@ version = 3
[[package]]
name = "addr2line"
-version = "0.17.0"
+version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"
+checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
dependencies = [
- "gimli 0.26.2",
+ "gimli 0.27.2",
]
[[package]]
name = "addr2line"
-version = "0.19.0"
+version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
+checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
dependencies = [
- "gimli 0.27.0",
+ "gimli 0.27.2",
]
[[package]]
@@ -37,20 +37,37 @@ dependencies = [
"version_check",
]
+[[package]]
+name = "ahash"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
+dependencies = [
+ "cfg-if 1.0.0",
+ "once_cell",
+ "version_check",
+]
+
[[package]]
name = "aho-corasick"
-version = "0.7.20"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
+checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
dependencies = [
"memchr",
]
[[package]]
name = "ambient-authority"
-version = "0.0.1"
+version = "0.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9d4ee0d472d1cd2e28c97dfa124b3d8d992e10eb0a035f33f5d12e3a177ba3b"
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec8ad6edb4840b78c5c3d88de606b22252d552b55f3a4699fbb10fc070ec3049"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
[[package]]
name = "android_system_properties"
@@ -61,17 +78,78 @@ dependencies = [
"libc",
]
+[[package]]
+name = "anstream"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is-terminal",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+dependencies = [
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "any_ascii"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70033777eb8b5124a81a1889416543dddef2de240019b674c81285a2635a7e1e"
+
[[package]]
name = "anyhow"
-version = "1.0.68"
+version = "1.0.72"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854"
+
+[[package]]
+name = "arbitrary"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
+checksum = "e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e"
[[package]]
name = "arrayvec"
-version = "0.7.2"
+version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
[[package]]
name = "ascii"
@@ -81,13 +159,22 @@ checksum = "3ae7d751998c189c1d4468cf0a39bb2eae052a9c58d50ebb3b9591ee3813ad50"
[[package]]
name = "async-trait"
-version = "0.1.64"
+version = "0.1.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2"
+checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.26",
+]
+
+[[package]]
+name = "atomic-polyfill"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28"
+dependencies = [
+ "critical-section",
]
[[package]]
@@ -98,16 +185,16 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "backtrace"
-version = "0.3.67"
+version = "0.3.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
+checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"
dependencies = [
- "addr2line 0.19.0",
+ "addr2line 0.20.0",
"cc",
"cfg-if 1.0.0",
"libc",
"miniz_oxide",
- "object 0.30.0",
+ "object 0.31.1",
"rustc-demangle",
]
@@ -119,9 +206,9 @@ checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270"
[[package]]
name = "base64"
-version = "0.13.1"
+version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
[[package]]
name = "bincode"
@@ -134,22 +221,23 @@ dependencies = [
[[package]]
name = "bindgen"
-version = "0.61.0"
+version = "0.65.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a022e58a142a46fea340d68012b9201c094e93ec3d033a944a24f8fd4a4f09a"
+checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"cexpr",
"clang-sys",
"lazy_static",
"lazycell",
"peeking_take_while",
+ "prettyplease",
"proc-macro2",
"quote",
"regex",
"rustc-hash",
"shlex",
- "syn",
+ "syn 2.0.26",
]
[[package]]
@@ -158,40 +246,59 @@ version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+[[package]]
+name = "bitflags"
+version = "2.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
+
+[[package]]
+name = "bitvec"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
+dependencies = [
+ "funty",
+ "radium",
+ "tap",
+ "wyz",
+]
+
[[package]]
name = "block-buffer"
-version = "0.10.3"
+version = "0.10.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
dependencies = [
"generic-array",
]
[[package]]
name = "bumpalo"
-version = "3.12.0"
+version = "3.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
+checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
[[package]]
name = "bytecheck"
-version = "0.6.9"
+version = "0.6.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d11cac2c12b5adc6570dad2ee1b87eff4955dac476fe12d81e5fdd352e52406f"
+checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627"
dependencies = [
"bytecheck_derive",
"ptr_meta",
+ "simdutf8",
]
[[package]]
name = "bytecheck_derive"
-version = "0.6.9"
+version = "0.6.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13e576ebe98e605500b3c8041bb888e966653577172df6dd97398714eb30b9bf"
+checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -200,40 +307,49 @@ version = "1.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+[[package]]
+name = "bytes"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+dependencies = [
+ "serde",
+]
+
[[package]]
name = "cap-fs-ext"
-version = "1.0.3"
+version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f8079425cfd20227020f2bff1320710ca68d6eddb4f64aba8e2741b2b4d8133"
+checksum = "58bc48200a1a0fa6fba138b1802ad7def18ec1cdd92f7b2a04e21f1bd887f7b9"
dependencies = [
"cap-primitives",
"cap-std",
- "io-lifetimes",
- "windows-sys 0.42.0",
+ "io-lifetimes 1.0.11",
+ "windows-sys 0.48.0",
]
[[package]]
name = "cap-primitives"
-version = "1.0.3"
+version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84bf8faa0b6397a4e26082818be03641a40e3aba1afc4ec44cbd6228c73c3a61"
+checksum = "a4b6df5b295dca8d56f35560be8c391d59f0420f72e546997154e24e765e6451"
dependencies = [
"ambient-authority",
"fs-set-times",
"io-extras",
- "io-lifetimes",
+ "io-lifetimes 1.0.11",
"ipnet",
"maybe-owned",
- "rustix",
- "windows-sys 0.42.0",
- "winx",
+ "rustix 0.37.19",
+ "windows-sys 0.48.0",
+ "winx 0.35.1",
]
[[package]]
name = "cap-rand"
-version = "1.0.4"
+version = "1.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a986c3b8fb6e25bbef961b237756ff7a771aa71c9ffdeb01c29f3f208577bf9"
+checksum = "383800fa434a9e7a463fa35196bd93dcd84a6bdc5d9aeae4e60b554134e852a2"
dependencies = [
"ambient-authority",
"rand",
@@ -241,27 +357,26 @@ dependencies = [
[[package]]
name = "cap-std"
-version = "1.0.3"
+version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4ad2b9e262a5c3b67ee92e4b9607ace704384c50c32aa6017a9282ddf15df20"
+checksum = "3373a62accd150b4fcba056d4c5f3b552127f0ec86d3c8c102d60b978174a012"
dependencies = [
"cap-primitives",
"io-extras",
- "io-lifetimes",
- "ipnet",
- "rustix",
+ "io-lifetimes 1.0.11",
+ "rustix 0.37.19",
]
[[package]]
name = "cap-time-ext"
-version = "1.0.3"
+version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dcbdbcced5c88b20f27c637faaed5dd283898cbefea48d2d8f3dcfaf048e5cc"
+checksum = "e95002993b7baee6b66c8950470e59e5226a23b3af39fc59c47fe416dd39821a"
dependencies = [
"cap-primitives",
"once_cell",
- "rustix",
- "winx",
+ "rustix 0.37.19",
+ "winx 0.35.1",
]
[[package]]
@@ -306,25 +421,22 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "chrono"
-version = "0.4.23"
+version = "0.4.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
+checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
dependencies = [
+ "android-tzdata",
"iana-time-zone",
- "js-sys",
- "num-integer",
"num-traits",
"serde",
- "time 0.1.45",
- "wasm-bindgen",
"winapi",
]
[[package]]
name = "clang-sys"
-version = "1.4.0"
+version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3"
+checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f"
dependencies = [
"glob",
"libc",
@@ -333,68 +445,80 @@ dependencies = [
[[package]]
name = "clap"
-version = "4.0.32"
+version = "4.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7db700bc935f9e43e88d00b0850dae18a63773cfbec6d8e070fccf7fef89a39"
+checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc"
dependencies = [
- "bitflags",
+ "clap_builder",
"clap_derive",
+ "once_cell",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "bitflags 1.3.2",
"clap_lex",
- "is-terminal",
"once_cell",
"strsim",
- "termcolor",
]
[[package]]
name = "clap_complete"
-version = "4.0.7"
+version = "4.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10861370d2ba66b0f5989f83ebf35db6421713fd92351790e7fdd6c36774c56b"
+checksum = "a04ddfaacc3bc9e6ea67d024575fafc2a813027cf374b8f24f7bc233c6b6be12"
dependencies = [
"clap",
]
[[package]]
name = "clap_derive"
-version = "4.0.21"
+version = "4.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014"
+checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b"
dependencies = [
- "heck",
- "proc-macro-error",
+ "heck 0.4.1",
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.26",
]
[[package]]
name = "clap_lex"
-version = "0.3.1"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
+
+[[package]]
+name = "clone3"
+version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade"
+checksum = "5ee4e061ea30800291ca09663878f3953840a69b08ce244b3e8b26e894d9f60f"
dependencies = [
- "os_str_bytes",
+ "bitflags 1.3.2",
+ "uapi",
]
[[package]]
name = "cmake"
-version = "0.1.49"
+version = "0.1.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c"
+checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130"
dependencies = [
"cc",
]
[[package]]
-name = "codespan-reporting"
-version = "0.11.1"
+name = "colorchoice"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
-dependencies = [
- "termcolor",
- "unicode-width",
-]
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
[[package]]
name = "combine"
@@ -412,11 +536,27 @@ version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935"
+[[package]]
+name = "cooked-waker"
+version = "5.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147be55d677052dabc6b22252d5dd0fd4c29c8c27aa4f2fbef0f94aa003b406f"
+
+[[package]]
+name = "core-foundation"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
[[package]]
name = "core-foundation-sys"
-version = "0.8.3"
+version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
[[package]]
name = "corosensei"
@@ -442,135 +582,148 @@ dependencies = [
[[package]]
name = "cpufeatures"
-version = "0.2.5"
+version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
+checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
dependencies = [
"libc",
]
[[package]]
name = "cranelift-bforest"
-version = "0.82.3"
+version = "0.91.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38faa2a16616c8e78a18d37b4726b98bfd2de192f2fdc8a39ddf568a408a0f75"
+checksum = "2a2ab4512dfd3a6f4be184403a195f76e81a8a9f9e6c898e19d2dc3ce20e0115"
dependencies = [
- "cranelift-entity 0.82.3",
+ "cranelift-entity 0.91.1",
]
[[package]]
name = "cranelift-bforest"
-version = "0.91.0"
+version = "0.97.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc952b310b24444fc14ab8b9cbe3fafd7e7329e3eec84c3a9b11d2b5cf6f3be1"
+checksum = "5c289b8eac3a97329a524e953b5fd68a8416ca629e1a37287f12d9e0760aadbc"
dependencies = [
- "cranelift-entity 0.91.0",
+ "cranelift-entity 0.97.1",
]
[[package]]
name = "cranelift-codegen"
-version = "0.82.3"
+version = "0.91.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26f192472a3ba23860afd07d2b0217dc628f21fcc72617aa1336d98e1671f33b"
+checksum = "98b022ed2a5913a38839dfbafe6cf135342661293b08049843362df4301261dc"
dependencies = [
- "cranelift-bforest 0.82.3",
- "cranelift-codegen-meta 0.82.3",
- "cranelift-codegen-shared 0.82.3",
- "cranelift-entity 0.82.3",
+ "arrayvec",
+ "bumpalo",
+ "cranelift-bforest 0.91.1",
+ "cranelift-codegen-meta 0.91.1",
+ "cranelift-codegen-shared 0.91.1",
+ "cranelift-egraph",
+ "cranelift-entity 0.91.1",
+ "cranelift-isle 0.91.1",
"gimli 0.26.2",
"log",
- "regalloc",
+ "regalloc2 0.5.1",
"smallvec",
"target-lexicon",
]
[[package]]
name = "cranelift-codegen"
-version = "0.91.0"
+version = "0.97.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e73470419b33011e50dbf0f6439cbccbaabe9381de172da4e1b6efcda4bb8fa7"
+checksum = "7bf07ba80f53fa7f7dc97b11087ea867f7ae4621cfca21a909eca92c0b96c7d9"
dependencies = [
- "arrayvec",
"bumpalo",
- "cranelift-bforest 0.91.0",
- "cranelift-codegen-meta 0.91.0",
- "cranelift-codegen-shared 0.91.0",
- "cranelift-egraph",
- "cranelift-entity 0.91.0",
- "cranelift-isle",
- "gimli 0.26.2",
+ "cranelift-bforest 0.97.1",
+ "cranelift-codegen-meta 0.97.1",
+ "cranelift-codegen-shared 0.97.1",
+ "cranelift-control",
+ "cranelift-entity 0.97.1",
+ "cranelift-isle 0.97.1",
+ "gimli 0.27.2",
+ "hashbrown 0.13.2",
"log",
- "regalloc2",
+ "regalloc2 0.9.1",
"smallvec",
"target-lexicon",
]
[[package]]
name = "cranelift-codegen-meta"
-version = "0.82.3"
+version = "0.91.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f32ddb89e9b89d3d9b36a5b7d7ea3261c98235a76ac95ba46826b8ec40b1a24"
+checksum = "639307b45434ad112a98f8300c0f0ab085cbefcd767efcdef9ef19d4c0756e74"
dependencies = [
- "cranelift-codegen-shared 0.82.3",
+ "cranelift-codegen-shared 0.91.1",
]
[[package]]
name = "cranelift-codegen-meta"
-version = "0.91.0"
+version = "0.97.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "911a1872464108a11ac9965c2b079e61bbdf1bc2e0b9001264264add2e12a38f"
+checksum = "40a7ca088173130c5c033e944756e3e441fbf3f637f32b4f6eb70252580c6dd4"
dependencies = [
- "cranelift-codegen-shared 0.91.0",
+ "cranelift-codegen-shared 0.97.1",
]
[[package]]
name = "cranelift-codegen-shared"
-version = "0.82.3"
+version = "0.91.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01fd0d9f288cc1b42d9333b7a776b17e278fc888c28e6a0f09b5573d45a150bc"
+checksum = "278e52e29c53fcf32431ef08406c295699a70306d05a0715c5b1bf50e33a9ab7"
[[package]]
name = "cranelift-codegen-shared"
-version = "0.91.0"
+version = "0.97.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0114095ec7d2fbd658ed100bd007006360bc2530f57c6eee3d3838869140dbf9"
+
+[[package]]
+name = "cranelift-control"
+version = "0.97.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e036f3f07adb24a86fb46e977e8fe03b18bb16b1eada949cf2c48283e5f8a862"
+checksum = "1d56031683a55a949977e756d21826eb17a1f346143a1badc0e120a15615cd38"
+dependencies = [
+ "arbitrary",
+]
[[package]]
name = "cranelift-egraph"
-version = "0.91.0"
+version = "0.91.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d6c623f4b5d2a6bad32c403f03765d4484a827eb93ee78f8cb6219ef118fd59"
+checksum = "624b54323b06e675293939311943ba82d323bb340468ce1889be5da7932c8d73"
dependencies = [
- "cranelift-entity 0.91.0",
+ "cranelift-entity 0.91.1",
"fxhash",
"hashbrown 0.12.3",
- "indexmap",
+ "indexmap 1.9.3",
"log",
"smallvec",
]
[[package]]
name = "cranelift-entity"
-version = "0.82.3"
+version = "0.91.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e3bfe172b83167604601faf9dc60453e0d0a93415b57a9c4d1a7ae6849185cf"
+checksum = "9a59bcbca89c3f1b70b93ab3cbba5e5e0cbf3e63dadb23c7525cb142e21a9d4c"
[[package]]
name = "cranelift-entity"
-version = "0.91.0"
+version = "0.97.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74385eb5e405b3562f0caa7bcc4ab9a93c7958dd5bcd0e910bffb7765eacd6fc"
+checksum = "d6565198b5684367371e2b946ceca721eb36965e75e3592fad12fc2e15f65d7b"
dependencies = [
"serde",
]
[[package]]
name = "cranelift-frontend"
-version = "0.82.3"
+version = "0.91.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a006e3e32d80ce0e4ba7f1f9ddf66066d052a8c884a110b91d05404d6ce26dce"
+checksum = "0d70abacb8cfef3dc8ff7e8836e9c1d70f7967dfdac824a4cd5e30223415aca6"
dependencies = [
- "cranelift-codegen 0.82.3",
+ "cranelift-codegen 0.91.1",
"log",
"smallvec",
"target-lexicon",
@@ -578,11 +731,11 @@ dependencies = [
[[package]]
name = "cranelift-frontend"
-version = "0.91.0"
+version = "0.97.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a4ac920422ee36bff2c66257fec861765e3d95a125cdf58d8c0f3bba7e40e61"
+checksum = "25f28cc44847c8b98cb921e6bfc0f7b228f4d27519376fea724d181da91709a6"
dependencies = [
- "cranelift-codegen 0.91.0",
+ "cranelift-codegen 0.97.1",
"log",
"smallvec",
"target-lexicon",
@@ -590,34 +743,40 @@ dependencies = [
[[package]]
name = "cranelift-isle"
-version = "0.91.0"
+version = "0.91.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "393bc73c451830ff8dbb3a07f61843d6cb41a084f9996319917c0b291ed785bb"
+
+[[package]]
+name = "cranelift-isle"
+version = "0.97.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c541263fb37ad2baa53ec8c37218ee5d02fa0984670d9419dedd8002ea68ff08"
+checksum = "80b658177e72178c438f7de5d6645c56d97af38e17fcb0b500459007b4e05cc5"
[[package]]
name = "cranelift-native"
-version = "0.91.0"
+version = "0.97.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1de5d7a063e8563d670aaca38de16591a9b70dc66cbad4d49a7b4ae8395fd1ce"
+checksum = "bf1c7de7221e6afcc5e13ced3b218faab3bc65b47eac67400046a05418aecd6a"
dependencies = [
- "cranelift-codegen 0.91.0",
+ "cranelift-codegen 0.97.1",
"libc",
"target-lexicon",
]
[[package]]
name = "cranelift-wasm"
-version = "0.91.0"
+version = "0.97.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfbc4dd03b713b5d71b582915b8c272f4813cdd8c99a3e03d9ba70c44468a6e0"
+checksum = "76b0d28ebe8edb6b503630c489aa4669f1e2d13b97bec7271a0fcb0e159be3ad"
dependencies = [
- "cranelift-codegen 0.91.0",
- "cranelift-entity 0.91.0",
- "cranelift-frontend 0.91.0",
+ "cranelift-codegen 0.97.1",
+ "cranelift-entity 0.97.1",
+ "cranelift-frontend 0.97.1",
"itertools",
"log",
"smallvec",
- "wasmparser 0.95.0",
+ "wasmparser 0.107.0",
"wasmtime-types",
]
@@ -630,6 +789,12 @@ dependencies = [
"cfg-if 1.0.0",
]
+[[package]]
+name = "critical-section"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52"
+
[[package]]
name = "crossbeam"
version = "0.8.2"
@@ -646,9 +811,9 @@ dependencies = [
[[package]]
name = "crossbeam-channel"
-version = "0.5.6"
+version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
+checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
dependencies = [
"cfg-if 1.0.0",
"crossbeam-utils",
@@ -656,9 +821,9 @@ dependencies = [
[[package]]
name = "crossbeam-deque"
-version = "0.8.2"
+version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc"
+checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
dependencies = [
"cfg-if 1.0.0",
"crossbeam-epoch",
@@ -667,14 +832,14 @@ dependencies = [
[[package]]
name = "crossbeam-epoch"
-version = "0.9.13"
+version = "0.9.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a"
+checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
dependencies = [
"autocfg",
"cfg-if 1.0.0",
"crossbeam-utils",
- "memoffset 0.7.1",
+ "memoffset 0.9.0",
"scopeguard",
]
@@ -690,9 +855,9 @@ dependencies = [
[[package]]
name = "crossbeam-utils"
-version = "0.8.14"
+version = "0.8.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f"
+checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
dependencies = [
"cfg-if 1.0.0",
]
@@ -708,92 +873,82 @@ dependencies = [
]
[[package]]
-name = "cxx"
-version = "1.0.89"
+name = "darling"
+version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc831ee6a32dd495436e317595e639a587aa9907bef96fe6e6abc290ab6204e9"
+checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"
dependencies = [
- "cc",
- "cxxbridge-flags",
- "cxxbridge-macro",
- "link-cplusplus",
+ "darling_core 0.14.4",
+ "darling_macro 0.14.4",
]
[[package]]
-name = "cxx-build"
-version = "1.0.89"
+name = "darling"
+version = "0.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94331d54f1b1a8895cd81049f7eaaaef9d05a7dcb4d1fd08bf3ff0806246789d"
+checksum = "0558d22a7b463ed0241e993f76f09f30b126687447751a8638587b864e4b3944"
dependencies = [
- "cc",
- "codespan-reporting",
- "once_cell",
- "proc-macro2",
- "quote",
- "scratch",
- "syn",
+ "darling_core 0.20.1",
+ "darling_macro 0.20.1",
]
[[package]]
-name = "cxxbridge-flags"
-version = "1.0.89"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48dcd35ba14ca9b40d6e4b4b39961f23d835dbb8eed74565ded361d93e1feb8a"
-
-[[package]]
-name = "cxxbridge-macro"
-version = "1.0.89"
+name = "darling_core"
+version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81bbeb29798b407ccd82a3324ade1a7286e0d29851475990b612670f6f5124d2"
+checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0"
dependencies = [
+ "fnv",
+ "ident_case",
"proc-macro2",
"quote",
- "syn",
+ "strsim",
+ "syn 1.0.109",
]
[[package]]
-name = "darling"
-version = "0.14.2"
+name = "darling_core"
+version = "0.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0dd3cd20dc6b5a876612a6e5accfe7f3dd883db6d07acfbf14c128f61550dfa"
+checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb"
dependencies = [
- "darling_core",
- "darling_macro",
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.26",
]
[[package]]
-name = "darling_core"
-version = "0.14.2"
+name = "darling_macro"
+version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a784d2ccaf7c98501746bf0be29b2022ba41fd62a2e622af997a03e9f972859f"
+checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
+ "darling_core 0.14.4",
"quote",
- "strsim",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "darling_macro"
-version = "0.14.2"
+version = "0.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e"
+checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a"
dependencies = [
- "darling_core",
+ "darling_core 0.20.1",
"quote",
- "syn",
+ "syn 2.0.26",
]
[[package]]
name = "dashmap"
-version = "5.4.0"
+version = "5.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc"
+checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d"
dependencies = [
"cfg-if 1.0.0",
- "hashbrown 0.12.3",
+ "hashbrown 0.14.0",
"lock_api",
"once_cell",
"parking_lot_core",
@@ -811,33 +966,32 @@ dependencies = [
]
[[package]]
-name = "derive_builder"
-version = "0.11.2"
+name = "debugid"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3"
+checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d"
dependencies = [
- "derive_builder_macro 0.11.2",
+ "uuid",
]
[[package]]
-name = "derive_builder"
-version = "0.12.0"
+name = "derivative"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8"
+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
dependencies = [
- "derive_builder_macro 0.12.0",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
]
[[package]]
-name = "derive_builder_core"
-version = "0.11.2"
+name = "derive_builder"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4"
+checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8"
dependencies = [
- "darling",
- "proc-macro2",
- "quote",
- "syn",
+ "derive_builder_macro",
]
[[package]]
@@ -846,20 +1000,10 @@ version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f"
dependencies = [
- "darling",
+ "darling 0.14.4",
"proc-macro2",
"quote",
- "syn",
-]
-
-[[package]]
-name = "derive_builder_macro"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68"
-dependencies = [
- "derive_builder_core 0.11.2",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -868,8 +1012,8 @@ version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e"
dependencies = [
- "derive_builder_core 0.12.0",
- "syn",
+ "derive_builder_core",
+ "syn 1.0.109",
]
[[package]]
@@ -880,9 +1024,9 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
[[package]]
name = "digest"
-version = "0.10.6"
+version = "0.10.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
dependencies = [
"block-buffer",
"crypto-common",
@@ -943,26 +1087,26 @@ checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1"
[[package]]
name = "either"
-version = "1.8.1"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
[[package]]
-name = "enum-iterator"
-version = "0.7.0"
+name = "encoding_rs"
+version = "0.8.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eeac5c5edb79e4e39fe8439ef35207780a11f69c52cbe424ce3dfad4cb78de6"
+checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
dependencies = [
- "enum-iterator-derive 0.7.0",
+ "cfg-if 1.0.0",
]
[[package]]
name = "enum-iterator"
-version = "1.2.0"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91a4ec26efacf4aeff80887a175a419493cb6f8b5480d26387eb0bd038976187"
+checksum = "4eeac5c5edb79e4e39fe8439ef35207780a11f69c52cbe424ce3dfad4cb78de6"
dependencies = [
- "enum-iterator-derive 1.1.0",
+ "enum-iterator-derive",
]
[[package]]
@@ -973,39 +1117,28 @@ checksum = "c134c37760b27a871ba422106eedbb8247da973a09e82558bf26d619c882b159"
dependencies = [
"proc-macro2",
"quote",
- "syn",
-]
-
-[[package]]
-name = "enum-iterator-derive"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "828de45d0ca18782232dfb8f3ea9cc428e8ced380eb26a520baaacfc70de39ce"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
name = "enumset"
-version = "1.0.12"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19be8061a06ab6f3a6cf21106c873578bf01bd42ad15e0311a9c76161cb1c753"
+checksum = "e875f1719c16de097dee81ed675e2d9bb63096823ed3f0ca827b7dea3028bbbb"
dependencies = [
"enumset_derive",
]
[[package]]
name = "enumset_derive"
-version = "0.6.1"
+version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03e7b551eba279bf0fa88b83a46330168c1560a52a94f5126f892f0b364ab3e0"
+checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af"
dependencies = [
- "darling",
+ "darling 0.20.1",
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.26",
]
[[package]]
@@ -1031,15 +1164,21 @@ dependencies = [
"termcolor",
]
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
[[package]]
name = "errno"
-version = "0.2.8"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
+checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
dependencies = [
"errno-dragonfly",
"libc",
- "winapi",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -1060,29 +1199,26 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
[[package]]
name = "fastrand"
-version = "1.8.0"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
-dependencies = [
- "instant",
-]
+checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
[[package]]
name = "fd-lock"
-version = "3.0.9"
+version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28c0190ff0bd3b28bfdd4d0cf9f92faa12880fb0b8ae2054723dd6c76a4efd42"
+checksum = "0b0377f1edc77dbd1118507bc7a66e4ab64d2b90c66f90726dc801e73a8c68f9"
dependencies = [
"cfg-if 1.0.0",
- "rustix",
- "windows-sys 0.42.0",
+ "rustix 0.38.1",
+ "windows-sys 0.48.0",
]
[[package]]
name = "file-per-thread-logger"
-version = "0.1.6"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84f2e425d9790201ba4af4630191feac6dcc98765b118d4d18e91d23c2353866"
+checksum = "8a3cc21c33af89af0930c8cae4ade5e6fdc17b5d2c97b3d2e2edb67a1cf683f3"
dependencies = [
"env_logger 0.10.0",
"log",
@@ -1090,14 +1226,14 @@ dependencies = [
[[package]]
name = "filetime"
-version = "0.2.19"
+version = "0.2.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9"
+checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153"
dependencies = [
"cfg-if 1.0.0",
"libc",
- "redox_syscall",
- "windows-sys 0.42.0",
+ "redox_syscall 0.2.16",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -1108,9 +1244,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
[[package]]
name = "flate2"
-version = "1.0.25"
+version = "1.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
+checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
dependencies = [
"crc32fast",
"miniz_oxide",
@@ -1131,11 +1267,26 @@ version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
[[package]]
name = "form_urlencoded"
-version = "1.1.0"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
+checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
dependencies = [
"percent-encoding",
]
@@ -1148,20 +1299,32 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
[[package]]
name = "fs-set-times"
-version = "0.18.0"
+version = "0.19.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e25ca26b0001154679ce0901527330e6153b670d17ccd1f86bab4e45dfba1a74"
+checksum = "6d167b646a876ba8fda6b50ac645cfd96242553cbaf0ca4fccaa39afcbf0801f"
dependencies = [
- "io-lifetimes",
- "rustix",
- "windows-sys 0.42.0",
+ "io-lifetimes 1.0.11",
+ "rustix 0.38.1",
+ "windows-sys 0.48.0",
]
+[[package]]
+name = "fs_extra"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
+
+[[package]]
+name = "funty"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
+
[[package]]
name = "futures"
-version = "0.3.26"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84"
+checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
dependencies = [
"futures-channel",
"futures-core",
@@ -1174,9 +1337,9 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.26"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5"
+checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
dependencies = [
"futures-core",
"futures-sink",
@@ -1184,15 +1347,15 @@ dependencies = [
[[package]]
name = "futures-core"
-version = "0.3.26"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608"
+checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
[[package]]
name = "futures-executor"
-version = "0.3.26"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e"
+checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
dependencies = [
"futures-core",
"futures-task",
@@ -1202,38 +1365,38 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.26"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531"
+checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
[[package]]
name = "futures-macro"
-version = "0.3.26"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70"
+checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.26",
]
[[package]]
name = "futures-sink"
-version = "0.3.26"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364"
+checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
[[package]]
name = "futures-task"
-version = "0.3.26"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366"
+checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
[[package]]
name = "futures-util"
-version = "0.3.26"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1"
+checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
dependencies = [
"futures-channel",
"futures-core",
@@ -1257,19 +1420,23 @@ dependencies = [
]
[[package]]
-name = "generational-arena"
-version = "0.2.8"
+name = "fxprof-processed-profile"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e1d3b771574f62d0548cee0ad9057857e9fc25d7a3335f140c84f6acd0bf601"
+checksum = "27d12c0aed7f1e24276a241aadc4cb8ea9f83000f34bc062b7cc2d51e3b0fabd"
dependencies = [
- "cfg-if 0.1.10",
+ "bitflags 2.3.3",
+ "debugid",
+ "fxhash",
+ "serde",
+ "serde_json",
]
[[package]]
name = "generic-array"
-version = "0.14.6"
+version = "0.14.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
dependencies = [
"typenum",
"version_check",
@@ -1277,13 +1444,15 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.2.8"
+version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
+checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
dependencies = [
"cfg-if 1.0.0",
+ "js-sys",
"libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi",
+ "wasm-bindgen",
]
[[package]]
@@ -1295,7 +1464,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -1305,27 +1474,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d"
dependencies = [
"fallible-iterator",
- "indexmap",
+ "indexmap 1.9.3",
"stable_deref_trait",
]
[[package]]
name = "gimli"
-version = "0.27.0"
+version = "0.27.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793"
-
-[[package]]
-name = "git2"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2994bee4a3a6a51eb90c218523be382fd7ea09b16380b9312e9dbe955ff7c7d1"
+checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4"
dependencies = [
- "bitflags",
- "libc",
- "libgit2-sys",
- "log",
- "url",
+ "fallible-iterator",
+ "indexmap 1.9.3",
+ "stable_deref_trait",
]
[[package]]
@@ -1335,12 +1496,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
[[package]]
-name = "hashbrown"
-version = "0.11.2"
+name = "h2"
+version = "0.3.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049"
+dependencies = [
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "http",
+ "indexmap 1.9.3",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "half"
+version = "1.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
+
+[[package]]
+name = "hash32"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
+checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67"
dependencies = [
- "ahash",
+ "byteorder",
]
[[package]]
@@ -1349,7 +1535,44 @@ version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
dependencies = [
- "ahash",
+ "ahash 0.7.6",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+dependencies = [
+ "ahash 0.8.3",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+
+[[package]]
+name = "heapless"
+version = "0.7.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743"
+dependencies = [
+ "atomic-polyfill",
+ "hash32",
+ "rustc_version 0.4.0",
+ "spin 0.9.8",
+ "stable_deref_trait",
+]
+
+[[package]]
+name = "heck"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
+dependencies = [
+ "unicode-segmentation",
]
[[package]]
@@ -1360,12 +1583,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
[[package]]
name = "hermit-abi"
-version = "0.2.6"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
-dependencies = [
- "libc",
-]
+checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
[[package]]
name = "hex"
@@ -1373,36 +1593,126 @@ version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+[[package]]
+name = "http"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
+dependencies = [
+ "bytes",
+ "http",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+
+[[package]]
+name = "httpdate"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
+
[[package]]
name = "humantime"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+[[package]]
+name = "hyper"
+version = "0.14.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower-service",
+ "tracing",
+ "want",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97"
+dependencies = [
+ "futures-util",
+ "http",
+ "hyper",
+ "rustls",
+ "tokio",
+ "tokio-rustls",
+]
+
+[[package]]
+name = "hyper-tls"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
+dependencies = [
+ "bytes",
+ "hyper",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+]
+
[[package]]
name = "iana-time-zone"
-version = "0.1.53"
+version = "0.1.57"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
+checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"
dependencies = [
"android_system_properties",
"core-foundation-sys",
"iana-time-zone-haiku",
"js-sys",
"wasm-bindgen",
- "winapi",
+ "windows",
]
[[package]]
name = "iana-time-zone-haiku"
-version = "0.1.1"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
dependencies = [
- "cxx",
- "cxx-build",
+ "cc",
]
+[[package]]
+name = "id-arena"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005"
+
[[package]]
name = "ident_case"
version = "1.0.1"
@@ -1411,9 +1721,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
[[package]]
name = "idna"
-version = "0.3.0"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
+checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
dependencies = [
"unicode-bidi",
"unicode-normalization",
@@ -1421,9 +1731,9 @@ dependencies = [
[[package]]
name = "indexmap"
-version = "1.9.2"
+version = "1.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
dependencies = [
"autocfg",
"hashbrown 0.12.3",
@@ -1431,12 +1741,13 @@ dependencies = [
]
[[package]]
-name = "instant"
-version = "0.1.12"
+name = "indexmap"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
dependencies = [
- "cfg-if 1.0.0",
+ "equivalent",
+ "hashbrown 0.14.0",
]
[[package]]
@@ -1450,67 +1761,76 @@ dependencies = [
"flate2",
"libcgroups",
"libcontainer",
- "log",
"nix",
"num_cpus",
- "oci-spec 0.6.0",
+ "oci-spec",
"once_cell",
"pnet_datalink",
"procfs",
"rand",
+ "scopeguard",
"serde",
"serde_json",
"tar",
+ "tempfile",
"test_framework",
+ "tracing",
+ "tracing-subscriber",
"uuid",
"which",
]
[[package]]
name = "io-extras"
-version = "0.17.1"
+version = "0.17.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b87bc110777311d7832025f38c4ab0f089f764644009edef3b5cbadfedee8c40"
+checksum = "fde93d48f0d9277f977a333eca8313695ddd5301dc96f7e02aeddcb0dd99096f"
dependencies = [
- "io-lifetimes",
- "windows-sys 0.42.0",
+ "io-lifetimes 1.0.11",
+ "windows-sys 0.48.0",
]
[[package]]
name = "io-lifetimes"
-version = "1.0.4"
+version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e"
+checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
dependencies = [
+ "hermit-abi",
"libc",
- "windows-sys 0.42.0",
+ "windows-sys 0.48.0",
]
+[[package]]
+name = "io-lifetimes"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c2355a5aef60b1c70b7001bd60ce60deebe6a98d95dff5a873519b125a3af51"
+
[[package]]
name = "ipnet"
-version = "2.7.1"
+version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146"
+checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
[[package]]
name = "ipnetwork"
-version = "0.19.0"
+version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f84f1612606f3753f205a4e9a2efd6fe5b4c573a6269b2cc6c3003d44a0d127"
+checksum = "bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e"
dependencies = [
"serde",
]
[[package]]
name = "is-terminal"
-version = "0.4.2"
+version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189"
+checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
dependencies = [
"hermit-abi",
- "io-lifetimes",
- "rustix",
- "windows-sys 0.42.0",
+ "rustix 0.38.1",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -1524,9 +1844,9 @@ dependencies = [
[[package]]
name = "itoa"
-version = "1.0.5"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
[[package]]
name = "ittapi"
@@ -1550,9 +1870,9 @@ dependencies = [
[[package]]
name = "jobserver"
-version = "0.1.25"
+version = "0.1.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b"
+checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2"
dependencies = [
"libc",
]
@@ -1584,25 +1904,36 @@ version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"
+[[package]]
+name = "lexical-sort"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c09e4591611e231daf4d4c685a66cb0410cc1e502027a20ae55f2bb9e997207a"
+dependencies = [
+ "any_ascii",
+]
+
[[package]]
name = "libbpf-sys"
-version = "1.1.1+v1.1.0"
+version = "1.2.1+v1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f0bfc74513824996a8f689cae8b40445c9a54bc9f57a31d9778b281b9970868"
+checksum = "75adb4021282a72ca63ebbc0e4247750ad74ede68ff062d247691072d709ad8b"
dependencies = [
"cc",
+ "nix",
+ "num_cpus",
"pkg-config",
]
[[package]]
name = "libc"
-version = "0.2.139"
+version = "0.2.147"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
[[package]]
name = "libcgroups"
-version = "0.0.4"
+version = "0.1.0"
dependencies = [
"anyhow",
"clap",
@@ -1612,71 +1943,58 @@ dependencies = [
"fixedbitset",
"libbpf-sys",
"libc",
- "log",
"mockall",
"nix",
- "oci-spec 0.5.8",
+ "oci-spec",
"procfs",
"quickcheck",
"rbpf",
"serde",
"serde_json",
"serial_test",
+ "tempfile",
+ "thiserror",
+ "tracing",
]
[[package]]
name = "libcontainer"
-version = "0.0.4"
+version = "0.1.0"
dependencies = [
"anyhow",
- "bitflags",
+ "bitflags 2.3.3",
"caps",
"chrono",
- "crossbeam-channel",
+ "clone3",
"fastrand",
"futures",
"libc",
"libcgroups",
"libseccomp",
- "log",
- "mio",
"nix",
- "oci-spec 0.5.8",
- "path-clean",
+ "oci-spec",
+ "once_cell",
"prctl",
"procfs",
"quickcheck",
"rand",
+ "regex",
"rust-criu",
+ "safe-path",
"serde",
"serde_json",
"serial_test",
- "syscalls",
- "wasmedge-sdk",
- "wasmer",
- "wasmer-wasi",
- "wasmtime",
- "wasmtime-wasi",
+ "tempfile",
+ "thiserror",
+ "tracing",
]
[[package]]
name = "libdbus-sys"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2264f9d90a9b4e60a2dc722ad899ea0374f03c2e96e755fe22a8f551d4d5fb3c"
-dependencies = [
- "pkg-config",
-]
-
-[[package]]
-name = "libgit2-sys"
-version = "0.14.2+1.5.1"
+version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4"
+checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72"
dependencies = [
- "cc",
- "libc",
- "libz-sys",
"pkg-config",
]
@@ -1692,7 +2010,7 @@ dependencies = [
[[package]]
name = "liboci-cli"
-version = "0.0.4"
+version = "0.1.0"
dependencies = [
"clap",
]
@@ -1703,7 +2021,7 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21c57fd8981a80019807b7b68118618d29a87177c63d704fc96e6ecd003ae5b3"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"libc",
"libseccomp-sys",
"pkg-config",
@@ -1716,24 +2034,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a7cbbd4ad467251987c6e5b47d53b11a5a05add08f2447a9e2d70aef1e0d138"
[[package]]
-name = "libz-sys"
-version = "1.1.8"
+name = "linked-hash-map"
+version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
+checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
[[package]]
-name = "link-cplusplus"
-version = "1.0.8"
+name = "linked_hash_set"
+version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
+checksum = "47186c6da4d81ca383c7c47c1bfc80f4b95f4720514d860a5407aaf4233f9588"
dependencies = [
- "cc",
+ "linked-hash-map",
]
[[package]]
@@ -1743,44 +2055,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
[[package]]
-name = "lock_api"
-version = "0.4.9"
+name = "linux-raw-sys"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
+checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
[[package]]
-name = "log"
-version = "0.4.17"
+name = "linux-raw-sys"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if 1.0.0",
-]
+checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0"
[[package]]
-name = "loupe"
-version = "0.1.3"
+name = "lock_api"
+version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b6a72dfa44fe15b5e76b94307eeb2ff995a8c5b283b55008940c02e0c5b634d"
+checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
dependencies = [
- "indexmap",
- "loupe-derive",
- "rustversion",
+ "autocfg",
+ "scopeguard",
]
[[package]]
-name = "loupe-derive"
-version = "0.1.3"
+name = "log"
+version = "0.4.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0fbfc88337168279f2e9ae06e157cfed4efd3316e14dc96ed074d4f2e6c5952"
-dependencies = [
- "quote",
- "syn",
-]
+checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
[[package]]
name = "mach"
@@ -1791,6 +2091,15 @@ dependencies = [
"libc",
]
+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata 0.1.10",
+]
+
[[package]]
name = "maybe-owned"
version = "0.3.4"
@@ -1805,29 +2114,29 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]]
name = "memfd"
-version = "0.6.2"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b20a59d985586e4a5aef64564ac77299f8586d8be6cf9106a5a40207e8908efb"
+checksum = "ffc89ccdc6e10d6907450f753537ebc5c5d3460d2e4e62ea74bd571db62c0f9e"
dependencies = [
- "rustix",
+ "rustix 0.37.19",
]
[[package]]
name = "memmap2"
-version = "0.5.8"
+version = "0.5.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc"
+checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
dependencies = [
"libc",
]
[[package]]
-name = "memoffset"
-version = "0.6.5"
+name = "memmap2"
+version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
+checksum = "6d28bba84adfe6646737845bc5ebbfa2c08424eb1c37e94a1fd2a82adb56a872"
dependencies = [
- "autocfg",
+ "libc",
]
[[package]]
@@ -1839,6 +2148,30 @@ dependencies = [
"autocfg",
]
+[[package]]
+name = "memoffset"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "memoffset"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
[[package]]
name = "minimal-lexical"
version = "0.2.1"
@@ -1847,30 +2180,29 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]]
name = "miniz_oxide"
-version = "0.6.4"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2e212582ede878b109755efd0773a4f0f4ec851584cf0aefbeb4d9ecc114822"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
dependencies = [
"adler",
]
[[package]]
name = "mio"
-version = "0.8.5"
+version = "0.8.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de"
+checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
dependencies = [
"libc",
- "log",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.42.0",
+ "wasi",
+ "windows-sys 0.48.0",
]
[[package]]
name = "mockall"
-version = "0.11.3"
+version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50e4a1c770583dac7ab5e2f6c139153b783a53a1bbee9729613f193e59828326"
+checksum = "4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96"
dependencies = [
"cfg-if 1.0.0",
"downcast",
@@ -1883,14 +2215,14 @@ dependencies = [
[[package]]
name = "mockall_derive"
-version = "0.11.3"
+version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "832663583d5fa284ca8810bf7015e46c9fff9622d3cf34bd1eea5003fec06dd0"
+checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb"
dependencies = [
"cfg-if 1.0.0",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -1899,18 +2231,36 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389"
+[[package]]
+name = "native-tls"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
+dependencies = [
+ "lazy_static",
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework",
+ "security-framework-sys",
+ "tempfile",
+]
+
[[package]]
name = "nix"
-version = "0.25.0"
+version = "0.26.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb"
+checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
dependencies = [
- "autocfg",
- "bitflags",
+ "bitflags 1.3.2",
"cfg-if 1.0.0",
"libc",
- "memoffset 0.6.5",
+ "memoffset 0.7.1",
"pin-utils",
+ "static_assertions",
]
[[package]]
@@ -1936,11 +2286,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
[[package]]
-name = "ntapi"
-version = "0.4.0"
+name = "nu-ansi-term"
+version = "0.46.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc51db7b362b205941f71232e56c625156eb9a929f8cf74a428fd5bc094a4afc"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
dependencies = [
+ "overload",
"winapi",
]
@@ -1952,87 +2303,86 @@ checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
dependencies = [
"proc-macro2",
"quote",
- "syn",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
-dependencies = [
- "autocfg",
- "num-traits",
+ "syn 1.0.109",
]
[[package]]
name = "num-traits"
-version = "0.2.15"
+version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
dependencies = [
"autocfg",
]
[[package]]
name = "num_cpus"
-version = "1.15.0"
+version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
dependencies = [
"hermit-abi",
"libc",
]
[[package]]
-name = "num_threads"
-version = "0.1.6"
+name = "num_enum"
+version = "0.5.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
dependencies = [
- "libc",
+ "num_enum_derive",
]
[[package]]
-name = "object"
-version = "0.28.4"
+name = "num_enum_derive"
+version = "0.5.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424"
+checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
dependencies = [
- "crc32fast",
- "hashbrown 0.11.2",
- "indexmap",
- "memchr",
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "num_threads"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
+dependencies = [
+ "libc",
]
[[package]]
name = "object"
-version = "0.29.0"
+version = "0.30.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53"
+checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385"
dependencies = [
"crc32fast",
- "hashbrown 0.12.3",
- "indexmap",
+ "hashbrown 0.13.2",
+ "indexmap 1.9.3",
"memchr",
]
[[package]]
name = "object"
-version = "0.30.0"
+version = "0.31.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "239da7f290cfa979f43f85a8efeee9a8a76d0827c356d37f9d3d7254d6b537fb"
+checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
dependencies = [
"memchr",
]
[[package]]
name = "oci-spec"
-version = "0.5.8"
+version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98135224dd4faeb24c05a2fac911ed53ea6b09ecb09d7cada1cb79963ab2ee34"
+checksum = "9421b067205c68dc80af7c68599a9c1eb113f975aafeb874cea7f4d5d41ce3fb"
dependencies = [
- "derive_builder 0.11.2",
+ "derive_builder",
"getset",
"quickcheck",
"serde",
@@ -2041,29 +2391,60 @@ dependencies = [
]
[[package]]
-name = "oci-spec"
-version = "0.6.0"
+name = "once_cell"
+version = "1.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "214b837f7dde5026f2028ead5ae720073277c19f82ff85623b142c39d4b843e7"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+
+[[package]]
+name = "openssl"
+version = "0.10.55"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d"
dependencies = [
- "derive_builder 0.12.0",
- "getset",
- "serde",
- "serde_json",
- "thiserror",
+ "bitflags 1.3.2",
+ "cfg-if 1.0.0",
+ "foreign-types",
+ "libc",
+ "once_cell",
+ "openssl-macros",
+ "openssl-sys",
]
[[package]]
-name = "once_cell"
-version = "1.17.0"
+name = "openssl-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.26",
+]
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.90"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
[[package]]
-name = "os_str_bytes"
-version = "6.4.1"
+name = "overload"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]]
name = "parking_lot"
@@ -2077,28 +2458,28 @@ dependencies = [
[[package]]
name = "parking_lot_core"
-version = "0.9.6"
+version = "0.9.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf"
+checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
dependencies = [
"cfg-if 1.0.0",
"libc",
- "redox_syscall",
+ "redox_syscall 0.3.5",
"smallvec",
- "windows-sys 0.42.0",
+ "windows-targets 0.48.0",
]
[[package]]
name = "paste"
-version = "1.0.11"
+version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba"
+checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
[[package]]
name = "path-clean"
-version = "0.1.0"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecba01bf2678719532c5e3059e0b5f0811273d94b397088b82e3bd0a78c78fdd"
+checksum = "17359afc20d7ab31fdb42bb844c8b3bb1dabd7dcf7e68428492da7f16966fcef"
[[package]]
name = "peeking_take_while"
@@ -2118,15 +2499,45 @@ dependencies = [
[[package]]
name = "percent-encoding"
-version = "2.2.0"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
+
+[[package]]
+name = "petgraph"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4"
+dependencies = [
+ "fixedbitset",
+ "indexmap 1.9.3",
+]
+
+[[package]]
+name = "pin-project"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
+checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.26",
+]
[[package]]
name = "pin-project-lite"
-version = "0.2.9"
+version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57"
[[package]]
name = "pin-utils"
@@ -2136,24 +2547,24 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "pkg-config"
-version = "0.3.26"
+version = "0.3.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
+checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
[[package]]
name = "pnet_base"
-version = "0.31.0"
+version = "0.34.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9d3a993d49e5fd5d4d854d6999d4addca1f72d86c65adf224a36757161c02b6"
+checksum = "fe4cf6fb3ab38b68d01ab2aea03ed3d1132b4868fa4e06285f29f16da01c5f4c"
dependencies = [
"no-std-net",
]
[[package]]
name = "pnet_datalink"
-version = "0.31.0"
+version = "0.34.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e466faf03a98ad27f6e15cd27a2b7cc89e73e640a43527742977bc503c37f8aa"
+checksum = "ad5854abf0067ebbd3967f7d45ebc8976ff577ff0c7bd101c4973ae3c70f98fe"
dependencies = [
"ipnetwork",
"libc",
@@ -2164,9 +2575,9 @@ dependencies = [
[[package]]
name = "pnet_sys"
-version = "0.31.0"
+version = "0.34.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "328e231f0add6d247d82421bf3790b4b33b39c8930637f428eef24c4c6a90805"
+checksum = "417c0becd1b573f6d544f73671070b039051e5ad819cc64aa96377b536128d00"
dependencies = [
"libc",
"winapi",
@@ -2204,20 +2615,40 @@ dependencies = [
[[package]]
name = "predicates-core"
-version = "1.0.5"
+version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72f883590242d3c6fc5bf50299011695fa6590c2c70eac95ee1bdb9a733ad1a2"
+checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174"
[[package]]
name = "predicates-tree"
-version = "1.0.7"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54ff541861505aabf6ea722d2131ee980b8276e10a1297b94e896dd8b621850d"
+checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf"
dependencies = [
"predicates-core",
"termtree",
]
+[[package]]
+name = "prettyplease"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62"
+dependencies = [
+ "proc-macro2",
+ "syn 2.0.26",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+dependencies = [
+ "once_cell",
+ "toml_edit",
+]
+
[[package]]
name = "proc-macro-error"
version = "1.0.4"
@@ -2227,7 +2658,7 @@ dependencies = [
"proc-macro-error-attr",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
"version_check",
]
@@ -2250,26 +2681,26 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
[[package]]
name = "proc-macro2"
-version = "1.0.50"
+version = "1.0.66"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2"
+checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
dependencies = [
"unicode-ident",
]
[[package]]
name = "procfs"
-version = "0.14.2"
+version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1de8dacb0873f77e6aefc6d71e044761fcc68060290f5b1089fcdf84626bb69"
+checksum = "943ca7f9f29bab5844ecd8fdb3992c5969b6622bb9609b9502fef9b4310e3f1f"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"byteorder",
"chrono",
"flate2",
"hex",
"lazy_static",
- "rustix",
+ "rustix 0.36.15",
]
[[package]]
@@ -2305,7 +2736,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d39b14605eaa1f6a340aec7f320b34064feb26c93aec35d6a9a2272a8ddfa49"
dependencies = [
"anyhow",
- "indexmap",
+ "indexmap 1.9.3",
"log",
"protobuf",
"protobuf-support",
@@ -2349,7 +2780,18 @@ checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "pulldown-cmark"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffade02495f22453cd593159ea2f59827aae7f53fa8323f756799b670881dcf8"
+dependencies = [
+ "bitflags 1.3.2",
+ "memchr",
+ "unicase",
]
[[package]]
@@ -2365,13 +2807,19 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.23"
+version = "1.0.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
+checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965"
dependencies = [
"proc-macro2",
]
+[[package]]
+name = "radium"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
+
[[package]]
name = "rand"
version = "0.8.5"
@@ -2404,9 +2852,9 @@ dependencies = [
[[package]]
name = "rayon"
-version = "1.6.1"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7"
+checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
dependencies = [
"either",
"rayon-core",
@@ -2414,9 +2862,9 @@ dependencies = [
[[package]]
name = "rayon-core"
-version = "1.10.2"
+version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b"
+checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
dependencies = [
"crossbeam-channel",
"crossbeam-deque",
@@ -2426,14 +2874,14 @@ dependencies = [
[[package]]
name = "rbpf"
-version = "0.1.0"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c9c11162e7a92d2ede17ea2e5ef83025fd3e252638e43bf92294ea61791d1c4"
+checksum = "b536dc5c7e3a730d06c578a41df1fbcccd66240a7a9bd5f150a0826291f01c66"
dependencies = [
"byteorder",
"combine",
"libc",
- "time 0.1.45",
+ "time 0.2.27",
]
[[package]]
@@ -2442,7 +2890,16 @@ version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+dependencies = [
+ "bitflags 1.3.2",
]
[[package]]
@@ -2452,49 +2909,78 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
dependencies = [
"getrandom",
- "redox_syscall",
+ "redox_syscall 0.2.16",
"thiserror",
]
[[package]]
-name = "regalloc"
-version = "0.0.34"
+name = "regalloc2"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62446b1d3ebf980bdc68837700af1d77b37bc430e524bf95319c6eada2a4cc02"
+checksum = "300d4fbfb40c1c66a78ba3ddd41c1110247cf52f97b87d0f2fc9209bd49b030c"
dependencies = [
+ "fxhash",
"log",
- "rustc-hash",
+ "slice-group-by",
"smallvec",
]
[[package]]
name = "regalloc2"
-version = "0.5.1"
+version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "300d4fbfb40c1c66a78ba3ddd41c1110247cf52f97b87d0f2fc9209bd49b030c"
+checksum = "12513beb38dd35aab3ac5f5b89fd0330159a0dc21d5309d75073011bbc8032b0"
dependencies = [
- "fxhash",
+ "hashbrown 0.13.2",
"log",
+ "rustc-hash",
"slice-group-by",
"smallvec",
]
[[package]]
name = "regex"
-version = "1.7.1"
+version = "1.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata 0.3.2",
+ "regex-syntax 0.7.3",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax 0.6.29",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
+checksum = "83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf"
dependencies = [
"aho-corasick",
"memchr",
- "regex-syntax",
+ "regex-syntax 0.7.3",
]
[[package]]
name = "regex-syntax"
-version = "0.6.28"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
+[[package]]
+name = "regex-syntax"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
+checksum = "2ab07dc67230e4a4718e70fd5c20055a4334b121f1f9db8fe63ef39ce9b8c846"
[[package]]
name = "region"
@@ -2502,53 +2988,111 @@ version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76e189c2369884dce920945e2ddf79b3dff49e071a167dd1817fa9c4c00d512e"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"libc",
"mach",
"winapi",
]
[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
+name = "rend"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
+checksum = "581008d2099240d37fb08d77ad713bcaec2c4d89d50b5b21a8bb1996bbab68ab"
dependencies = [
- "winapi",
+ "bytecheck",
]
[[package]]
-name = "rend"
-version = "0.3.6"
+name = "replace_with"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3a8614ee435691de62bcffcf4a66d91b3594bf1428a5722e79103249a095690"
+
+[[package]]
+name = "reqwest"
+version = "0.11.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79af64b4b6362ffba04eef3a4e10829718a4896dac19daa741851c86781edf95"
+checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55"
dependencies = [
- "bytecheck",
+ "base64",
+ "bytes",
+ "encoding_rs",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "hyper",
+ "hyper-rustls",
+ "hyper-tls",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "native-tls",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustls",
+ "rustls-pemfile",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "tokio",
+ "tokio-native-tls",
+ "tokio-rustls",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "webpki-roots",
+ "winreg",
+]
+
+[[package]]
+name = "ring"
+version = "0.16.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
+dependencies = [
+ "cc",
+ "libc",
+ "once_cell",
+ "spin 0.5.2",
+ "untrusted",
+ "web-sys",
+ "winapi",
]
[[package]]
name = "rkyv"
-version = "0.7.39"
+version = "0.7.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cec2b3485b07d96ddfd3134767b8a447b45ea4eb91448d0a35180ec0ffd5ed15"
+checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58"
dependencies = [
+ "bitvec",
"bytecheck",
"hashbrown 0.12.3",
+ "indexmap 1.9.3",
"ptr_meta",
"rend",
"rkyv_derive",
"seahash",
+ "tinyvec",
+ "uuid",
]
[[package]]
name = "rkyv_derive"
-version = "0.7.39"
+version = "0.7.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6eaedadc88b53e36dd32d940ed21ae4d850d5916f2581526921f553a72ac34c4"
+checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -2558,7 +3102,7 @@ dependencies = [
"anyhow",
"libc",
"nix",
- "oci-spec 0.6.0",
+ "oci-spec",
]
[[package]]
@@ -2575,9 +3119,9 @@ dependencies = [
[[package]]
name = "rustc-demangle"
-version = "0.1.21"
+version = "0.1.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
[[package]]
name = "rustc-hash"
@@ -2600,150 +3144,318 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
dependencies = [
- "semver 1.0.13",
+ "semver 1.0.17",
]
[[package]]
name = "rustix"
-version = "0.36.7"
+version = "0.36.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03"
+checksum = "c37f1bd5ef1b5422177b7646cba67430579cfe2ace80f284fee876bca52ad941"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"errno",
- "io-lifetimes",
- "itoa",
+ "io-lifetimes 1.0.11",
"libc",
- "linux-raw-sys",
- "once_cell",
- "windows-sys 0.42.0",
+ "linux-raw-sys 0.1.4",
+ "windows-sys 0.45.0",
]
[[package]]
-name = "rustversion"
-version = "1.0.11"
+name = "rustix"
+version = "0.37.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70"
+checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d"
+dependencies = [
+ "bitflags 1.3.2",
+ "errno",
+ "io-lifetimes 1.0.11",
+ "itoa",
+ "libc",
+ "linux-raw-sys 0.3.8",
+ "once_cell",
+ "windows-sys 0.48.0",
+]
[[package]]
-name = "ryu"
-version = "1.0.12"
+name = "rustix"
+version = "0.38.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
+checksum = "fbc6396159432b5c8490d4e301d8c705f61860b8b6c863bf79942ce5401968f3"
+dependencies = [
+ "bitflags 2.3.3",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.4.3",
+ "windows-sys 0.48.0",
+]
[[package]]
-name = "scopeguard"
-version = "1.1.0"
+name = "rustls"
+version = "0.21.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+checksum = "79ea77c539259495ce8ca47f53e66ae0330a8819f67e23ac96ca02f50e7b7d36"
+dependencies = [
+ "log",
+ "ring",
+ "rustls-webpki",
+ "sct",
+]
[[package]]
-name = "scratch"
+name = "rustls-pemfile"
version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2"
-
-[[package]]
-name = "seahash"
-version = "4.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
+checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
+dependencies = [
+ "base64",
+]
[[package]]
-name = "semver"
-version = "0.9.0"
+name = "rustls-webpki"
+version = "0.101.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
+checksum = "513722fd73ad80a71f72b61009ea1b584bcfa1483ca93949c8f290298837fa59"
dependencies = [
- "semver-parser",
+ "ring",
+ "untrusted",
]
[[package]]
-name = "semver"
-version = "1.0.13"
+name = "rustversion"
+version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93f6841e709003d68bb2deee8c343572bf446003ec20a583e76f7b15cebf3711"
+checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
[[package]]
-name = "semver-parser"
-version = "0.7.0"
+name = "ryu"
+version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
[[package]]
-name = "serde"
-version = "1.0.152"
+name = "safe-path"
+version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
+checksum = "980abdd3220aa19b67ca3ea07b173ca36383f18ae48cde696d90c8af39447ffb"
dependencies = [
- "serde_derive",
+ "libc",
]
[[package]]
-name = "serde_bytes"
-version = "0.11.8"
+name = "same-file"
+version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "718dc5fff5b36f99093fc49b280cfc96ce6fc824317783bff5a1fed0c7a64819"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
dependencies = [
- "serde",
+ "winapi-util",
]
[[package]]
-name = "serde_derive"
-version = "1.0.152"
+name = "schannel"
+version = "0.1.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
+checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "windows-sys 0.48.0",
]
[[package]]
-name = "serde_json"
-version = "1.0.91"
+name = "scoped-tls"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
[[package]]
-name = "serde_repr"
-version = "0.1.10"
+name = "scopeguard"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a5ec9fa74a20ebbe5d9ac23dac1fc96ba0ecfe9f50f2843b52e537b10fbcb4e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]]
-name = "serial_test"
-version = "1.0.0"
+name = "sct"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "538c30747ae860d6fb88330addbbd3e0ddbe46d662d032855596d8a8ca260611"
+checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
dependencies = [
- "dashmap",
- "futures",
- "lazy_static",
- "log",
- "parking_lot",
- "serial_test_derive",
+ "ring",
+ "untrusted",
+]
+
+[[package]]
+name = "seahash"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
+
+[[package]]
+name = "security-framework"
+version = "2.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "semver"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
+dependencies = [
+ "semver-parser",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "semver-parser"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
+
+[[package]]
+name = "serde"
+version = "1.0.177"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63ba2516aa6bf82e0b19ca8b50019d52df58455d3cf9bdaf6315225fdd0c560a"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde-wasm-bindgen"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3b4c031cd0d9014307d82b8abf653c0290fbdaeb4c02d00c63cf52f728628bf"
+dependencies = [
+ "js-sys",
+ "serde",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "serde_cbor"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"
+dependencies = [
+ "half",
+ "serde",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.177"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "401797fe7833d72109fedec6bfcbe67c0eed9b99772f26eb8afd261f0abc6fd3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.26",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde_urlencoded"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
+dependencies = [
+ "form_urlencoded",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_yaml"
+version = "0.8.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b"
+dependencies = [
+ "indexmap 1.9.3",
+ "ryu",
+ "serde",
+ "yaml-rust",
+]
+
+[[package]]
+name = "serde_yaml"
+version = "0.9.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574"
+dependencies = [
+ "indexmap 2.0.0",
+ "itoa",
+ "ryu",
+ "serde",
+ "unsafe-libyaml",
+]
+
+[[package]]
+name = "serial_test"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e56dd856803e253c8f298af3f4d7eb0ae5e23a737252cd90bb4f3b435033b2d"
+dependencies = [
+ "dashmap",
+ "futures",
+ "lazy_static",
+ "log",
+ "parking_lot",
+ "serial_test_derive",
]
[[package]]
name = "serial_test_derive"
-version = "1.0.0"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "079a83df15f85d89a68d64ae1238f142f172b1fa915d0d76b26a7cba1b659a69"
+checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.26",
]
[[package]]
@@ -2763,15 +3475,34 @@ checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
[[package]]
name = "sha2"
-version = "0.10.6"
+version = "0.10.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
+checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8"
dependencies = [
"cfg-if 1.0.0",
"cpufeatures",
"digest",
]
+[[package]]
+name = "sharded-slab"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "shared-buffer"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2cf61602ee61e2f83dd016b3e6387245291cf728ea071c378b35088125b4d995"
+dependencies = [
+ "bytes",
+ "memmap2 0.6.2",
+]
+
[[package]]
name = "shellexpand"
version = "2.1.2"
@@ -2787,26 +3518,72 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "simdutf8"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a"
+
[[package]]
name = "slab"
-version = "0.4.7"
+version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
+checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
dependencies = [
"autocfg",
]
[[package]]
name = "slice-group-by"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec"
+checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7"
[[package]]
name = "smallvec"
-version = "1.10.0"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
+
+[[package]]
+name = "socket2"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "spin"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+dependencies = [
+ "lock_api",
+]
+
+[[package]]
+name = "sptr"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a"
[[package]]
name = "stable_deref_trait"
@@ -2823,6 +3600,12 @@ dependencies = [
"version_check",
]
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
[[package]]
name = "stdweb"
version = "0.4.20"
@@ -2847,7 +3630,7 @@ dependencies = [
"quote",
"serde",
"serde_derive",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -2863,7 +3646,7 @@ dependencies = [
"serde_derive",
"serde_json",
"sha1",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -2880,9 +3663,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]]
name = "syn"
-version = "1.0.107"
+version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
dependencies = [
"proc-macro2",
"quote",
@@ -2890,44 +3673,30 @@ dependencies = [
]
[[package]]
-name = "syscalls"
-version = "0.6.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "535e4a480d47370482f8251117cba053e32067862c439dcd4c9ea4026d08f88e"
-dependencies = [
- "cc",
- "serde",
- "serde_repr",
-]
-
-[[package]]
-name = "sysinfo"
-version = "0.27.7"
+name = "syn"
+version = "2.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "975fe381e0ecba475d4acff52466906d95b153a40324956552e027b2a9eaa89e"
+checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970"
dependencies = [
- "cfg-if 1.0.0",
- "core-foundation-sys",
- "libc",
- "ntapi",
- "once_cell",
- "winapi",
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
]
[[package]]
name = "system-interface"
-version = "0.25.3"
+version = "0.25.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6afe2d3c354cfbfdc14611db99b272f59f80289a2abe30c8b4355ee619bc22ef"
+checksum = "10081a99cbecbc363d381b9503563785f0b02735fccbb0d4c1a2cb3d39f7e7fe"
dependencies = [
- "bitflags",
+ "bitflags 2.3.3",
"cap-fs-ext",
"cap-std",
"fd-lock",
- "io-lifetimes",
- "rustix",
- "windows-sys 0.42.0",
- "winx",
+ "io-lifetimes 2.0.1",
+ "rustix 0.38.1",
+ "windows-sys 0.48.0",
+ "winx 0.36.1",
]
[[package]]
@@ -2939,11 +3708,17 @@ dependencies = [
"unicode-width",
]
+[[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
[[package]]
name = "tar"
-version = "0.4.38"
+version = "0.4.39"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6"
+checksum = "ec96d2ffad078296368d46ff1cb309be1c23c513b4ab0e22a45de0185275ac96"
dependencies = [
"filetime",
"libc",
@@ -2952,21 +3727,30 @@ dependencies = [
[[package]]
name = "target-lexicon"
-version = "0.12.5"
+version = "0.12.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9410d0f6853b1d94f0e519fb95df60f29d2c1eff2d921ffdf01a4c8a3b54f12d"
+checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e"
[[package]]
name = "tempfile"
-version = "3.3.0"
+version = "3.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
+checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998"
dependencies = [
"cfg-if 1.0.0",
"fastrand",
+ "redox_syscall 0.3.5",
+ "rustix 0.38.1",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "term_size"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9"
+dependencies = [
"libc",
- "redox_syscall",
- "remove_dir_all",
"winapi",
]
@@ -2979,11 +3763,20 @@ dependencies = [
"winapi-util",
]
+[[package]]
+name = "termios"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b"
+dependencies = [
+ "libc",
+]
+
[[package]]
name = "termtree"
-version = "0.4.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8"
+checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
[[package]]
name = "test_framework"
@@ -2995,33 +3788,32 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.38"
+version = "1.0.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
+checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.38"
+version = "1.0.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
+checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.26",
]
[[package]]
-name = "time"
-version = "0.1.45"
+name = "thread_local"
+version = "1.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
+checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
dependencies = [
- "libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
- "winapi",
+ "cfg-if 1.0.0",
+ "once_cell",
]
[[package]]
@@ -3034,22 +3826,31 @@ dependencies = [
"libc",
"standback",
"stdweb",
- "time-macros",
+ "time-macros 0.1.1",
"version_check",
"winapi",
]
[[package]]
name = "time"
-version = "0.3.14"
+version = "0.3.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c3f9a28b618c3a6b9251b6908e9c99e04b9e5c02e6581ccbb67d59c34ef7f9b"
+checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd"
dependencies = [
"itoa",
"libc",
"num_threads",
+ "serde",
+ "time-core",
+ "time-macros 0.2.9",
]
+[[package]]
+name = "time-core"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
+
[[package]]
name = "time-macros"
version = "0.1.1"
@@ -3060,6 +3861,15 @@ dependencies = [
"time-macros-impl",
]
+[[package]]
+name = "time-macros"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b"
+dependencies = [
+ "time-core",
+]
+
[[package]]
name = "time-macros-impl"
version = "0.1.2"
@@ -3070,7 +3880,7 @@ dependencies = [
"proc-macro2",
"quote",
"standback",
- "syn",
+ "syn 1.0.109",
]
[[package]]
@@ -3084,69 +3894,268 @@ dependencies = [
[[package]]
name = "tinyvec_macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
-
-[[package]]
-name = "toml"
-version = "0.5.11"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
-dependencies = [
- "serde",
-]
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
-name = "tracing"
-version = "0.1.37"
+name = "tokio"
+version = "1.29.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da"
dependencies = [
- "cfg-if 1.0.0",
- "log",
+ "autocfg",
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "num_cpus",
"pin-project-lite",
- "tracing-attributes",
- "tracing-core",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "windows-sys 0.48.0",
]
[[package]]
-name = "tracing-attributes"
-version = "0.1.23"
+name = "tokio-macros"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
+checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.26",
]
[[package]]
-name = "tracing-core"
-version = "0.1.30"
+name = "tokio-native-tls"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+dependencies = [
+ "native-tls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
+dependencies = [
+ "rustls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "toml"
+version = "0.5.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.19.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a"
+dependencies = [
+ "indexmap 2.0.0",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "tower-service"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+
+[[package]]
+name = "tracing"
+version = "0.1.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+dependencies = [
+ "cfg-if 1.0.0",
+ "log",
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.26",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-journald"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba316a74e8fc3c3896a850dba2375928a9fa171b085ecddfc7c054d39970f3fd"
+dependencies = [
+ "libc",
+ "tracing-core",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
+dependencies = [
+ "lazy_static",
+ "log",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-serde"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1"
+dependencies = [
+ "serde",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
+dependencies = [
+ "matchers",
+ "nu-ansi-term",
"once_cell",
+ "regex",
+ "serde",
+ "serde_json",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
+ "tracing-serde",
]
+[[package]]
+name = "try-lock"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
+
[[package]]
name = "typenum"
version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
+[[package]]
+name = "uapi"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "019450240401d342e2a5bc47f7fbaeb002a38fe18197b83788750d7ffb143274"
+dependencies = [
+ "cc",
+ "cfg-if 0.1.10",
+ "libc",
+ "uapi-proc",
+]
+
+[[package]]
+name = "uapi-proc"
+version = "0.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54de46f980cea7b2ae8d8f7f9f1c35cf7062c68343e99345ef73758f8e60975a"
+dependencies = [
+ "lazy_static",
+ "libc",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "unicase"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
+dependencies = [
+ "version_check",
+]
+
[[package]]
name = "unicode-bidi"
-version = "0.3.10"
+version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58"
+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
[[package]]
name = "unicode-ident"
-version = "1.0.6"
+version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
+checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
[[package]]
name = "unicode-normalization"
@@ -3157,28 +4166,71 @@ dependencies = [
"tinyvec",
]
+[[package]]
+name = "unicode-segmentation"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+
[[package]]
name = "unicode-width"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+[[package]]
+name = "unicode-xid"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
+
+[[package]]
+name = "unsafe-libyaml"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa"
+
+[[package]]
+name = "untrusted"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+
[[package]]
name = "url"
-version = "2.3.1"
+version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
+checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
dependencies = [
"form_urlencoded",
"idna",
"percent-encoding",
+ "serde",
]
+[[package]]
+name = "urlencoding"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+
[[package]]
name = "uuid"
-version = "1.3.0"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
+
+[[package]]
+name = "valuable"
+version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
[[package]]
name = "vcpkg"
@@ -3188,20 +4240,13 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
[[package]]
name = "vergen"
-version = "7.5.0"
+version = "8.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "571b69f690c855821462709b6f41d42ceccc316fbd17b60bd06d06928cfe6a99"
+checksum = "bbc5ad0d9d26b2c49a5ab7da76c3e79d3ee37e7821799f8223fcb8f2f391a2e7"
dependencies = [
"anyhow",
- "cfg-if 1.0.0",
- "enum-iterator 1.2.0",
- "getset",
- "git2",
- "rustc_version 0.4.0",
"rustversion",
- "sysinfo",
- "thiserror",
- "time 0.3.14",
+ "time 0.3.22",
]
[[package]]
@@ -3211,10 +4256,173 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]]
-name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
+name = "virtual-fs"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcd74701f37aea30b90a83c90b92bc3850dedb9448836dbcc0960f993bda423b"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "bytes",
+ "derivative",
+ "filetime",
+ "fs_extra",
+ "futures",
+ "getrandom",
+ "indexmap 1.9.3",
+ "lazy_static",
+ "libc",
+ "pin-project-lite",
+ "replace_with",
+ "slab",
+ "thiserror",
+ "tokio",
+ "tracing",
+ "webc",
+]
+
+[[package]]
+name = "virtual-net"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfac1d64ecfe2d8b295530da2a14af9eb9acccd91d76f3347dee96d745c83661"
+dependencies = [
+ "async-trait",
+ "bytes",
+ "libc",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "wai-bindgen-gen-core"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1aa3dc41b510811122b3088197234c27e08fcad63ef936306dd8e11e2803876c"
+dependencies = [
+ "anyhow",
+ "wai-parser",
+]
+
+[[package]]
+name = "wai-bindgen-gen-rust"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19bc05e8380515c4337c40ef03b2ff233e391315b178a320de8640703d522efe"
+dependencies = [
+ "heck 0.3.3",
+ "wai-bindgen-gen-core",
+]
+
+[[package]]
+name = "wai-bindgen-gen-rust-wasm"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6f35ce5e74086fac87f3a7bd50f643f00fe3559adb75c88521ecaa01c8a6199"
+dependencies = [
+ "heck 0.3.3",
+ "wai-bindgen-gen-core",
+ "wai-bindgen-gen-rust",
+]
+
+[[package]]
+name = "wai-bindgen-gen-wasmer"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f61484185d8c520a86d5a7f7f8265f446617c2f9774b2e20a52de19b6e53432"
+dependencies = [
+ "heck 0.3.3",
+ "wai-bindgen-gen-core",
+ "wai-bindgen-gen-rust",
+]
+
+[[package]]
+name = "wai-bindgen-rust"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e5601c6f448c063e83a5e931b8fefcdf7e01ada424ad42372c948d2e3d67741"
+dependencies = [
+ "bitflags 1.3.2",
+ "wai-bindgen-rust-impl",
+]
+
+[[package]]
+name = "wai-bindgen-rust-impl"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bdeeb5c1170246de8425a3e123e7ef260dc05ba2b522a1d369fe2315376efea4"
+dependencies = [
+ "proc-macro2",
+ "syn 1.0.109",
+ "wai-bindgen-gen-core",
+ "wai-bindgen-gen-rust-wasm",
+]
+
+[[package]]
+name = "wai-bindgen-wasmer"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ffd9a8124a3e4e664cb79864fd1eaf24521e15bf8d67509af1bc45e8b510475"
+dependencies = [
+ "anyhow",
+ "bitflags 1.3.2",
+ "once_cell",
+ "thiserror",
+ "tracing",
+ "wai-bindgen-wasmer-impl",
+ "wasmer",
+]
+
+[[package]]
+name = "wai-bindgen-wasmer-impl"
+version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
+checksum = "4b3488ed88d4dd0e3bf85bad4e27dac6cb31aae5d122a5dda2424803c8dc863a"
+dependencies = [
+ "proc-macro2",
+ "syn 1.0.109",
+ "wai-bindgen-gen-core",
+ "wai-bindgen-gen-wasmer",
+]
+
+[[package]]
+name = "wai-parser"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9bd0acb6d70885ea0c343749019ba74f015f64a9d30542e66db69b49b7e28186"
+dependencies = [
+ "anyhow",
+ "id-arena",
+ "pulldown-cmark",
+ "unicode-normalization",
+ "unicode-xid",
+]
+
+[[package]]
+name = "waker-fn"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
+
+[[package]]
+name = "walkdir"
+version = "2.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "want"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
+dependencies = [
+ "try-lock",
+]
[[package]]
name = "wasi"
@@ -3224,9 +4432,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasi-cap-std-sync"
-version = "4.0.0"
+version = "10.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79eba5cf83a4adb2ccba4c029858229a4992dd88cc35dbfa5a555ec7fc2a8416"
+checksum = "291862f1014dd7e674f93b263d57399de4dd1907ea37e74cf7d36454536ba2f0"
dependencies = [
"anyhow",
"async-trait",
@@ -3236,33 +4444,34 @@ dependencies = [
"cap-time-ext",
"fs-set-times",
"io-extras",
- "io-lifetimes",
+ "io-lifetimes 1.0.11",
"is-terminal",
"once_cell",
- "rustix",
+ "rustix 0.37.19",
"system-interface",
"tracing",
"wasi-common",
- "windows-sys 0.42.0",
+ "windows-sys 0.48.0",
]
[[package]]
name = "wasi-common"
-version = "4.0.0"
+version = "10.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "678ff55fb89ae721dae166003b843f53ee3e7bdb96aa96715fec8d44d012b105"
+checksum = "3b422ae2403cae9ca603864272a402cf5001dd6fef8632e090e00c4fb475741b"
dependencies = [
"anyhow",
- "bitflags",
+ "bitflags 1.3.2",
"cap-rand",
"cap-std",
"io-extras",
- "rustix",
+ "log",
+ "rustix 0.37.19",
"thiserror",
"tracing",
"wasmtime",
"wiggle",
- "windows-sys 0.42.0",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -3286,10 +4495,45 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
"wasm-bindgen-shared",
]
+[[package]]
+name = "wasm-bindgen-downcast"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dac026d43bcca6e7ce1c0956ba68f59edf6403e8e930a5d891be72c31a44340"
+dependencies = [
+ "js-sys",
+ "once_cell",
+ "wasm-bindgen",
+ "wasm-bindgen-downcast-macros",
+]
+
+[[package]]
+name = "wasm-bindgen-downcast-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5020cfa87c7cecefef118055d44e3c1fc122c7ec25701d528ee458a0b45f38f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454"
+dependencies = [
+ "cfg-if 1.0.0",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
+]
+
[[package]]
name = "wasm-bindgen-macro"
version = "0.2.84"
@@ -3308,7 +4552,7 @@ checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -3321,9 +4565,18 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
[[package]]
name = "wasm-encoder"
-version = "0.22.0"
+version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef126be0e14bdf355ac1a8b41afc89195289e5c7179f80118e3abddb472f0810"
+checksum = "18c41dbd92eaebf3612a39be316540b8377c871cb9bde6b064af962984912881"
+dependencies = [
+ "leb128",
+]
+
+[[package]]
+name = "wasm-encoder"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41763f20eafed1399fff1afb466496d3a959f58241436cfdc17e3f5ca954de16"
dependencies = [
"leb128",
]
@@ -3334,20 +4587,20 @@ version = "0.1.0"
[[package]]
name = "wasmedge-macro"
-version = "0.3.0"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f159a9a7d3d2301de2fc9cb88ad3459af9e95cbd5a0f57437efccc2b572a027"
+checksum = "372985c17ffd2705e0cc14aa85e96c546d04823aec07ec1e0da0a2983c9eb655"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.26",
]
[[package]]
name = "wasmedge-sdk"
-version = "0.7.1"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6b7678a024c25fbe7168dedbca6958b6baf5412a998c697bf40dbf359efc54e"
+checksum = "e30b3d1a423ee62c0016bbfd07bdca4669a30cd167d7ff528caff559b467c17b"
dependencies = [
"anyhow",
"num-derive",
@@ -3361,17 +4614,15 @@ dependencies = [
[[package]]
name = "wasmedge-sys"
-version = "0.12.2"
+version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00ab1f78c1d3de17fd0deff054de96e337cf8cf02d13651748bdfa1f1b219369"
+checksum = "3db99e2ef8cf618f832f1ecf32c3b86e8ce0fb2f31013426040ae514a981312c"
dependencies = [
"bindgen",
"cmake",
- "lazy_static",
"libc",
- "parking_lot",
"paste",
- "rand",
+ "scoped-tls",
"thiserror",
"wasmedge-macro",
"wasmedge-types",
@@ -3380,9 +4631,9 @@ dependencies = [
[[package]]
name = "wasmedge-types"
-version = "0.3.1"
+version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3323fe75a4e65476b33a041092aac22a1065a7ba0bfecbedc8135e8efb6c522d"
+checksum = "3b447f1a187fc86d866f388d7f29382b61896ee33627b727d678a994a0cbbd9e"
dependencies = [
"thiserror",
"wat",
@@ -3390,73 +4641,65 @@ dependencies = [
[[package]]
name = "wasmer"
-version = "2.3.0"
+version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea8d8361c9d006ea3d7797de7bd6b1492ffd0f91a22430cfda6c1658ad57bedf"
+checksum = "ea790bcdfb4e6e9d1e5ddf75b4699aac62b078fcc9f27f44e1748165ceea67bf"
dependencies = [
+ "bytes",
"cfg-if 1.0.0",
- "indexmap",
+ "derivative",
+ "indexmap 1.9.3",
"js-sys",
- "loupe",
"more-asserts",
+ "rustc-demangle",
+ "serde",
+ "serde-wasm-bindgen",
"target-lexicon",
"thiserror",
"wasm-bindgen",
- "wasmer-artifact",
+ "wasm-bindgen-downcast",
"wasmer-compiler",
"wasmer-compiler-cranelift",
"wasmer-derive",
- "wasmer-engine",
- "wasmer-engine-dylib",
- "wasmer-engine-universal",
"wasmer-types",
"wasmer-vm",
"wat",
"winapi",
]
-[[package]]
-name = "wasmer-artifact"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7aaf9428c29c1d8ad2ac0e45889ba8a568a835e33fd058964e5e500f2f7ce325"
-dependencies = [
- "enumset",
- "loupe",
- "thiserror",
- "wasmer-compiler",
- "wasmer-types",
-]
-
[[package]]
name = "wasmer-compiler"
-version = "2.3.0"
+version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e67a6cd866aed456656db2cfea96c18baabbd33f676578482b85c51e1ee19d2c"
+checksum = "f093937725e242e5529fed27e08ff836c011a9ecc22e6819fb818c2ac6ff5f88"
dependencies = [
+ "backtrace",
+ "cfg-if 1.0.0",
+ "enum-iterator",
"enumset",
- "loupe",
- "rkyv",
- "serde",
- "serde_bytes",
+ "lazy_static",
+ "leb128",
+ "memmap2 0.5.10",
+ "more-asserts",
+ "region",
"smallvec",
- "target-lexicon",
"thiserror",
"wasmer-types",
- "wasmparser 0.83.0",
+ "wasmer-vm",
+ "wasmparser 0.95.0",
+ "winapi",
]
[[package]]
name = "wasmer-compiler-cranelift"
-version = "2.3.0"
+version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48be2f9f6495f08649e4f8b946a2cbbe119faf5a654aa1457f9504a99d23dae0"
+checksum = "3b27b1670d27158789ebe14e4da3902c72132174884a1c6a3533ce4fd9dd83db"
dependencies = [
- "cranelift-codegen 0.82.3",
- "cranelift-entity 0.82.3",
- "cranelift-frontend 0.82.3",
+ "cranelift-codegen 0.91.1",
+ "cranelift-entity 0.91.1",
+ "cranelift-frontend 0.91.1",
"gimli 0.26.2",
- "loupe",
"more-asserts",
"rayon",
"smallvec",
@@ -3468,259 +4711,248 @@ dependencies = [
[[package]]
name = "wasmer-derive"
-version = "2.3.0"
+version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00e50405cc2a2f74ff574584710a5f2c1d5c93744acce2ca0866084739284b51"
+checksum = "13ae8286cba2acb10065a4dac129c7c7f7bcd24acd6538555d96616eea16bc27"
dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
]
[[package]]
-name = "wasmer-engine"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f98f010978c244db431b392aeab0661df7ea0822343334f8f2a920763548e45"
-dependencies = [
- "backtrace",
- "enumset",
- "lazy_static",
- "loupe",
- "memmap2",
- "more-asserts",
- "rustc-demangle",
- "serde",
- "serde_bytes",
- "target-lexicon",
- "thiserror",
- "wasmer-artifact",
- "wasmer-compiler",
- "wasmer-types",
- "wasmer-vm",
-]
-
-[[package]]
-name = "wasmer-engine-dylib"
-version = "2.3.0"
+name = "wasmer-toml"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0358af9c154724587731175553805648d9acb8f6657880d165e378672b7e53"
+checksum = "4232db0aff83ed6208d541ddcf1bf72730673528be8c4fe13c6369060f6e05a7"
dependencies = [
- "cfg-if 1.0.0",
- "enum-iterator 0.7.0",
- "enumset",
- "leb128",
- "libloading",
- "loupe",
- "object 0.28.4",
- "rkyv",
+ "anyhow",
+ "indexmap 1.9.3",
+ "semver 1.0.17",
"serde",
- "tempfile",
- "tracing",
- "wasmer-artifact",
- "wasmer-compiler",
- "wasmer-engine",
- "wasmer-object",
- "wasmer-types",
- "wasmer-vm",
- "which",
-]
-
-[[package]]
-name = "wasmer-engine-universal"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "440dc3d93c9ca47865a4f4edd037ea81bf983b5796b59b3d712d844b32dbef15"
-dependencies = [
- "cfg-if 1.0.0",
- "enumset",
- "leb128",
- "loupe",
- "region",
- "rkyv",
- "wasmer-compiler",
- "wasmer-engine",
- "wasmer-engine-universal-artifact",
- "wasmer-types",
- "wasmer-vm",
- "winapi",
-]
-
-[[package]]
-name = "wasmer-engine-universal-artifact"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68f1db3f54152657eb6e86c44b66525ff7801dad8328fe677da48dd06af9ad41"
-dependencies = [
- "enum-iterator 0.7.0",
- "enumset",
- "loupe",
- "rkyv",
- "thiserror",
- "wasmer-artifact",
- "wasmer-compiler",
- "wasmer-types",
-]
-
-[[package]]
-name = "wasmer-object"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d831335ff3a44ecf451303f6f891175c642488036b92ceceb24ac8623a8fa8b"
-dependencies = [
- "object 0.28.4",
+ "serde_cbor",
+ "serde_json",
+ "serde_yaml 0.9.25",
"thiserror",
- "wasmer-compiler",
- "wasmer-types",
+ "toml 0.5.11",
]
[[package]]
name = "wasmer-types"
-version = "2.3.0"
+version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39df01ea05dc0a9bab67e054c7cb01521e53b35a7bb90bd02eca564ed0b2667f"
+checksum = "918d2f0bb5eaa95a80c06be33f21dee92f40f12cd0982da34490d121a99d244b"
dependencies = [
- "backtrace",
- "enum-iterator 0.7.0",
- "indexmap",
- "loupe",
+ "bytecheck",
+ "enum-iterator",
+ "enumset",
+ "indexmap 1.9.3",
"more-asserts",
"rkyv",
"serde",
+ "target-lexicon",
"thiserror",
]
-[[package]]
-name = "wasmer-vfs"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9302eae3edc53cb540c2d681e7f16d8274918c1ce207591f04fed351649e97c0"
-dependencies = [
- "libc",
- "thiserror",
- "tracing",
-]
-
[[package]]
name = "wasmer-vm"
-version = "2.3.0"
+version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30d965fa61f4dc4cdb35a54daaf7ecec3563fbb94154a6c35433f879466247dd"
+checksum = "a1e000c2cbd4f9805427af5f3b3446574caf89ab3a1e66c2f3579fbde22b072b"
dependencies = [
"backtrace",
"cc",
"cfg-if 1.0.0",
"corosensei",
- "enum-iterator 0.7.0",
- "indexmap",
+ "dashmap",
+ "derivative",
+ "enum-iterator",
+ "fnv",
+ "indexmap 1.9.3",
"lazy_static",
"libc",
- "loupe",
"mach",
- "memoffset 0.6.5",
+ "memoffset 0.8.0",
"more-asserts",
"region",
- "rkyv",
"scopeguard",
+ "thiserror",
+ "wasmer-types",
+ "winapi",
+]
+
+[[package]]
+name = "wasmer-wasix"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dcd089dcd440141b2edf300ddd61c2d67d052baac8d29256c901f607d44d459"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "bincode",
+ "bytes",
+ "cfg-if 1.0.0",
+ "cooked-waker",
+ "dashmap",
+ "derivative",
+ "futures",
+ "getrandom",
+ "heapless",
+ "hex",
+ "http",
+ "lazy_static",
+ "libc",
+ "linked_hash_set",
+ "once_cell",
+ "petgraph",
+ "pin-project",
+ "rand",
+ "reqwest",
+ "semver 1.0.17",
"serde",
+ "serde_cbor",
+ "serde_derive",
+ "serde_json",
+ "serde_yaml 0.8.26",
+ "sha2",
+ "shellexpand",
+ "tempfile",
+ "term_size",
+ "termios",
"thiserror",
- "wasmer-artifact",
+ "tokio",
+ "tracing",
+ "url",
+ "urlencoding",
+ "virtual-fs",
+ "virtual-net",
+ "wai-bindgen-wasmer",
+ "waker-fn",
+ "wasm-bindgen",
+ "wasmer",
"wasmer-types",
+ "wasmer-wasix-types",
+ "webc",
+ "weezl",
"winapi",
]
[[package]]
-name = "wasmer-wasi"
-version = "2.3.0"
+name = "wasmer-wasix-types"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fadbe31e3c1b6f3e398ad172b169152ae1a743ae6efd5f9ffb34019983319d99"
+checksum = "7a4a519e8f0b878bb4cd2b1bc733235aa6c331b7b4857dd6e0ac3c9a36d942ae"
dependencies = [
+ "anyhow",
+ "bitflags 1.3.2",
+ "byteorder",
"cfg-if 1.0.0",
- "generational-arena",
- "getrandom",
- "libc",
- "thiserror",
- "tracing",
- "wasm-bindgen",
+ "num_enum",
+ "serde",
+ "time 0.2.27",
+ "wai-bindgen-gen-core",
+ "wai-bindgen-gen-rust",
+ "wai-bindgen-gen-rust-wasm",
+ "wai-bindgen-rust",
+ "wai-parser",
"wasmer",
- "wasmer-vfs",
- "wasmer-wasi-types",
- "winapi",
+ "wasmer-derive",
+ "wasmer-types",
]
[[package]]
-name = "wasmer-wasi-types"
-version = "2.3.0"
+name = "wasmparser"
+version = "0.95.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22dc83aadbdf97388de3211cb6f105374f245a3cf2a5c65a16776e7a087a8468"
+checksum = "f2ea896273ea99b15132414be1da01ab0d8836415083298ecaffbe308eaac87a"
dependencies = [
- "byteorder",
- "time 0.2.27",
- "wasmer-types",
+ "indexmap 1.9.3",
+ "url",
]
[[package]]
name = "wasmparser"
-version = "0.83.0"
+version = "0.107.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a"
+checksum = "29e3ac9b780c7dda0cac7a52a5d6d2d6707cc6e3451c9db209b6c758f40d7acb"
+dependencies = [
+ "indexmap 1.9.3",
+ "semver 1.0.17",
+]
[[package]]
name = "wasmparser"
-version = "0.95.0"
+version = "0.110.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2ea896273ea99b15132414be1da01ab0d8836415083298ecaffbe308eaac87a"
+checksum = "1dfcdb72d96f01e6c85b6bf20102e7423bdbaad5c337301bab2bbf253d26413c"
dependencies = [
- "indexmap",
- "url",
+ "indexmap 2.0.0",
+ "semver 1.0.17",
+]
+
+[[package]]
+name = "wasmprinter"
+version = "0.2.62"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42cd12ed4d96a984e4b598a17457f1126d01640cc7461afbb319642111ff9e7f"
+dependencies = [
+ "anyhow",
+ "wasmparser 0.110.0",
]
[[package]]
name = "wasmtime"
-version = "4.0.0"
+version = "10.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4abddf11816dd8f5e7310f6ebe5a2503b43f20ab2bf050b7d63f5b1bb96a81d9"
+checksum = "cd02b992d828b91efaf2a7499b21205fe4ab3002e401e3fe0f227aaeb4001d93"
dependencies = [
"anyhow",
"async-trait",
"bincode",
+ "bumpalo",
"cfg-if 1.0.0",
- "indexmap",
+ "encoding_rs",
+ "fxprof-processed-profile",
+ "indexmap 1.9.3",
"libc",
"log",
- "object 0.29.0",
+ "object 0.30.4",
"once_cell",
"paste",
"psm",
"rayon",
"serde",
+ "serde_json",
"target-lexicon",
- "wasmparser 0.95.0",
+ "wasmparser 0.107.0",
"wasmtime-cache",
+ "wasmtime-component-macro",
+ "wasmtime-component-util",
"wasmtime-cranelift",
"wasmtime-environ",
"wasmtime-fiber",
"wasmtime-jit",
"wasmtime-runtime",
+ "wasmtime-winch",
"wat",
- "windows-sys 0.42.0",
+ "windows-sys 0.48.0",
]
[[package]]
name = "wasmtime-asm-macros"
-version = "4.0.0"
+version = "10.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1f5206486f0467ba86e84d35996c4048b077cec2c9e5b322e7b853bdbe79334"
+checksum = "284466ef356ce2d909bc0ad470b60c4d0df5df2de9084457e118131b3c779b92"
dependencies = [
"cfg-if 1.0.0",
]
[[package]]
name = "wasmtime-cache"
-version = "4.0.0"
+version = "10.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1e77abcf538af42517e188c109e4b50ecf6c0ee4d77ede76a438e0306b934dc"
+checksum = "efc78cfe1a758d1336f447a47af6ec05e0df2c03c93440d70faf80e17fbb001e"
dependencies = [
"anyhow",
"base64",
@@ -3728,162 +4960,249 @@ dependencies = [
"directories-next",
"file-per-thread-logger",
"log",
- "rustix",
+ "rustix 0.37.19",
"serde",
"sha2",
- "toml",
- "windows-sys 0.42.0",
+ "toml 0.5.11",
+ "windows-sys 0.48.0",
"zstd",
]
+[[package]]
+name = "wasmtime-component-macro"
+version = "10.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8e916103436a6d84faa4c2083e2e98612a323c2cc6147ec419124f67c764c9c"
+dependencies = [
+ "anyhow",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "wasmtime-component-util",
+ "wasmtime-wit-bindgen",
+ "wit-parser",
+]
+
+[[package]]
+name = "wasmtime-component-util"
+version = "10.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f20a5135ec5ef01080e674979b02d6fa5eebaa2b0c2d6660513ee9956a1bf624"
+
[[package]]
name = "wasmtime-cranelift"
-version = "4.0.0"
+version = "10.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e5bcb1d5ef211726b11e1286fe96cb40c69044c3632e1d6c67805d88a2e1a34"
+checksum = "8e1aa99cbf3f8edb5ad8408ba380f5ab481528ecd8a5053acf758e006d6727fd"
dependencies = [
"anyhow",
- "cranelift-codegen 0.91.0",
- "cranelift-entity 0.91.0",
- "cranelift-frontend 0.91.0",
+ "cranelift-codegen 0.97.1",
+ "cranelift-control",
+ "cranelift-entity 0.97.1",
+ "cranelift-frontend 0.97.1",
"cranelift-native",
"cranelift-wasm",
- "gimli 0.26.2",
+ "gimli 0.27.2",
"log",
- "object 0.29.0",
+ "object 0.30.4",
"target-lexicon",
"thiserror",
- "wasmparser 0.95.0",
+ "wasmparser 0.107.0",
+ "wasmtime-cranelift-shared",
+ "wasmtime-environ",
+]
+
+[[package]]
+name = "wasmtime-cranelift-shared"
+version = "10.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cce31fd55978601acc103acbb8a26f81c89a6eae12d3a1c59f34151dfa609484"
+dependencies = [
+ "anyhow",
+ "cranelift-codegen 0.97.1",
+ "cranelift-control",
+ "cranelift-native",
+ "gimli 0.27.2",
+ "object 0.30.4",
+ "target-lexicon",
"wasmtime-environ",
]
[[package]]
name = "wasmtime-environ"
-version = "4.0.0"
+version = "10.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcab3fac5a2ff68ce9857166a7d7c0e5251b554839b9dda7ed3b5528e191936e"
+checksum = "41f9e58e0ee7d43ff13e75375c726b16bce022db798d3a099a65eeaa7d7a544b"
dependencies = [
"anyhow",
- "cranelift-entity 0.91.0",
- "gimli 0.26.2",
- "indexmap",
+ "cranelift-entity 0.97.1",
+ "gimli 0.27.2",
+ "indexmap 1.9.3",
"log",
- "object 0.29.0",
+ "object 0.30.4",
"serde",
"target-lexicon",
"thiserror",
- "wasmparser 0.95.0",
+ "wasm-encoder 0.29.0",
+ "wasmparser 0.107.0",
+ "wasmprinter",
+ "wasmtime-component-util",
"wasmtime-types",
]
[[package]]
name = "wasmtime-fiber"
-version = "4.0.0"
+version = "10.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fb38af221b780f2c03764d763fe7f7bc414ea9db744d66dac98f9b694892561"
+checksum = "14309cbdf2c395258b124a24757c727403070c0465a28bcc780c4f82f4bca5ff"
dependencies = [
"cc",
"cfg-if 1.0.0",
- "rustix",
+ "rustix 0.37.19",
"wasmtime-asm-macros",
- "windows-sys 0.42.0",
+ "windows-sys 0.48.0",
]
[[package]]
name = "wasmtime-jit"
-version = "4.0.0"
+version = "10.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7d866e2a84ee164739b7ed7bd7cc9e1f918639d2ec5e2817a31e24c148cab20"
+checksum = "5f0f2eaeb01bb67266416507829bd8e0bb60278444e4cbd048e280833ebeaa02"
dependencies = [
- "addr2line 0.17.0",
+ "addr2line 0.19.0",
"anyhow",
"bincode",
"cfg-if 1.0.0",
"cpp_demangle",
- "gimli 0.26.2",
+ "gimli 0.27.2",
"ittapi",
"log",
- "object 0.29.0",
+ "object 0.30.4",
"rustc-demangle",
+ "rustix 0.37.19",
"serde",
"target-lexicon",
"wasmtime-environ",
"wasmtime-jit-debug",
"wasmtime-jit-icache-coherence",
"wasmtime-runtime",
- "windows-sys 0.42.0",
+ "windows-sys 0.48.0",
]
[[package]]
name = "wasmtime-jit-debug"
-version = "4.0.0"
+version = "10.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0104c2b1ce443f2a2806216fcdf6dce09303203ec5797a698d313063b31e5bc8"
+checksum = "f42e59d62542bfb73ce30672db7eaf4084a60b434b688ac4f05b287d497de082"
dependencies = [
- "object 0.29.0",
+ "object 0.30.4",
"once_cell",
- "rustix",
+ "rustix 0.37.19",
]
[[package]]
name = "wasmtime-jit-icache-coherence"
-version = "3.0.0"
+version = "10.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22d9c2e92b0fc124d2cad6cb497a4c840580a7dd2414a37109e8c7cfe699c0ea"
+checksum = "2b49ceb7e2105a8ebe5614d7bbab6f6ef137a284e371633af60b34925493081f"
dependencies = [
"cfg-if 1.0.0",
"libc",
- "windows-sys 0.42.0",
+ "windows-sys 0.48.0",
]
[[package]]
name = "wasmtime-runtime"
-version = "4.0.0"
+version = "10.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a1f0f99297a94cb20c511d1d4e864d9b54794644016d2530dc797cacfa7224a"
+checksum = "3a5de4762421b0b2b19e02111ca403632852b53e506e03b4b227ffb0fbfa63c2"
dependencies = [
"anyhow",
"cc",
"cfg-if 1.0.0",
- "indexmap",
+ "encoding_rs",
+ "indexmap 1.9.3",
"libc",
"log",
"mach",
"memfd",
- "memoffset 0.6.5",
+ "memoffset 0.8.0",
"paste",
"rand",
- "rustix",
+ "rustix 0.37.19",
+ "sptr",
"wasmtime-asm-macros",
"wasmtime-environ",
"wasmtime-fiber",
"wasmtime-jit-debug",
- "windows-sys 0.42.0",
+ "windows-sys 0.48.0",
]
[[package]]
name = "wasmtime-types"
-version = "4.0.0"
+version = "10.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f3d8ee409447cae51651fd812437a0047ed8d7f44e94171ee05ce7cb955c96"
+checksum = "dcbb7c138f797192f46afdd3ec16f85ef007c3bb45fa8e5174031f17b0be4c4a"
dependencies = [
- "cranelift-entity 0.91.0",
+ "cranelift-entity 0.97.1",
"serde",
"thiserror",
- "wasmparser 0.95.0",
+ "wasmparser 0.107.0",
]
[[package]]
name = "wasmtime-wasi"
-version = "4.0.0"
+version = "10.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f32b06e3282ccbeab6fb96c64fa12a359f1253022dfd5cf99385b2344e70830"
+checksum = "01686e859249d4dffe3d7ce9957ae35bcf4161709dfafd165ee136bd54d179f1"
dependencies = [
"anyhow",
+ "async-trait",
+ "bitflags 1.3.2",
+ "cap-fs-ext",
+ "cap-rand",
+ "cap-std",
+ "cap-time-ext",
+ "fs-set-times",
+ "io-extras",
+ "libc",
+ "rustix 0.37.19",
+ "system-interface",
+ "thiserror",
+ "tracing",
"wasi-cap-std-sync",
"wasi-common",
"wasmtime",
"wiggle",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "wasmtime-winch"
+version = "10.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60160d8f7d2b301790730dac8ff25156c61d4fed79481e7074c21dd1283cfe2f"
+dependencies = [
+ "anyhow",
+ "cranelift-codegen 0.97.1",
+ "gimli 0.27.2",
+ "object 0.30.4",
+ "target-lexicon",
+ "wasmparser 0.107.0",
+ "wasmtime-cranelift-shared",
+ "wasmtime-environ",
+ "winch-codegen",
+]
+
+[[package]]
+name = "wasmtime-wit-bindgen"
+version = "10.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3334b0466a4d340de345cda83474d1d2c429770c3d667877971407672bc618a"
+dependencies = [
+ "anyhow",
+ "heck 0.4.1",
+ "wit-parser",
]
[[package]]
@@ -3897,25 +5216,91 @@ dependencies = [
[[package]]
name = "wast"
-version = "52.0.2"
+version = "62.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707a9fd59b0144c530f0a31f21737036ffea6ece492918cae0843dd09b6f9bc9"
+checksum = "b8ae06f09dbe377b889fbd620ff8fa21e1d49d1d9d364983c0cdbf9870cb9f1f"
dependencies = [
"leb128",
"memchr",
"unicode-width",
- "wasm-encoder",
+ "wasm-encoder 0.31.1",
]
[[package]]
name = "wat"
-version = "1.0.56"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "842e15861d203fb4a96d314b0751cdeaf0f6f8b35e8d81d2953af2af5e44e637"
+dependencies = [
+ "wast 62.0.1",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "webc"
+version = "5.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d8b985cecc5a364f746c7fcd6e5396986360a58550072f2f9147a07532f525c"
+dependencies = [
+ "anyhow",
+ "base64",
+ "byteorder",
+ "bytes",
+ "flate2",
+ "indexmap 1.9.3",
+ "leb128",
+ "lexical-sort",
+ "once_cell",
+ "path-clean",
+ "rand",
+ "serde",
+ "serde_cbor",
+ "serde_json",
+ "sha2",
+ "shared-buffer",
+ "tar",
+ "tempfile",
+ "thiserror",
+ "toml 0.7.6",
+ "url",
+ "walkdir",
+ "wasmer-toml",
+]
+
+[[package]]
+name = "webpki"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "0.22.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91d73cbaa81acc2f8a3303e2289205c971d99c89245c2f56ab8765c4daabc2be"
+checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
dependencies = [
- "wast 52.0.2",
+ "webpki",
]
+[[package]]
+name = "weezl"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
+
[[package]]
name = "which"
version = "4.4.0"
@@ -3929,13 +5314,13 @@ dependencies = [
[[package]]
name = "wiggle"
-version = "4.0.0"
+version = "10.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2433252352677648dc4ac0c99e7e254e1c58be8019cda3323ab3a3ce29da5b"
+checksum = "ea93d31f59f2b2fa4196990b684771500072d385eaac12587c63db2bc185d705"
dependencies = [
"anyhow",
"async-trait",
- "bitflags",
+ "bitflags 1.3.2",
"thiserror",
"tracing",
"wasmtime",
@@ -3944,28 +5329,28 @@ dependencies = [
[[package]]
name = "wiggle-generate"
-version = "4.0.0"
+version = "10.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c15bf89e66bd1a9463ee529d37b999947befafd792f345d4a82e0d2b28c0845f"
+checksum = "7df96ee6bea595fabf0346c08c553f684b08e88fad6fdb125e6efde047024f7b"
dependencies = [
"anyhow",
- "heck",
+ "heck 0.4.1",
"proc-macro2",
"quote",
"shellexpand",
- "syn",
+ "syn 1.0.109",
"witx",
]
[[package]]
name = "wiggle-macro"
-version = "4.0.0"
+version = "10.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "919fb8f106375c7f6daf7b388a1fea3e2092dedb273b17b2d917522917c07a3c"
+checksum = "8649011a011ecca6197c4db6ee630735062ba20595ea56ce58529b3b1c20aa2f"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.109",
"wiggle-generate",
]
@@ -4000,6 +5385,31 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+[[package]]
+name = "winch-codegen"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "525fdd0d4e82d1bd3083bd87e8ca8014abfbdc5bf290d1d5371dac440d351e89"
+dependencies = [
+ "anyhow",
+ "cranelift-codegen 0.97.1",
+ "gimli 0.27.2",
+ "regalloc2 0.9.1",
+ "smallvec",
+ "target-lexicon",
+ "wasmparser 0.107.0",
+ "wasmtime-environ",
+]
+
+[[package]]
+name = "windows"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+dependencies = [
+ "windows-targets 0.48.0",
+]
+
[[package]]
name = "windows-sys"
version = "0.33.0"
@@ -4015,24 +5425,63 @@ dependencies = [
[[package]]
name = "windows-sys"
-version = "0.42.0"
+version = "0.45.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets 0.42.2",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.0",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+dependencies = [
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.42.0",
- "windows_i686_gnu 0.42.0",
- "windows_i686_msvc 0.42.0",
- "windows_x86_64_gnu 0.42.0",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.0",
+ "windows_aarch64_gnullvm 0.48.0",
+ "windows_aarch64_msvc 0.48.0",
+ "windows_i686_gnu 0.48.0",
+ "windows_i686_msvc 0.48.0",
+ "windows_x86_64_gnu 0.48.0",
+ "windows_x86_64_gnullvm 0.48.0",
+ "windows_x86_64_msvc 0.48.0",
]
[[package]]
name = "windows_aarch64_gnullvm"
-version = "0.42.1"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
+checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
[[package]]
name = "windows_aarch64_msvc"
@@ -4042,9 +5491,15 @@ checksum = "cd761fd3eb9ab8cc1ed81e56e567f02dd82c4c837e48ac3b2181b9ffc5060807"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.42.0"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
[[package]]
name = "windows_i686_gnu"
@@ -4054,9 +5509,15 @@ checksum = "cab0cf703a96bab2dc0c02c0fa748491294bf9b7feb27e1f4f96340f208ada0e"
[[package]]
name = "windows_i686_gnu"
-version = "0.42.0"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
+checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
[[package]]
name = "windows_i686_msvc"
@@ -4066,9 +5527,15 @@ checksum = "8cfdbe89cc9ad7ce618ba34abc34bbb6c36d99e96cae2245b7943cd75ee773d0"
[[package]]
name = "windows_i686_msvc"
-version = "0.42.0"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
[[package]]
name = "windows_x86_64_gnu"
@@ -4078,15 +5545,27 @@ checksum = "b4dd9b0c0e9ece7bb22e84d70d01b71c6d6248b81a3c60d11869451b4cb24784"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.42.0"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
+checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
[[package]]
name = "windows_x86_64_gnullvm"
-version = "0.42.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
[[package]]
name = "windows_x86_64_msvc"
@@ -4096,19 +5575,69 @@ checksum = "ff1e4aa646495048ec7f3ffddc411e1d829c026a2ec62b39da15c1055e406eaa"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.42.0"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
+checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+
+[[package]]
+name = "winnow"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25b5872fa2e10bd067ae946f927e726d7d603eaeb6e02fa6a350e0722d2b8c11"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "winreg"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
+dependencies = [
+ "winapi",
+]
[[package]]
name = "winx"
-version = "0.34.0"
+version = "0.35.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c52a121f0fbf9320d5f2a9a5d82f6cb7557eda5e8b47fc3e7f359ec866ae960"
+dependencies = [
+ "bitflags 1.3.2",
+ "io-lifetimes 1.0.11",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "winx"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4857cedf8371f690bb6782a3e2b065c54d1b6661be068aaf3eac8b45e813fdf8"
+dependencies = [
+ "bitflags 2.3.3",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "wit-parser"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9baf690e238840de84bbfad6ad72d6628c41d34c1a5e276dab7fb2c9167ca1ac"
+checksum = "6daec9f093dbaea0e94043eeb92ece327bbbe70c86b1f41aca9bbfefd7f050f0"
dependencies = [
- "bitflags",
- "io-lifetimes",
- "windows-sys 0.42.0",
+ "anyhow",
+ "id-arena",
+ "indexmap 1.9.3",
+ "log",
+ "pulldown-cmark",
+ "semver 1.0.17",
+ "unicode-xid",
+ "url",
]
[[package]]
@@ -4123,6 +5652,15 @@ dependencies = [
"wast 35.0.2",
]
+[[package]]
+name = "wyz"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
+dependencies = [
+ "tap",
+]
+
[[package]]
name = "xattr"
version = "0.2.3"
@@ -4132,9 +5670,18 @@ dependencies = [
"libc",
]
+[[package]]
+name = "yaml-rust"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
+dependencies = [
+ "linked-hash-map",
+]
+
[[package]]
name = "youki"
-version = "0.0.4"
+version = "0.1.0"
dependencies = [
"anyhow",
"caps",
@@ -4144,17 +5691,25 @@ dependencies = [
"libcgroups",
"libcontainer",
"liboci-cli",
- "log",
"nix",
- "oci-spec 0.5.8",
"once_cell",
"pentacle",
"procfs",
+ "scopeguard",
"serde",
"serde_json",
"serial_test",
"tabwriter",
+ "tempfile",
+ "tracing",
+ "tracing-journald",
+ "tracing-subscriber",
"vergen",
+ "wasmedge-sdk",
+ "wasmer",
+ "wasmer-wasix",
+ "wasmtime",
+ "wasmtime-wasi",
]
[[package]]
@@ -4178,9 +5733,9 @@ dependencies = [
[[package]]
name = "zstd-sys"
-version = "2.0.6+zstd.1.5.2"
+version = "2.0.8+zstd.1.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a3f9792c0c3dc6c165840a75f47ae1f4da402c2d006881129579f6597e801b"
+checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c"
dependencies = [
"cc",
"libc",
diff --git a/Cargo.toml b/Cargo.toml
index 0fc295d8a..86d2aca24 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,4 +1,5 @@
[workspace]
+resolver = "2"
members = ["tests/rust-integration-tests/*", "crates/*", "tools/*"]
[profile.release]
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 92668f2bd..000000000
--- a/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-ROOT = $(shell git rev-parse --show-toplevel)
-
-# builds
-
-build: youki-release
-
-youki: youki-dev # helper
-
-youki-dev:
- ./scripts/build.sh -o $(ROOT) -c youki
-
-youki-release:
- ./scripts/build.sh -o $(ROOT) -r -c youki
-
-runtimetest:
- ./scripts/build.sh -o $(ROOT) -r -c runtimetest
-
-rust-oci-tests-bin:
- ./scripts/build.sh -o $(ROOT) -r -c integration-test
-
-all: youki-release rust-oci-tests-bin runtimetest
-
-# Tests
-unittest:
- cd ./crates && LD_LIBRARY_PATH=${HOME}/.wasmedge/lib cargo test --all --all-targets --all-features
-
-featuretest:
- ./scripts/features_test.sh
-
-oci-tests: youki-release
- ./scripts/oci_integration_tests.sh $(ROOT)
-
-rust-oci-tests: youki-release runtimetest rust-oci-tests-bin
- ./scripts/rust_integration_tests.sh $(ROOT)/youki
-
-validate-rust-oci-runc: runtimetest rust-oci-tests-bin
- ./scripts/rust_integration_tests.sh runc
-
-containerd-test: youki-dev
- VAGRANT_VAGRANTFILE=Vagrantfile.containerd2youki vagrant up
- VAGRANT_VAGRANTFILE=Vagrantfile.containerd2youki vagrant provision --provision-with test
-
-test-oci: oci-tests rust-oci-tests
-
-test-all: unittest featuretest oci-tests containerd-test # currently not doing rust-oci here
-
-# Misc
-
-lint:
- cargo clippy --all-targets --all-features
-
-clean:
- ./scripts/clean.sh $(ROOT)
diff --git a/README.md b/README.md
index 5a15faefa..1ac3a4a23 100644
--- a/README.md
+++ b/README.md
@@ -6,12 +6,16 @@
[](https://codecov.io/gh/containers/youki)
- 
+ 
youki is an implementation of the [OCI runtime-spec](https://github.com/opencontainers/runtime-spec) in Rust, similar to [runc](https://github.com/opencontainers/runc).
Your ideas are welcome [here](https://github.com/containers/youki/issues/10).
+# Quick Install
+
+[User Documentation](https://containers.github.io/youki/user/basic_setup.html#quick-install)
+
# About the name
youki is pronounced as /joสki/ or yoh-key.
@@ -32,10 +36,13 @@ Here is why we are writing a new container runtime in Rust.
Details about the benchmark
- A command used for the benchmark
- ```console
- $ hyperfine --prepare 'sudo sync; echo 3 | sudo tee /proc/sys/vm/drop_caches' --warmup 10 --min-runs 100 'sudo ./youki create -b tutorial a && sudo ./youki start a && sudo ./youki delete -f a'
+
+ ```bash
+ hyperfine --prepare 'sudo sync; echo 3 | sudo tee /proc/sys/vm/drop_caches' --warmup 10 --min-runs 100 'sudo ./youki create -b tutorial a && sudo ./youki start a && sudo ./youki delete -f a'
```
+
- Environment
+
```console
$ ./youki info
Version 0.0.1
@@ -91,9 +98,9 @@ Here is why we are writing a new container runtime in Rust.
spec: 1.0.0
+SYSTEMD +SELINUX +APPARMOR +CAP +SECCOMP +EBPF +CRIU +YAJL
```
+
-- The development of [railcar](https://github.com/oracle/railcar) has been suspended. This project was very nice but is no longer being developed. This project is inspired by it.
- I have fun implementing this. In fact, this may be the most important.
# Related project
@@ -106,7 +113,8 @@ youki is not at the practical stage yet. However, it is getting closer to practi
| Feature | Description | State |
-| :-------------------: | :---------------------------------------------: | :-------------------------------------------------------------------------------------------------: |
+|:---------------------:|:-----------------------------------------------:| :-------------------------------------------------------------------------------------------------: |
+| Containerd | Running via Containerd | โ
|
| Docker | Running via Docker | โ
|
| Podman | Running via Podman | โ
|
| pivot_root | Change the root directory | โ
|
@@ -138,65 +146,74 @@ For other platforms, please use the [Vagrantfile](#setting-up-vagrant) that we h
## Requires
- Rust(See [here](https://www.rust-lang.org/tools/install)), edition 2021
-- Docker(See [here](https://docs.docker.com/engine/install))
+- linux kernel โฅ 5.3
## Dependencies
+To install `just`, follow the instruction [here](https://github.com/casey/just#installation).
+
### Debian, Ubuntu and related distributions
```console
-$ sudo apt-get install \
- pkg-config \
- libsystemd-dev \
- libdbus-glib-1-dev \
- build-essential \
- libelf-dev \
- libseccomp-dev \
- libclang-dev
+$ sudo apt-get install \
+ pkg-config \
+ libsystemd-dev \
+ libdbus-glib-1-dev \
+ build-essential \
+ libelf-dev \
+ libseccomp-dev \
+ libclang-dev \
+ glibc-static \
+ libssl-dev
```
-### Fedora, Centos, RHEL and related distributions
+### Fedora, CentOS, RHEL and related distributions
```console
-$ sudo dnf install \
- pkg-config \
- systemd-devel \
- dbus-devel \
+$ sudo dnf install \
+ pkg-config \
+ systemd-devel \
+ dbus-devel \
elfutils-libelf-devel \
- libseccomp-devel \
- libclang-dev
+ libseccomp-devel \
+ clang-devel \
+ openssl-devel
```
## Build
-```console
-$ git clone git@github.com:containers/youki.git
-$ cd youki
-$ make youki-dev # or youki-release
-$ ./youki -h # you can get information about youki command
+```bash
+git clone git@github.com:containers/youki.git
+cd youki
+just youki-dev # or youki-release
+./youki -h # you can get information about youki command
```
## Tutorial
+### Requires
+
+- Docker(See [here](https://docs.docker.com/engine/install))
+
### Create and run a container
Let's try to run a container that executes `sleep 30` with youki. This tutorial may need root permission.
-```console
-$ git clone git@github.com:containers/youki.git
-$ cd youki
-$ make youki-dev # or youki-release
+```bash
+git clone git@github.com:containers/youki.git
+cd youki
+just youki-dev # or youki-release
-$ mkdir -p tutorial/rootfs
-$ cd tutorial
+mkdir -p tutorial/rootfs
+cd tutorial
# use docker to export busybox into the rootfs directory
-$ docker export $(docker create busybox) | tar -C rootfs -xvf -
+docker export $(docker create busybox) | tar -C rootfs -xvf -
```
Then, we need to prepare a configuration file. This file contains metadata and specs for a container, such as the process to run, environment variables to inject, sandboxing features to use, etc.
-```console
-$ ../youki spec # will generate a spec file named config.json
+```bash
+../youki spec # will generate a spec file named config.json
```
We can edit the `config.json` to add customized behaviors for container. Here, we modify the `process` field to run `sleep 30`.
@@ -214,13 +231,13 @@ We can edit the `config.json` to add customized behaviors for container. Here, w
Then we can explore the lifecycle of a container:
-```console
-$ cd .. # go back to the repository root
-$ sudo ./youki create -b tutorial tutorial_container # create a container with name `tutorial_container`
-$ sudo ./youki state tutorial_container # you can see the state the container is `created`
-$ sudo ./youki start tutorial_container # start the container
-$ sudo ./youki list # will show the list of containers, the container is `running`
-$ sudo ./youki delete tutorial_container # delete the container
+```bash
+cd .. # go back to the repository root
+sudo ./youki create -b tutorial tutorial_container # create a container with name `tutorial_container`
+sudo ./youki state tutorial_container # you can see the state the container is `created`
+sudo ./youki start tutorial_container # start the container
+sudo ./youki list # will show the list of containers, the container is `running`
+sudo ./youki delete tutorial_container # delete the container
```
Change the command to be executed in `config.json` and try something other than `sleep 30`.
@@ -229,7 +246,7 @@ Change the command to be executed in `config.json` and try something other than
`youki` provides the ability to run containers as non-root user([rootless mode](https://docs.docker.com/engine/security/rootless/)). To run a container in rootless mode, we need to add some extra options in `config.json`, other steps are same with above:
-```console
+```bash
$ mkdir -p tutorial/rootfs
$ cd tutorial
# use docker to export busybox into the rootfs directory
@@ -245,13 +262,13 @@ $ ../youki run rootless-container # will create and run a container with rootl
Start the docker daemon.
-```console
-$ dockerd --experimental --add-runtime="youki=$(pwd)/target/x86_64-unknown-linux-gnu/debug/youki"
+```bash
+dockerd --experimental --add-runtime="youki=$(pwd)/youki"
```
If you get an error like the below, that means your normal Docker daemon is running, and it needs to be stopped. Do that with your init system (i.e., with systemd, run `systemctl stop docker`, as root if necessary).
-```
+```console
failed to start daemon: pid file found, ensure docker is not running or delete /var/run/docker.pid
```
@@ -259,44 +276,44 @@ Now repeat the command, which should start the docker daemon.
You can use youki in a different terminal to start the container.
-```console
-$ docker run -it --rm --runtime youki busybox
+```bash
+docker run -it --rm --runtime youki busybox
```
Afterwards, you can close the docker daemon process in other the other terminal. To restart normal docker daemon (if you had stopped it before), run:
-```console
-$ systemctl start docker # might need root permission
+```bash
+systemctl start docker # might need root permission
```
### Integration Tests
Go and node-tap are required to run integration tests. See the [opencontainers/runtime-tools](https://github.com/opencontainers/runtime-tools) README for details.
-```console
-$ git submodule update --init --recursive
-$ make oci-tests
+```bash
+git submodule update --init --recursive
+just oci-tests
```
### Setting up Vagrant
You can try youki on platforms other than Linux by using the Vagrantfile we have prepared. We have prepared two environments for vagrant, namely rootless mode and rootful mode
-```console
-$ git clone git@github.com:containers/youki.git
-$ cd youki
+```bash
+git clone git@github.com:containers/youki.git
+cd youki
# If you want to develop in rootless mode, and this is the default mode
-$ vagrant up
-$ vagrant ssh
+vagrant up
+vagrant ssh
# or if you want to develop in rootful mode
-$ VAGRANT_VAGRANTFILE=Vagrantfile.root vagrant up
-$ VAGRANT_VAGRANTFILE=Vagrantfile.root vagrant ssh
+VAGRANT_VAGRANTFILE=Vagrantfile.root vagrant up
+VAGRANT_VAGRANTFILE=Vagrantfile.root vagrant ssh
# in virtual machine
-$ cd youki
-$ make youki-dev # or youki-release
+cd youki
+just youki-dev # or youki-release
```
# Community
diff --git a/Vagrantfile b/Vagrantfile
index ea371889b..7e68fc9fc 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -12,7 +12,7 @@ Vagrant.configure("2") do |config|
config.vm.provision "shell", inline: <<-SHELL
set -e -u -o pipefail
yum update -y
- yum install -y git gcc docker systemd-devel dbus-devel libseccomp-devel
+ yum install -y git gcc docker wget pkg-config systemd-devel dbus-devel elfutils-libelf-devel libseccomp-devel clang-devel openssl-devel
grubby --update-kernel=ALL --args="systemd.unified_cgroup_hierarchy=0"
service docker start
SHELL
diff --git a/Vagrantfile.containerd2youki b/Vagrantfile.containerd2youki
index e8240e6a1..6907a0197 100644
--- a/Vagrantfile.containerd2youki
+++ b/Vagrantfile.containerd2youki
@@ -31,7 +31,7 @@ Vagrant.configure("2") do |config|
export GOPATH=$HOME/go
git clone https://github.com/containerd/containerd \
- /root/go/src/github.com/containerd/containerd -b v1.5.11
+ /root/go/src/github.com/containerd/containerd -b v1.6.20
cd /root/go/src/github.com/containerd/containerd
make
diff --git a/Vagrantfile.root b/Vagrantfile.root
index e44047f99..8a622e279 100644
--- a/Vagrantfile.root
+++ b/Vagrantfile.root
@@ -14,7 +14,7 @@ Vagrant.configure("2") do |config|
config.vm.provision "shell", inline: <<-SHELL
set -e -u -o pipefail
yum update -y
- yum install -y git gcc docker systemd-devel dbus-devel libseccomp-devel
+ yum install -y git gcc docker wget pkg-config systemd-devel dbus-devel elfutils-libelf-devel libseccomp-devel clang-devel openssl-devel
grubby --update-kernel=ALL --args="systemd.unified_cgroup_hierarchy=0"
service docker start
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
@@ -23,4 +23,3 @@ Vagrant.configure("2") do |config|
config.ssh.username = 'root'
config.ssh.insert_key = 'true'
end
-
diff --git a/crates/Makefile b/crates/Makefile
deleted file mode 100644
index a4f211111..000000000
--- a/crates/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-.PHONY : debug release
-
-debug:
- cargo build && cp ./target/debug/youki ./youki_bin
-
-release:
- cargo build --release && cp ./target/release/youki ./youki_bin
-
-clean:
- rm ./youki_bin
diff --git a/crates/libcgroups/Cargo.toml b/crates/libcgroups/Cargo.toml
index 618e1c188..b8f79cd34 100644
--- a/crates/libcgroups/Cargo.toml
+++ b/crates/libcgroups/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "libcgroups"
-version = "0.0.4"
+version = "0.1.0"
description = "Library for cgroup"
license-file = "../../LICENSE"
repository = "https://github.com/containers/youki"
@@ -9,7 +9,7 @@ readme = "README.md"
authors = ["youki team"]
edition = "2021"
rust-version = "1.58.1"
-autoexamples = false
+autoexamples = true
keywords = ["youki", "container", "cgroups"]
[features]
@@ -20,25 +20,27 @@ systemd = ["v2", "dep:dbus"]
cgroupsv2_devices = ["rbpf", "libbpf-sys", "errno", "libc"]
[dependencies]
-nix = "0.25.0"
-procfs = "0.14.2"
-log = "0.4"
-anyhow = "1.0"
-oci-spec = { version = "^0.5.5", features = ["runtime"] }
+nix = "0.26.2"
+procfs = "0.15.1"
+oci-spec = { version = "~0.6.2", features = ["runtime"] }
dbus = { version = "0.9.7", optional = true }
fixedbitset = "0.4.2"
serde = { version = "1.0", features = ["derive"] }
-rbpf = {version = "0.1.0", optional = true }
-libbpf-sys = { version = "1.1.1+v1.0.1", optional = true }
-errno = { version = "0.2.8", optional = true }
-libc = { version = "0.2.139", optional = true }
+rbpf = {version = "0.2.0", optional = true }
+libbpf-sys = { version = "1.2.1", optional = true }
+errno = { version = "0.3.1", optional = true }
+libc = { version = "0.2.147", optional = true }
+thiserror = "1.0.44"
+tracing = { version = "0.1.37", features = ["attributes"]}
[dev-dependencies]
-oci-spec = { version = "^0.5.5", features = ["proptests", "runtime"] }
+anyhow = "1.0"
+oci-spec = { version = "~0.6.2", features = ["proptests", "runtime"] }
quickcheck = "1"
-mockall = { version = "0.11.3", features = [] }
-clap = "4.0.32"
+mockall = { version = "0.11.4", features = [] }
+clap = "4.1.6"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
env_logger = "0.10"
-serial_test = "1.0.0"
+serial_test = "2.0.0"
+tempfile = "3"
diff --git a/crates/libcgroups/examples/bpf.rs b/crates/libcgroups/examples/bpf.rs
index 662802e7a..a1a57284d 100644
--- a/crates/libcgroups/examples/bpf.rs
+++ b/crates/libcgroups/examples/bpf.rs
@@ -1,100 +1,117 @@
-use anyhow::{bail, Result};
-use clap::{Arg, SubCommand};
-use std::os::unix::io::AsRawFd;
-use std::path::Path;
+use anyhow::Result;
-use nix::fcntl::OFlag;
-use nix::sys::stat::Mode;
+#[cfg(feature = "cgroupsv2_devices")]
+mod bpf {
+ use anyhow::{bail, Result};
+ use clap::Arg;
+ use clap::Command;
+ use oci_spec::runtime::LinuxDeviceCgroup;
+ use std::os::unix::io::AsRawFd;
+ use std::path::Path;
-use cgroups::v2::devices::bpf;
-use cgroups::v2::devices::emulator;
-use cgroups::v2::devices::program;
-use oci_spec::*;
+ use nix::fcntl::OFlag;
+ use nix::sys::stat::Mode;
-const LICENSE: &'static str = &"Apache";
+ use libcgroups::v2::devices::bpf;
+ use libcgroups::v2::devices::emulator;
+ use libcgroups::v2::devices::program;
-fn main() -> Result<()> {
- env_logger::init();
+ const LICENSE: &str = "Apache";
+ fn cli() -> Command {
+ clap::Command::new("bpf")
+ .version("0.1")
+ .about("tools to test BPF program for cgroups v2 devices")
+ .arg(Arg::new("cgroup_dir").short('c').value_name("CGROUP_DIR"))
+ .subcommand(
+ Command::new("query").about("query list of BPF programs attached to cgroup dir"),
+ )
+ .subcommand(
+ Command::new("detach")
+ .about("detach BPF program by id")
+ .arg(
+ Arg::new("id")
+ .value_name("PROG_ID")
+ .required(true)
+ .help("ID of BPF program returned by query command"),
+ ),
+ )
+ .subcommand(
+ Command::new("attach")
+ .about("compile rules to BPF and attach to cgroup dir")
+ .arg(
+ Arg::new("input_file")
+ .value_name("INPUT_FILE")
+ .required(true)
+ .help("File contains Vec in json format"),
+ ),
+ )
+ }
- let matches = clap::App::new("bpf")
- .version("0.1")
- .about("tools to test BPF program for cgroups v2 devices")
- .arg(
- Arg::with_name("cgroup_dir")
- .short("c")
- .value_name("CGROUP_DIR"),
- )
- .subcommand(
- SubCommand::with_name("query")
- .help("query list of BPF programs attached to cgroup dir"),
- )
- .subcommand(
- SubCommand::with_name("detach")
- .help("detach BPF program by id")
- .arg(
- Arg::with_name("id")
- .value_name("PROG_ID")
- .required(true)
- .help("ID of BPF program returned by query command"),
- ),
- )
- .subcommand(
- SubCommand::with_name("attach")
- .help("compile rules to BPF and attach to cgroup dir")
- .arg(
- Arg::with_name("input_file")
- .value_name("INPUT_FILE")
- .required(true)
- .help("File contains Vec in json format"),
- ),
- )
- .get_matches_safe()?;
+ fn parse_cgroupv1_device_rules>(path: P) -> Result> {
+ let content = std::fs::read_to_string(path)?;
+ let devices = serde_json::from_str(&content)?;
+ Ok(devices)
+ }
- let cgroup_dir = matches.value_of("cgroup_dir").unwrap();
-
- let cgroup_fd = nix::dir::Dir::open(
- cgroup_dir,
- OFlag::O_RDONLY | OFlag::O_DIRECTORY,
- Mode::from_bits(0o600).unwrap(),
- )?;
+ pub fn run() -> Result<()> {
+ let matches = cli().get_matches();
+ let cgroup_dir = matches.get_one::("cgroup_dir").unwrap();
+ let cgroup_fd = nix::dir::Dir::open(
+ cgroup_dir.as_str(),
+ OFlag::O_RDONLY | OFlag::O_DIRECTORY,
+ Mode::from_bits(0o600).unwrap(),
+ )?;
+ match matches.subcommand() {
+ Some(("query", _)) => {
+ let progs = bpf::prog::query(cgroup_fd.as_raw_fd())?;
+ for prog in &progs {
+ println!("prog: id={}, fd={}", prog.id, prog.fd);
+ }
+ }
+ Some(("detach", submatch)) => {
+ let prog_id = submatch.get_one::("id").unwrap().parse::()?;
+ let progs = bpf::prog::query(cgroup_fd.as_raw_fd())?;
+ let prog = progs.iter().find(|v| v.id == prog_id);
+ if prog.is_none() {
+ bail!("can't get prog fd by prog id");
+ }
- match matches.subcommand() {
- ("query", Some(_)) => {
- let progs = bpf::prog_query(cgroup_fd.as_raw_fd())?;
- for prog in &progs {
- println!("prog: id={}, fd={}", prog.id, prog.fd);
+ bpf::prog::detach2(prog.unwrap().fd, cgroup_fd.as_raw_fd())?;
+ println!("detach ok");
}
- }
- ("detach", Some(submatch)) => {
- let prog_id = submatch.value_of("id").unwrap().parse::()?;
- let progs = bpf::prog_query(cgroup_fd.as_raw_fd())?;
- let prog = progs.iter().find(|v| v.id == prog_id);
- if prog.is_none() {
- bail!("can't get prog fd by prog id");
+ Some(("attach", submatch)) => {
+ let input_file = submatch.get_one::("input_file").unwrap();
+ let rules = parse_cgroupv1_device_rules(input_file)?;
+ let mut emulator = emulator::Emulator::with_default_allow(false);
+ emulator.add_rules(&rules);
+ let prog = program::Program::from_rules(&emulator.rules, emulator.default_allow)?;
+ let prog_fd = bpf::prog::load(LICENSE, prog.bytecodes())?;
+ bpf::prog::attach(prog_fd, cgroup_fd.as_raw_fd())?;
+ println!("attach ok");
}
- bpf::prog_detach2(prog.unwrap().fd, cgroup_fd.as_raw_fd())?;
- println!("detach ok");
- }
- ("attach", Some(submatch)) => {
- let input_file = submatch.value_of("input_file").unwrap();
- let rules = parse_cgroupv1_device_rules(&input_file)?;
- let mut emulator = emulator::Emulator::with_default_allow(false);
- emulator.add_rules(&rules)?;
- let prog = program::Program::from_rules(&emulator.rules, emulator.default_allow)?;
- let prog_fd = bpf::prog_load(LICENSE, prog.bytecodes())?;
- bpf::prog_attach(prog_fd, cgroup_fd.as_raw_fd())?;
- println!("attach ok");
- }
+ _ => unreachable!(),
+ };
+ Ok(())
+ }
+}
- (_, _) => {}
- };
+#[cfg(not(feature = "cgroupsv2_devices"))]
+mod bpf {
+ use anyhow::{bail, Result};
- Ok(())
+ pub fn run() -> Result<()> {
+ if !cfg!(feature = "cgroupsv2_devices") {
+ bail!("cgroupsv2_devices feature is not enabled");
+ }
+
+ unreachable!()
+ }
}
-fn parse_cgroupv1_device_rules>(path: P) -> Result> {
- let content = std::fs::read_to_string(path)?;
- let devices = serde_json::from_str(&content)?;
- Ok(devices)
+fn main() -> Result<()> {
+ env_logger::init();
+ bpf::run()?;
+
+ Ok(())
}
diff --git a/crates/libcgroups/src/common.rs b/crates/libcgroups/src/common.rs
index 538e95a61..a0d20424d 100644
--- a/crates/libcgroups/src/common.rs
+++ b/crates/libcgroups/src/common.rs
@@ -2,11 +2,10 @@ use std::{
fmt::{Debug, Display},
fs::{self, File},
io::{BufRead, BufReader, Write},
- path::{Path, PathBuf},
+ path::{Path, PathBuf, StripPrefixError},
time::Duration,
};
-use anyhow::{bail, Context, Result};
use nix::{
sys::statfs::{statfs, CGROUP2_SUPER_MAGIC, TMPFS_MAGIC},
unistd::Pid,
@@ -17,11 +16,8 @@ use oci_spec::runtime::{
LinuxDevice, LinuxDeviceBuilder, LinuxDeviceCgroup, LinuxDeviceCgroupBuilder, LinuxDeviceType,
};
-#[cfg(feature = "systemd")]
use super::systemd;
-#[cfg(feature = "v1")]
use super::v1;
-#[cfg(feature = "v2")]
use super::v2;
use super::stats::Stats;
@@ -30,23 +26,93 @@ pub const CGROUP_PROCS: &str = "cgroup.procs";
pub const DEFAULT_CGROUP_ROOT: &str = "/sys/fs/cgroup";
pub trait CgroupManager {
+ type Error;
+
/// Adds a task specified by its pid to the cgroup
- fn add_task(&self, pid: Pid) -> Result<()>;
+ fn add_task(&self, pid: Pid) -> Result<(), Self::Error>;
/// Applies resource restrictions to the cgroup
- fn apply(&self, controller_opt: &ControllerOpt) -> Result<()>;
+ fn apply(&self, controller_opt: &ControllerOpt) -> Result<(), Self::Error>;
/// Removes the cgroup
- fn remove(&self) -> Result<()>;
+ fn remove(&self) -> Result<(), Self::Error>;
/// Sets the freezer cgroup to the specified state
- fn freeze(&self, state: FreezerState) -> Result<()>;
+ fn freeze(&self, state: FreezerState) -> Result<(), Self::Error>;
/// Retrieve statistics for the cgroup
- fn stats(&self) -> Result;
+ fn stats(&self) -> Result;
/// Gets the PIDs inside the cgroup
- fn get_all_pids(&self) -> Result>;
+ fn get_all_pids(&self) -> Result, Self::Error>;
+}
+
+#[derive(thiserror::Error, Debug)]
+pub enum AnyManagerError {
+ #[error(transparent)]
+ Systemd(#[from] systemd::manager::SystemdManagerError),
+ #[error(transparent)]
+ V1(#[from] v1::manager::V1ManagerError),
+ #[error(transparent)]
+ V2(#[from] v2::manager::V2ManagerError),
+}
+
+pub enum AnyCgroupManager {
+ Systemd(systemd::manager::Manager),
+ V1(v1::manager::Manager),
+ V2(v2::manager::Manager),
+}
+
+impl CgroupManager for AnyCgroupManager {
+ type Error = AnyManagerError;
+
+ fn add_task(&self, pid: Pid) -> Result<(), Self::Error> {
+ match self {
+ AnyCgroupManager::Systemd(m) => Ok(m.add_task(pid)?),
+ AnyCgroupManager::V1(m) => Ok(m.add_task(pid)?),
+ AnyCgroupManager::V2(m) => Ok(m.add_task(pid)?),
+ }
+ }
+
+ fn apply(&self, controller_opt: &ControllerOpt) -> Result<(), Self::Error> {
+ match self {
+ AnyCgroupManager::Systemd(m) => Ok(m.apply(controller_opt)?),
+ AnyCgroupManager::V1(m) => Ok(m.apply(controller_opt)?),
+ AnyCgroupManager::V2(m) => Ok(m.apply(controller_opt)?),
+ }
+ }
+
+ fn remove(&self) -> Result<(), Self::Error> {
+ match self {
+ AnyCgroupManager::Systemd(m) => Ok(m.remove()?),
+ AnyCgroupManager::V1(m) => Ok(m.remove()?),
+ AnyCgroupManager::V2(m) => Ok(m.remove()?),
+ }
+ }
+
+ fn freeze(&self, state: FreezerState) -> Result<(), Self::Error> {
+ match self {
+ AnyCgroupManager::Systemd(m) => Ok(m.freeze(state)?),
+ AnyCgroupManager::V1(m) => Ok(m.freeze(state)?),
+ AnyCgroupManager::V2(m) => Ok(m.freeze(state)?),
+ }
+ }
+
+ fn stats(&self) -> Result {
+ match self {
+ AnyCgroupManager::Systemd(m) => Ok(m.stats()?),
+ AnyCgroupManager::V1(m) => Ok(m.stats()?),
+ AnyCgroupManager::V2(m) => Ok(m.stats()?),
+ }
+ }
+
+ fn get_all_pids(&self) -> Result, Self::Error> {
+ match self {
+ AnyCgroupManager::Systemd(m) => Ok(m.get_all_pids()?),
+ AnyCgroupManager::V1(m) => Ok(m.get_all_pids()?),
+ AnyCgroupManager::V2(m) => Ok(m.get_all_pids()?),
+ }
+ }
}
#[derive(Debug)]
@@ -64,11 +130,11 @@ impl Display for CgroupSetup {
CgroupSetup::Unified => "unified",
};
- write!(f, "{}", print)
+ write!(f, "{print}")
}
}
-/// FreezerState is given freezer contoller
+/// FreezerState is given freezer controller
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
pub enum FreezerState {
/// Tasks in cgroup are undefined
@@ -88,43 +154,107 @@ pub struct ControllerOpt<'a> {
pub disable_oom_killer: bool,
/// Specify an oom_score_adj for container.
pub oom_score_adj: Option,
- /// FreezerState is given to freezer contoller for suspending process.
+ /// FreezerState is given to freezer controller for suspending process.
pub freezer_state: Option,
}
+#[derive(thiserror::Error, Debug)]
+pub enum WrappedIoError {
+ #[error("failed to open {path}: {err}")]
+ Open { err: std::io::Error, path: PathBuf },
+ #[error("failed to write {data} to {path}: {err}")]
+ Write {
+ err: std::io::Error,
+ path: PathBuf,
+ data: String,
+ },
+ #[error("failed to read {path}: {err}")]
+ Read { err: std::io::Error, path: PathBuf },
+ #[error("failed to create dir {path}: {err}")]
+ CreateDir { err: std::io::Error, path: PathBuf },
+ #[error("at {path}: {err}")]
+ Other { err: std::io::Error, path: PathBuf },
+}
+
+impl WrappedIoError {
+ pub fn inner(&self) -> &std::io::Error {
+ match self {
+ WrappedIoError::Open { err, .. } => err,
+ WrappedIoError::Write { err, .. } => err,
+ WrappedIoError::Read { err, .. } => err,
+ WrappedIoError::CreateDir { err, .. } => err,
+ WrappedIoError::Other { err, .. } => err,
+ }
+ }
+}
+
#[inline]
-pub fn write_cgroup_file_str>(path: P, data: &str) -> Result<()> {
+pub fn write_cgroup_file_str>(path: P, data: &str) -> Result<(), WrappedIoError> {
+ let path = path.as_ref();
+
fs::OpenOptions::new()
.create(false)
.write(true)
.truncate(false)
- .open(path.as_ref())
- .with_context(|| format!("failed to open {:?}", path.as_ref()))?
+ .open(path)
+ .map_err(|err| WrappedIoError::Open {
+ err,
+ path: path.to_path_buf(),
+ })?
.write_all(data.as_bytes())
- .with_context(|| format!("failed to write {} to {:?}", data, path.as_ref()))?;
+ .map_err(|err| WrappedIoError::Write {
+ err,
+ path: path.to_path_buf(),
+ data: data.into(),
+ })?;
Ok(())
}
#[inline]
-pub fn write_cgroup_file, T: ToString>(path: P, data: T) -> Result<()> {
+pub fn write_cgroup_file, T: ToString>(
+ path: P,
+ data: T,
+) -> Result<(), WrappedIoError> {
+ let path = path.as_ref();
let data = data.to_string();
+
fs::OpenOptions::new()
.create(false)
.write(true)
.truncate(false)
- .open(path.as_ref())
- .with_context(|| format!("failed to open {:?}", path.as_ref()))?
+ .open(path)
+ .map_err(|err| WrappedIoError::Open {
+ err,
+ path: path.to_path_buf(),
+ })?
.write_all(data.as_bytes())
- .with_context(|| format!("failed to write {} to {:?}", data, path.as_ref()))?;
+ .map_err(|err| WrappedIoError::Write {
+ err,
+ path: path.to_path_buf(),
+ data,
+ })?;
Ok(())
}
#[inline]
-pub fn read_cgroup_file>(path: P) -> Result {
+pub fn read_cgroup_file>(path: P) -> Result {
let path = path.as_ref();
- fs::read_to_string(path).with_context(|| format!("failed to open {:?}", path))
+ fs::read_to_string(path).map_err(|err| WrappedIoError::Read {
+ err,
+ path: path.to_path_buf(),
+ })
+}
+
+#[derive(thiserror::Error, Debug)]
+pub enum GetCgroupSetupError {
+ #[error("io error: {0}")]
+ WrappedIo(#[from] WrappedIoError),
+ #[error("non default cgroup root not supported")]
+ NonDefault,
+ #[error("failed to detect cgroup setup")]
+ FailedToDetect,
}
/// Determines the cgroup setup of the system. Systems typically have one of
@@ -135,7 +265,7 @@ pub fn read_cgroup_file>(path: P) -> Result {
/// an additional unified hierarchy which doesn't have any
/// controllers attached. Resource control can purely be achieved
/// through the cgroup v1 hierarchy, not through the cgroup v2 hierarchy.
-pub fn get_cgroup_setup() -> Result {
+pub fn get_cgroup_setup() -> Result {
let default_root = Path::new(DEFAULT_CGROUP_ROOT);
match default_root.exists() {
true => {
@@ -143,12 +273,9 @@ pub fn get_cgroup_setup() -> Result {
// If the filesystem is tmpfs instead the system is either in legacy or
// hybrid mode. If a cgroup2 filesystem has been mounted under the "unified"
// folder we are in hybrid mode, otherwise we are in legacy mode.
- let stat = statfs(default_root).with_context(|| {
- format!(
- "failed to stat default cgroup root {}",
- &default_root.display()
- )
- })?;
+ let stat = statfs(default_root)
+ .map_err(|err| std::io::Error::new(std::io::ErrorKind::Other, err))
+ .wrap_other(default_root)?;
if stat.filesystem_type() == CGROUP2_SUPER_MAGIC {
return Ok(CgroupSetup::Unified);
}
@@ -157,7 +284,8 @@ pub fn get_cgroup_setup() -> Result {
let unified = Path::new("/sys/fs/cgroup/unified");
if Path::new(unified).exists() {
let stat = statfs(unified)
- .with_context(|| format!("failed to stat {}", unified.display()))?;
+ .map_err(|err| std::io::Error::new(std::io::ErrorKind::Other, err))
+ .wrap_other(unified)?;
if stat.filesystem_type() == CGROUP2_SUPER_MAGIC {
return Ok(CgroupSetup::Hybrid);
}
@@ -166,113 +294,150 @@ pub fn get_cgroup_setup() -> Result {
return Ok(CgroupSetup::Legacy);
}
}
- false => bail!("non default cgroup root not supported"),
+ false => return Err(GetCgroupSetupError::NonDefault),
}
- bail!("failed to detect cgroup setup");
+ Err(GetCgroupSetupError::FailedToDetect)
}
-pub fn create_cgroup_manager>(
- cgroup_path: P,
- systemd_cgroup: bool,
- container_name: &str,
-) -> Result> {
- let cgroup_setup = get_cgroup_setup()?;
- let cgroup_path = cgroup_path.into();
+#[derive(thiserror::Error, Debug)]
+pub enum CreateCgroupSetupError {
+ #[error("io error: {0}")]
+ WrappedIo(#[from] WrappedIoError),
+ #[error("non default cgroup root not supported")]
+ NonDefault,
+ #[error("failed to detect cgroup setup")]
+ FailedToDetect,
+ #[error("v1 error: {0}")]
+ V1(#[from] v1::manager::V1ManagerError),
+ #[error("v2 error: {0}")]
+ V2(#[from] v2::manager::V2ManagerError),
+ #[error("systemd error: {0}")]
+ Systemd(#[from] systemd::manager::SystemdManagerError),
+}
+
+#[derive(Clone)]
+pub struct CgroupConfig {
+ pub cgroup_path: PathBuf,
+ pub systemd_cgroup: bool,
+ pub container_name: String,
+}
+
+pub fn create_cgroup_manager(
+ config: CgroupConfig,
+) -> Result {
+ let cgroup_setup = get_cgroup_setup().map_err(|err| match err {
+ GetCgroupSetupError::WrappedIo(err) => CreateCgroupSetupError::WrappedIo(err),
+ GetCgroupSetupError::NonDefault => CreateCgroupSetupError::NonDefault,
+ GetCgroupSetupError::FailedToDetect => CreateCgroupSetupError::FailedToDetect,
+ })?;
+ let cgroup_path = config.cgroup_path.as_path();
match cgroup_setup {
- CgroupSetup::Legacy | CgroupSetup::Hybrid => create_v1_cgroup_manager(cgroup_path),
+ CgroupSetup::Legacy | CgroupSetup::Hybrid => {
+ Ok(create_v1_cgroup_manager(cgroup_path)?.any())
+ }
CgroupSetup::Unified => {
// ref https://github.com/opencontainers/runtime-spec/blob/main/config-linux.md#cgroups-path
- if cgroup_path.is_absolute() || !systemd_cgroup {
- return create_v2_cgroup_manager(cgroup_path);
+ if cgroup_path.is_absolute() || !config.systemd_cgroup {
+ return Ok(create_v2_cgroup_manager(cgroup_path)?.any());
}
- create_systemd_cgroup_manager(cgroup_path, container_name)
+ Ok(create_systemd_cgroup_manager(cgroup_path, config.container_name.as_str())?.any())
}
}
}
#[cfg(feature = "v1")]
-fn create_v1_cgroup_manager(cgroup_path: PathBuf) -> Result> {
- log::info!("cgroup manager V1 will be used");
- Ok(Box::new(v1::manager::Manager::new(cgroup_path)?))
+fn create_v1_cgroup_manager(
+ cgroup_path: &Path,
+) -> Result {
+ tracing::info!("cgroup manager V1 will be used");
+ v1::manager::Manager::new(cgroup_path)
}
#[cfg(not(feature = "v1"))]
-fn create_v1_cgroup_manager(_cgroup_path: PathBuf) -> Result> {
- bail!("cgroup v1 feature is required, but was not enabled during compile time");
+fn create_v1_cgroup_manager(
+ _cgroup_path: &Path,
+) -> Result {
+ Err(v1::manager::V1ManagerError::NotEnabled)
}
#[cfg(feature = "v2")]
-fn create_v2_cgroup_manager(cgroup_path: PathBuf) -> Result> {
- log::info!("cgroup manager V2 will be used");
- Ok(Box::new(v2::manager::Manager::new(
- DEFAULT_CGROUP_ROOT.into(),
- cgroup_path,
- )?))
+fn create_v2_cgroup_manager(
+ cgroup_path: &Path,
+) -> Result {
+ tracing::info!("cgroup manager V2 will be used");
+ v2::manager::Manager::new(DEFAULT_CGROUP_ROOT.into(), cgroup_path.to_owned())
}
#[cfg(not(feature = "v2"))]
-fn create_v2_cgroup_manager(_cgroup_path: PathBuf) -> Result> {
- bail!("cgroup v2 feature is required, but was not enabled during compile time");
+fn create_v2_cgroup_manager(
+ _cgroup_path: &Path,
+) -> Result {
+ Err(v2::manager::V2ManagerError::NotEnabled)
}
#[cfg(feature = "systemd")]
fn create_systemd_cgroup_manager(
- cgroup_path: PathBuf,
+ cgroup_path: &Path,
container_name: &str,
-) -> Result> {
+) -> Result {
if !systemd::booted() {
- bail!(
+ panic!(
"systemd cgroup flag passed, but systemd support for managing cgroups is not available"
);
}
let use_system = nix::unistd::geteuid().is_root();
- log::info!(
+ tracing::info!(
"systemd cgroup manager with system bus {} will be used",
use_system
);
- Ok(Box::new(systemd::manager::Manager::new(
+ systemd::manager::Manager::new(
DEFAULT_CGROUP_ROOT.into(),
- cgroup_path,
+ cgroup_path.to_owned(),
container_name.into(),
use_system,
- )?))
+ )
}
#[cfg(not(feature = "systemd"))]
fn create_systemd_cgroup_manager(
- _cgroup_path: PathBuf,
+ _cgroup_path: &Path,
_container_name: &str,
-) -> Result> {
- bail!("systemd cgroup feature is required, but was not enabled during compile time");
+) -> Result {
+ Err(systemd::manager::SystemdManagerError::NotEnabled)
}
-pub fn get_all_pids(path: &Path) -> Result> {
- log::debug!("scan pids in folder: {:?}", path);
+pub fn get_all_pids(path: &Path) -> Result, WrappedIoError> {
+ tracing::debug!("scan pids in folder: {:?}", path);
let mut result = vec![];
walk_dir(path, &mut |p| {
let file_path = p.join(CGROUP_PROCS);
if file_path.exists() {
- let file = File::open(file_path)?;
+ let file = File::open(&file_path).wrap_open(&file_path)?;
for line in BufReader::new(file).lines().flatten() {
- result.push(Pid::from_raw(line.parse::()?))
+ result.push(Pid::from_raw(
+ line.parse::()
+ .map_err(|err| std::io::Error::new(std::io::ErrorKind::InvalidData, err))
+ .wrap_other(&file_path)?,
+ ))
}
}
- Ok(())
+ Ok::<(), WrappedIoError>(())
})?;
Ok(result)
}
-fn walk_dir(path: &Path, c: &mut F) -> Result<()>
+fn walk_dir(path: &Path, c: &mut F) -> Result<(), E>
where
- F: FnMut(&Path) -> Result<()>,
+ F: FnMut(&Path) -> Result<(), E>,
+ E: From,
{
c(path)?;
- for entry in fs::read_dir(path)? {
- let entry = entry?;
+ for entry in fs::read_dir(path).wrap_read(path)? {
+ let entry = entry.wrap_open(path)?;
let path = entry.path();
if path.is_dir() {
@@ -283,11 +448,20 @@ where
}
pub(crate) trait PathBufExt {
- fn join_safely>(&self, path: P) -> Result;
+ fn join_safely>(&self, path: P) -> Result;
+}
+
+#[derive(thiserror::Error, Debug)]
+pub enum JoinSafelyError {
+ #[error("failed to strip prefix from {path}: {err}")]
+ StripPrefix {
+ err: StripPrefixError,
+ path: PathBuf,
+ },
}
impl PathBufExt for PathBuf {
- fn join_safely>(&self, path: P) -> Result {
+ fn join_safely>(&self, path: P) -> Result {
let path = path.as_ref();
if path.is_relative() {
return Ok(self.join(path));
@@ -295,7 +469,10 @@ impl PathBufExt for PathBuf {
let stripped = path
.strip_prefix("/")
- .with_context(|| format!("failed to strip prefix from {}", path.display()))?;
+ .map_err(|err| JoinSafelyError::StripPrefix {
+ err,
+ path: path.to_path_buf(),
+ })?;
Ok(self.join(stripped))
}
}
@@ -411,7 +588,7 @@ pub(crate) fn delete_with_retry, L: Into>>(
path: P,
retries: u32,
limit_backoff: L,
-) -> Result<()> {
+) -> Result<(), WrappedIoError> {
let mut attempts = 0;
let mut delay = Duration::from_millis(10);
let path = path.as_ref();
@@ -430,5 +607,93 @@ pub(crate) fn delete_with_retry, L: Into>>(
}
}
- bail!("could not delete {:?}", path)
+ Err(std::io::Error::new(
+ std::io::ErrorKind::TimedOut,
+ "could not delete".to_string(),
+ ))
+ .wrap_other(path)?
+}
+
+pub(crate) trait WrapIoResult {
+ type Target;
+
+ fn wrap_create_dir>(self, path: P) -> Result;
+ fn wrap_read>(self, path: P) -> Result;
+ fn wrap_open>(self, path: P) -> Result;
+ fn wrap_write, D: Into>(
+ self,
+ path: P,
+ data: D,
+ ) -> Result;
+ fn wrap_other>(self, path: P) -> Result;
+}
+
+impl WrapIoResult for Result {
+ type Target = T;
+
+ fn wrap_create_dir>(self, path: P) -> Result {
+ self.map_err(|err| WrappedIoError::CreateDir {
+ err,
+ path: path.into(),
+ })
+ }
+
+ fn wrap_read>(self, path: P) -> Result {
+ self.map_err(|err| WrappedIoError::Read {
+ err,
+ path: path.into(),
+ })
+ }
+
+ fn wrap_open>(self, path: P) -> Result {
+ self.map_err(|err| WrappedIoError::Open {
+ err,
+ path: path.into(),
+ })
+ }
+
+ fn wrap_write, D: Into>(
+ self,
+ path: P,
+ data: D,
+ ) -> Result {
+ self.map_err(|err| WrappedIoError::Write {
+ err,
+ path: path.into(),
+ data: data.into(),
+ })
+ }
+
+ fn wrap_other>(self, path: P) -> Result {
+ self.map_err(|err| WrappedIoError::Other {
+ err,
+ path: path.into(),
+ })
+ }
+}
+
+#[derive(Debug)]
+pub enum EitherError {
+ Left(L),
+ Right(R),
+}
+
+impl Display for EitherError {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ match self {
+ EitherError::Left(left) => ::fmt(left, f),
+ EitherError::Right(right) => ::fmt(right, f),
+ }
+ }
+}
+
+impl std::error::Error for EitherError {}
+
+#[derive(Debug)]
+pub struct MustBePowerOfTwo;
+
+impl Display for MustBePowerOfTwo {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ f.write_str("page size must be in the format of 2^(integer)")
+ }
}
diff --git a/crates/libcgroups/src/lib.rs b/crates/libcgroups/src/lib.rs
index f7e82c2ce..12234ef3a 100644
--- a/crates/libcgroups/src/lib.rs
+++ b/crates/libcgroups/src/lib.rs
@@ -15,8 +15,17 @@ pub mod common;
pub mod stats;
#[cfg(feature = "systemd")]
pub mod systemd;
+#[cfg(not(feature = "systemd"))]
+#[path = "stub/systemd/mod.rs"]
+pub mod systemd;
pub mod test_manager;
#[cfg(feature = "v1")]
pub mod v1;
+#[cfg(not(feature = "v1"))]
+#[path = "stub/v1/mod.rs"]
+pub mod v1;
#[cfg(feature = "v2")]
pub mod v2;
+#[cfg(not(feature = "v2"))]
+#[path = "stub/v2/mod.rs"]
+pub mod v2;
diff --git a/crates/libcgroups/src/stats.rs b/crates/libcgroups/src/stats.rs
index 6d53065b2..de9491eb5 100644
--- a/crates/libcgroups/src/stats.rs
+++ b/crates/libcgroups/src/stats.rs
@@ -1,13 +1,21 @@
-use anyhow::{bail, Context, Result};
use serde::Serialize;
-use std::{collections::HashMap, fmt::Display, fs, path::Path};
+use std::{
+ collections::HashMap,
+ fmt::Display,
+ fs,
+ num::ParseIntError,
+ path::{Path, PathBuf},
+};
+
+use crate::common::{WrapIoResult, WrappedIoError};
use super::common;
-pub trait StatsProvider {
+pub(crate) trait StatsProvider {
+ type Error;
type Stats;
- fn stats(cgroup_path: &Path) -> Result;
+ fn stats(cgroup_path: &Path) -> Result;
}
/// Reports the statistics for a cgroup
@@ -188,8 +196,18 @@ pub struct PSIData {
pub avg300: f64,
}
+#[derive(thiserror::Error, Debug)]
+pub enum SupportedPageSizesError {
+ #[error("io error: {0}")]
+ Io(#[from] std::io::Error),
+ #[error("failed to parse value {value}: {err}")]
+ Parse { value: String, err: ParseIntError },
+ #[error("failed to determine page size from {dir_name}")]
+ Failed { dir_name: String },
+}
+
/// Reports which hugepage sizes are supported by the system
-pub fn supported_page_sizes() -> Result> {
+pub fn supported_page_sizes() -> Result, SupportedPageSizesError> {
let mut sizes = Vec::new();
for hugetlb_entry in fs::read_dir("/sys/kernel/mm/hugepages")? {
let hugetlb_entry = hugetlb_entry?;
@@ -206,12 +224,15 @@ pub fn supported_page_sizes() -> Result> {
Ok(sizes)
}
-fn extract_page_size(dir_name: &str) -> Result {
+fn extract_page_size(dir_name: &str) -> Result {
if let Some(size) = dir_name
.strip_prefix("hugepages-")
.and_then(|name_stripped| name_stripped.strip_suffix("kB"))
{
- let size: u64 = parse_value(size)?;
+ let size: u64 = size.parse().map_err(|err| SupportedPageSizesError::Parse {
+ value: size.into(),
+ err,
+ })?;
let size_moniker = if size >= (1 << 20) {
(size >> 20).to_string() + "GB"
@@ -224,7 +245,9 @@ fn extract_page_size(dir_name: &str) -> Result {
return Ok(size_moniker);
}
- bail!("failed to determine page size from {}", dir_name);
+ Err(SupportedPageSizesError::Failed {
+ dir_name: dir_name.into(),
+ })
}
/// Parses this string slice into an u64
@@ -235,10 +258,8 @@ fn extract_page_size(dir_name: &str) -> Result {
/// let value = parse_value("32").unwrap();
/// assert_eq!(value, 32);
/// ```
-pub fn parse_value(value: &str) -> Result {
- value
- .parse()
- .with_context(|| format!("failed to parse {}", value))
+pub fn parse_value(value: &str) -> Result {
+ value.parse()
}
/// Parses a single valued file to an u64
@@ -250,58 +271,82 @@ pub fn parse_value(value: &str) -> Result {
/// let value = parse_single_value(&Path::new("memory.current")).unwrap();
/// assert_eq!(value, 32);
/// ```
-pub fn parse_single_value(file_path: &Path) -> Result {
+pub fn parse_single_value(file_path: &Path) -> Result {
let value = common::read_cgroup_file(file_path)?;
let value = value.trim();
if value == "max" {
return Ok(u64::MAX);
}
- value.parse().with_context(|| {
- format!(
- "failed to parse value {} from {}",
- value,
- file_path.display()
- )
- })
+ value
+ .parse()
+ .map_err(|err| std::io::Error::new(std::io::ErrorKind::InvalidData, err))
+ .wrap_other(file_path)
+}
+
+#[derive(thiserror::Error, Debug)]
+pub enum ParseFlatKeyedDataError {
+ #[error("io error: {0}")]
+ WrappedIo(#[from] WrappedIoError),
+ #[error("flat keyed data at {path} contains entries that do not conform to 'key value'")]
+ DoesNotConform { path: PathBuf },
+ #[error("failed to parse value {value} from {path}")]
+ FailedToParse {
+ value: String,
+ path: PathBuf,
+ err: ParseIntError,
+ },
}
/// Parses a file that is structured according to the flat keyed format
-pub fn parse_flat_keyed_data(file_path: &Path) -> Result> {
+pub(crate) fn parse_flat_keyed_data(
+ file_path: &Path,
+) -> Result, ParseFlatKeyedDataError> {
let mut stats = HashMap::new();
let keyed_data = common::read_cgroup_file(file_path)?;
for entry in keyed_data.lines() {
let entry_fields: Vec<&str> = entry.split_ascii_whitespace().collect();
if entry_fields.len() != 2 {
- bail!(
- "flat keyed data at {} contains entries that do not conform to 'key value'",
- &file_path.display()
- );
+ return Err(ParseFlatKeyedDataError::DoesNotConform {
+ path: file_path.to_path_buf(),
+ });
}
stats.insert(
entry_fields[0].to_owned(),
- entry_fields[1].parse().with_context(|| {
- format!(
- "failed to parse value {} from {}",
- entry_fields[0],
- file_path.display()
- )
- })?,
+ entry_fields[1]
+ .parse()
+ .map_err(|err| ParseFlatKeyedDataError::FailedToParse {
+ value: entry_fields[0].into(),
+ path: file_path.to_path_buf(),
+ err,
+ })?,
);
}
Ok(stats)
}
-/// Parses a file that is structed according to the nested keyed format
-pub fn parse_nested_keyed_data(file_path: &Path) -> Result>> {
+#[derive(thiserror::Error, Debug)]
+pub enum ParseNestedKeyedDataError {
+ #[error("io error: {0}")]
+ WrappedIo(#[from] WrappedIoError),
+ #[error("nested keyed data at {path} contains entries that do not conform to key format")]
+ DoesNotConform { path: PathBuf },
+}
+
+/// Parses a file that is structured according to the nested keyed format
+pub fn parse_nested_keyed_data(
+ file_path: &Path,
+) -> Result>, ParseNestedKeyedDataError> {
let mut stats: HashMap> = HashMap::new();
let keyed_data = common::read_cgroup_file(file_path)?;
for entry in keyed_data.lines() {
let entry_fields: Vec<&str> = entry.split_ascii_whitespace().collect();
if entry_fields.len() < 2 || !entry_fields[1..].iter().all(|p| p.contains('=')) {
- bail!("nested key data at {} contains entries that do not conform to the nested key format", file_path.display());
+ return Err(ParseNestedKeyedDataError::DoesNotConform {
+ path: file_path.to_path_buf(),
+ });
}
stats.insert(
@@ -317,50 +362,76 @@ pub fn parse_nested_keyed_data(file_path: &Path) -> Result Result<(u64, u64)> {
+#[derive(thiserror::Error, Debug)]
+pub enum ParseDeviceNumberError {
+ #[error("failed to parse device number from {device}: expected 2 parts, found {numbers}")]
+ TooManyNumbers { device: String, numbers: usize },
+ #[error("failed to parse device number from {device}: {err}")]
+ MalformedNumber { device: String, err: ParseIntError },
+}
+
+pub(crate) fn parse_device_number(device: &str) -> Result<(u64, u64), ParseDeviceNumberError> {
let numbers: Vec<&str> = device.split_terminator(':').collect();
if numbers.len() != 2 {
- bail!("failed to parse device number {}", device);
+ return Err(ParseDeviceNumberError::TooManyNumbers {
+ device: device.into(),
+ numbers: numbers.len(),
+ });
}
- Ok((numbers[0].parse()?, numbers[1].parse()?))
+ Ok((
+ numbers[0]
+ .parse()
+ .map_err(|err| ParseDeviceNumberError::MalformedNumber {
+ device: device.into(),
+ err,
+ })?,
+ numbers[1]
+ .parse()
+ .map_err(|err| ParseDeviceNumberError::MalformedNumber {
+ device: device.into(),
+ err,
+ })?,
+ ))
+}
+
+#[derive(thiserror::Error, Debug)]
+pub enum PidStatsError {
+ #[error("io error: {0}")]
+ WrappedIo(#[from] WrappedIoError),
+ #[error("failed to parse current pids: {0}")]
+ ParseCurrent(ParseIntError),
+ #[error("failed to parse pids limit: {0}")]
+ ParseLimit(ParseIntError),
}
/// Returns cgroup pid statistics
-pub fn pid_stats(cgroup_path: &Path) -> Result {
+pub fn pid_stats(cgroup_path: &Path) -> Result {
let mut stats = PidStats::default();
let current = common::read_cgroup_file(cgroup_path.join("pids.current"))?;
stats.current = current
.trim()
.parse()
- .context("failed to parse current pids")?;
+ .map_err(PidStatsError::ParseCurrent)?;
let limit =
common::read_cgroup_file(cgroup_path.join("pids.max")).map(|l| l.trim().to_owned())?;
if limit != "max" {
- stats.limit = limit.parse().context("failed to parse pids limit")?;
+ stats.limit = limit.parse().map_err(PidStatsError::ParseLimit)?;
}
Ok(stats)
}
-pub fn psi_stats(psi_file: &Path) -> Result {
+pub fn psi_stats(psi_file: &Path) -> Result {
let mut stats = PSIStats::default();
let psi = common::read_cgroup_file(psi_file)?;
for line in psi.lines() {
match &line[0..4] {
- "some" => stats.some = parse_psi(&line[4..])?,
- "full" => stats.full = parse_psi(&line[4..])?,
+ "some" => stats.some = parse_psi(&line[4..], psi_file)?,
+ "full" => stats.full = parse_psi(&line[4..], psi_file)?,
_ => continue,
}
}
@@ -368,7 +439,9 @@ pub fn psi_stats(psi_file: &Path) -> Result {
Ok(stats)
}
-fn parse_psi(stat_line: &str) -> Result {
+fn parse_psi(stat_line: &str, path: &Path) -> Result {
+ use std::io::{Error, ErrorKind};
+
let mut psi_data = PSIData::default();
for kv in stat_line.split_ascii_whitespace() {
@@ -376,17 +449,20 @@ fn parse_psi(stat_line: &str) -> Result {
Some(("avg10", v)) => {
psi_data.avg10 = v
.parse()
- .with_context(|| format!("invalid psi value {v}"))?
+ .map_err(|err| Error::new(ErrorKind::InvalidData, err))
+ .wrap_other(path)?
}
Some(("avg60", v)) => {
psi_data.avg60 = v
.parse()
- .with_context(|| format!("invalid psi value {v}"))?
+ .map_err(|err| Error::new(ErrorKind::InvalidData, err))
+ .wrap_other(path)?
}
Some(("avg300", v)) => {
psi_data.avg300 = v
.parse()
- .with_context(|| format!("invalid psi value {v}"))?
+ .map_err(|err| Error::new(ErrorKind::InvalidData, err))
+ .wrap_other(path)?
}
_ => continue,
}
@@ -397,7 +473,7 @@ fn parse_psi(stat_line: &str) -> Result {
#[cfg(test)]
mod tests {
- use crate::test::{create_temp_dir, set_fixture};
+ use crate::test::set_fixture;
use super::*;
@@ -421,8 +497,8 @@ mod tests {
#[test]
fn test_parse_single_value_valid() {
- let tmp = create_temp_dir("test_parse_single_value_valid").unwrap();
- let file_path = set_fixture(&tmp, "single_valued_file", "1200\n").unwrap();
+ let tmp = tempfile::tempdir().unwrap();
+ let file_path = set_fixture(tmp.path(), "single_valued_file", "1200\n").unwrap();
let value = parse_single_value(&file_path).unwrap();
assert_eq!(value, 1200);
@@ -430,8 +506,8 @@ mod tests {
#[test]
fn test_parse_single_value_invalid_number() {
- let tmp = create_temp_dir("test_parse_single_value_invalid_number").unwrap();
- let file_path = set_fixture(&tmp, "single_invalid_file", "noop\n").unwrap();
+ let tmp = tempfile::tempdir().unwrap();
+ let file_path = set_fixture(tmp.path(), "single_invalid_file", "noop\n").unwrap();
let value = parse_single_value(&file_path);
assert!(value.is_err());
@@ -439,8 +515,8 @@ mod tests {
#[test]
fn test_parse_single_value_multiple_entries() {
- let tmp = create_temp_dir("test_parse_single_value_multiple_entries").unwrap();
- let file_path = set_fixture(&tmp, "multi_valued_file", "1200\n1400\n1600").unwrap();
+ let tmp = tempfile::tempdir().unwrap();
+ let file_path = set_fixture(tmp.path(), "multi_valued_file", "1200\n1400\n1600").unwrap();
let value = parse_single_value(&file_path);
assert!(value.is_err());
@@ -448,9 +524,9 @@ mod tests {
#[test]
fn test_parse_flat_keyed_data() {
- let tmp = create_temp_dir("test_parse_flat_keyed_data").unwrap();
+ let tmp = tempfile::tempdir().unwrap();
let file_content = ["key1 1", "key2 2", "key3 3"].join("\n");
- let file_path = set_fixture(&tmp, "flat_keyed_data", &file_content).unwrap();
+ let file_path = set_fixture(tmp.path(), "flat_keyed_data", &file_content).unwrap();
let actual = parse_flat_keyed_data(&file_path).unwrap();
let mut expected = HashMap::with_capacity(3);
@@ -463,9 +539,9 @@ mod tests {
#[test]
fn test_parse_flat_keyed_data_with_characters() {
- let tmp = create_temp_dir("test_parse_flat_keyed_data_with_characters").unwrap();
+ let tmp = tempfile::tempdir().unwrap();
let file_content = ["key1 1", "key2 a", "key3 b"].join("\n");
- let file_path = set_fixture(&tmp, "flat_keyed_data", &file_content).unwrap();
+ let file_path = set_fixture(tmp.path(), "flat_keyed_data", &file_content).unwrap();
let result = parse_flat_keyed_data(&file_path);
assert!(result.is_err());
@@ -473,9 +549,9 @@ mod tests {
#[test]
fn test_parse_space_separated_as_flat_keyed_data() {
- let tmp = create_temp_dir("test_parse_space_separated_as_flat_keyed_data").unwrap();
+ let tmp = tempfile::tempdir().unwrap();
let file_content = ["key1", "key2", "key3", "key4"].join(" ");
- let file_path = set_fixture(&tmp, "space_separated", &file_content).unwrap();
+ let file_path = set_fixture(tmp.path(), "space_separated", &file_content).unwrap();
let result = parse_flat_keyed_data(&file_path);
assert!(result.is_err());
@@ -483,9 +559,9 @@ mod tests {
#[test]
fn test_parse_newline_separated_as_flat_keyed_data() {
- let tmp = create_temp_dir("test_parse_newline_separated_as_flat_keyed_data").unwrap();
+ let tmp = tempfile::tempdir().unwrap();
let file_content = ["key1", "key2", "key3", "key4"].join("\n");
- let file_path = set_fixture(&tmp, "newline_separated", &file_content).unwrap();
+ let file_path = set_fixture(tmp.path(), "newline_separated", &file_content).unwrap();
let result = parse_flat_keyed_data(&file_path);
assert!(result.is_err());
@@ -493,14 +569,14 @@ mod tests {
#[test]
fn test_parse_nested_keyed_data_as_flat_keyed_data() {
- let tmp = create_temp_dir("test_parse_nested_keyed_data_as_flat_keyed_data").unwrap();
+ let tmp = tempfile::tempdir().unwrap();
let file_content = [
"key1 subkey1=value1 subkey2=value2 subkey3=value3",
"key2 subkey1=value1 subkey2=value2 subkey3=value3",
"key3 subkey1=value1 subkey2=value2 subkey3=value3",
]
.join("\n");
- let file_path = set_fixture(&tmp, "nested_keyed_data", &file_content).unwrap();
+ let file_path = set_fixture(tmp.path(), "nested_keyed_data", &file_content).unwrap();
let result = parse_flat_keyed_data(&file_path);
assert!(result.is_err());
@@ -508,14 +584,14 @@ mod tests {
#[test]
fn test_parse_nested_keyed_data() {
- let tmp = create_temp_dir("test_parse_nested_keyed_data").unwrap();
+ let tmp = tempfile::tempdir().unwrap();
let file_content = [
"key1 subkey1=value1 subkey2=value2 subkey3=value3",
"key2 subkey1=value1 subkey2=value2 subkey3=value3",
"key3 subkey1=value1 subkey2=value2 subkey3=value3",
]
.join("\n");
- let file_path = set_fixture(&tmp, "nested_keyed_data", &file_content).unwrap();
+ let file_path = set_fixture(tmp.path(), "nested_keyed_data", &file_content).unwrap();
let actual = parse_nested_keyed_data(&file_path).unwrap();
let mut expected = HashMap::with_capacity(3);
@@ -549,9 +625,9 @@ mod tests {
#[test]
fn test_parse_space_separated_as_nested_keyed_data() {
- let tmp = create_temp_dir("test_parse_space_separated_as_nested_keyed_data").unwrap();
+ let tmp = tempfile::tempdir().unwrap();
let file_content = ["key1", "key2", "key3", "key4"].join(" ");
- let file_path = set_fixture(&tmp, "space_separated", &file_content).unwrap();
+ let file_path = set_fixture(tmp.path(), "space_separated", &file_content).unwrap();
let result = parse_nested_keyed_data(&file_path);
assert!(result.is_err());
@@ -559,9 +635,9 @@ mod tests {
#[test]
fn test_parse_newline_separated_as_nested_keyed_data() {
- let tmp = create_temp_dir("test_parse_newline_separated_as_nested_keyed_data").unwrap();
+ let tmp = tempfile::tempdir().unwrap();
let file_content = ["key1", "key2", "key3", "key4"].join("\n");
- let file_path = set_fixture(&tmp, "newline_separated", &file_content).unwrap();
+ let file_path = set_fixture(tmp.path(), "newline_separated", &file_content).unwrap();
let result = parse_nested_keyed_data(&file_path);
assert!(result.is_err());
@@ -569,9 +645,9 @@ mod tests {
#[test]
fn test_parse_flat_keyed_as_nested_keyed_data() {
- let tmp = create_temp_dir("test_parse_flat_keyed_as_nested_keyed_data").unwrap();
+ let tmp = tempfile::tempdir().unwrap();
let file_content = ["key1 1", "key2 2", "key3 3"].join("\n");
- let file_path = set_fixture(&tmp, "newline_separated", &file_content).unwrap();
+ let file_path = set_fixture(tmp.path(), "newline_separated", &file_content).unwrap();
let result = parse_nested_keyed_data(&file_path);
assert!(result.is_err());
@@ -591,13 +667,13 @@ mod tests {
#[test]
fn test_parse_psi_full_stats() {
- let tmp = create_temp_dir("test_parse_psi_full_stats").unwrap();
+ let tmp = tempfile::tempdir().unwrap();
let file_content = [
"some avg10=80.00 avg60=50.00 avg300=90.00 total=0",
"full avg10=10.00 avg60=30.00 avg300=50.00 total=0",
]
.join("\n");
- let psi_file = set_fixture(&tmp, "psi.pressure", &file_content).unwrap();
+ let psi_file = set_fixture(tmp.path(), "psi.pressure", &file_content).unwrap();
let result = psi_stats(&psi_file).unwrap();
assert_eq!(
@@ -619,9 +695,9 @@ mod tests {
#[test]
fn test_parse_psi_only_some() {
- let tmp = create_temp_dir("test_parse_psi_only_some").unwrap();
+ let tmp = tempfile::tempdir().unwrap();
let file_content = ["some avg10=80.00 avg60=50.00 avg300=90.00 total=0"].join("\n");
- let psi_file = set_fixture(&tmp, "psi.pressure", &file_content).unwrap();
+ let psi_file = set_fixture(tmp.path(), "psi.pressure", &file_content).unwrap();
let result = psi_stats(&psi_file).unwrap();
assert_eq!(
diff --git a/crates/libcgroups/src/stub/systemd/manager.rs b/crates/libcgroups/src/stub/systemd/manager.rs
new file mode 100644
index 000000000..d2f488870
--- /dev/null
+++ b/crates/libcgroups/src/stub/systemd/manager.rs
@@ -0,0 +1,43 @@
+use crate::common::{AnyCgroupManager, CgroupManager};
+
+#[derive(thiserror::Error, Debug)]
+pub enum SystemdManagerError {
+ #[error("systemd cgroup feature is required, but was not enabled during compile time")]
+ NotEnabled,
+}
+
+pub struct Manager {}
+
+impl Manager {
+ pub fn any(self) -> AnyCgroupManager {
+ AnyCgroupManager::Systemd(self)
+ }
+}
+
+impl CgroupManager for Manager {
+ type Error = SystemdManagerError;
+
+ fn add_task(&self, _pid: nix::unistd::Pid) -> Result<(), Self::Error> {
+ Err(SystemdManagerError::NotEnabled)
+ }
+
+ fn apply(&self, _controller_opt: &crate::common::ControllerOpt) -> Result<(), Self::Error> {
+ Err(SystemdManagerError::NotEnabled)
+ }
+
+ fn remove(&self) -> Result<(), Self::Error> {
+ Err(SystemdManagerError::NotEnabled)
+ }
+
+ fn freeze(&self, _state: crate::common::FreezerState) -> Result<(), Self::Error> {
+ Err(SystemdManagerError::NotEnabled)
+ }
+
+ fn stats(&self) -> Result {
+ Err(SystemdManagerError::NotEnabled)
+ }
+
+ fn get_all_pids(&self) -> Result, Self::Error> {
+ Err(SystemdManagerError::NotEnabled)
+ }
+}
diff --git a/crates/libcgroups/src/stub/systemd/mod.rs b/crates/libcgroups/src/stub/systemd/mod.rs
new file mode 100644
index 000000000..ff8de9eb9
--- /dev/null
+++ b/crates/libcgroups/src/stub/systemd/mod.rs
@@ -0,0 +1 @@
+pub mod manager;
diff --git a/crates/libcgroups/src/stub/v1/manager.rs b/crates/libcgroups/src/stub/v1/manager.rs
new file mode 100644
index 000000000..d464ca53c
--- /dev/null
+++ b/crates/libcgroups/src/stub/v1/manager.rs
@@ -0,0 +1,43 @@
+use crate::common::{AnyCgroupManager, CgroupManager};
+
+#[derive(thiserror::Error, Debug)]
+pub enum V1ManagerError {
+ #[error("v1 cgroup feature is required, but was not enabled during compile time")]
+ NotEnabled,
+}
+
+pub struct Manager {}
+
+impl Manager {
+ pub fn any(self) -> AnyCgroupManager {
+ crate::common::AnyCgroupManager::V1(self)
+ }
+}
+
+impl CgroupManager for Manager {
+ type Error = V1ManagerError;
+
+ fn add_task(&self, _pid: nix::unistd::Pid) -> Result<(), Self::Error> {
+ Err(V1ManagerError::NotEnabled)
+ }
+
+ fn apply(&self, _controller_opt: &crate::common::ControllerOpt) -> Result<(), Self::Error> {
+ Err(V1ManagerError::NotEnabled)
+ }
+
+ fn remove(&self) -> Result<(), Self::Error> {
+ Err(V1ManagerError::NotEnabled)
+ }
+
+ fn freeze(&self, _state: crate::common::FreezerState) -> Result<(), Self::Error> {
+ Err(V1ManagerError::NotEnabled)
+ }
+
+ fn stats(&self) -> Result {
+ Err(V1ManagerError::NotEnabled)
+ }
+
+ fn get_all_pids(&self) -> Result, Self::Error> {
+ Err(V1ManagerError::NotEnabled)
+ }
+}
diff --git a/crates/libcgroups/src/stub/v1/mod.rs b/crates/libcgroups/src/stub/v1/mod.rs
new file mode 100644
index 000000000..ff8de9eb9
--- /dev/null
+++ b/crates/libcgroups/src/stub/v1/mod.rs
@@ -0,0 +1 @@
+pub mod manager;
diff --git a/crates/libcgroups/src/stub/v2/manager.rs b/crates/libcgroups/src/stub/v2/manager.rs
new file mode 100644
index 000000000..220184bf4
--- /dev/null
+++ b/crates/libcgroups/src/stub/v2/manager.rs
@@ -0,0 +1,43 @@
+use crate::common::{AnyCgroupManager, CgroupManager};
+
+#[derive(thiserror::Error, Debug)]
+pub enum V2ManagerError {
+ #[error("v2 cgroup feature is required, but was not enabled during compile time")]
+ NotEnabled,
+}
+
+pub struct Manager {}
+
+impl Manager {
+ pub fn any(self) -> AnyCgroupManager {
+ crate::common::AnyCgroupManager::V2(self)
+ }
+}
+
+impl CgroupManager for Manager {
+ type Error = V2ManagerError;
+
+ fn add_task(&self, _pid: nix::unistd::Pid) -> Result<(), Self::Error> {
+ Err(V2ManagerError::NotEnabled)
+ }
+
+ fn apply(&self, _controller_opt: &crate::common::ControllerOpt) -> Result<(), Self::Error> {
+ Err(V2ManagerError::NotEnabled)
+ }
+
+ fn remove(&self) -> Result<(), Self::Error> {
+ Err(V2ManagerError::NotEnabled)
+ }
+
+ fn freeze(&self, _state: crate::common::FreezerState) -> Result<(), Self::Error> {
+ Err(V2ManagerError::NotEnabled)
+ }
+
+ fn stats(&self) -> Result {
+ Err(V2ManagerError::NotEnabled)
+ }
+
+ fn get_all_pids(&self) -> Result, Self::Error> {
+ Err(V2ManagerError::NotEnabled)
+ }
+}
diff --git a/crates/libcgroups/src/stub/v2/mod.rs b/crates/libcgroups/src/stub/v2/mod.rs
new file mode 100644
index 000000000..ff8de9eb9
--- /dev/null
+++ b/crates/libcgroups/src/stub/v2/mod.rs
@@ -0,0 +1 @@
+pub mod manager;
diff --git a/crates/libcgroups/src/systemd/controller.rs b/crates/libcgroups/src/systemd/controller.rs
index 5e2075a63..2e93003c5 100644
--- a/crates/libcgroups/src/systemd/controller.rs
+++ b/crates/libcgroups/src/systemd/controller.rs
@@ -1,14 +1,15 @@
use std::collections::HashMap;
-use anyhow::Result;
use dbus::arg::RefArg;
use crate::common::ControllerOpt;
-pub(crate) trait Controller {
+pub(super) trait Controller {
+ type Error;
+
fn apply(
options: &ControllerOpt,
systemd_version: u32,
properties: &mut HashMap<&str, Box>,
- ) -> Result<()>;
+ ) -> Result<(), Self::Error>;
}
diff --git a/crates/libcgroups/src/systemd/controller_type.rs b/crates/libcgroups/src/systemd/controller_type.rs
index e38d5d64f..2383a31ec 100644
--- a/crates/libcgroups/src/systemd/controller_type.rs
+++ b/crates/libcgroups/src/systemd/controller_type.rs
@@ -18,7 +18,7 @@ impl Display for ControllerType {
ControllerType::Pids => "pids",
};
- write!(f, "{}", print)
+ write!(f, "{print}")
}
}
diff --git a/crates/libcgroups/src/systemd/cpu.rs b/crates/libcgroups/src/systemd/cpu.rs
index 32aaec048..f9b104af4 100644
--- a/crates/libcgroups/src/systemd/cpu.rs
+++ b/crates/libcgroups/src/systemd/cpu.rs
@@ -1,6 +1,5 @@
use std::collections::HashMap;
-use anyhow::{bail, Context, Result};
use dbus::arg::RefArg;
use oci_spec::runtime::LinuxCpu;
@@ -12,18 +11,25 @@ pub const CPU_QUOTA: &str = "CPUQuotaPerSecUSec";
pub const CPU_PERIOD: &str = "CPUQuotaPeriodUSec";
const MICROSECS_PER_SEC: u64 = 1_000_000;
+#[derive(thiserror::Error, Debug)]
+pub enum SystemdCpuError {
+ #[error("realtime is not supported on systemd v2 yet")]
+ RealtimeSystemd,
+}
+
pub(crate) struct Cpu {}
impl Controller for Cpu {
+ type Error = SystemdCpuError;
+
fn apply(
options: &ControllerOpt,
_: u32,
properties: &mut HashMap<&str, Box>,
- ) -> Result<()> {
+ ) -> Result<(), Self::Error> {
if let Some(cpu) = options.resources.cpu() {
- log::debug!("Applying cpu resource restrictions");
- return Self::apply(cpu, properties)
- .context("could not apply cpu resource restrictions");
+ tracing::debug!("Applying cpu resource restrictions");
+ Self::apply(cpu, properties)?;
}
Ok(())
@@ -31,9 +37,12 @@ impl Controller for Cpu {
}
impl Cpu {
- fn apply(cpu: &LinuxCpu, properties: &mut HashMap<&str, Box>) -> Result<()> {
+ fn apply(
+ cpu: &LinuxCpu,
+ properties: &mut HashMap<&str, Box>,
+ ) -> Result<(), SystemdCpuError> {
if Self::is_realtime_requested(cpu) {
- bail!("realtime is not supported on systemd v2 yet");
+ return Err(SystemdCpuError::RealtimeSystemd);
}
if let Some(mut shares) = cpu.shares() {
@@ -77,11 +86,12 @@ pub fn convert_shares_to_cgroup2(shares: u64) -> u64 {
return 0;
}
- 1 + ((shares - 2) * 9999) / 262142
+ 1 + ((shares.saturating_sub(2)) * 9999) / 262142
}
#[cfg(test)]
mod tests {
+ use anyhow::{Context, Result};
use dbus::arg::ArgType;
use oci_spec::runtime::LinuxCpuBuilder;
@@ -97,7 +107,7 @@ mod tests {
let mut properties: HashMap<&str, Box> = HashMap::new();
// act
- Cpu::apply(&cpu, &mut properties).context("apply cpu")?;
+ Cpu::apply(&cpu, &mut properties)?;
// assert
assert!(properties.contains_key(CPU_WEIGHT));
@@ -119,7 +129,7 @@ mod tests {
let mut properties: HashMap<&str, Box> = HashMap::new();
// act
- Cpu::apply(&cpu, &mut properties).context("apply cpu")?;
+ Cpu::apply(&cpu, &mut properties)?;
// assert
assert!(properties.contains_key(CPU_QUOTA));
@@ -143,7 +153,7 @@ mod tests {
let mut properties: HashMap<&str, Box> = HashMap::new();
// act
- Cpu::apply(&cpu, &mut properties).context("apply cpu")?;
+ Cpu::apply(&cpu, &mut properties)?;
// assert
assert!(properties.contains_key(CPU_PERIOD));
diff --git a/crates/libcgroups/src/systemd/cpuset.rs b/crates/libcgroups/src/systemd/cpuset.rs
index e85fb7d6d..33b73b992 100644
--- a/crates/libcgroups/src/systemd/cpuset.rs
+++ b/crates/libcgroups/src/systemd/cpuset.rs
@@ -1,6 +1,5 @@
use std::collections::HashMap;
-use anyhow::{bail, Context, Result};
use dbus::arg::RefArg;
use fixedbitset::FixedBitSet;
use oci_spec::runtime::LinuxCpu;
@@ -12,18 +11,29 @@ use super::controller::Controller;
pub const ALLOWED_CPUS: &str = "AllowedCPUs";
pub const ALLOWED_NODES: &str = "AllowedMemoryNodes";
+#[derive(thiserror::Error, Debug)]
+pub enum SystemdCpuSetError {
+ #[error("setting cpuset restrictions requires systemd version greater than 243")]
+ OldSystemd,
+ #[error("could not create bitmask for cpus: {0}")]
+ CpusBitmask(BitmaskError),
+ #[error("could not create bitmask for memory nodes: {0}")]
+ MemoryNodesBitmask(BitmaskError),
+}
+
pub struct CpuSet {}
impl Controller for CpuSet {
+ type Error = SystemdCpuSetError;
+
fn apply(
options: &ControllerOpt,
systemd_version: u32,
properties: &mut HashMap<&str, Box>,
- ) -> Result<()> {
+ ) -> Result<(), Self::Error> {
if let Some(cpu) = options.resources.cpu() {
- log::debug!("Applying cpuset resource restrictions");
- return Self::apply(cpu, systemd_version, properties)
- .context("could not apply cpuset resource restrictions");
+ tracing::debug!("Applying cpuset resource restrictions");
+ return Self::apply(cpu, systemd_version, properties);
}
Ok(())
@@ -35,19 +45,18 @@ impl CpuSet {
cpu: &LinuxCpu,
systemd_version: u32,
properties: &mut HashMap<&str, Box>,
- ) -> Result<()> {
+ ) -> Result<(), SystemdCpuSetError> {
if systemd_version <= 243 {
- bail!("setting cpuset restrictions requires systemd version greather than 243");
+ return Err(SystemdCpuSetError::OldSystemd);
}
if let Some(cpus) = cpu.cpus() {
- let cpu_mask = to_bitmask(cpus).context("could not create bitmask for cpus")?;
+ let cpu_mask = to_bitmask(cpus).map_err(SystemdCpuSetError::CpusBitmask)?;
properties.insert(ALLOWED_CPUS, Box::new(cpu_mask));
}
if let Some(mems) = cpu.mems() {
- let mems_mask =
- to_bitmask(mems).context("could not create bitmask for memory nodes")?;
+ let mems_mask = to_bitmask(mems).map_err(SystemdCpuSetError::MemoryNodesBitmask)?;
properties.insert(ALLOWED_NODES, Box::new(mems_mask));
}
@@ -55,7 +64,18 @@ impl CpuSet {
}
}
-pub fn to_bitmask(range: &str) -> Result> {
+#[derive(thiserror::Error, Debug)]
+pub enum BitmaskError {
+ #[error("invalid index {index}: {err}")]
+ InvalidIndex {
+ err: std::num::ParseIntError,
+ index: String,
+ },
+ #[error("invalid cpu range {0}")]
+ InvalidRange(String),
+}
+
+pub fn to_bitmask(range: &str) -> Result, BitmaskError> {
let mut bitset = FixedBitSet::with_capacity(8);
for cpu_set in range.split_terminator(',') {
@@ -66,16 +86,25 @@ pub fn to_bitmask(range: &str) -> Result> {
let cpus: Vec<&str> = cpu_set.split('-').map(|s| s.trim()).collect();
if cpus.len() == 1 {
- let cpu_index: usize = cpus[0].parse()?;
+ let cpu_index: usize = cpus[0].parse().map_err(|err| BitmaskError::InvalidIndex {
+ err,
+ index: cpus[0].into(),
+ })?;
if cpu_index >= bitset.len() {
bitset.grow(bitset.len() + 8);
}
bitset.set(cpu_index, true);
} else {
- let start_index = cpus[0].parse()?;
- let end_index = cpus[1].parse()?;
+ let start_index = cpus[0].parse().map_err(|err| BitmaskError::InvalidIndex {
+ err,
+ index: cpus[0].into(),
+ })?;
+ let end_index = cpus[1].parse().map_err(|err| BitmaskError::InvalidIndex {
+ err,
+ index: cpus[1].into(),
+ })?;
if start_index > end_index {
- bail!("invalid cpu range {}", cpu_set);
+ return Err(BitmaskError::InvalidRange(cpu_set.into()));
}
if end_index >= bitset.len() {
@@ -98,6 +127,7 @@ pub fn to_bitmask(range: &str) -> Result> {
#[cfg(test)]
mod tests {
+ use anyhow::{Context, Result};
use dbus::arg::{ArgType, RefArg};
use oci_spec::runtime::LinuxCpuBuilder;
diff --git a/crates/libcgroups/src/systemd/dbus/client.rs b/crates/libcgroups/src/systemd/dbus/client.rs
index bb489b9f7..b51b9a801 100644
--- a/crates/libcgroups/src/systemd/dbus/client.rs
+++ b/crates/libcgroups/src/systemd/dbus/client.rs
@@ -1,11 +1,29 @@
use crate::systemd::dbus::systemd_api::OrgFreedesktopSystemd1Manager;
-use anyhow::{Context, Result};
use dbus::arg::{RefArg, Variant};
use dbus::blocking::{Connection, Proxy};
use std::collections::HashMap;
+use std::num::ParseIntError;
use std::path::PathBuf;
use std::time::Duration;
+#[derive(thiserror::Error, Debug)]
+pub enum SystemdClientError {
+ #[error("dbus error: {0}")]
+ DBus(#[from] dbus::Error),
+ #[error("failed to start transient unit {unit_name}, parent is {parent}: {err}")]
+ FailedTransient {
+ err: dbus::Error,
+ unit_name: String,
+ parent: String,
+ },
+ #[error("failed to stop unit {unit_name}: {err}")]
+ FailedStop { err: dbus::Error, unit_name: String },
+ #[error("failed to set properties for unit {unit_name}: {err}")]
+ FailedProperties { err: dbus::Error, unit_name: String },
+ #[error("could not parse systemd version: {0}")]
+ SystemdVersion(ParseIntError),
+}
+
pub trait SystemdClient {
fn is_system(&self) -> bool;
@@ -17,19 +35,19 @@ pub trait SystemdClient {
pid: u32,
parent: &str,
unit_name: &str,
- ) -> Result<()>;
+ ) -> Result<(), SystemdClientError>;
- fn stop_transient_unit(&self, unit_name: &str) -> Result<()>;
+ fn stop_transient_unit(&self, unit_name: &str) -> Result<(), SystemdClientError>;
fn set_unit_properties(
&self,
unit_name: &str,
properties: &HashMap<&str, Box>,
- ) -> Result<()>;
+ ) -> Result<(), SystemdClientError>;
- fn systemd_version(&self) -> Result;
+ fn systemd_version(&self) -> Result;
- fn control_cgroup_root(&self) -> Result;
+ fn control_cgroup_root(&self) -> Result;
}
/// Client is a wrapper providing higher level API and abatraction around dbus.
@@ -41,13 +59,13 @@ pub struct Client {
impl Client {
/// Uses the system bus to communicate with systemd
- pub fn new_system() -> Result {
+ pub fn new_system() -> Result {
let conn = Connection::new_system()?;
Ok(Client { conn, system: true })
}
/// Uses the session bus to communicate with systemd
- pub fn new_session() -> Result {
+ pub fn new_session() -> Result {
let conn = Connection::new_session()?;
Ok(Client {
conn,
@@ -83,7 +101,7 @@ impl SystemdClient for Client {
pid: u32,
parent: &str,
unit_name: &str,
- ) -> Result<()> {
+ ) -> Result<(), SystemdClientError> {
// To view and introspect the methods under the 'org.freedesktop.systemd1' destination
// and object path under it use the following command:
// `gdbus introspect --system --dest org.freedesktop.systemd1 --object-path /org/freedesktop/systemd1`
@@ -99,7 +117,7 @@ impl SystemdClient for Client {
let mut properties: Vec<(&str, Variant>)> = Vec::with_capacity(6);
properties.push((
"Description",
- Variant(Box::new(format!("youki container {}", container_name))),
+ Variant(Box::new(format!("youki container {container_name}"))),
));
// if we create a slice, the parent is defined via a Wants=
@@ -119,24 +137,26 @@ impl SystemdClient for Client {
properties.push(("DefaultDependencies", Variant(Box::new(false))));
properties.push(("PIDs", Variant(Box::new(vec![pid]))));
- log::debug!("Starting transient unit: {:?}", properties);
+ tracing::debug!("Starting transient unit: {:?}", properties);
proxy
.start_transient_unit(unit_name, "replace", properties, vec![])
- .with_context(|| {
- format!(
- "failed to start transient unit {}, parent is {}",
- unit_name, parent
- )
+ .map_err(|err| SystemdClientError::FailedTransient {
+ err,
+ unit_name: unit_name.into(),
+ parent: parent.into(),
})?;
Ok(())
}
- fn stop_transient_unit(&self, unit_name: &str) -> Result<()> {
+ fn stop_transient_unit(&self, unit_name: &str) -> Result<(), SystemdClientError> {
let proxy = self.create_proxy();
proxy
.stop_unit(unit_name, "replace")
- .with_context(|| format!("failed to stop unit {}", unit_name))?;
+ .map_err(|err| SystemdClientError::FailedStop {
+ err,
+ unit_name: unit_name.into(),
+ })?;
Ok(())
}
@@ -144,7 +164,7 @@ impl SystemdClient for Client {
&self,
unit_name: &str,
properties: &HashMap<&str, Box>,
- ) -> Result<()> {
+ ) -> Result<(), SystemdClientError> {
let proxy = self.create_proxy();
let props = properties
@@ -154,33 +174,32 @@ impl SystemdClient for Client {
proxy
.set_unit_properties(unit_name, true, props)
- .with_context(|| format!("failed to set properties for unit {:?}", unit_name))?;
+ .map_err(|err| SystemdClientError::FailedProperties {
+ err,
+ unit_name: unit_name.into(),
+ })?;
Ok(())
}
- fn systemd_version(&self) -> Result {
+ fn systemd_version(&self) -> Result {
let proxy = self.create_proxy();
let version = proxy
- .version()
- .context("dbus request failed")?
+ .version()?
.chars()
.skip_while(|c| c.is_alphabetic())
.take_while(|c| c.is_numeric())
.collect::()
.parse::()
- .context("could not parse systemd version")?;
+ .map_err(SystemdClientError::SystemdVersion)?;
Ok(version)
}
- fn control_cgroup_root(&self) -> Result {
+ fn control_cgroup_root(&self) -> Result {
let proxy = self.create_proxy();
- let cgroup_root = proxy
- .control_group()
- .context("failed to get systemd control group")?;
- PathBuf::try_from(&cgroup_root)
- .with_context(|| format!("parse systemd control cgroup {} into path", cgroup_root))
+ let cgroup_root = proxy.control_group()?;
+ Ok(PathBuf::from(&cgroup_root))
}
}
diff --git a/crates/libcgroups/src/systemd/manager.rs b/crates/libcgroups/src/systemd/manager.rs
index 4f38c1e52..286b2fe34 100644
--- a/crates/libcgroups/src/systemd/manager.rs
+++ b/crates/libcgroups/src/systemd/manager.rs
@@ -1,11 +1,11 @@
use std::{
collections::HashMap,
+ convert::Infallible,
fmt::{Debug, Display},
fs::{self},
path::Component::RootDir,
};
-use anyhow::{anyhow, bail, Context, Result};
use dbus::arg::RefArg;
use nix::{unistd::Pid, NixPath};
use std::path::{Path, PathBuf};
@@ -15,13 +15,17 @@ use super::{
controller_type::{ControllerType, CONTROLLER_TYPES},
cpu::Cpu,
cpuset::CpuSet,
- dbus::client::{Client, SystemdClient},
+ dbus::client::{Client, SystemdClient, SystemdClientError},
memory::Memory,
pids::Pids,
};
use crate::{
- common::{self, CgroupManager, ControllerOpt, FreezerState, PathBufExt},
+ common::{
+ self, AnyCgroupManager, CgroupManager, ControllerOpt, FreezerState, JoinSafelyError,
+ PathBufExt, WrapIoResult, WrappedIoError,
+ },
systemd::unified::Unified,
+ v2::manager::V2ManagerError,
};
use crate::{stats::Stats, v2::manager::Manager as FsManager};
@@ -61,19 +65,29 @@ struct CgroupsPath {
name: String,
}
+#[derive(thiserror::Error, Debug)]
+pub enum CgroupsPathError {
+ #[error("no cgroups path has been provided")]
+ NoPath,
+ #[error("cgroups path does not contain valid utf8")]
+ InvalidUtf8(PathBuf),
+ #[error("cgroups path is malformed: {0}")]
+ MalformedPath(PathBuf),
+}
+
impl TryFrom<&Path> for CgroupsPath {
- type Error = anyhow::Error;
+ type Error = CgroupsPathError;
fn try_from(cgroups_path: &Path) -> Result {
// if cgroups_path was provided it should be of the form [slice]:[prefix]:[name],
// for example: "system.slice:docker:1234".
if cgroups_path.len() == 0 {
- bail!("no cgroups path has been provided");
+ return Err(CgroupsPathError::NoPath);
}
let parts = cgroups_path
.to_str()
- .ok_or_else(|| anyhow!("failed to parse cgroups path {:?}", cgroups_path))?
+ .ok_or_else(|| CgroupsPathError::InvalidUtf8(cgroups_path.to_path_buf()))?
.split(':')
.collect::>();
@@ -88,7 +102,7 @@ impl TryFrom<&Path> for CgroupsPath {
prefix: parts[1].to_owned(),
name: parts[2].to_owned(),
},
- _ => bail!("cgroup path {:?} is invalid", cgroups_path),
+ _ => return Err(CgroupsPathError::MalformedPath(cgroups_path.to_path_buf())),
};
Ok(destructured_path)
@@ -126,27 +140,56 @@ impl Debug for Manager {
}
}
+#[derive(thiserror::Error, Debug)]
+pub enum SystemdManagerError {
+ #[error("io error: {0}")]
+ WrappedIo(#[from] WrappedIoError),
+ #[error("failed to destructure cgroups path: {0}")]
+ CgroupsPath(#[from] CgroupsPathError),
+ #[error("dbus error: {0}")]
+ DBus(#[from] dbus::Error),
+ #[error("invalid slice name: {0}")]
+ InvalidSliceName(String),
+ #[error(transparent)]
+ SystemdClient(#[from] SystemdClientError),
+ #[error("failed to join safely: {0}")]
+ JoinSafely(#[from] JoinSafelyError),
+ #[error("file not found: {0}")]
+ FileNotFound(PathBuf),
+ #[error("bad delegation boundary {boundary} for cgroups path {cgroup}")]
+ BadDelegationBoundary { boundary: PathBuf, cgroup: PathBuf },
+ #[error("in v2 manager: {0}")]
+ V2Manager(#[from] V2ManagerError),
+
+ #[error("in cpu controller: {0}")]
+ Cpu(#[from] super::cpu::SystemdCpuError),
+ #[error("in cpuset controller: {0}")]
+ CpuSet(#[from] super::cpuset::SystemdCpuSetError),
+ #[error("in memory controller: {0}")]
+ Memory(#[from] super::memory::SystemdMemoryError),
+ #[error("in pids controller: {0}")]
+ Pids(Infallible),
+ #[error("in pids unified controller: {0}")]
+ Unified(#[from] super::unified::SystemdUnifiedError),
+}
+
impl Manager {
pub fn new(
root_path: PathBuf,
cgroups_path: PathBuf,
container_name: String,
use_system: bool,
- ) -> Result {
- let mut destructured_path = cgroups_path
- .as_path()
- .try_into()
- .with_context(|| format!("failed to destructure cgroups path {:?}", cgroups_path))?;
+ ) -> Result {
+ let mut destructured_path: CgroupsPath = cgroups_path.as_path().try_into()?;
ensure_parent_unit(&mut destructured_path, use_system);
let client = match use_system {
- true => Client::new_system().context("failed to create system dbus client")?,
- false => Client::new_session().context("failed to create session dbus client")?,
+ true => Client::new_system()?,
+ false => Client::new_session()?,
};
let (cgroups_path, delegation_boundary) =
- Self::construct_cgroups_path(&destructured_path, &client)
- .context("failed to construct cgroups path")?;
+ Self::construct_cgroups_path(&destructured_path, &client)?;
let full_path = root_path.join_safely(&cgroups_path)?;
let fs_manager = FsManager::new(root_path.clone(), cgroups_path.clone())?;
@@ -179,7 +222,7 @@ impl Manager {
fn construct_cgroups_path(
cgroups_path: &CgroupsPath,
client: &dyn SystemdClient,
- ) -> Result<(PathBuf, PathBuf)> {
+ ) -> Result<(PathBuf, PathBuf), SystemdManagerError> {
// if the user provided a '.slice' (as in a branch of a tree)
// we need to convert it to a filesystem path.
@@ -187,24 +230,20 @@ impl Manager {
let systemd_root = client.control_cgroup_root()?;
let unit_name = Self::get_unit_name(cgroups_path);
- let cgroups_path = systemd_root
- .join_safely(&parent)
- .with_context(|| format!("failed to join {:?} with {:?}", systemd_root, parent))?
- .join_safely(&unit_name)
- .with_context(|| format!("failed to join {:?} with {:?}", parent, unit_name))?;
+ let cgroups_path = systemd_root.join_safely(parent)?.join_safely(unit_name)?;
Ok((cgroups_path, systemd_root))
}
// systemd represents slice hierarchy using `-`, so we need to follow suit when
// generating the path of slice. For example, 'test-a-b.slice' becomes
// '/test.slice/test-a.slice/test-a-b.slice'.
- fn expand_slice(slice: &str) -> Result {
+ fn expand_slice(slice: &str) -> Result {
let suffix = ".slice";
if slice.len() <= suffix.len() || !slice.ends_with(suffix) {
- bail!("invalid slice name: {}", slice);
+ return Err(SystemdManagerError::InvalidSliceName(slice.into()));
}
if slice.contains('/') {
- bail!("invalid slice name: {}", slice);
+ return Err(SystemdManagerError::InvalidSliceName(slice.into()));
}
let mut path = "".to_owned();
let mut prefix = "".to_owned();
@@ -215,18 +254,18 @@ impl Manager {
}
for component in slice_name.split('-') {
if component.is_empty() {
- bail!("invalid slice name: {}", slice);
+ return Err(SystemdManagerError::InvalidSliceName(slice.into()));
}
// Append the component to the path and to the prefix.
- path = format!("{}/{}{}{}", path, prefix, component, suffix);
- prefix = format!("{}{}-", prefix, component);
+ path = format!("{path}/{prefix}{component}{suffix}");
+ prefix = format!("{prefix}{component}-");
}
Ok(Path::new(&path).to_path_buf())
}
/// ensures that each level in the downward path from the delegation boundary down to
/// the scope or slice of the transient unit has all available controllers enabled
- fn ensure_controllers_attached(&self) -> Result<()> {
+ fn ensure_controllers_attached(&self) -> Result<(), SystemdManagerError> {
let full_boundary_path = self.root_path.join_safely(&self.delegation_boundary)?;
let controllers: Vec = self
@@ -240,7 +279,11 @@ impl Manager {
let mut current_path = full_boundary_path;
let mut components = self
.cgroups_path
- .strip_prefix(&self.delegation_boundary)?
+ .strip_prefix(&self.delegation_boundary)
+ .map_err(|_| SystemdManagerError::BadDelegationBoundary {
+ boundary: self.delegation_boundary.clone(),
+ cgroup: self.cgroups_path.clone(),
+ })?
.components()
.filter(|c| c.ne(&RootDir))
.peekable();
@@ -250,7 +293,7 @@ impl Manager {
while let Some(component) = components.next() {
current_path = current_path.join(component);
if !current_path.exists() {
- log::warn!(
+ tracing::warn!(
"{:?} does not exist. Resource restrictions might not work correctly",
current_path
);
@@ -270,17 +313,17 @@ impl Manager {
fn get_available_controllers>(
&self,
cgroups_path: P,
- ) -> Result> {
+ ) -> Result, SystemdManagerError> {
let controllers_path = self.root_path.join(cgroups_path).join(CGROUP_CONTROLLERS);
if !controllers_path.exists() {
- bail!(
- "cannot get available controllers. {:?} does not exist",
- controllers_path
- )
+ return Err(SystemdManagerError::FileNotFound(controllers_path));
}
let mut controllers = Vec::new();
- for controller in fs::read_to_string(controllers_path)?.split_whitespace() {
+ for controller in fs::read_to_string(&controllers_path)
+ .wrap_read(controllers_path)?
+ .split_whitespace()
+ {
match controller {
"cpu" => controllers.push(ControllerType::Cpu),
"memory" => controllers.push(ControllerType::Memory),
@@ -292,110 +335,103 @@ impl Manager {
Ok(controllers)
}
- fn write_controllers(path: &Path, controllers: &[String]) -> Result<()> {
+ fn write_controllers(path: &Path, controllers: &[String]) -> Result<(), SystemdManagerError> {
for controller in controllers {
common::write_cgroup_file_str(path.join(CGROUP_SUBTREE_CONTROL), controller)?;
}
Ok(())
}
+
+ pub fn any(self) -> AnyCgroupManager {
+ AnyCgroupManager::Systemd(self)
+ }
}
impl CgroupManager for Manager {
- fn add_task(&self, pid: Pid) -> Result<()> {
+ type Error = SystemdManagerError;
+
+ fn add_task(&self, pid: Pid) -> Result<(), Self::Error> {
// Dont attach any pid to the cgroup if -1 is specified as a pid
if pid.as_raw() == -1 {
return Ok(());
}
- log::debug!("Starting {:?}", self.unit_name);
- self.client
- .start_transient_unit(
- &self.container_name,
- pid.as_raw() as u32,
- &self.destructured_path.parent,
- &self.unit_name,
- )
- .with_context(|| {
- format!(
- "failed to create unit {} for container {}",
- self.unit_name, self.container_name
- )
- })?;
+ tracing::debug!("Starting {:?}", self.unit_name);
+ self.client.start_transient_unit(
+ &self.container_name,
+ pid.as_raw() as u32,
+ &self.destructured_path.parent,
+ &self.unit_name,
+ )?;
Ok(())
}
- fn apply(&self, controller_opt: &ControllerOpt) -> Result<()> {
+ fn apply(&self, controller_opt: &ControllerOpt) -> Result<(), Self::Error> {
let mut properties: HashMap<&str, Box> = HashMap::new();
- let systemd_version = self
- .client
- .systemd_version()
- .context("could not retrieve systemd version")?;
+ let systemd_version = self.client.systemd_version()?;
for controller in CONTROLLER_TYPES {
match controller {
ControllerType::Cpu => {
- Cpu::apply(controller_opt, systemd_version, &mut properties)?
+ Cpu::apply(controller_opt, systemd_version, &mut properties)?;
}
ControllerType::CpuSet => {
- CpuSet::apply(controller_opt, systemd_version, &mut properties)?
+ CpuSet::apply(controller_opt, systemd_version, &mut properties)?;
}
ControllerType::Pids => {
- Pids::apply(controller_opt, systemd_version, &mut properties)?
+ Pids::apply(controller_opt, systemd_version, &mut properties)
+ .map_err(SystemdManagerError::Pids)?;
}
ControllerType::Memory => {
- Memory::apply(controller_opt, systemd_version, &mut properties)?
+ Memory::apply(controller_opt, systemd_version, &mut properties)?;
}
_ => {}
};
}
Unified::apply(controller_opt, systemd_version, &mut properties)?;
- log::debug!("{:?}", properties);
+ tracing::debug!("{:?}", properties);
if !properties.is_empty() {
- self.ensure_controllers_attached()
- .context("failed to attach controllers")?;
+ self.ensure_controllers_attached()?;
self.client
- .set_unit_properties(&self.unit_name, &properties)
- .context("could not apply resource restrictions")?;
+ .set_unit_properties(&self.unit_name, &properties)?;
}
Ok(())
}
- fn remove(&self) -> Result<()> {
- log::debug!("remove {}", self.unit_name);
+ fn remove(&self) -> Result<(), Self::Error> {
+ tracing::debug!("remove {}", self.unit_name);
if self.client.transient_unit_exists(&self.unit_name) {
- self.client
- .stop_transient_unit(&self.unit_name)
- .with_context(|| {
- format!("could not remove control group {}", self.destructured_path)
- })?;
+ self.client.stop_transient_unit(&self.unit_name)?;
}
Ok(())
}
- fn freeze(&self, state: FreezerState) -> Result<()> {
- self.fs_manager.freeze(state)
+ fn freeze(&self, state: FreezerState) -> Result<(), Self::Error> {
+ Ok(self.fs_manager.freeze(state)?)
}
- fn stats(&self) -> Result {
- self.fs_manager.stats()
+ fn stats(&self) -> Result {
+ Ok(self.fs_manager.stats()?)
}
- fn get_all_pids(&self) -> Result> {
- common::get_all_pids(&self.full_path)
+ fn get_all_pids(&self) -> Result, Self::Error> {
+ Ok(common::get_all_pids(&self.full_path)?)
}
}
#[cfg(test)]
mod tests {
+ use anyhow::{Context, Result};
+
use crate::systemd::dbus::client::SystemdClient;
use super::*;
@@ -417,11 +453,11 @@ mod tests {
_pid: u32,
_parent: &str,
_unit_name: &str,
- ) -> Result<()> {
+ ) -> Result<(), SystemdClientError> {
Ok(())
}
- fn stop_transient_unit(&self, _unit_name: &str) -> Result<()> {
+ fn stop_transient_unit(&self, _unit_name: &str) -> Result<(), SystemdClientError> {
Ok(())
}
@@ -429,15 +465,15 @@ mod tests {
&self,
_unit_name: &str,
_properties: &HashMap<&str, Box>,
- ) -> Result<()> {
+ ) -> Result<(), SystemdClientError> {
Ok(())
}
- fn systemd_version(&self) -> Result {
+ fn systemd_version(&self) -> Result {
Ok(245)
}
- fn control_cgroup_root(&self) -> Result {
+ fn control_cgroup_root(&self) -> Result {
Ok(PathBuf::from("/"))
}
}
diff --git a/crates/libcgroups/src/systemd/memory.rs b/crates/libcgroups/src/systemd/memory.rs
index ed8e7f1f3..07c9799d1 100644
--- a/crates/libcgroups/src/systemd/memory.rs
+++ b/crates/libcgroups/src/systemd/memory.rs
@@ -1,6 +1,5 @@
use std::collections::HashMap;
-use anyhow::{bail, Context, Result};
use dbus::arg::RefArg;
use oci_spec::runtime::LinuxMemory;
@@ -14,18 +13,29 @@ pub const MEMORY_HIGH: &str = "MemoryHigh";
pub const MEMORY_MAX: &str = "MemoryMax";
pub const MEMORY_SWAP: &str = "MemorySwapMax";
+#[derive(thiserror::Error, Debug)]
+pub enum SystemdMemoryError {
+ #[error("invalid memory reservation value: {0}")]
+ ReservationValue(i64),
+ #[error("invalid memory limit value: {0}")]
+ MemoryLimit(i64),
+ #[error("cgroup v2 swap value cannot be calculated from swap of {swap} and limit of {limit}")]
+ SwapValue { swap: i64, limit: String },
+}
+
pub struct Memory {}
impl Controller for Memory {
+ type Error = SystemdMemoryError;
+
fn apply(
options: &ControllerOpt,
_: u32,
properties: &mut HashMap<&str, Box>,
- ) -> Result<()> {
+ ) -> Result<(), Self::Error> {
if let Some(memory) = options.resources.memory() {
- log::debug!("applying memory resource restrictions");
- return Self::apply(memory, properties)
- .context("could not apply memory resource restrictions");
+ tracing::debug!("applying memory resource restrictions");
+ return Self::apply(memory, properties);
}
Ok(())
@@ -33,7 +43,10 @@ impl Controller for Memory {
}
impl Memory {
- fn apply(memory: &LinuxMemory, properties: &mut HashMap<&str, Box>) -> Result<()> {
+ fn apply(
+ memory: &LinuxMemory,
+ properties: &mut HashMap<&str, Box>,
+ ) -> Result<(), SystemdMemoryError> {
if let Some(reservation) = memory.reservation() {
match reservation {
1..=i64::MAX => {
@@ -42,7 +55,7 @@ impl Memory {
-1 => {
properties.insert(MEMORY_LOW, Box::new(u64::MAX));
}
- _ => bail!("invalid memory reservation value: {}", reservation),
+ _ => return Err(SystemdMemoryError::ReservationValue(reservation)),
}
}
@@ -54,12 +67,11 @@ impl Memory {
-1 => {
properties.insert(MEMORY_MAX, Box::new(u64::MAX));
}
- _ => bail!("invalid memory limit value: {}", limit),
+ _ => return Err(SystemdMemoryError::MemoryLimit(limit)),
}
}
- Self::apply_swap(memory.swap(), memory.limit(), properties)
- .context("could not apply swap")?;
+ Self::apply_swap(memory.swap(), memory.limit(), properties)?;
Ok(())
}
@@ -72,7 +84,7 @@ impl Memory {
swap: Option,
limit: Option,
properties: &mut HashMap<&str, Box>,
- ) -> Result<()> {
+ ) -> Result<(), SystemdMemoryError> {
let value: Box = match (limit, swap) {
// memory is unlimited and swap not specified -> assume swap unlimited
(Some(-1), None) => Box::new(u64::MAX),
@@ -84,11 +96,13 @@ impl Memory {
// if swap is greater than zero and memory limit is unspecified swap cannot be
// calculated. If memory limit is zero the container would have only swap. If
// memory is unlimited it would be bigger than swap.
- (_, Some(0)) | (None | Some(0) | Some(-1), Some(1..=i64::MAX)) => bail!(
- "cgroup v2 swap value cannot be calculated from swap of {} and limit of {}",
- swap.unwrap(),
- limit.map_or("none".to_owned(), |v| v.to_string())
- ),
+ (_, Some(0)) | (None | Some(0) | Some(-1), Some(1..=i64::MAX)) => {
+ return Err(SystemdMemoryError::SwapValue {
+ swap: swap.unwrap(),
+ limit: limit.map_or("none".to_owned(), |v| v.to_string()),
+ })
+ }
+
(Some(l), Some(s)) if l < s => Box::new((s - l) as u64),
_ => return Ok(()),
};
@@ -100,6 +114,7 @@ impl Memory {
#[cfg(test)]
mod tests {
+ use anyhow::{Context, Result};
use dbus::arg::ArgType;
use oci_spec::runtime::LinuxMemoryBuilder;
diff --git a/crates/libcgroups/src/systemd/pids.rs b/crates/libcgroups/src/systemd/pids.rs
index e29cf2a23..c93dfb7e1 100644
--- a/crates/libcgroups/src/systemd/pids.rs
+++ b/crates/libcgroups/src/systemd/pids.rs
@@ -1,6 +1,5 @@
-use std::collections::HashMap;
+use std::{collections::HashMap, convert::Infallible};
-use anyhow::{Context, Result};
use dbus::arg::RefArg;
use oci_spec::runtime::LinuxPids;
@@ -13,14 +12,16 @@ pub const TASKS_MAX: &str = "TasksMax";
pub struct Pids {}
impl Controller for Pids {
+ type Error = Infallible;
+
fn apply(
options: &ControllerOpt,
_: u32,
properties: &mut HashMap<&str, Box>,
- ) -> Result<()> {
+ ) -> Result<(), Self::Error> {
if let Some(pids) = options.resources.pids() {
- log::debug!("Applying pids resource restrictions");
- return Self::apply(pids, properties).context("");
+ tracing::debug!("Applying pids resource restrictions");
+ Self::apply(pids, properties);
}
Ok(())
@@ -28,7 +29,7 @@ impl Controller for Pids {
}
impl Pids {
- fn apply(pids: &LinuxPids, properties: &mut HashMap<&str, Box>) -> Result<()> {
+ fn apply(pids: &LinuxPids, properties: &mut HashMap<&str, Box>) {
let limit = if pids.limit() > 0 {
pids.limit() as u64
} else {
@@ -36,13 +37,13 @@ impl Pids {
};
properties.insert(TASKS_MAX, Box::new(limit));
- Ok(())
}
}
#[cfg(test)]
mod tests {
use super::*;
+ use anyhow::{anyhow, Context, Result};
use dbus::arg::ArgType;
use oci_spec::runtime::{LinuxPidsBuilder, LinuxResources, LinuxResourcesBuilder};
@@ -65,7 +66,9 @@ mod tests {
.build()?;
let (options, mut properties) = setup(&resources);
- ::apply(&options, 245, &mut properties).context("apply pids")?;
+ ::apply(&options, 245, &mut properties)
+ .map_err(|err| anyhow!(err))
+ .context("apply pids")?;
assert_eq!(properties.len(), 1);
assert!(properties.contains_key(TASKS_MAX));
@@ -84,7 +87,9 @@ mod tests {
.build()?;
let (options, mut properties) = setup(&resources);
- ::apply(&options, 245, &mut properties).context("apply pids")?;
+ ::apply(&options, 245, &mut properties)
+ .map_err(|err| anyhow!(err))
+ .context("apply pids")?;
assert_eq!(properties.len(), 1);
assert!(properties.contains_key(TASKS_MAX));
@@ -103,7 +108,9 @@ mod tests {
.build()?;
let (options, mut properties) = setup(&resources);
- ::apply(&options, 245, &mut properties).context("apply pids")?;
+ ::apply(&options, 245, &mut properties)
+ .map_err(|err| anyhow!(err))
+ .context("apply pids")?;
assert_eq!(properties.len(), 1);
assert!(properties.contains_key(TASKS_MAX));
diff --git a/crates/libcgroups/src/systemd/unified.rs b/crates/libcgroups/src/systemd/unified.rs
index 8081e79b1..79d6d71bb 100644
--- a/crates/libcgroups/src/systemd/unified.rs
+++ b/crates/libcgroups/src/systemd/unified.rs
@@ -1,27 +1,51 @@
-use anyhow::{bail, Context, Result};
use dbus::arg::RefArg;
-use std::collections::HashMap;
+use std::{collections::HashMap, num::ParseIntError};
use super::{
controller::Controller,
cpu::{self, convert_shares_to_cgroup2},
- cpuset::{self, to_bitmask},
+ cpuset::{self, to_bitmask, BitmaskError},
memory, pids,
};
use crate::common::ControllerOpt;
+#[derive(thiserror::Error, Debug)]
+pub enum SystemdUnifiedError {
+ #[error("failed to parse cpu weight {value}: {err}")]
+ CpuWeight { err: ParseIntError, value: String },
+ #[error("invalid format for cpu.max: {0}")]
+ CpuMax(String),
+ #[error("failed to to parse cpu quota {value}: {err}")]
+ CpuQuota { err: ParseIntError, value: String },
+ #[error("failed to to parse cpu period {value}: {err}")]
+ CpuPeriod { err: ParseIntError, value: String },
+ #[error("setting {0} requires systemd version greater than 243")]
+ OldSystemd(String),
+ #[error("invalid value for cpuset.cpus {0}")]
+ CpuSetCpu(BitmaskError),
+ #[error("failed to parse {name} {value}: {err}")]
+ Memory {
+ err: ParseIntError,
+ name: String,
+ value: String,
+ },
+ #[error("failed to to parse pids.max {value}: {err}")]
+ PidsMax { err: ParseIntError, value: String },
+}
+
pub struct Unified {}
impl Controller for Unified {
+ type Error = SystemdUnifiedError;
+
fn apply(
options: &ControllerOpt,
systemd_version: u32,
properties: &mut HashMap<&str, Box>,
- ) -> Result<()> {
+ ) -> Result<(), Self::Error> {
if let Some(unified) = options.resources.unified() {
- log::debug!("applying unified resource restrictions");
- Self::apply(unified, systemd_version, properties)
- .context("failed to apply unified resource restrictions")?;
+ tracing::debug!("applying unified resource restrictions");
+ Self::apply(unified, systemd_version, properties)?;
}
Ok(())
@@ -33,43 +57,50 @@ impl Unified {
unified: &HashMap,
systemd_version: u32,
properties: &mut HashMap<&str, Box>,
- ) -> Result<()> {
+ ) -> Result<(), SystemdUnifiedError> {
for (key, value) in unified {
match key.as_str() {
"cpu.weight" => {
- let shares = value
- .parse::()
- .with_context(|| format!("failed to parse cpu weight: {}", value))?;
+ let shares =
+ value
+ .parse::()
+ .map_err(|err| SystemdUnifiedError::CpuWeight {
+ err,
+ value: value.into(),
+ })?;
properties.insert(cpu::CPU_WEIGHT, Box::new(convert_shares_to_cgroup2(shares)));
}
"cpu.max" => {
let parts: Vec<&str> = value.split_whitespace().collect();
if parts.is_empty() || parts.len() > 2 {
- bail!("invalid format for cpu.max: {}", value);
+ return Err(SystemdUnifiedError::CpuMax(value.into()));
}
- let quota = parts[0]
- .parse::()
- .with_context(|| format!("failed to parse cpu quota: {}", parts[0]))?;
+ let quota =
+ parts[0]
+ .parse::()
+ .map_err(|err| SystemdUnifiedError::CpuQuota {
+ err,
+ value: parts[0].into(),
+ })?;
properties.insert(cpu::CPU_QUOTA, Box::new(quota));
if parts.len() == 2 {
- let period = parts[1].parse::().with_context(|| {
- format!("failed to to parse cpu period: {}", parts[1])
+ let period = parts[1].parse::().map_err(|err| {
+ SystemdUnifiedError::CpuPeriod {
+ err,
+ value: parts[1].into(),
+ }
})?;
properties.insert(cpu::CPU_PERIOD, Box::new(period));
}
}
cpuset @ ("cpuset.cpus" | "cpuset.mems") => {
if systemd_version <= 243 {
- bail!(
- "setting {} requires systemd version greater than 243",
- cpuset
- );
+ return Err(SystemdUnifiedError::OldSystemd(cpuset.into()));
}
- let bitmask = to_bitmask(value)
- .with_context(|| format!("invalid value for cpuset.cpus: {}", value))?;
+ let bitmask = to_bitmask(value).map_err(SystemdUnifiedError::CpuSetCpu)?;
let systemd_cpuset = match cpuset {
"cpuset.cpus" => cpuset::ALLOWED_CPUS,
@@ -80,9 +111,14 @@ impl Unified {
properties.insert(systemd_cpuset, Box::new(bitmask));
}
memory @ ("memory.min" | "memory.low" | "memory.high" | "memory.max") => {
- let value = value
- .parse::()
- .with_context(|| format!("failed to parse {}: {}", memory, value))?;
+ let value =
+ value
+ .parse::()
+ .map_err(|err| SystemdUnifiedError::Memory {
+ err,
+ name: memory.into(),
+ value: value.into(),
+ })?;
let systemd_memory = match memory {
"memory.min" => memory::MEMORY_MIN,
"memory.low" => memory::MEMORY_LOW,
@@ -93,11 +129,16 @@ impl Unified {
properties.insert(systemd_memory, Box::new(value));
}
"pids.max" => {
- let pids = value.trim().parse::()?;
+ let pids = value.trim().parse::().map_err(|err| {
+ SystemdUnifiedError::PidsMax {
+ err,
+ value: value.into(),
+ }
+ })?;
properties.insert(pids::TASKS_MAX, Box::new(pids as u64));
}
- unknown => log::warn!("could not apply {}. Unknown property.", unknown),
+ unknown => tracing::warn!("could not apply {}. Unknown property.", unknown),
}
}
@@ -107,6 +148,7 @@ impl Unified {
#[cfg(test)]
mod tests {
+ use anyhow::{bail, Context, Result};
use dbus::arg::ArgType;
use super::*;
@@ -145,10 +187,10 @@ mod tests {
// assert
for (setting, value) in expected {
assert!(actual.contains_key(setting));
- assert_eq!(value.arg_type(), actual[setting].arg_type(), "{}", setting);
+ assert_eq!(value.arg_type(), actual[setting].arg_type(), "{setting}");
match value.arg_type() {
ArgType::UInt64 => {
- assert_eq!(value.as_u64(), actual[setting].as_u64(), "{}", setting)
+ assert_eq!(value.as_u64(), actual[setting].as_u64(), "{setting}")
}
ArgType::Array => assert_eq!(
value.as_iter().unwrap().next().unwrap().as_u64(),
diff --git a/crates/libcgroups/src/test.rs b/crates/libcgroups/src/test.rs
index e2c54490c..84e6246be 100644
--- a/crates/libcgroups/src/test.rs
+++ b/crates/libcgroups/src/test.rs
@@ -2,66 +2,14 @@
use anyhow::{Context, Result};
use std::{
- fs,
io::Write,
- ops::Deref,
path::{Path, PathBuf},
};
-pub struct TempDir {
- path: Option,
-}
-
-impl TempDir {
- pub fn new>(path: P) -> Result {
- let p = path.into();
- std::fs::create_dir_all(&p)?;
- Ok(Self { path: Some(p) })
- }
-
- pub fn path(&self) -> &Path {
- self.path
- .as_ref()
- .expect("temp dir has already been removed")
- }
-
- pub fn remove(&mut self) {
- if let Some(p) = &self.path {
- let _ = fs::remove_dir_all(p);
- self.path = None;
- }
- }
-}
-
-impl Drop for TempDir {
- fn drop(&mut self) {
- self.remove();
- }
-}
-
-impl AsRef for TempDir {
- fn as_ref(&self) -> &Path {
- self.path()
- }
-}
-
-impl Deref for TempDir {
- type Target = Path;
-
- fn deref(&self) -> &Self::Target {
- self.path()
- }
-}
-
-pub fn create_temp_dir(test_name: &str) -> Result {
- let dir = TempDir::new(std::env::temp_dir().join(test_name))?;
- Ok(dir)
-}
-
-pub fn setup(testname: &str, cgroup_file: &str) -> (TempDir, PathBuf) {
- let tmp = create_temp_dir(testname).expect("create temp directory for test");
- let cgroup_file = set_fixture(&tmp, cgroup_file, "")
- .unwrap_or_else(|_| panic!("set test fixture for {}", cgroup_file));
+pub fn setup(cgroup_file: &str) -> (tempfile::TempDir, PathBuf) {
+ let tmp = tempfile::tempdir().expect("create temp directory for test");
+ let cgroup_file = set_fixture(tmp.path(), cgroup_file, "")
+ .unwrap_or_else(|_| panic!("set test fixture for {cgroup_file}"));
(tmp, cgroup_file)
}
@@ -74,9 +22,9 @@ pub fn set_fixture(temp_dir: &Path, filename: &str, val: &str) -> Result Result<()> {
+ type Error = Infallible;
+
+ fn add_task(&self, pid: Pid) -> Result<(), Infallible> {
self.add_task_args.borrow_mut().push(pid);
Ok(())
}
// NOTE: The argument cannot be stored due to lifetime.
- fn apply(&self, _controller_opt: &ControllerOpt) -> Result<()> {
+ fn apply(&self, _controller_opt: &ControllerOpt) -> Result<(), Infallible> {
*self.apply_called.borrow_mut() = true;
Ok(())
}
- fn remove(&self) -> Result<()> {
+ fn remove(&self) -> Result<(), Infallible> {
unimplemented!()
}
- fn freeze(&self, _state: FreezerState) -> Result<()> {
+ fn freeze(&self, _state: FreezerState) -> Result<(), Infallible> {
unimplemented!()
}
- fn stats(&self) -> anyhow::Result {
+ fn stats(&self) -> Result {
unimplemented!()
}
- fn get_all_pids(&self) -> Result> {
+ fn get_all_pids(&self) -> Result, Infallible> {
unimplemented!()
}
}
diff --git a/crates/libcgroups/src/v1/blkio.rs b/crates/libcgroups/src/v1/blkio.rs
index bb02bbf28..a66102a40 100644
--- a/crates/libcgroups/src/v1/blkio.rs
+++ b/crates/libcgroups/src/v1/blkio.rs
@@ -1,14 +1,17 @@
-use std::path::Path;
+use std::{
+ num::ParseIntError,
+ path::{Path, PathBuf},
+};
use crate::{
- common::{self, ControllerOpt},
- stats::{self, BlkioDeviceStat, BlkioStats, StatsProvider},
- v1::Controller,
+ common::{self, ControllerOpt, WrappedIoError},
+ stats::{self, BlkioDeviceStat, BlkioStats, ParseDeviceNumberError, StatsProvider},
};
-use anyhow::{Context, Result};
use oci_spec::runtime::LinuxBlockIo;
+use super::controller::Controller;
+
// Throttling/upper limit policy
// ---------------------------------------
// Upper limit on the number of read operations a device can perform specified in bytes
@@ -76,10 +79,11 @@ const BLKIO_MERGED: &str = "blkio.io_merged_recursive";
pub struct Blkio {}
impl Controller for Blkio {
+ type Error = WrappedIoError;
type Resource = LinuxBlockIo;
- fn apply(controller_opt: &ControllerOpt, cgroup_root: &Path) -> Result<()> {
- log::debug!("Apply blkio cgroup config");
+ fn apply(controller_opt: &ControllerOpt, cgroup_root: &Path) -> Result<(), Self::Error> {
+ tracing::debug!("Apply blkio cgroup config");
if let Some(blkio) = Self::needs_to_handle(controller_opt) {
Self::apply(cgroup_root, blkio)?;
@@ -93,10 +97,25 @@ impl Controller for Blkio {
}
}
+#[derive(thiserror::Error, Debug)]
+pub enum V1BlkioStatsError {
+ #[error("io error: {0}")]
+ WrappedIo(#[from] WrappedIoError),
+ #[error("failed to parse device value {value} in {path}: {err}")]
+ FailedParseValue {
+ value: String,
+ path: PathBuf,
+ err: ParseIntError,
+ },
+ #[error("failed to parse device number: {0}")]
+ FailedParseNumber(#[from] ParseDeviceNumberError),
+}
+
impl StatsProvider for Blkio {
+ type Error = V1BlkioStatsError;
type Stats = BlkioStats;
- fn stats(cgroup_path: &Path) -> Result {
+ fn stats(cgroup_path: &Path) -> Result {
if cgroup_path.join(BLKIO_WEIGHT).exists() {
return Self::get_weight_division_policy_stats(cgroup_path);
}
@@ -106,7 +125,7 @@ impl StatsProvider for Blkio {
}
impl Blkio {
- fn apply(root_path: &Path, blkio: &LinuxBlockIo) -> Result<()> {
+ fn apply(root_path: &Path, blkio: &LinuxBlockIo) -> Result<(), WrappedIoError> {
if let Some(blkio_weight) = blkio.weight() {
// be aligned with what runc does
// See also: https://github.com/opencontainers/runc/blob/81044ad7c902f3fc153cb8ffadaf4da62855193f/libcontainer/cgroups/fs/blkio.go#L28-L33
@@ -159,7 +178,7 @@ impl Blkio {
Ok(())
}
- fn get_throttling_policy_stats(cgroup_path: &Path) -> Result {
+ fn get_throttling_policy_stats(cgroup_path: &Path) -> Result {
let stats = BlkioStats {
service_bytes: Self::parse_blkio_file(
&cgroup_path.join(BLKIO_THROTTLE_IO_SERVICE_BYTES),
@@ -171,7 +190,9 @@ impl Blkio {
Ok(stats)
}
- fn get_weight_division_policy_stats(cgroup_path: &Path) -> Result {
+ fn get_weight_division_policy_stats(
+ cgroup_path: &Path,
+ ) -> Result {
let stats = BlkioStats {
time: Self::parse_blkio_file(&cgroup_path.join(BLKIO_TIME))?,
sectors: Self::parse_blkio_file(&cgroup_path.join(BLKIO_SECTORS))?,
@@ -187,7 +208,7 @@ impl Blkio {
Ok(stats)
}
- fn parse_blkio_file(blkio_file: &Path) -> Result> {
+ fn parse_blkio_file(blkio_file: &Path) -> Result, V1BlkioStatsError> {
let content = common::read_cgroup_file(blkio_file)?;
let mut stats = Vec::new();
for entry in content.lines() {
@@ -203,21 +224,21 @@ impl Blkio {
None
};
let value = if entry_fields.len() == 3 {
- entry_fields[2].parse().with_context(|| {
- format!(
- "failed to parse device value {} in {}",
- entry_fields[2],
- blkio_file.display()
- )
- })?
+ entry_fields[2]
+ .parse()
+ .map_err(|err| V1BlkioStatsError::FailedParseValue {
+ value: entry_fields[2].into(),
+ path: blkio_file.to_path_buf(),
+ err,
+ })?
} else {
- entry_fields[1].parse().with_context(|| {
- format!(
- "failed to parse device value {} in {}",
- entry_fields[1],
- blkio_file.display()
- )
- })?
+ entry_fields[1]
+ .parse()
+ .map_err(|err| V1BlkioStatsError::FailedParseValue {
+ value: entry_fields[1].into(),
+ path: blkio_file.to_path_buf(),
+ err,
+ })?
};
let stat = BlkioDeviceStat {
@@ -239,21 +260,20 @@ mod tests {
use std::fs;
use super::*;
- use crate::test::{create_temp_dir, set_fixture, setup};
+ use crate::test::{set_fixture, setup};
- use anyhow::Result;
use oci_spec::runtime::{LinuxBlockIoBuilder, LinuxThrottleDeviceBuilder};
#[test]
fn test_set_blkio_weight() {
for cgroup_file in &[BLKIO_WEIGHT, BLKIO_BFQ_WEIGHT] {
- let (tmp, weight_file) = setup("test_set_blkio_weight", cgroup_file);
+ let (tmp, weight_file) = setup(cgroup_file);
let blkio = LinuxBlockIoBuilder::default()
.weight(200_u16)
.build()
.unwrap();
- Blkio::apply(&tmp, &blkio).expect("apply blkio");
+ Blkio::apply(tmp.path(), &blkio).expect("apply blkio");
let content = fs::read_to_string(weight_file).expect("read blkio weight");
assert_eq!("200", content);
}
@@ -261,7 +281,7 @@ mod tests {
#[test]
fn test_set_blkio_read_bps() {
- let (tmp, throttle) = setup("test_set_blkio_read_bps", BLKIO_THROTTLE_READ_BPS);
+ let (tmp, throttle) = setup(BLKIO_THROTTLE_READ_BPS);
let blkio = LinuxBlockIoBuilder::default()
.throttle_read_bps_device(vec![LinuxThrottleDeviceBuilder::default()
@@ -273,16 +293,16 @@ mod tests {
.build()
.unwrap();
- Blkio::apply(&tmp, &blkio).expect("apply blkio");
+ Blkio::apply(tmp.path(), &blkio).expect("apply blkio");
let content = fs::read_to_string(throttle)
- .unwrap_or_else(|_| panic!("read {} content", BLKIO_THROTTLE_READ_BPS));
+ .unwrap_or_else(|_| panic!("read {BLKIO_THROTTLE_READ_BPS} content"));
assert_eq!("8:0 102400", content);
}
#[test]
fn test_set_blkio_write_bps() {
- let (tmp, throttle) = setup("test_set_blkio_write_bps", BLKIO_THROTTLE_WRITE_BPS);
+ let (tmp, throttle) = setup(BLKIO_THROTTLE_WRITE_BPS);
let blkio = LinuxBlockIoBuilder::default()
.throttle_write_bps_device(vec![LinuxThrottleDeviceBuilder::default()
@@ -294,16 +314,16 @@ mod tests {
.build()
.unwrap();
- Blkio::apply(&tmp, &blkio).expect("apply blkio");
+ Blkio::apply(tmp.path(), &blkio).expect("apply blkio");
let content = fs::read_to_string(throttle)
- .unwrap_or_else(|_| panic!("read {} content", BLKIO_THROTTLE_WRITE_BPS));
+ .unwrap_or_else(|_| panic!("read {BLKIO_THROTTLE_WRITE_BPS} content"));
assert_eq!("8:0 102400", content);
}
#[test]
fn test_set_blkio_read_iops() {
- let (tmp, throttle) = setup("test_set_blkio_read_iops", BLKIO_THROTTLE_READ_IOPS);
+ let (tmp, throttle) = setup(BLKIO_THROTTLE_READ_IOPS);
let blkio = LinuxBlockIoBuilder::default()
.throttle_read_iops_device(vec![LinuxThrottleDeviceBuilder::default()
@@ -315,16 +335,16 @@ mod tests {
.build()
.unwrap();
- Blkio::apply(&tmp, &blkio).expect("apply blkio");
+ Blkio::apply(tmp.path(), &blkio).expect("apply blkio");
let content = fs::read_to_string(throttle)
- .unwrap_or_else(|_| panic!("read {} content", BLKIO_THROTTLE_READ_IOPS));
+ .unwrap_or_else(|_| panic!("read {BLKIO_THROTTLE_READ_IOPS} content"));
assert_eq!("8:0 102400", content);
}
#[test]
fn test_set_blkio_write_iops() {
- let (tmp, throttle) = setup("test_set_blkio_write_iops", BLKIO_THROTTLE_WRITE_IOPS);
+ let (tmp, throttle) = setup(BLKIO_THROTTLE_WRITE_IOPS);
let blkio = LinuxBlockIoBuilder::default()
.throttle_write_iops_device(vec![LinuxThrottleDeviceBuilder::default()
@@ -336,16 +356,16 @@ mod tests {
.build()
.unwrap();
- Blkio::apply(&tmp, &blkio).expect("apply blkio");
+ Blkio::apply(tmp.path(), &blkio).expect("apply blkio");
let content = fs::read_to_string(throttle)
- .unwrap_or_else(|_| panic!("read {} content", BLKIO_THROTTLE_WRITE_IOPS));
+ .unwrap_or_else(|_| panic!("read {BLKIO_THROTTLE_WRITE_IOPS} content"));
assert_eq!("8:0 102400", content);
}
#[test]
- fn test_stat_throttling_policy() -> Result<()> {
- let tmp = create_temp_dir("test_stat_throttling_policy").expect("create test directory");
+ fn test_stat_throttling_policy() -> Result<(), Box> {
+ let tmp = tempfile::tempdir().unwrap();
let content = &[
"8:0 Read 20",
"8:0 Write 20",
@@ -356,10 +376,10 @@ mod tests {
"Total 0",
]
.join("\n");
- set_fixture(&tmp, BLKIO_THROTTLE_IO_SERVICE_BYTES, content).unwrap();
- set_fixture(&tmp, BLKIO_THROTTLE_IO_SERVICED, content).unwrap();
+ set_fixture(tmp.path(), BLKIO_THROTTLE_IO_SERVICE_BYTES, content).unwrap();
+ set_fixture(tmp.path(), BLKIO_THROTTLE_IO_SERVICED, content).unwrap();
- let actual = Blkio::stats(&tmp).expect("get cgroup stats");
+ let actual = Blkio::stats(tmp.path()).expect("get cgroup stats");
let mut expected = BlkioStats::default();
let devices: Vec = ["Read", "Write", "Sync", "Async", "Discard", "Total"]
.iter()
diff --git a/crates/libcgroups/src/v1/controller.rs b/crates/libcgroups/src/v1/controller.rs
index 3966fb86b..86cd5a17c 100644
--- a/crates/libcgroups/src/v1/controller.rs
+++ b/crates/libcgroups/src/v1/controller.rs
@@ -1,22 +1,22 @@
use std::{fs, path::Path};
-use anyhow::Result;
use nix::unistd::Pid;
-use crate::common::{self, ControllerOpt, CGROUP_PROCS};
+use crate::common::{self, ControllerOpt, WrapIoResult, WrappedIoError, CGROUP_PROCS};
-pub trait Controller {
+pub(super) trait Controller {
+ type Error: From;
type Resource;
/// Adds a new task specified by its pid to the cgroup
- fn add_task(pid: Pid, cgroup_path: &Path) -> Result<()> {
- fs::create_dir_all(cgroup_path)?;
+ fn add_task(pid: Pid, cgroup_path: &Path) -> Result<(), Self::Error> {
+ fs::create_dir_all(cgroup_path).wrap_create_dir(cgroup_path)?;
common::write_cgroup_file(cgroup_path.join(CGROUP_PROCS), pid)?;
Ok(())
}
/// Applies resource restrictions to the cgroup
- fn apply(controller_opt: &ControllerOpt, cgroup_root: &Path) -> Result<()>;
+ fn apply(controller_opt: &ControllerOpt, cgroup_root: &Path) -> Result<(), Self::Error>;
/// Checks if the controller needs to handle this request
fn needs_to_handle<'a>(controller_opt: &'a ControllerOpt) -> Option<&'a Self::Resource>;
diff --git a/crates/libcgroups/src/v1/controller_type.rs b/crates/libcgroups/src/v1/controller_type.rs
index c073811a8..dcc3f66e8 100644
--- a/crates/libcgroups/src/v1/controller_type.rs
+++ b/crates/libcgroups/src/v1/controller_type.rs
@@ -1,6 +1,6 @@
use std::fmt::Display;
-#[derive(Hash, PartialEq, Eq, Debug, Clone)]
+#[derive(Hash, PartialEq, Eq, Debug, Clone, Copy)]
pub enum ControllerType {
Cpu,
CpuAcct,
@@ -33,7 +33,7 @@ impl Display for ControllerType {
Self::Freezer => "freezer",
};
- write!(f, "{}", print)
+ write!(f, "{print}")
}
}
diff --git a/crates/libcgroups/src/v1/cpu.rs b/crates/libcgroups/src/v1/cpu.rs
index ad44ca696..73c9074f3 100644
--- a/crates/libcgroups/src/v1/cpu.rs
+++ b/crates/libcgroups/src/v1/cpu.rs
@@ -1,14 +1,13 @@
-use std::path::Path;
+use std::path::{Path, PathBuf};
-use anyhow::{bail, Context, Result};
use oci_spec::runtime::LinuxCpu;
use crate::{
- common::{self, ControllerOpt},
- stats::{CpuThrottling, StatsProvider},
+ common::{self, ControllerOpt, WrappedIoError},
+ stats::{parse_flat_keyed_data, CpuThrottling, ParseFlatKeyedDataError, StatsProvider},
};
-use super::Controller;
+use super::controller::Controller;
const CGROUP_CPU_SHARES: &str = "cpu.shares";
const CGROUP_CPU_QUOTA: &str = "cpu.cfs_quota_us";
@@ -22,13 +21,14 @@ const CGROUP_CPU_IDLE: &str = "cpu.idle";
pub struct Cpu {}
impl Controller for Cpu {
+ type Error = WrappedIoError;
type Resource = LinuxCpu;
- fn apply(controller_opt: &ControllerOpt, cgroup_root: &Path) -> Result<()> {
- log::debug!("Apply Cpu cgroup config");
+ fn apply(controller_opt: &ControllerOpt, cgroup_root: &Path) -> Result<(), Self::Error> {
+ tracing::debug!("Apply Cpu cgroup config");
if let Some(cpu) = Self::needs_to_handle(controller_opt) {
- Self::apply(cgroup_root, cpu).context("failed to apply cpu resource restrictions")?;
+ Self::apply(cgroup_root, cpu)?;
}
Ok(())
@@ -51,53 +51,46 @@ impl Controller for Cpu {
}
}
+#[derive(thiserror::Error, Debug)]
+pub enum V1CpuStatsError {
+ #[error("error parsing data: {0}")]
+ ParseData(#[from] ParseFlatKeyedDataError),
+ #[error("missing field {field} from {path}")]
+ MissingField { field: &'static str, path: PathBuf },
+}
+
impl StatsProvider for Cpu {
+ type Error = V1CpuStatsError;
type Stats = CpuThrottling;
- fn stats(cgroup_path: &Path) -> Result {
+ fn stats(cgroup_path: &Path) -> Result {
let mut stats = CpuThrottling::default();
let stat_path = cgroup_path.join(CGROUP_CPU_STAT);
- let stat_content = common::read_cgroup_file(&stat_path)?;
-
- let parts: Vec<&str> = stat_content.split_ascii_whitespace().collect();
- if parts.len() < 6 {
- bail!(
- "{} contains less than the expected number of entries",
- stat_path.display()
- );
- }
-
- if parts[0] != "nr_periods" {
- bail!(
- "{} does not contain the number of elapsed periods",
- stat_path.display()
- );
- }
-
- if parts[2] != "nr_throttled" {
- bail!(
- "{} does not contain the number of throttled periods",
- stat_path.display()
- );
- }
- if parts[4] != "throttled_time" {
- bail!(
- "{} does not contain the total time tasks have spent throttled",
- stat_path.display()
- );
+ let stat_table = parse_flat_keyed_data(&stat_path)?;
+
+ macro_rules! get {
+ ($name: expr => $field: ident) => {
+ stats.$field =
+ *stat_table
+ .get($name)
+ .ok_or_else(|| V1CpuStatsError::MissingField {
+ field: $name,
+ path: stat_path.clone(),
+ })?;
+ };
}
- stats.periods = parts[1].parse().context("failed to parse nr_periods")?;
- stats.throttled_periods = parts[3].parse().context("failed to parse nr_throttled")?;
- stats.throttled_time = parts[5].parse().context("failed to parse throttled time")?;
+ get!("nr_periods" => periods);
+ get!("nr_throttled" => throttled_periods);
+ get!("throttled_time" => throttled_time);
Ok(stats)
}
}
impl Cpu {
- fn apply(root_path: &Path, cpu: &LinuxCpu) -> Result<()> {
+ fn apply(root_path: &Path, cpu: &LinuxCpu) -> Result<(), WrappedIoError> {
if let Some(cpu_shares) = cpu.shares() {
if cpu_shares != 0 {
common::write_cgroup_file(root_path.join(CGROUP_CPU_SHARES), cpu_shares)?;
@@ -143,24 +136,24 @@ impl Cpu {
#[cfg(test)]
mod tests {
use super::*;
- use crate::test::{create_temp_dir, set_fixture, setup};
+ use crate::test::{set_fixture, setup};
use oci_spec::runtime::LinuxCpuBuilder;
use std::fs;
#[test]
fn test_set_shares() {
// arrange
- let (tmp, shares) = setup("test_set_shares", CGROUP_CPU_SHARES);
- let _ = set_fixture(&tmp, CGROUP_CPU_SHARES, "")
- .unwrap_or_else(|_| panic!("set test fixture for {}", CGROUP_CPU_SHARES));
+ let (tmp, shares) = setup(CGROUP_CPU_SHARES);
+ let _ = set_fixture(tmp.path(), CGROUP_CPU_SHARES, "")
+ .unwrap_or_else(|_| panic!("set test fixture for {CGROUP_CPU_SHARES}"));
let cpu = LinuxCpuBuilder::default().shares(2048u64).build().unwrap();
// act
- Cpu::apply(&tmp, &cpu).expect("apply cpu");
+ Cpu::apply(tmp.path(), &cpu).expect("apply cpu");
// assert
let content = fs::read_to_string(shares)
- .unwrap_or_else(|_| panic!("read {} file content", CGROUP_CPU_SHARES));
+ .unwrap_or_else(|_| panic!("read {CGROUP_CPU_SHARES} file content"));
assert_eq!(content, 2048.to_string());
}
@@ -168,15 +161,15 @@ mod tests {
fn test_set_quota() {
// arrange
const QUOTA: i64 = 200000;
- let (tmp, max) = setup("test_set_quota", CGROUP_CPU_QUOTA);
+ let (tmp, max) = setup(CGROUP_CPU_QUOTA);
let cpu = LinuxCpuBuilder::default().quota(QUOTA).build().unwrap();
// act
- Cpu::apply(&tmp, &cpu).expect("apply cpu");
+ Cpu::apply(tmp.path(), &cpu).expect("apply cpu");
// assert
let content = fs::read_to_string(max)
- .unwrap_or_else(|_| panic!("read {} file content", CGROUP_CPU_QUOTA));
+ .unwrap_or_else(|_| panic!("read {CGROUP_CPU_QUOTA} file content"));
assert_eq!(content, QUOTA.to_string());
}
@@ -184,15 +177,15 @@ mod tests {
fn test_set_period() {
// arrange
const PERIOD: u64 = 100000;
- let (tmp, max) = setup("test_set_period", CGROUP_CPU_PERIOD);
+ let (tmp, max) = setup(CGROUP_CPU_PERIOD);
let cpu = LinuxCpuBuilder::default().period(PERIOD).build().unwrap();
// act
- Cpu::apply(&tmp, &cpu).expect("apply cpu");
+ Cpu::apply(tmp.path(), &cpu).expect("apply cpu");
// assert
let content = fs::read_to_string(max)
- .unwrap_or_else(|_| panic!("read {} file content", CGROUP_CPU_PERIOD));
+ .unwrap_or_else(|_| panic!("read {CGROUP_CPU_PERIOD} file content"));
assert_eq!(content, PERIOD.to_string());
}
@@ -200,18 +193,18 @@ mod tests {
fn test_set_rt_runtime() {
// arrange
const RUNTIME: i64 = 100000;
- let (tmp, max) = setup("test_set_rt_runtime", CGROUP_CPU_RT_RUNTIME);
+ let (tmp, max) = setup(CGROUP_CPU_RT_RUNTIME);
let cpu = LinuxCpuBuilder::default()
.realtime_runtime(RUNTIME)
.build()
.unwrap();
// act
- Cpu::apply(&tmp, &cpu).expect("apply cpu");
+ Cpu::apply(tmp.path(), &cpu).expect("apply cpu");
// assert
let content = fs::read_to_string(max)
- .unwrap_or_else(|_| panic!("read {} file content", CGROUP_CPU_RT_RUNTIME));
+ .unwrap_or_else(|_| panic!("read {CGROUP_CPU_RT_RUNTIME} file content"));
assert_eq!(content, RUNTIME.to_string());
}
@@ -230,15 +223,15 @@ mod tests {
return;
}
- let (tmp, max) = setup("test_set_cpu_idle", CGROUP_CPU_IDLE);
+ let (tmp, max) = setup(CGROUP_CPU_IDLE);
let cpu = LinuxCpuBuilder::default().idle(IDLE).build().unwrap();
// act
- Cpu::apply(&tmp, &cpu).expect("apply cpu");
+ Cpu::apply(tmp.path(), &cpu).expect("apply cpu");
// assert
let content = fs::read_to_string(max)
- .unwrap_or_else(|_| panic!("read {} file content", CGROUP_CPU_IDLE));
+ .unwrap_or_else(|_| panic!("read {CGROUP_CPU_IDLE} file content"));
assert_eq!(content, IDLE.to_string());
}
@@ -246,33 +239,33 @@ mod tests {
fn test_set_rt_period() {
// arrange
const PERIOD: u64 = 100000;
- let (tmp, max) = setup("test_set_rt_period", CGROUP_CPU_RT_PERIOD);
+ let (tmp, max) = setup(CGROUP_CPU_RT_PERIOD);
let cpu = LinuxCpuBuilder::default()
.realtime_period(PERIOD)
.build()
.unwrap();
// act
- Cpu::apply(&tmp, &cpu).expect("apply cpu");
+ Cpu::apply(tmp.path(), &cpu).expect("apply cpu");
// assert
let content = fs::read_to_string(max)
- .unwrap_or_else(|_| panic!("read {} file content", CGROUP_CPU_RT_PERIOD));
+ .unwrap_or_else(|_| panic!("read {CGROUP_CPU_RT_PERIOD} file content"));
assert_eq!(content, PERIOD.to_string());
}
#[test]
fn test_stat_cpu_throttling() {
- let tmp = create_temp_dir("test_stat_cpu_throttling").expect("create test directory");
+ let tmp = tempfile::tempdir().unwrap();
let stat_content = &[
"nr_periods 165000",
"nr_throttled 27",
"throttled_time 1080",
]
.join("\n");
- set_fixture(&tmp, CGROUP_CPU_STAT, stat_content).expect("create stat file");
+ set_fixture(tmp.path(), CGROUP_CPU_STAT, stat_content).expect("create stat file");
- let actual = Cpu::stats(&tmp).expect("get cgroup stats");
+ let actual = Cpu::stats(tmp.path()).expect("get cgroup stats");
let expected = CpuThrottling {
periods: 165000,
throttled_periods: 27,
@@ -285,14 +278,14 @@ mod tests {
fn test_set_burst() {
// arrange
let expected_burst: u64 = 100_000;
- let (tmp, max) = setup("test_set_burst", CGROUP_CPU_BURST);
+ let (tmp, max) = setup(CGROUP_CPU_BURST);
let cpu = LinuxCpuBuilder::default()
.burst(expected_burst)
.build()
.unwrap();
// act
- Cpu::apply(&tmp, &cpu).expect("apply cpu");
+ Cpu::apply(tmp.path(), &cpu).expect("apply cpu");
// assert
let actual_burst = fs::read_to_string(max).expect("read burst");
diff --git a/crates/libcgroups/src/v1/cpuacct.rs b/crates/libcgroups/src/v1/cpuacct.rs
index 3dadf12ac..20ddb2f90 100644
--- a/crates/libcgroups/src/v1/cpuacct.rs
+++ b/crates/libcgroups/src/v1/cpuacct.rs
@@ -1,13 +1,14 @@
-use std::path::Path;
-
-use anyhow::{bail, Context, Result};
+use std::{
+ num::ParseIntError,
+ path::{Path, PathBuf},
+};
use crate::{
- common::{self, ControllerOpt},
- stats::{CpuUsage, StatsProvider},
+ common::{self, ControllerOpt, WrappedIoError},
+ stats::{parse_flat_keyed_data, CpuUsage, ParseFlatKeyedDataError, StatsProvider},
};
-use super::Controller;
+use super::controller::Controller;
// Contains user mode and kernel mode cpu consumption
const CGROUP_CPUACCT_STAT: &str = "cpuacct.stat";
@@ -21,9 +22,10 @@ const CGROUP_CPUACCT_PERCPU: &str = "cpuacct.usage_percpu";
pub struct CpuAcct {}
impl Controller for CpuAcct {
+ type Error = WrappedIoError;
type Resource = ();
- fn apply(_controller_opt: &ControllerOpt, _cgroup_path: &Path) -> Result<()> {
+ fn apply(_controller_opt: &ControllerOpt, _cgroup_path: &Path) -> Result<(), Self::Error> {
Ok(())
}
@@ -32,10 +34,31 @@ impl Controller for CpuAcct {
}
}
+#[derive(thiserror::Error, Debug)]
+pub enum V1CpuAcctStatsError {
+ #[error("io error: {0}")]
+ WrappedIo(#[from] WrappedIoError),
+ #[error("error parsing data: {0}")]
+ ParseData(#[from] ParseFlatKeyedDataError),
+ #[error("missing field {field} from {path}")]
+ MissingField { field: &'static str, path: PathBuf },
+ #[error("failed to parse total cpu usage: {0}")]
+ ParseTotalCpu(ParseIntError),
+ #[error("failed to parse per core {mode} mode cpu usage in {path}: {err}")]
+ FailedToParseField {
+ mode: &'static str,
+ path: PathBuf,
+ err: ParseIntError,
+ },
+ #[error("failed to parse per core cpu usage: {0}")]
+ ParsePerCore(ParseIntError),
+}
+
impl StatsProvider for CpuAcct {
+ type Error = V1CpuAcctStatsError;
type Stats = CpuUsage;
- fn stats(cgroup_path: &Path) -> Result {
+ fn stats(cgroup_path: &Path) -> Result {
let mut stats = CpuUsage::default();
Self::get_total_cpu_usage(cgroup_path, &mut stats)?;
Self::get_per_core_usage(cgroup_path, &mut stats)?;
@@ -45,54 +68,43 @@ impl StatsProvider for CpuAcct {
}
impl CpuAcct {
- fn get_total_cpu_usage(cgroup_path: &Path, stats: &mut CpuUsage) -> Result<()> {
+ fn get_total_cpu_usage(
+ cgroup_path: &Path,
+ stats: &mut CpuUsage,
+ ) -> Result<(), V1CpuAcctStatsError> {
let stat_file_path = cgroup_path.join(CGROUP_CPUACCT_STAT);
- let stat_file_content = common::read_cgroup_file(&stat_file_path)?;
-
- // the first two entries of the file should look like this
- // user 746908
- // system 213896
- let parts: Vec<&str> = stat_file_content.split_whitespace().collect();
-
- if parts.len() < 4 {
- bail!(
- "{} contains less than the expected number of entries",
- stat_file_path.display()
- );
+ let stat_table = parse_flat_keyed_data(&stat_file_path)?;
+
+ macro_rules! get {
+ ($name: expr => $field: ident) => {
+ stats.$field =
+ *stat_table
+ .get($name)
+ .ok_or_else(|| V1CpuAcctStatsError::MissingField {
+ field: $name,
+ path: stat_file_path.clone(),
+ })?;
+ };
}
- if !parts[0].eq("user") {
- bail!(
- "{} does not contain user mode cpu usage",
- stat_file_path.display()
- );
- }
-
- if !parts[2].eq("system") {
- bail!(
- "{} does not contain kernel mode cpu usage",
- stat_file_path.display()
- );
- }
-
- stats.usage_user = parts[1]
- .parse()
- .context("failed to parse user mode cpu usage")?;
- stats.usage_kernel = parts[3]
- .parse()
- .context("failed to parse kernel mode cpu usage")?;
+ get!("user" => usage_user);
+ get!("system" => usage_kernel);
let total = common::read_cgroup_file(cgroup_path.join(CGROUP_CPUACCT_USAGE))?;
stats.usage_total = total
.trim()
.parse()
- .context("failed to parse total cpu usage")?;
+ .map_err(V1CpuAcctStatsError::ParseTotalCpu)?;
Ok(())
}
- fn get_per_core_usage(cgroup_path: &Path, stats: &mut CpuUsage) -> Result<()> {
- let all_content = common::read_cgroup_file(cgroup_path.join(CGROUP_CPUACCT_USAGE_ALL))?;
+ fn get_per_core_usage(
+ cgroup_path: &Path,
+ stats: &mut CpuUsage,
+ ) -> Result<(), V1CpuAcctStatsError> {
+ let path = cgroup_path.join(CGROUP_CPUACCT_USAGE_ALL);
+ let all_content = common::read_cgroup_file(&path)?;
// first line is header, skip it
for entry in all_content.lines().skip(1) {
let entry_parts: Vec<&str> = entry.split_ascii_whitespace().collect();
@@ -100,16 +112,24 @@ impl CpuAcct {
continue;
}
- stats.per_core_usage_user.push(
- entry_parts[1]
- .parse()
- .context("failed to parse per core user mode cpu usage")?,
- );
- stats.per_core_usage_kernel.push(
- entry_parts[2]
- .parse()
- .context("failed to parse per core kernel mode cpu usage")?,
- );
+ stats
+ .per_core_usage_user
+ .push(entry_parts[1].parse().map_err(|err| {
+ V1CpuAcctStatsError::FailedToParseField {
+ mode: "user",
+ path: path.clone(),
+ err,
+ }
+ })?);
+ stats
+ .per_core_usage_kernel
+ .push(entry_parts[2].parse().map_err(|err| {
+ V1CpuAcctStatsError::FailedToParseField {
+ mode: "kernel",
+ path: path.clone(),
+ err,
+ }
+ })?);
}
let percpu_content = common::read_cgroup_file(cgroup_path.join(CGROUP_CPUACCT_PERCPU))?;
@@ -117,7 +137,7 @@ impl CpuAcct {
.split_ascii_whitespace()
.map(|v| v.parse())
.collect::, _>>()
- .context("failed to parse per core cpu usage")?;
+ .map_err(V1CpuAcctStatsError::ParsePerCore)?;
Ok(())
}
@@ -128,45 +148,45 @@ mod tests {
use std::fs;
use nix::unistd::Pid;
+ use tempfile::TempDir;
use super::*;
use crate::{
common::CGROUP_PROCS,
- test::{create_temp_dir, TempDir},
test::{set_fixture, setup},
};
- fn setup_total_cpu(test_name: &str, stat_content: &str, usage_content: &str) -> TempDir {
- let tmp = create_temp_dir(test_name).expect("create temp directory for test");
+ fn setup_total_cpu(stat_content: &str, usage_content: &str) -> TempDir {
+ let tmp = tempfile::tempdir().unwrap();
- let _ = set_fixture(&tmp, CGROUP_CPUACCT_STAT, stat_content)
- .unwrap_or_else(|_| panic!("create {} file", CGROUP_CPUACCT_STAT));
- let _ = set_fixture(&tmp, CGROUP_CPUACCT_USAGE, usage_content)
- .unwrap_or_else(|_| panic!("create {} file", CGROUP_CPUACCT_USAGE));
+ let _ = set_fixture(tmp.path(), CGROUP_CPUACCT_STAT, stat_content)
+ .unwrap_or_else(|_| panic!("create {CGROUP_CPUACCT_STAT} file"));
+ let _ = set_fixture(tmp.path(), CGROUP_CPUACCT_USAGE, usage_content)
+ .unwrap_or_else(|_| panic!("create {CGROUP_CPUACCT_USAGE} file"));
tmp
}
- fn setup_per_core(test_name: &str, percpu_content: &str, usage_all_content: &str) -> TempDir {
- let tmp = create_temp_dir(test_name).expect("create temp directory for test");
+ fn setup_per_core(percpu_content: &str, usage_all_content: &str) -> TempDir {
+ let tmp = tempfile::tempdir().unwrap();
- let _ = set_fixture(&tmp, CGROUP_CPUACCT_PERCPU, percpu_content)
- .unwrap_or_else(|_| panic!("create {} file", CGROUP_CPUACCT_PERCPU));
- let _ = set_fixture(&tmp, CGROUP_CPUACCT_USAGE_ALL, usage_all_content)
- .unwrap_or_else(|_| panic!("create {} file", CGROUP_CPUACCT_USAGE_ALL));
+ let _ = set_fixture(tmp.path(), CGROUP_CPUACCT_PERCPU, percpu_content)
+ .unwrap_or_else(|_| panic!("create {CGROUP_CPUACCT_PERCPU} file"));
+ let _ = set_fixture(tmp.path(), CGROUP_CPUACCT_USAGE_ALL, usage_all_content)
+ .unwrap_or_else(|_| panic!("create {CGROUP_CPUACCT_USAGE_ALL} file"));
tmp
}
#[test]
fn test_add_task() {
- let (tmp, procs) = setup("test_cpuacct_apply", CGROUP_PROCS);
+ let (tmp, procs) = setup(CGROUP_PROCS);
let pid = Pid::from_raw(1000);
- CpuAcct::add_task(pid, &tmp).expect("apply cpuacct");
+ CpuAcct::add_task(pid, tmp.path()).expect("apply cpuacct");
let content = fs::read_to_string(procs)
- .unwrap_or_else(|_| panic!("read {} file content", CGROUP_PROCS));
+ .unwrap_or_else(|_| panic!("read {CGROUP_PROCS} file content"));
assert_eq!(content, "1000");
}
@@ -174,7 +194,7 @@ mod tests {
fn test_stat_total_cpu_usage() {
let stat_content = &["user 1300888", "system 364592"].join("\n");
let usage_content = "18198092369681";
- let tmp = setup_total_cpu("test_get_total_cpu", stat_content, usage_content);
+ let tmp = setup_total_cpu(stat_content, usage_content);
let mut stats = CpuUsage::default();
CpuAcct::get_total_cpu_usage(tmp.path(), &mut stats).expect("get cgroup stats");
@@ -195,11 +215,7 @@ mod tests {
"3 4021385867300 304269989810",
]
.join("\n");
- let tmp = setup_per_core(
- "test_get_per_core_cpu_usage",
- percpu_content,
- usage_all_content,
- );
+ let tmp = setup_per_core(percpu_content, usage_all_content);
let mut stats = CpuUsage::default();
CpuAcct::get_per_core_usage(tmp.path(), &mut stats).expect("get cgroup stats");
diff --git a/crates/libcgroups/src/v1/cpuset.rs b/crates/libcgroups/src/v1/cpuset.rs
index ec9cec54c..a190ceaae 100644
--- a/crates/libcgroups/src/v1/cpuset.rs
+++ b/crates/libcgroups/src/v1/cpuset.rs
@@ -1,24 +1,46 @@
-use std::{fs, path::Path};
+use std::{
+ fs,
+ path::{Path, PathBuf, StripPrefixError},
+};
-use anyhow::{bail, Context, Result};
use nix::unistd;
use oci_spec::runtime::LinuxCpu;
use unistd::Pid;
-use crate::common::{self, ControllerOpt, CGROUP_PROCS};
+use crate::common::{self, ControllerOpt, WrapIoResult, WrappedIoError, CGROUP_PROCS};
-use super::{util, Controller, ControllerType};
+use super::{
+ controller::Controller,
+ util::{self, V1MountPointError},
+ ControllerType,
+};
const CGROUP_CPUSET_CPUS: &str = "cpuset.cpus";
const CGROUP_CPUSET_MEMS: &str = "cpuset.mems";
+#[derive(thiserror::Error, Debug)]
+pub enum V1CpuSetControllerError {
+ #[error("io error: {0}")]
+ WrappedIo(#[from] WrappedIoError),
+ #[error("bad cgroup path {path}: {err}")]
+ BadCgroupPath {
+ err: StripPrefixError,
+ path: PathBuf,
+ },
+ #[error("cpuset parent value is empty")]
+ EmptyParent,
+ #[error("mount point error: {0}")]
+ MountPoint(#[from] V1MountPointError),
+}
+
pub struct CpuSet {}
impl Controller for CpuSet {
+ type Error = V1CpuSetControllerError;
type Resource = LinuxCpu;
- fn add_task(pid: Pid, cgroup_path: &Path) -> Result<()> {
- fs::create_dir_all(cgroup_path)?;
+ fn add_task(pid: Pid, cgroup_path: &Path) -> Result<(), Self::Error> {
+ fs::create_dir_all(cgroup_path).wrap_create_dir(cgroup_path)?;
Self::ensure_not_empty(cgroup_path, CGROUP_CPUSET_CPUS)?;
Self::ensure_not_empty(cgroup_path, CGROUP_CPUSET_MEMS)?;
@@ -27,12 +49,11 @@ impl Controller for CpuSet {
Ok(())
}
- fn apply(controller_opt: &ControllerOpt, cgroup_path: &Path) -> Result<()> {
- log::debug!("Apply CpuSet cgroup config");
+ fn apply(controller_opt: &ControllerOpt, cgroup_path: &Path) -> Result<(), Self::Error> {
+ tracing::debug!("Apply CpuSet cgroup config");
if let Some(cpuset) = Self::needs_to_handle(controller_opt) {
- Self::apply(cgroup_path, cpuset)
- .context("failed to apply cpuset resource restrictions")?;
+ Self::apply(cgroup_path, cpuset)?;
}
Ok(())
@@ -50,7 +71,7 @@ impl Controller for CpuSet {
}
impl CpuSet {
- fn apply(cgroup_path: &Path, cpuset: &LinuxCpu) -> Result<()> {
+ fn apply(cgroup_path: &Path, cpuset: &LinuxCpu) -> Result<(), V1CpuSetControllerError> {
if let Some(cpus) = &cpuset.cpus() {
common::write_cgroup_file_str(cgroup_path.join(CGROUP_CPUSET_CPUS), cpus)?;
}
@@ -64,19 +85,28 @@ impl CpuSet {
// if a task is moved into the cgroup and a value has not been set for cpus and mems
// Errno 28 (no space left on device) will be returned. Therefore we set the value from the parent if required.
- fn ensure_not_empty(cgroup_path: &Path, interface_file: &str) -> Result<()> {
+ fn ensure_not_empty(
+ cgroup_path: &Path,
+ interface_file: &str,
+ ) -> Result<(), V1CpuSetControllerError> {
let mut current = util::get_subsystem_mount_point(&ControllerType::CpuSet)?;
- let relative_cgroup_path = cgroup_path.strip_prefix(¤t)?;
+ let relative_cgroup_path = cgroup_path.strip_prefix(¤t).map_err(|err| {
+ V1CpuSetControllerError::BadCgroupPath {
+ err,
+ path: cgroup_path.to_path_buf(),
+ }
+ })?;
for component in relative_cgroup_path.components() {
- let parent_value = fs::read_to_string(current.join(interface_file))?;
+ let parent_value =
+ fs::read_to_string(current.join(interface_file)).wrap_read(cgroup_path)?;
if parent_value.trim().is_empty() {
- bail!("cpuset parent value is empty")
+ return Err(V1CpuSetControllerError::EmptyParent);
}
current.push(component);
let child_path = current.join(interface_file);
- let child_value = fs::read_to_string(&child_path)?;
+ let child_value = fs::read_to_string(&child_path).wrap_read(&child_path)?;
// the file can contain a newline character. Need to trim it away,
// otherwise it is not considered empty and value will not be written
if child_value.trim().is_empty() {
@@ -99,36 +129,36 @@ mod tests {
#[test]
fn test_set_cpus() {
// arrange
- let (tmp, cpus) = setup("test_set_cpus", CGROUP_CPUSET_CPUS);
+ let (tmp, cpus) = setup(CGROUP_CPUSET_CPUS);
let cpuset = LinuxCpuBuilder::default()
.cpus("1-3".to_owned())
.build()
.unwrap();
// act
- CpuSet::apply(&tmp, &cpuset).expect("apply cpuset");
+ CpuSet::apply(tmp.path(), &cpuset).expect("apply cpuset");
// assert
let content = fs::read_to_string(cpus)
- .unwrap_or_else(|_| panic!("read {} file content", CGROUP_CPUSET_CPUS));
+ .unwrap_or_else(|_| panic!("read {CGROUP_CPUSET_CPUS} file content"));
assert_eq!(content, "1-3");
}
#[test]
fn test_set_mems() {
// arrange
- let (tmp, mems) = setup("test_set_mems", CGROUP_CPUSET_MEMS);
+ let (tmp, mems) = setup(CGROUP_CPUSET_MEMS);
let cpuset = LinuxCpuBuilder::default()
.mems("1-3".to_owned())
.build()
.unwrap();
// act
- CpuSet::apply(&tmp, &cpuset).expect("apply cpuset");
+ CpuSet::apply(tmp.path(), &cpuset).expect("apply cpuset");
// assert
let content = fs::read_to_string(mems)
- .unwrap_or_else(|_| panic!("read {} file content", CGROUP_CPUSET_MEMS));
+ .unwrap_or_else(|_| panic!("read {CGROUP_CPUSET_MEMS} file content"));
assert_eq!(content, "1-3");
}
}
diff --git a/crates/libcgroups/src/v1/devices.rs b/crates/libcgroups/src/v1/devices.rs
index 2d58992b8..fc6f392e5 100644
--- a/crates/libcgroups/src/v1/devices.rs
+++ b/crates/libcgroups/src/v1/devices.rs
@@ -1,18 +1,17 @@
use std::path::Path;
-use anyhow::Result;
-
use super::controller::Controller;
-use crate::common::{self, default_allow_devices, default_devices, ControllerOpt};
+use crate::common::{self, default_allow_devices, default_devices, ControllerOpt, WrappedIoError};
use oci_spec::runtime::LinuxDeviceCgroup;
pub struct Devices {}
impl Controller for Devices {
+ type Error = WrappedIoError;
type Resource = ();
- fn apply(controller_opt: &ControllerOpt, cgroup_root: &Path) -> Result<()> {
- log::debug!("Apply Devices cgroup config");
+ fn apply(controller_opt: &ControllerOpt, cgroup_root: &Path) -> Result<(), Self::Error> {
+ tracing::debug!("Apply Devices cgroup config");
if let Some(devices) = controller_opt.resources.devices().as_ref() {
for d in devices {
@@ -39,7 +38,7 @@ impl Controller for Devices {
}
impl Devices {
- fn apply_device(device: &LinuxDeviceCgroup, cgroup_root: &Path) -> Result<()> {
+ fn apply_device(device: &LinuxDeviceCgroup, cgroup_root: &Path) -> Result<(), WrappedIoError> {
let path = if device.allow() {
cgroup_root.join("devices.allow")
} else {
@@ -54,33 +53,31 @@ impl Devices {
#[cfg(test)]
mod tests {
use super::*;
- use crate::test::create_temp_dir;
use crate::test::set_fixture;
use oci_spec::runtime::{LinuxDeviceCgroupBuilder, LinuxDeviceType};
use std::fs::read_to_string;
#[test]
fn test_set_default_devices() {
- let tmp =
- create_temp_dir("test_set_default_devices").expect("create temp directory for test");
+ let tmp = tempfile::tempdir().unwrap();
default_allow_devices().iter().for_each(|d| {
// NOTE: We reset the fixtures every iteration because files aren't appended
// so what happens in the tests is you get strange overwrites which can contain
// remaining bytes from the last iteration. Resetting the files more appropriately
// mocks the behavior of cgroup files.
- set_fixture(&tmp, "devices.allow", "").expect("create allowed devices list");
- set_fixture(&tmp, "devices.deny", "").expect("create denied devices list");
+ set_fixture(tmp.path(), "devices.allow", "").expect("create allowed devices list");
+ set_fixture(tmp.path(), "devices.deny", "").expect("create denied devices list");
- Devices::apply_device(d, &tmp).expect("Apply default device");
+ Devices::apply_device(d, tmp.path()).expect("Apply default device");
println!("Device: {}", d.to_string());
if d.allow() {
let allowed_content =
- read_to_string(tmp.join("devices.allow")).expect("read to string");
+ read_to_string(tmp.path().join("devices.allow")).expect("read to string");
assert_eq!(allowed_content, d.to_string());
} else {
let denied_content =
- read_to_string(tmp.join("devices.deny")).expect("read to string");
+ read_to_string(tmp.path().join("devices.deny")).expect("read to string");
assert_eq!(denied_content, d.to_string());
}
});
@@ -88,7 +85,7 @@ mod tests {
#[test]
fn test_set_mock_devices() {
- let tmp = create_temp_dir("test_set_mock_devices").expect("create temp directory for test");
+ let tmp = tempfile::tempdir().unwrap();
[
LinuxDeviceCgroupBuilder::default()
.allow(true)
@@ -121,18 +118,18 @@ mod tests {
]
.iter()
.for_each(|d| {
- set_fixture(&tmp, "devices.allow", "").expect("create allowed devices list");
- set_fixture(&tmp, "devices.deny", "").expect("create denied devices list");
+ set_fixture(tmp.path(), "devices.allow", "").expect("create allowed devices list");
+ set_fixture(tmp.path(), "devices.deny", "").expect("create denied devices list");
- Devices::apply_device(d, &tmp).expect("Apply default device");
+ Devices::apply_device(d, tmp.path()).expect("Apply default device");
println!("Device: {}", d.to_string());
if d.allow() {
let allowed_content =
- read_to_string(tmp.join("devices.allow")).expect("read to string");
+ read_to_string(tmp.path().join("devices.allow")).expect("read to string");
assert_eq!(allowed_content, d.to_string());
} else {
let denied_content =
- read_to_string(tmp.join("devices.deny")).expect("read to string");
+ read_to_string(tmp.path().join("devices.deny")).expect("read to string");
assert_eq!(denied_content, d.to_string());
}
});
@@ -140,35 +137,35 @@ mod tests {
quickcheck! {
fn property_test_apply_device(device: LinuxDeviceCgroup) -> bool {
- let tmp = create_temp_dir("property_test_apply_device").expect("create temp directory for test");
- set_fixture(&tmp, "devices.allow", "").expect("create allowed devices list");
- set_fixture(&tmp, "devices.deny", "").expect("create denied devices list");
- Devices::apply_device(&device, &tmp).expect("Apply default device");
+ let tmp = tempfile::tempdir().unwrap();
+ set_fixture(tmp.path(), "devices.allow", "").expect("create allowed devices list");
+ set_fixture(tmp.path(), "devices.deny", "").expect("create denied devices list");
+ Devices::apply_device(&device, tmp.path()).expect("Apply default device");
if device.allow() {
let allowed_content =
- read_to_string(tmp.join("devices.allow")).expect("read to string");
+ read_to_string(tmp.path().join("devices.allow")).expect("read to string");
allowed_content == device.to_string()
} else {
let denied_content =
- read_to_string(tmp.join("devices.deny")).expect("read to string");
+ read_to_string(tmp.path().join("devices.deny")).expect("read to string");
denied_content == device.to_string()
}
}
fn property_test_apply_multiple_devices(devices: Vec) -> bool {
- let tmp = create_temp_dir("property_test_apply_multiple_devices").expect("create temp directory for test");
+ let tmp = tempfile::tempdir().unwrap();
devices.iter()
.map(|device| {
- set_fixture(&tmp, "devices.allow", "").expect("create allowed devices list");
- set_fixture(&tmp, "devices.deny", "").expect("create denied devices list");
- Devices::apply_device(device, &tmp).expect("Apply default device");
+ set_fixture(tmp.path(), "devices.allow", "").expect("create allowed devices list");
+ set_fixture(tmp.path(), "devices.deny", "").expect("create denied devices list");
+ Devices::apply_device(device, tmp.path()).expect("Apply default device");
if device.allow() {
let allowed_content =
- read_to_string(tmp.join("devices.allow")).expect("read to string");
+ read_to_string(tmp.path().join("devices.allow")).expect("read to string");
allowed_content == device.to_string()
} else {
let denied_content =
- read_to_string(tmp.join("devices.deny")).expect("read to string");
+ read_to_string(tmp.path().join("devices.deny")).expect("read to string");
denied_content == device.to_string()
}
})
diff --git a/crates/libcgroups/src/v1/freezer.rs b/crates/libcgroups/src/v1/freezer.rs
index cda198c51..66d44520f 100644
--- a/crates/libcgroups/src/v1/freezer.rs
+++ b/crates/libcgroups/src/v1/freezer.rs
@@ -1,32 +1,38 @@
-use std::io::prelude::*;
-use std::{
- fs::{create_dir_all, OpenOptions},
- path::Path,
- thread, time,
-};
+use std::io::Read;
+use std::{fs::OpenOptions, path::Path, thread, time};
-use anyhow::{Result, *};
-
-use super::Controller;
-use crate::common;
+use crate::common::{self, WrapIoResult, WrappedIoError};
use crate::common::{ControllerOpt, FreezerState};
+use super::controller::Controller;
+
const CGROUP_FREEZER_STATE: &str = "freezer.state";
const FREEZER_STATE_THAWED: &str = "THAWED";
const FREEZER_STATE_FROZEN: &str = "FROZEN";
const FREEZER_STATE_FREEZING: &str = "FREEZING";
+#[derive(thiserror::Error, Debug)]
+pub enum V1FreezerControllerError {
+ #[error("io error: {0}")]
+ WrappedIo(#[from] WrappedIoError),
+ #[error("unexpected state {state} while freezing")]
+ UnexpectedState { state: String },
+ #[error("unable to freeze")]
+ UnableToFreeze,
+}
+
pub struct Freezer {}
impl Controller for Freezer {
+ type Error = V1FreezerControllerError;
type Resource = FreezerState;
- fn apply(controller_opt: &ControllerOpt, cgroup_root: &Path) -> Result<()> {
- log::debug!("Apply Freezer cgroup config");
- create_dir_all(cgroup_root)?;
+ fn apply(controller_opt: &ControllerOpt, cgroup_root: &Path) -> Result<(), Self::Error> {
+ tracing::debug!("Apply Freezer cgroup config");
+ std::fs::create_dir_all(cgroup_root).wrap_create_dir(cgroup_root)?;
if let Some(freezer_state) = Self::needs_to_handle(controller_opt) {
- Self::apply(freezer_state, cgroup_root).context("failed to appyl freezer")?;
+ Self::apply(freezer_state, cgroup_root)?;
}
Ok(())
@@ -38,7 +44,10 @@ impl Controller for Freezer {
}
impl Freezer {
- fn apply(freezer_state: &FreezerState, cgroup_root: &Path) -> Result<()> {
+ fn apply(
+ freezer_state: &FreezerState,
+ cgroup_root: &Path,
+ ) -> Result<(), V1FreezerControllerError> {
match freezer_state {
FreezerState::Undefined => {}
FreezerState::Thawed => {
@@ -48,7 +57,7 @@ impl Freezer {
)?;
}
FreezerState::Frozen => {
- let r = || -> Result<()> {
+ let r = || -> Result<(), V1FreezerControllerError> {
// We should do our best to retry if FREEZING is seen until it becomes FROZEN.
// Add sleep between retries occasionally helped when system is extremely slow.
// see:
@@ -78,17 +87,17 @@ impl Freezer {
}
FREEZER_STATE_FROZEN => {
if i > 1 {
- log::debug!("frozen after {} retries", i)
+ tracing::debug!("frozen after {} retries", i)
}
return Ok(());
}
_ => {
// should not reach here.
- bail!("unexpected state {} while freezing", r.trim());
+ return Err(V1FreezerControllerError::UnexpectedState { state: r });
}
}
}
- bail!("unbale to freeze");
+ Err(V1FreezerControllerError::UnableToFreeze)
}();
if r.is_err() {
@@ -105,14 +114,16 @@ impl Freezer {
Ok(())
}
- fn read_freezer_state(cgroup_root: &Path) -> Result {
+ fn read_freezer_state(cgroup_root: &Path) -> Result {
let path = cgroup_root.join(CGROUP_FREEZER_STATE);
let mut content = String::new();
OpenOptions::new()
.create(false)
.read(true)
- .open(path)?
- .read_to_string(&mut content)?;
+ .open(path)
+ .wrap_open(cgroup_root)?
+ .read_to_string(&mut content)
+ .wrap_read(cgroup_root)?;
Ok(content)
}
}
@@ -121,54 +132,53 @@ impl Freezer {
mod tests {
use super::*;
use crate::common::{FreezerState, CGROUP_PROCS};
- use crate::test::{create_temp_dir, set_fixture};
+ use crate::test::set_fixture;
use nix::unistd::Pid;
use oci_spec::runtime::LinuxResourcesBuilder;
#[test]
fn test_set_freezer_state() {
- let tmp =
- create_temp_dir("test_set_freezer_state").expect("create temp directory for test");
- set_fixture(&tmp, CGROUP_FREEZER_STATE, "").expect("Set fixure for freezer state");
+ let tmp = tempfile::tempdir().unwrap();
+ set_fixture(tmp.path(), CGROUP_FREEZER_STATE, "").expect("Set fixure for freezer state");
// set Frozen state.
{
let freezer_state = FreezerState::Frozen;
- Freezer::apply(&freezer_state, &tmp).expect("Set freezer state");
+ Freezer::apply(&freezer_state, tmp.path()).expect("Set freezer state");
- let state_content =
- std::fs::read_to_string(tmp.join(CGROUP_FREEZER_STATE)).expect("Read to string");
+ let state_content = std::fs::read_to_string(tmp.path().join(CGROUP_FREEZER_STATE))
+ .expect("Read to string");
assert_eq!(FREEZER_STATE_FROZEN, state_content);
}
// set Thawed state.
{
let freezer_state = FreezerState::Thawed;
- Freezer::apply(&freezer_state, &tmp).expect("Set freezer state");
+ Freezer::apply(&freezer_state, tmp.path()).expect("Set freezer state");
- let state_content =
- std::fs::read_to_string(tmp.join(CGROUP_FREEZER_STATE)).expect("Read to string");
+ let state_content = std::fs::read_to_string(tmp.path().join(CGROUP_FREEZER_STATE))
+ .expect("Read to string");
assert_eq!(FREEZER_STATE_THAWED, state_content);
}
// set Undefined state.
{
- let old_state_content =
- std::fs::read_to_string(tmp.join(CGROUP_FREEZER_STATE)).expect("Read to string");
+ let old_state_content = std::fs::read_to_string(tmp.path().join(CGROUP_FREEZER_STATE))
+ .expect("Read to string");
let freezer_state = FreezerState::Undefined;
- Freezer::apply(&freezer_state, &tmp).expect("Set freezer state");
+ Freezer::apply(&freezer_state, tmp.path()).expect("Set freezer state");
- let state_content =
- std::fs::read_to_string(tmp.join(CGROUP_FREEZER_STATE)).expect("Read to string");
+ let state_content = std::fs::read_to_string(tmp.path().join(CGROUP_FREEZER_STATE))
+ .expect("Read to string");
assert_eq!(old_state_content, state_content);
}
}
#[test]
fn test_add_and_apply() {
- let tmp = create_temp_dir("test_add_task").expect("create temp directory for test");
- set_fixture(&tmp, CGROUP_FREEZER_STATE, "").expect("set fixure for freezer state");
- set_fixture(&tmp, CGROUP_PROCS, "").expect("set fixture for proc file");
+ let tmp = tempfile::tempdir().unwrap();
+ set_fixture(tmp.path(), CGROUP_FREEZER_STATE, "").expect("set fixure for freezer state");
+ set_fixture(tmp.path(), CGROUP_PROCS, "").expect("set fixture for proc file");
// set Thawed state.
{
@@ -187,13 +197,13 @@ mod tests {
};
let pid = Pid::from_raw(1000);
- Freezer::add_task(pid, &tmp).expect("freezer add task");
- ::apply(&controller_opt, &tmp).expect("freezer apply");
- let state_content =
- std::fs::read_to_string(tmp.join(CGROUP_FREEZER_STATE)).expect("read to string");
+ Freezer::add_task(pid, tmp.path()).expect("freezer add task");
+ ::apply(&controller_opt, tmp.path()).expect("freezer apply");
+ let state_content = std::fs::read_to_string(tmp.path().join(CGROUP_FREEZER_STATE))
+ .expect("read to string");
assert_eq!(FREEZER_STATE_THAWED, state_content);
let pid_content =
- std::fs::read_to_string(tmp.join(CGROUP_PROCS)).expect("read to string");
+ std::fs::read_to_string(tmp.path().join(CGROUP_PROCS)).expect("read to string");
assert_eq!(pid_content, "1000");
}
@@ -214,13 +224,13 @@ mod tests {
};
let pid = Pid::from_raw(1001);
- Freezer::add_task(pid, &tmp).expect("freezer add task");
- ::apply(&controller_opt, &tmp).expect("freezer apply");
- let state_content =
- std::fs::read_to_string(tmp.join(CGROUP_FREEZER_STATE)).expect("read to string");
+ Freezer::add_task(pid, tmp.path()).expect("freezer add task");
+ ::apply(&controller_opt, tmp.path()).expect("freezer apply");
+ let state_content = std::fs::read_to_string(tmp.path().join(CGROUP_FREEZER_STATE))
+ .expect("read to string");
assert_eq!(FREEZER_STATE_FROZEN, state_content);
let pid_content =
- std::fs::read_to_string(tmp.join(CGROUP_PROCS)).expect("read to string");
+ std::fs::read_to_string(tmp.path().join(CGROUP_PROCS)).expect("read to string");
assert_eq!(pid_content, "1001");
}
@@ -242,15 +252,15 @@ mod tests {
};
let pid = Pid::from_raw(1002);
- let old_state_content =
- std::fs::read_to_string(tmp.join(CGROUP_FREEZER_STATE)).expect("read to string");
- Freezer::add_task(pid, &tmp).expect("freezer add task");
- ::apply(&controller_opt, &tmp).expect("freezer apply");
- let state_content =
- std::fs::read_to_string(tmp.join(CGROUP_FREEZER_STATE)).expect("read to string");
+ let old_state_content = std::fs::read_to_string(tmp.path().join(CGROUP_FREEZER_STATE))
+ .expect("read to string");
+ Freezer::add_task(pid, tmp.path()).expect("freezer add task");
+ ::apply(&controller_opt, tmp.path()).expect("freezer apply");
+ let state_content = std::fs::read_to_string(tmp.path().join(CGROUP_FREEZER_STATE))
+ .expect("read to string");
assert_eq!(old_state_content, state_content);
let pid_content =
- std::fs::read_to_string(tmp.join(CGROUP_PROCS)).expect("read to string");
+ std::fs::read_to_string(tmp.path().join(CGROUP_PROCS)).expect("read to string");
assert_eq!(pid_content, "1002");
}
}
diff --git a/crates/libcgroups/src/v1/hugetlb.rs b/crates/libcgroups/src/v1/hugetlb.rs
index 501cb3778..ae301d02f 100644
--- a/crates/libcgroups/src/v1/hugetlb.rs
+++ b/crates/libcgroups/src/v1/hugetlb.rs
@@ -1,27 +1,40 @@
-use std::{collections::HashMap, path::Path};
-
-use anyhow::{bail, Context, Result};
+use std::{collections::HashMap, num::ParseIntError, path::Path};
use crate::{
- common::{self, ControllerOpt},
- stats::{supported_page_sizes, HugeTlbStats, StatsProvider},
+ common::{self, ControllerOpt, EitherError, MustBePowerOfTwo, WrappedIoError},
+ stats::{supported_page_sizes, HugeTlbStats, StatsProvider, SupportedPageSizesError},
};
-use super::Controller;
use oci_spec::runtime::LinuxHugepageLimit;
+use super::controller::Controller;
+
+#[derive(thiserror::Error, Debug)]
+pub enum V1HugeTlbControllerError {
+ #[error("io error: {0}")]
+ WrappedIo(#[from] WrappedIoError),
+ #[error("malformed page size {page_size}: {err}")]
+ MalformedPageSize {
+ page_size: String,
+ err: EitherError,
+ },
+}
+
pub struct HugeTlb {}
impl Controller for HugeTlb {
+ type Error = V1HugeTlbControllerError;
type Resource = Vec;
- fn apply(controller_opt: &ControllerOpt, cgroup_root: &std::path::Path) -> Result<()> {
- log::debug!("Apply Hugetlb cgroup config");
+ fn apply(
+ controller_opt: &ControllerOpt,
+ cgroup_root: &std::path::Path,
+ ) -> Result<(), Self::Error> {
+ tracing::debug!("Apply Hugetlb cgroup config");
if let Some(hugepage_limits) = Self::needs_to_handle(controller_opt) {
for hugetlb in hugepage_limits {
- Self::apply(cgroup_root, hugetlb)
- .context("failed to apply hugetlb resource restrictions")?
+ Self::apply(cgroup_root, hugetlb)?
}
}
@@ -39,10 +52,21 @@ impl Controller for HugeTlb {
}
}
+#[derive(thiserror::Error, Debug)]
+pub enum V1HugeTlbStatsError {
+ #[error("io error: {0}")]
+ WrappedIo(#[from] WrappedIoError),
+ #[error("error getting supported page sizes: {0}")]
+ SupportedPageSizes(#[from] SupportedPageSizesError),
+ #[error("error parsing value: {0}")]
+ Parse(#[from] ParseIntError),
+}
+
impl StatsProvider for HugeTlb {
+ type Error = V1HugeTlbStatsError;
type Stats = HashMap;
- fn stats(cgroup_path: &Path) -> Result {
+ fn stats(cgroup_path: &Path) -> Result {
let page_sizes = supported_page_sizes()?;
let mut hugetlb_stats = HashMap::with_capacity(page_sizes.len());
@@ -56,15 +80,29 @@ impl StatsProvider for HugeTlb {
}
impl HugeTlb {
- fn apply(root_path: &Path, hugetlb: &LinuxHugepageLimit) -> Result<()> {
- let page_size: String = hugetlb
+ fn apply(
+ root_path: &Path,
+ hugetlb: &LinuxHugepageLimit,
+ ) -> Result<(), V1HugeTlbControllerError> {
+ let raw_page_size: String = hugetlb
.page_size()
.chars()
.take_while(|c| c.is_ascii_digit())
.collect();
- let page_size: u64 = page_size.parse()?;
+ let page_size: u64 = match raw_page_size.parse() {
+ Ok(page_size) => page_size,
+ Err(err) => {
+ return Err(V1HugeTlbControllerError::MalformedPageSize {
+ page_size: raw_page_size,
+ err: EitherError::Left(err),
+ })
+ }
+ };
if !Self::is_power_of_two(page_size) {
- bail!("page size must be in the format of 2^(integer)");
+ return Err(V1HugeTlbControllerError::MalformedPageSize {
+ page_size: raw_page_size,
+ err: EitherError::Right(MustBePowerOfTwo),
+ });
}
common::write_cgroup_file(
@@ -75,21 +113,24 @@ impl HugeTlb {
}
fn is_power_of_two(number: u64) -> bool {
- (number != 0) && (number & (number - 1)) == 0
+ (number != 0) && (number & (number.saturating_sub(1))) == 0
}
- fn stats_for_page_size(cgroup_path: &Path, page_size: &str) -> Result