From 45a00b4f02972d21eac9de42ec541e20bd72f56c Mon Sep 17 00:00:00 2001 From: Liu Jiang Date: Wed, 8 Dec 2021 23:09:13 +0800 Subject: [PATCH] libs/sys-util: add kata-sys-util crate under src/libs The kata-sys-util crate is a collection of modules that provides helpers and utilities used by multiple Kata Containers components. Fixes: #3305 Signed-off-by: Liu Jiang --- src/libs/Cargo.lock | 24 +++++------------------- src/libs/Cargo.toml | 1 + src/libs/README.md | 1 + src/libs/kata-sys-util/Cargo.toml | 13 +++++++++++++ src/libs/kata-sys-util/README.md | 19 +++++++++++++++++++ src/libs/kata-sys-util/src/lib.rs | 4 ++++ 6 files changed, 43 insertions(+), 19 deletions(-) create mode 100644 src/libs/kata-sys-util/Cargo.toml create mode 100644 src/libs/kata-sys-util/README.md create mode 100644 src/libs/kata-sys-util/src/lib.rs diff --git a/src/libs/Cargo.lock b/src/libs/Cargo.lock index 341abf83b4..1467aa3913 100644 --- a/src/libs/Cargo.lock +++ b/src/libs/Cargo.lock @@ -89,7 +89,6 @@ dependencies = [ "libc", "num-integer", "num-traits", - "time", "winapi", ] @@ -307,6 +306,10 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" +[[package]] +name = "kata-sys-util" +version = "0.1.0" + [[package]] name = "kata-types" version = "0.1.0" @@ -382,7 +385,7 @@ dependencies = [ "log", "miow", "ntapi", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "winapi", ] @@ -810,17 +813,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "time" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - [[package]] name = "tokio" version = "1.17.0" @@ -938,12 +930,6 @@ dependencies = [ "nix 0.23.1", ] -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" diff --git a/src/libs/Cargo.toml b/src/libs/Cargo.toml index 10887de3c1..b485eaa43e 100644 --- a/src/libs/Cargo.toml +++ b/src/libs/Cargo.toml @@ -2,6 +2,7 @@ members = [ "logging", "kata-types", + "kata-sys-util", "safe-path", "protocols", "oci", diff --git a/src/libs/README.md b/src/libs/README.md index 0593749a09..bb1a655c38 100644 --- a/src/libs/README.md +++ b/src/libs/README.md @@ -7,5 +7,6 @@ Currently it provides following library crates: | Library | Description | |-|-| | [logging](logging/) | Facilities to setup logging subsystem based on slog. | +| [system utilities](kata-sys-util/) | Collection of facilities and helpers to access system services. | | [types](kata-types/) | Collection of constants and data types shared by multiple Kata Containers components. | | [safe-path](safe-path/) | Utilities to safely resolve filesystem paths. | diff --git a/src/libs/kata-sys-util/Cargo.toml b/src/libs/kata-sys-util/Cargo.toml new file mode 100644 index 0000000000..52baa85f5f --- /dev/null +++ b/src/libs/kata-sys-util/Cargo.toml @@ -0,0 +1,13 @@ +[package] +name = "kata-sys-util" +version = "0.1.0" +description = "System Utilities for Kata Containers" +keywords = ["kata", "container", "runtime"] +authors = ["The Kata Containers community "] +repository = "https://github.com/kata-containers/kata-containers.git" +homepage = "https://katacontainers.io/" +readme = "README.md" +license = "Apache-2.0" +edition = "2018" + +[dependencies] diff --git a/src/libs/kata-sys-util/README.md b/src/libs/kata-sys-util/README.md new file mode 100644 index 0000000000..0c3f887bcb --- /dev/null +++ b/src/libs/kata-sys-util/README.md @@ -0,0 +1,19 @@ +# kata-sys-util + +This crate is a collection of utilities and helpers for +[Kata Containers](https://github.com/kata-containers/kata-containers/) components to access system services. + +It provides safe wrappers over system services, such as: +- cgroups +- file systems +- mount +- NUMA + +## Support + +**Operating Systems**: +- Linux + +## License + +This code is licensed under [Apache-2.0](../../../LICENSE). diff --git a/src/libs/kata-sys-util/src/lib.rs b/src/libs/kata-sys-util/src/lib.rs new file mode 100644 index 0000000000..09d8d18581 --- /dev/null +++ b/src/libs/kata-sys-util/src/lib.rs @@ -0,0 +1,4 @@ +// Copyright (c) 2021 Alibaba Cloud +// +// SPDX-License-Identifier: Apache-2.0 +//