mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-06-27 07:48:55 +00:00
agent: upgrade tokio to 1.0
Fixes: #1257 Signed-off-by: Tim Zhang <tim@hyper.sh>
This commit is contained in:
Tim Zhang
parent
947913f6e5
commit
02079dbb4f
335
src/agent/Cargo.lock
generated
335
src/agent/Cargo.lock
generated
@ -139,6 +139,12 @@ version = "0.5.6"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
|
checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "bytes"
|
||||||
|
version = "1.0.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "caps"
|
name = "caps"
|
||||||
version = "0.5.0"
|
version = "0.5.0"
|
||||||
@ -191,7 +197,7 @@ dependencies = [
|
|||||||
"num-integer",
|
"num-integer",
|
||||||
"num-traits",
|
"num-traits",
|
||||||
"time",
|
"time",
|
||||||
"winapi 0.3.9",
|
"winapi",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -269,7 +275,7 @@ checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"libc",
|
"libc",
|
||||||
"redox_users",
|
"redox_users",
|
||||||
"winapi 0.3.9",
|
"winapi",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -286,7 +292,7 @@ checksum = "fa68f2fb9cae9d37c9b2b3584aba698a2e97f72d7aef7b9f7aa71d8b54ce46fe"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"errno-dragonfly",
|
"errno-dragonfly",
|
||||||
"libc",
|
"libc",
|
||||||
"winapi 0.3.9",
|
"winapi",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -320,27 +326,11 @@ version = "1.0.7"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
|
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "fuchsia-zircon"
|
|
||||||
version = "0.3.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
|
|
||||||
dependencies = [
|
|
||||||
"bitflags",
|
|
||||||
"fuchsia-zircon-sys",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "fuchsia-zircon-sys"
|
|
||||||
version = "0.3.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "futures"
|
name = "futures"
|
||||||
version = "0.3.8"
|
version = "0.3.12"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9b3b0c040a1fe6529d30b3c5944b280c7f0dcb2930d2c3062bca967b602583d0"
|
checksum = "da9052a1a50244d8d5aa9bf55cbc2fb6f357c86cc52e46c62ed390a7180cf150"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"futures-channel",
|
"futures-channel",
|
||||||
"futures-core",
|
"futures-core",
|
||||||
@ -353,9 +343,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "futures-channel"
|
name = "futures-channel"
|
||||||
version = "0.3.8"
|
version = "0.3.12"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64"
|
checksum = "f2d31b7ec7efab6eefc7c57233bb10b847986139d88cc2f5a02a1ae6871a1846"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"futures-core",
|
"futures-core",
|
||||||
"futures-sink",
|
"futures-sink",
|
||||||
@ -363,15 +353,15 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "futures-core"
|
name = "futures-core"
|
||||||
version = "0.3.8"
|
version = "0.3.12"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748"
|
checksum = "79e5145dde8da7d1b3892dad07a9c98fc04bc39892b1ecc9692cf53e2b780a65"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "futures-executor"
|
name = "futures-executor"
|
||||||
version = "0.3.8"
|
version = "0.3.12"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "4caa2b2b68b880003057c1dd49f1ed937e38f22fcf6c212188a121f08cf40a65"
|
checksum = "e9e59fdc009a4b3096bf94f740a0f2424c082521f20a9b08c5c07c48d90fd9b9"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"futures-core",
|
"futures-core",
|
||||||
"futures-task",
|
"futures-task",
|
||||||
@ -380,15 +370,15 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "futures-io"
|
name = "futures-io"
|
||||||
version = "0.3.8"
|
version = "0.3.12"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb"
|
checksum = "28be053525281ad8259d47e4de5de657b25e7bac113458555bb4b70bc6870500"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "futures-macro"
|
name = "futures-macro"
|
||||||
version = "0.3.8"
|
version = "0.3.12"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "77408a692f1f97bcc61dc001d752e00643408fbc922e4d634c655df50d595556"
|
checksum = "c287d25add322d9f9abdcdc5927ca398917996600182178774032e9f8258fedd"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro-hack",
|
"proc-macro-hack",
|
||||||
"proc-macro2 1.0.24",
|
"proc-macro2 1.0.24",
|
||||||
@ -398,24 +388,24 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "futures-sink"
|
name = "futures-sink"
|
||||||
version = "0.3.8"
|
version = "0.3.12"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f878195a49cee50e006b02b93cf7e0a95a38ac7b776b4c4d9cc1207cd20fcb3d"
|
checksum = "caf5c69029bda2e743fddd0582d1083951d65cc9539aebf8812f36c3491342d6"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "futures-task"
|
name = "futures-task"
|
||||||
version = "0.3.8"
|
version = "0.3.12"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d"
|
checksum = "13de07eb8ea81ae445aca7b69f5f7bf15d7bf4912d8ca37d6645c77ae8a58d86"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"once_cell",
|
"once_cell",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "futures-util"
|
name = "futures-util"
|
||||||
version = "0.3.8"
|
version = "0.3.12"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2"
|
checksum = "632a8cd0f2a4b3fdea1657f08bde063848c3bd00f9bbf6e256b8be78802e624b"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"futures-channel",
|
"futures-channel",
|
||||||
"futures-core",
|
"futures-core",
|
||||||
@ -424,7 +414,7 @@ dependencies = [
|
|||||||
"futures-sink",
|
"futures-sink",
|
||||||
"futures-task",
|
"futures-task",
|
||||||
"memchr",
|
"memchr",
|
||||||
"pin-project",
|
"pin-project-lite 0.2.4",
|
||||||
"pin-utils",
|
"pin-utils",
|
||||||
"proc-macro-hack",
|
"proc-macro-hack",
|
||||||
"proc-macro-nested",
|
"proc-macro-nested",
|
||||||
@ -463,15 +453,6 @@ dependencies = [
|
|||||||
"unicode-segmentation",
|
"unicode-segmentation",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "hermit-abi"
|
|
||||||
version = "0.1.17"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
|
|
||||||
dependencies = [
|
|
||||||
"libc",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "hex"
|
name = "hex"
|
||||||
version = "0.4.2"
|
version = "0.4.2"
|
||||||
@ -480,15 +461,15 @@ checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "inotify"
|
name = "inotify"
|
||||||
version = "0.9.1"
|
version = "0.9.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "04c6848dfb1580647ab039713282cdd1ab2bfb47b60ecfb598e22e60e3baf3f8"
|
checksum = "d19f57db1baad9d09e43a3cd76dcf82ebdafd37d75c9498b87762dba77c93f15"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags",
|
"bitflags",
|
||||||
"futures-core",
|
"futures-core",
|
||||||
"inotify-sys",
|
"inotify-sys",
|
||||||
"libc",
|
"libc",
|
||||||
"tokio 0.3.6",
|
"tokio 1.2.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -556,7 +537,7 @@ dependencies = [
|
|||||||
"log",
|
"log",
|
||||||
"logging",
|
"logging",
|
||||||
"netlink-packet-utils",
|
"netlink-packet-utils",
|
||||||
"netlink-sys 0.4.0",
|
"netlink-sys",
|
||||||
"nix 0.17.0",
|
"nix 0.17.0",
|
||||||
"oci",
|
"oci",
|
||||||
"prctl",
|
"prctl",
|
||||||
@ -574,21 +555,11 @@ dependencies = [
|
|||||||
"slog-scope",
|
"slog-scope",
|
||||||
"slog-stdlog",
|
"slog-stdlog",
|
||||||
"tempfile",
|
"tempfile",
|
||||||
"tokio 0.2.24",
|
"tokio 1.2.0",
|
||||||
"tokio-vsock",
|
"tokio-vsock",
|
||||||
"ttrpc",
|
"ttrpc",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "kernel32-sys"
|
|
||||||
version = "0.2.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
|
|
||||||
dependencies = [
|
|
||||||
"winapi 0.2.8",
|
|
||||||
"winapi-build",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lazy_static"
|
name = "lazy_static"
|
||||||
version = "1.4.0"
|
version = "1.4.0"
|
||||||
@ -670,25 +641,6 @@ dependencies = [
|
|||||||
"autocfg",
|
"autocfg",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "mio"
|
|
||||||
version = "0.6.23"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4"
|
|
||||||
dependencies = [
|
|
||||||
"cfg-if 0.1.10",
|
|
||||||
"fuchsia-zircon",
|
|
||||||
"fuchsia-zircon-sys",
|
|
||||||
"iovec",
|
|
||||||
"kernel32-sys",
|
|
||||||
"libc",
|
|
||||||
"log",
|
|
||||||
"miow 0.2.2",
|
|
||||||
"net2",
|
|
||||||
"slab",
|
|
||||||
"winapi 0.2.8",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "mio"
|
name = "mio"
|
||||||
version = "0.7.6"
|
version = "0.7.6"
|
||||||
@ -697,44 +649,9 @@ checksum = "f33bc887064ef1fd66020c9adfc45bb9f33d75a42096c81e7c56c65b75dd1a8b"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"libc",
|
"libc",
|
||||||
"log",
|
"log",
|
||||||
"miow 0.3.6",
|
"miow",
|
||||||
"ntapi",
|
"ntapi",
|
||||||
"winapi 0.3.9",
|
"winapi",
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "mio-named-pipes"
|
|
||||||
version = "0.1.7"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656"
|
|
||||||
dependencies = [
|
|
||||||
"log",
|
|
||||||
"mio 0.6.23",
|
|
||||||
"miow 0.3.6",
|
|
||||||
"winapi 0.3.9",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "mio-uds"
|
|
||||||
version = "0.6.8"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0"
|
|
||||||
dependencies = [
|
|
||||||
"iovec",
|
|
||||||
"libc",
|
|
||||||
"mio 0.6.23",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "miow"
|
|
||||||
version = "0.2.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d"
|
|
||||||
dependencies = [
|
|
||||||
"kernel32-sys",
|
|
||||||
"net2",
|
|
||||||
"winapi 0.2.8",
|
|
||||||
"ws2_32-sys",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -744,7 +661,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897"
|
checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"socket2",
|
"socket2",
|
||||||
"winapi 0.3.9",
|
"winapi",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -753,17 +670,6 @@ version = "0.4.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "2eb04b9f127583ed176e163fb9ec6f3e793b87e21deedd5734a69386a18a0151"
|
checksum = "2eb04b9f127583ed176e163fb9ec6f3e793b87e21deedd5734a69386a18a0151"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "net2"
|
|
||||||
version = "0.2.37"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
|
|
||||||
dependencies = [
|
|
||||||
"cfg-if 0.1.10",
|
|
||||||
"libc",
|
|
||||||
"winapi 0.3.9",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "netlink-packet-core"
|
name = "netlink-packet-core"
|
||||||
version = "0.2.2"
|
version = "0.2.2"
|
||||||
@ -778,9 +684,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "netlink-packet-route"
|
name = "netlink-packet-route"
|
||||||
version = "0.6.0"
|
version = "0.7.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "2253105e60b35a3fb6cf342b56a45ee1c76ef4b1e68c59b08f813f24c3b7b469"
|
checksum = "da1bf86b4324996fb58f8e17752b2a06176f4c5efc013928060ac94a3a329b71"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"bitflags",
|
"bitflags",
|
||||||
@ -804,43 +710,29 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "netlink-proto"
|
name = "netlink-proto"
|
||||||
version = "0.5.0"
|
version = "0.6.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "31dfd4f1653ba8e1e2410b3def2313f3399d9b9f7ec3a8a6a8f2f670c3e58d71"
|
checksum = "9b72e0d34a11ff4253bc7d38fbc246750c4d2d2718b318c9ad981d450ed62aa8"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bytes 0.5.6",
|
"bytes 0.5.6",
|
||||||
"futures",
|
"futures",
|
||||||
"log",
|
"log",
|
||||||
"netlink-packet-core",
|
"netlink-packet-core",
|
||||||
"netlink-sys 0.5.0",
|
"netlink-sys",
|
||||||
"tokio 0.2.24",
|
"tokio 1.2.0",
|
||||||
"tokio-util",
|
"tokio-util",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "netlink-sys"
|
name = "netlink-sys"
|
||||||
version = "0.4.0"
|
version = "0.6.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "cc9e9df13fd91bdd4b92bea93d5d2848c8035677c60fc3fee5dabddc02c3012e"
|
checksum = "d61c5374735aa0cd07cb7fd820b656062b187b5588d79517f72956b57c6de9ef"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"futures",
|
"futures",
|
||||||
"libc",
|
"libc",
|
||||||
"log",
|
"log",
|
||||||
"mio 0.6.23",
|
"tokio 1.2.0",
|
||||||
"tokio 0.2.24",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "netlink-sys"
|
|
||||||
version = "0.5.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "bf10c3ab67b9c09b42abb5a53ecb8ffdad160d6485b140a6f21f53ba5362042d"
|
|
||||||
dependencies = [
|
|
||||||
"futures",
|
|
||||||
"libc",
|
|
||||||
"log",
|
|
||||||
"mio 0.6.23",
|
|
||||||
"tokio 0.2.24",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -905,7 +797,7 @@ version = "0.3.6"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
|
checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"winapi 0.3.9",
|
"winapi",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -927,16 +819,6 @@ dependencies = [
|
|||||||
"autocfg",
|
"autocfg",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "num_cpus"
|
|
||||||
version = "1.13.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
|
|
||||||
dependencies = [
|
|
||||||
"hermit-abi",
|
|
||||||
"libc",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "object"
|
name = "object"
|
||||||
version = "0.22.0"
|
version = "0.22.0"
|
||||||
@ -981,7 +863,7 @@ dependencies = [
|
|||||||
"libc",
|
"libc",
|
||||||
"redox_syscall",
|
"redox_syscall",
|
||||||
"smallvec",
|
"smallvec",
|
||||||
"winapi 0.3.9",
|
"winapi",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -1018,26 +900,6 @@ dependencies = [
|
|||||||
"fixedbitset",
|
"fixedbitset",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "pin-project"
|
|
||||||
version = "1.0.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "9ccc2237c2c489783abd8c4c80e5450fc0e98644555b1364da68cc29aa151ca7"
|
|
||||||
dependencies = [
|
|
||||||
"pin-project-internal",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "pin-project-internal"
|
|
||||||
version = "1.0.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f"
|
|
||||||
dependencies = [
|
|
||||||
"proc-macro2 1.0.24",
|
|
||||||
"quote 1.0.8",
|
|
||||||
"syn 1.0.55",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pin-project-lite"
|
name = "pin-project-lite"
|
||||||
version = "0.1.11"
|
version = "0.1.11"
|
||||||
@ -1046,9 +908,9 @@ checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pin-project-lite"
|
name = "pin-project-lite"
|
||||||
version = "0.2.0"
|
version = "0.2.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "6b063f57ec186e6140e2b8b6921e5f1bd89c7356dda5b33acc5401203ca6131c"
|
checksum = "439697af366c49a6d0a010c56a0d97685bc140ce0d377b13a2ea2aa42d64a827"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pin-utils"
|
name = "pin-utils"
|
||||||
@ -1332,7 +1194,7 @@ version = "0.5.3"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
|
checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"winapi 0.3.9",
|
"winapi",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -1352,16 +1214,18 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rtnetlink"
|
name = "rtnetlink"
|
||||||
version = "0.6.0"
|
version = "0.7.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "0c942df3c7725a0500971d857a080d6dc537e257e19ccb352f80b2c726ef7007"
|
checksum = "d7c188dd8ddd43e195e483d255f4975d457a78021acf185ea2269e0667ef8b1a"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"byteordered",
|
"byteordered",
|
||||||
"futures",
|
"futures",
|
||||||
"log",
|
"log",
|
||||||
"netlink-packet-route",
|
"netlink-packet-route",
|
||||||
"netlink-proto",
|
"netlink-proto",
|
||||||
|
"nix 0.19.1",
|
||||||
"thiserror",
|
"thiserror",
|
||||||
|
"tokio 1.2.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -1404,7 +1268,6 @@ dependencies = [
|
|||||||
"inotify",
|
"inotify",
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
"libc",
|
"libc",
|
||||||
"mio 0.6.23",
|
|
||||||
"nix 0.17.0",
|
"nix 0.17.0",
|
||||||
"oci",
|
"oci",
|
||||||
"path-absolutize",
|
"path-absolutize",
|
||||||
@ -1422,7 +1285,7 @@ dependencies = [
|
|||||||
"slog",
|
"slog",
|
||||||
"slog-scope",
|
"slog-scope",
|
||||||
"tempfile",
|
"tempfile",
|
||||||
"tokio 0.2.24",
|
"tokio 1.2.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -1598,7 +1461,7 @@ checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if 1.0.0",
|
"cfg-if 1.0.0",
|
||||||
"libc",
|
"libc",
|
||||||
"winapi 0.3.9",
|
"winapi",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -1646,7 +1509,7 @@ dependencies = [
|
|||||||
"rand",
|
"rand",
|
||||||
"redox_syscall",
|
"redox_syscall",
|
||||||
"remove_dir_all",
|
"remove_dir_all",
|
||||||
"winapi 0.3.9",
|
"winapi",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -1686,7 +1549,7 @@ checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"libc",
|
"libc",
|
||||||
"wasi 0.10.0+wasi-snapshot-preview1",
|
"wasi 0.10.0+wasi-snapshot-preview1",
|
||||||
"winapi 0.3.9",
|
"winapi",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -1696,39 +1559,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "099837d3464c16a808060bb3f02263b412f6fafcb5d01c533d309985fbeebe48"
|
checksum = "099837d3464c16a808060bb3f02263b412f6fafcb5d01c533d309985fbeebe48"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bytes 0.5.6",
|
"bytes 0.5.6",
|
||||||
"fnv",
|
|
||||||
"futures-core",
|
|
||||||
"lazy_static",
|
|
||||||
"libc",
|
|
||||||
"memchr",
|
|
||||||
"mio 0.6.23",
|
|
||||||
"mio-named-pipes",
|
|
||||||
"mio-uds",
|
|
||||||
"num_cpus",
|
|
||||||
"pin-project-lite 0.1.11",
|
"pin-project-lite 0.1.11",
|
||||||
"signal-hook-registry",
|
|
||||||
"slab",
|
|
||||||
"tokio-macros",
|
|
||||||
"winapi 0.3.9",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tokio"
|
name = "tokio"
|
||||||
version = "0.3.6"
|
version = "1.2.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "720ba21c25078711bf456d607987d95bce90f7c3bea5abe1db587862e7a1e87c"
|
checksum = "e8190d04c665ea9e6b6a0dc45523ade572c088d2e6566244c1122671dbf4ae3a"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"autocfg",
|
"autocfg",
|
||||||
|
"bytes 1.0.1",
|
||||||
"libc",
|
"libc",
|
||||||
"mio 0.7.6",
|
"memchr",
|
||||||
"pin-project-lite 0.2.0",
|
"mio",
|
||||||
|
"once_cell",
|
||||||
|
"pin-project-lite 0.2.4",
|
||||||
|
"signal-hook-registry",
|
||||||
|
"tokio-macros",
|
||||||
|
"winapi",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tokio-macros"
|
name = "tokio-macros"
|
||||||
version = "0.2.6"
|
version = "1.1.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a"
|
checksum = "caf7b11a536f46a809a8a9f0bb4237020f70ecbf115b842360afb127ea2fda57"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2 1.0.24",
|
"proc-macro2 1.0.24",
|
||||||
"quote 1.0.8",
|
"quote 1.0.8",
|
||||||
@ -1751,25 +1607,22 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tokio-vsock"
|
name = "tokio-vsock"
|
||||||
version = "0.2.2"
|
version = "0.3.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "547a35667d4d842422da7f5528612321770f2f640e7fd5df0431de7b717fb2b4"
|
checksum = "70c401a3d0e82328c6fa900e9e2c4152737a4caa304558b762f0154a8b306456"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bytes 0.4.12",
|
"bytes 0.4.12",
|
||||||
"futures",
|
"futures",
|
||||||
"iovec",
|
|
||||||
"libc",
|
"libc",
|
||||||
"mio 0.6.23",
|
"tokio 1.2.0",
|
||||||
"nix 0.17.0",
|
|
||||||
"tokio 0.2.24",
|
|
||||||
"vsock",
|
"vsock",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ttrpc"
|
name = "ttrpc"
|
||||||
version = "0.4.14"
|
version = "0.5.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "fc512242eee1f113eadd48087dd97cbf807ccae4820006e7a890044044399c51"
|
checksum = "ff9ad10daac7027ac1e4c46326abc301349ab9b4006e931e9f7cb0feeb9a2096"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-trait",
|
"async-trait",
|
||||||
"byteorder",
|
"byteorder",
|
||||||
@ -1780,15 +1633,15 @@ dependencies = [
|
|||||||
"protobuf",
|
"protobuf",
|
||||||
"protobuf-codegen-pure",
|
"protobuf-codegen-pure",
|
||||||
"thiserror",
|
"thiserror",
|
||||||
"tokio 0.2.24",
|
"tokio 1.2.0",
|
||||||
"tokio-vsock",
|
"tokio-vsock",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ttrpc-codegen"
|
name = "ttrpc-codegen"
|
||||||
version = "0.1.2"
|
version = "0.2.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "12e8844d7a8351fa833bea811f826401bec020b233e60a7c0a8f313f764ce5a5"
|
checksum = "809eda4e459820237104e4b61d6b41bbe6c9e1ce6adf4057955e6e6722a90408"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"protobuf",
|
"protobuf",
|
||||||
"protobuf-codegen",
|
"protobuf-codegen",
|
||||||
@ -1798,9 +1651,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ttrpc-compiler"
|
name = "ttrpc-compiler"
|
||||||
version = "0.3.2"
|
version = "0.4.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d290e64bdb994926d102f2983cc6550ece0778c8430253dc2de4e71cbf5285d9"
|
checksum = "8c2f2ce8c9a6e9422d0714bc8058b705d503fc9d028e69fae2236050c4721d75"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"derive-new",
|
"derive-new",
|
||||||
"prost",
|
"prost",
|
||||||
@ -1837,12 +1690,12 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "vsock"
|
name = "vsock"
|
||||||
version = "0.2.1"
|
version = "0.2.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "dba063357047c0f2216c7c653879ea4e5e198d0c3cde7efa37ebfd9039b48491"
|
checksum = "50e2ef09834e1d203d24556512c0e58e66de203440bd9d74c30a33f7240091c6"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"libc",
|
"libc",
|
||||||
"nix 0.17.0",
|
"nix 0.19.1",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -1867,12 +1720,6 @@ dependencies = [
|
|||||||
"libc",
|
"libc",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "winapi"
|
|
||||||
version = "0.2.8"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "winapi"
|
name = "winapi"
|
||||||
version = "0.3.9"
|
version = "0.3.9"
|
||||||
@ -1883,12 +1730,6 @@ dependencies = [
|
|||||||
"winapi-x86_64-pc-windows-gnu",
|
"winapi-x86_64-pc-windows-gnu",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "winapi-build"
|
|
||||||
version = "0.1.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "winapi-i686-pc-windows-gnu"
|
name = "winapi-i686-pc-windows-gnu"
|
||||||
version = "0.4.0"
|
version = "0.4.0"
|
||||||
@ -1900,13 +1741,3 @@ name = "winapi-x86_64-pc-windows-gnu"
|
|||||||
version = "0.4.0"
|
version = "0.4.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "ws2_32-sys"
|
|
||||||
version = "0.2.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
|
|
||||||
dependencies = [
|
|
||||||
"winapi 0.2.8",
|
|
||||||
"winapi-build",
|
|
||||||
]
|
|
||||||
|
|||||||
@ -10,7 +10,7 @@ logging = { path = "../../pkg/logging" }
|
|||||||
rustjail = { path = "rustjail" }
|
rustjail = { path = "rustjail" }
|
||||||
protocols = { path = "protocols" }
|
protocols = { path = "protocols" }
|
||||||
lazy_static = "1.3.0"
|
lazy_static = "1.3.0"
|
||||||
ttrpc = { version = "0.4.14", features = ["async", "protobuf-codec"], default-features = false }
|
ttrpc = { version = "0.5.0", features = ["async", "protobuf-codec"], default-features = false }
|
||||||
protobuf = "=2.14.0"
|
protobuf = "=2.14.0"
|
||||||
libc = "0.2.58"
|
libc = "0.2.58"
|
||||||
nix = "0.17.0"
|
nix = "0.17.0"
|
||||||
@ -21,11 +21,11 @@ scopeguard = "1.0.0"
|
|||||||
regex = "1"
|
regex = "1"
|
||||||
|
|
||||||
async-trait = "0.1.42"
|
async-trait = "0.1.42"
|
||||||
tokio = { version = "0.2", features = ["rt-core", "sync", "uds", "stream", "macros", "io-util", "time", "signal", "io-std", "process", "blocking"] }
|
tokio = { version = "1.2.0", features = ["rt", "sync", "macros", "io-util", "time", "signal", "io-std", "process"] }
|
||||||
futures = "0.3"
|
futures = "0.3.12"
|
||||||
netlink-sys = { version = "0.4.0", features = ["tokio_socket",]}
|
netlink-sys = { version = "0.6.0", features = ["tokio_socket",]}
|
||||||
tokio-vsock = "0.2.2"
|
tokio-vsock = "0.3.0"
|
||||||
rtnetlink = "0.6.0"
|
rtnetlink = "0.7.0"
|
||||||
netlink-packet-utils = "0.4.0"
|
netlink-packet-utils = "0.4.0"
|
||||||
ipnetwork = "0.17.0"
|
ipnetwork = "0.17.0"
|
||||||
|
|
||||||
|
|||||||
@ -5,9 +5,9 @@ authors = ["The Kata Containers community <kata-dev@lists.katacontainers.io>"]
|
|||||||
edition = "2018"
|
edition = "2018"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
ttrpc = { version = "0.4.14", features = ["async"] }
|
ttrpc = { version = "0.5.0", features = ["async"] }
|
||||||
async-trait = "0.1.42"
|
async-trait = "0.1.42"
|
||||||
protobuf = "=2.14.0"
|
protobuf = "=2.14.0"
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
ttrpc-codegen = "0.1.2"
|
ttrpc-codegen = "0.2.0"
|
||||||
|
|||||||
@ -28,11 +28,10 @@ cgroups = { package = "cgroups-rs", version = "0.2.1" }
|
|||||||
tempfile = "3.1.0"
|
tempfile = "3.1.0"
|
||||||
rlimit = "0.5.3"
|
rlimit = "0.5.3"
|
||||||
|
|
||||||
tokio = { version = "0.2", features = ["sync", "io-util", "process", "time", "macros"] }
|
tokio = { version = "1.2.0", features = ["sync", "io-util", "process", "time", "macros"] }
|
||||||
futures = "0.3"
|
futures = "0.3"
|
||||||
async-trait = "0.1.31"
|
async-trait = "0.1.31"
|
||||||
mio = "0.6"
|
inotify = "0.9.2"
|
||||||
inotify = "0.9"
|
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
serial_test = "0.5.0"
|
serial_test = "0.5.0"
|
||||||
|
|||||||
@ -85,7 +85,7 @@ async fn register_memory_event_v2(
|
|||||||
info!(sl!(), "ev_wd: {:?}", ev_wd);
|
info!(sl!(), "ev_wd: {:?}", ev_wd);
|
||||||
info!(sl!(), "cg_wd: {:?}", cg_wd);
|
info!(sl!(), "cg_wd: {:?}", cg_wd);
|
||||||
|
|
||||||
let (mut sender, receiver) = channel(100);
|
let (sender, receiver) = channel(100);
|
||||||
let containere_id = containere_id.to_string();
|
let containere_id = containere_id.to_string();
|
||||||
|
|
||||||
tokio::spawn(async move {
|
tokio::spawn(async move {
|
||||||
@ -180,7 +180,7 @@ async fn register_memory_event(
|
|||||||
|
|
||||||
tokio::spawn(async move {
|
tokio::spawn(async move {
|
||||||
loop {
|
loop {
|
||||||
let mut sender = sender.clone();
|
let sender = sender.clone();
|
||||||
let mut buf = [0u8; 8];
|
let mut buf = [0u8; 8];
|
||||||
match eventfd_stream.read(&mut buf).await {
|
match eventfd_stream.read(&mut buf).await {
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
|
|||||||
@ -5,52 +5,28 @@
|
|||||||
|
|
||||||
//! Async support for pipe or something has file descriptor
|
//! Async support for pipe or something has file descriptor
|
||||||
|
|
||||||
|
use nix::unistd;
|
||||||
use std::{
|
use std::{
|
||||||
fmt, io, mem,
|
fmt, io,
|
||||||
|
io::{Read, Result, Write},
|
||||||
|
mem,
|
||||||
os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd},
|
os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd},
|
||||||
pin::Pin,
|
pin::Pin,
|
||||||
task::{Context, Poll},
|
task::{Context, Poll},
|
||||||
};
|
};
|
||||||
|
|
||||||
use mio::event::Evented;
|
use futures::ready;
|
||||||
use mio::unix::EventedFd;
|
use tokio::io::{unix::AsyncFd, AsyncRead, AsyncWrite, ReadBuf};
|
||||||
use mio::{Poll as MioPoll, PollOpt, Ready, Token};
|
|
||||||
use nix::unistd;
|
|
||||||
use tokio::io::{AsyncRead, AsyncWrite, PollEvented};
|
|
||||||
|
|
||||||
unsafe fn set_nonblocking(fd: RawFd) {
|
fn set_nonblocking(fd: RawFd) {
|
||||||
libc::fcntl(fd, libc::F_SETFL, libc::O_NONBLOCK);
|
unsafe {
|
||||||
|
libc::fcntl(fd, libc::F_SETFL, libc::O_NONBLOCK);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
struct StreamFd(RawFd);
|
struct StreamFd(RawFd);
|
||||||
|
|
||||||
impl Evented for StreamFd {
|
impl io::Read for &StreamFd {
|
||||||
fn register(
|
|
||||||
&self,
|
|
||||||
poll: &MioPoll,
|
|
||||||
token: Token,
|
|
||||||
interest: Ready,
|
|
||||||
opts: PollOpt,
|
|
||||||
) -> io::Result<()> {
|
|
||||||
EventedFd(&self.0).register(poll, token, interest, opts)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn reregister(
|
|
||||||
&self,
|
|
||||||
poll: &MioPoll,
|
|
||||||
token: Token,
|
|
||||||
interest: Ready,
|
|
||||||
opts: PollOpt,
|
|
||||||
) -> io::Result<()> {
|
|
||||||
EventedFd(&self.0).reregister(poll, token, interest, opts)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn deregister(&self, poll: &MioPoll) -> io::Result<()> {
|
|
||||||
EventedFd(&self.0).deregister(poll)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl io::Read for StreamFd {
|
|
||||||
fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
|
fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
|
||||||
match unistd::read(self.0, buf) {
|
match unistd::read(self.0, buf) {
|
||||||
Ok(l) => Ok(l),
|
Ok(l) => Ok(l),
|
||||||
@ -59,7 +35,7 @@ impl io::Read for StreamFd {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl io::Write for StreamFd {
|
impl io::Write for &StreamFd {
|
||||||
fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
|
fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
|
||||||
match unistd::write(self.0, buf) {
|
match unistd::write(self.0, buf) {
|
||||||
Ok(l) => Ok(l),
|
Ok(l) => Ok(l),
|
||||||
@ -87,10 +63,20 @@ impl Drop for StreamFd {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Pipe read
|
impl AsRawFd for StreamFd {
|
||||||
pub struct PipeStream(PollEvented<StreamFd>);
|
fn as_raw_fd(&self) -> RawFd {
|
||||||
|
self.0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct PipeStream(AsyncFd<StreamFd>);
|
||||||
|
|
||||||
impl PipeStream {
|
impl PipeStream {
|
||||||
|
pub fn new(fd: RawFd) -> Result<Self> {
|
||||||
|
set_nonblocking(fd);
|
||||||
|
Ok(Self(AsyncFd::new(StreamFd(fd))?))
|
||||||
|
}
|
||||||
|
|
||||||
pub fn shutdown(&mut self) -> io::Result<()> {
|
pub fn shutdown(&mut self) -> io::Result<()> {
|
||||||
self.0.get_mut().close()
|
self.0.get_mut().close()
|
||||||
}
|
}
|
||||||
@ -100,25 +86,15 @@ impl PipeStream {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl AsyncRead for PipeStream {
|
|
||||||
fn poll_read(
|
|
||||||
mut self: Pin<&mut Self>,
|
|
||||||
cx: &mut Context<'_>,
|
|
||||||
buf: &mut [u8],
|
|
||||||
) -> Poll<io::Result<usize>> {
|
|
||||||
Pin::new(&mut self.0).poll_read(cx, buf)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl AsRawFd for PipeStream {
|
impl AsRawFd for PipeStream {
|
||||||
fn as_raw_fd(&self) -> RawFd {
|
fn as_raw_fd(&self) -> RawFd {
|
||||||
self.0.get_ref().0
|
self.0.as_raw_fd()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl IntoRawFd for PipeStream {
|
impl IntoRawFd for PipeStream {
|
||||||
fn into_raw_fd(self) -> RawFd {
|
fn into_raw_fd(self) -> RawFd {
|
||||||
let fd = self.0.get_ref().0;
|
let fd = self.as_raw_fd();
|
||||||
mem::forget(self);
|
mem::forget(self);
|
||||||
fd
|
fd
|
||||||
}
|
}
|
||||||
@ -126,8 +102,7 @@ impl IntoRawFd for PipeStream {
|
|||||||
|
|
||||||
impl FromRawFd for PipeStream {
|
impl FromRawFd for PipeStream {
|
||||||
unsafe fn from_raw_fd(fd: RawFd) -> Self {
|
unsafe fn from_raw_fd(fd: RawFd) -> Self {
|
||||||
set_nonblocking(fd);
|
Self::new(fd).unwrap()
|
||||||
PipeStream(PollEvented::new(StreamFd(fd)).unwrap())
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -137,23 +112,59 @@ impl fmt::Debug for PipeStream {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl AsyncWrite for PipeStream {
|
impl AsyncRead for PipeStream {
|
||||||
fn poll_write(
|
fn poll_read(
|
||||||
mut self: Pin<&mut Self>,
|
self: Pin<&mut Self>,
|
||||||
cx: &mut Context<'_>,
|
cx: &mut Context<'_>,
|
||||||
buf: &[u8],
|
buf: &mut ReadBuf<'_>,
|
||||||
) -> Poll<Result<usize, io::Error>> {
|
) -> Poll<Result<()>> {
|
||||||
Pin::new(&mut self.0).poll_write(cx, buf)
|
let b;
|
||||||
}
|
unsafe {
|
||||||
|
b = &mut *(buf.unfilled_mut() as *mut [mem::MaybeUninit<u8>] as *mut [u8]);
|
||||||
|
};
|
||||||
|
|
||||||
fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), io::Error>> {
|
loop {
|
||||||
Pin::new(&mut self.0).poll_flush(cx)
|
let mut guard = ready!(self.0.poll_read_ready(cx))?;
|
||||||
}
|
|
||||||
|
|
||||||
fn poll_shutdown(
|
match guard.try_io(|inner| inner.get_ref().read(b)) {
|
||||||
mut self: Pin<&mut Self>,
|
Ok(Ok(n)) => {
|
||||||
cx: &mut Context<'_>,
|
unsafe {
|
||||||
) -> Poll<Result<(), io::Error>> {
|
buf.assume_init(n);
|
||||||
Pin::new(&mut self.0).poll_shutdown(cx)
|
}
|
||||||
|
buf.advance(n);
|
||||||
|
return Ok(()).into();
|
||||||
|
}
|
||||||
|
Ok(Err(e)) => return Err(e).into(),
|
||||||
|
Err(_would_block) => {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl AsyncWrite for PipeStream {
|
||||||
|
fn poll_write(
|
||||||
|
self: Pin<&mut Self>,
|
||||||
|
cx: &mut Context<'_>,
|
||||||
|
buf: &[u8],
|
||||||
|
) -> Poll<io::Result<usize>> {
|
||||||
|
loop {
|
||||||
|
let mut guard = ready!(self.0.poll_write_ready(cx))?;
|
||||||
|
|
||||||
|
match guard.try_io(|inner| inner.get_ref().write(buf)) {
|
||||||
|
Ok(result) => return Poll::Ready(result),
|
||||||
|
Err(_would_block) => continue,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn poll_flush(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<io::Result<()>> {
|
||||||
|
Poll::Ready(Ok(()))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn poll_shutdown(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<io::Result<()>> {
|
||||||
|
self.get_mut().shutdown()?;
|
||||||
|
Poll::Ready(Ok(()))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -144,7 +144,7 @@ impl Process {
|
|||||||
|
|
||||||
pub fn notify_term_close(&mut self) {
|
pub fn notify_term_close(&mut self) {
|
||||||
let notify = self.term_exit_notifier.clone();
|
let notify = self.term_exit_notifier.clone();
|
||||||
notify.notify();
|
notify.notify_one();
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_fd(&self, stream_type: &StreamType) -> Option<RawFd> {
|
fn get_fd(&self, stream_type: &StreamType) -> Option<RawFd> {
|
||||||
|
|||||||
@ -110,14 +110,10 @@ async fn get_device_name(sandbox: &Arc<Mutex<Sandbox>>, dev_addr: &str) -> Resul
|
|||||||
|
|
||||||
info!(sl!(), "Waiting on channel for device notification\n");
|
info!(sl!(), "Waiting on channel for device notification\n");
|
||||||
let hotplug_timeout = AGENT_CONFIG.read().await.hotplug_timeout;
|
let hotplug_timeout = AGENT_CONFIG.read().await.hotplug_timeout;
|
||||||
let timeout = tokio::time::delay_for(hotplug_timeout);
|
|
||||||
|
|
||||||
let dev_name;
|
let dev_name = match tokio::time::timeout(hotplug_timeout, rx).await {
|
||||||
tokio::select! {
|
Ok(v) => v?,
|
||||||
v = rx => {
|
Err(_) => {
|
||||||
dev_name = v?;
|
|
||||||
}
|
|
||||||
_ = timeout => {
|
|
||||||
let watcher = GLOBAL_DEVICE_WATCHER.clone();
|
let watcher = GLOBAL_DEVICE_WATCHER.clone();
|
||||||
let mut w = watcher.lock().await;
|
let mut w = watcher.lock().await;
|
||||||
w.remove_entry(dev_addr);
|
w.remove_entry(dev_addr);
|
||||||
|
|||||||
@ -141,9 +141,7 @@ fn main() -> std::result::Result<(), Box<dyn std::error::Error>> {
|
|||||||
exit(0);
|
exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut rt = tokio::runtime::Builder::new()
|
let rt = tokio::runtime::Builder::new_current_thread()
|
||||||
.basic_scheduler()
|
|
||||||
.max_threads(1)
|
|
||||||
.enable_all()
|
.enable_all()
|
||||||
.build()?;
|
.build()?;
|
||||||
|
|
||||||
|
|||||||
@ -322,9 +322,18 @@ impl Handle {
|
|||||||
|
|
||||||
use packet::nlas::route::Nla;
|
use packet::nlas::route::Nla;
|
||||||
|
|
||||||
|
// Build a common indeterminate ip request
|
||||||
|
let request = self
|
||||||
|
.handle
|
||||||
|
.route()
|
||||||
|
.add()
|
||||||
|
.table(MAIN_TABLE)
|
||||||
|
.kind(UNICAST)
|
||||||
|
.protocol(BOOT_PROT)
|
||||||
|
.scope(scope);
|
||||||
|
|
||||||
// `rtnetlink` offers a separate request builders for different IP versions (IP v4 and v6).
|
// `rtnetlink` offers a separate request builders for different IP versions (IP v4 and v6).
|
||||||
// This if branch is a bit clumsy because it does almost the same.
|
// This if branch is a bit clumsy because it does almost the same.
|
||||||
// TODO: Simplify this once https://github.com/little-dude/netlink/pull/140 is merged and released
|
|
||||||
if is_v6 {
|
if is_v6 {
|
||||||
let dest_addr = if !route.dest.is_empty() {
|
let dest_addr = if !route.dest.is_empty() {
|
||||||
Ipv6Network::from_str(&route.dest)?
|
Ipv6Network::from_str(&route.dest)?
|
||||||
@ -333,14 +342,8 @@ impl Handle {
|
|||||||
};
|
};
|
||||||
|
|
||||||
// Build IP v6 request
|
// Build IP v6 request
|
||||||
let mut request = self
|
let mut request = request
|
||||||
.handle
|
.v6()
|
||||||
.route()
|
|
||||||
.add_v6()
|
|
||||||
.table(MAIN_TABLE)
|
|
||||||
.kind(UNICAST)
|
|
||||||
.protocol(BOOT_PROT)
|
|
||||||
.scope(scope)
|
|
||||||
.destination_prefix(dest_addr.ip(), dest_addr.prefix())
|
.destination_prefix(dest_addr.ip(), dest_addr.prefix())
|
||||||
.output_interface(link.index());
|
.output_interface(link.index());
|
||||||
|
|
||||||
@ -377,14 +380,8 @@ impl Handle {
|
|||||||
};
|
};
|
||||||
|
|
||||||
// Build IP v4 request
|
// Build IP v4 request
|
||||||
let mut request = self
|
let mut request = request
|
||||||
.handle
|
.v4()
|
||||||
.route()
|
|
||||||
.add_v4()
|
|
||||||
.table(MAIN_TABLE)
|
|
||||||
.kind(UNICAST)
|
|
||||||
.protocol(BOOT_PROT)
|
|
||||||
.scope(scope)
|
|
||||||
.destination_prefix(dest_addr.ip(), dest_addr.prefix())
|
.destination_prefix(dest_addr.ip(), dest_addr.prefix())
|
||||||
.output_interface(link.index());
|
.output_interface(link.index());
|
||||||
|
|
||||||
|
|||||||
@ -259,14 +259,12 @@ impl AgentService {
|
|||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
let timeout = tokio::time::delay_for(Duration::from_secs(req.timeout.into()));
|
if tokio::time::timeout(Duration::from_secs(req.timeout.into()), rx)
|
||||||
|
.await
|
||||||
tokio::select! {
|
.is_err()
|
||||||
_ = rx => {}
|
{
|
||||||
_ = timeout => {
|
return Err(anyhow!(nix::Error::from_errno(nix::errno::Errno::ETIME)));
|
||||||
return Err(anyhow!(nix::Error::from_errno(nix::errno::Errno::ETIME)));
|
}
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
if handle.await.is_err() {
|
if handle.await.is_err() {
|
||||||
return Err(anyhow!(nix::Error::from_errno(
|
return Err(anyhow!(nix::Error::from_errno(
|
||||||
|
|||||||
@ -311,7 +311,7 @@ impl Sandbox {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub async fn run_oom_event_monitor(&self, mut rx: Receiver<String>, container_id: String) {
|
pub async fn run_oom_event_monitor(&self, mut rx: Receiver<String>, container_id: String) {
|
||||||
let mut tx = self.event_tx.clone();
|
let tx = self.event_tx.clone();
|
||||||
let logger = self.logger.clone();
|
let logger = self.logger.clone();
|
||||||
|
|
||||||
tokio::spawn(async move {
|
tokio::spawn(async move {
|
||||||
|
|||||||
@ -9,7 +9,7 @@ use crate::sandbox::Sandbox;
|
|||||||
use crate::GLOBAL_DEVICE_WATCHER;
|
use crate::GLOBAL_DEVICE_WATCHER;
|
||||||
use slog::Logger;
|
use slog::Logger;
|
||||||
|
|
||||||
use netlink_sys::{Protocol, Socket, SocketAddr};
|
use netlink_sys::{protocols, SocketAddr, TokioSocket};
|
||||||
use nix::errno::Errno;
|
use nix::errno::Errno;
|
||||||
use std::os::unix::io::FromRawFd;
|
use std::os::unix::io::FromRawFd;
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
@ -143,9 +143,9 @@ pub async fn watch_uevents(sandbox: Arc<Mutex<Sandbox>>) {
|
|||||||
let fd = libc::socket(
|
let fd = libc::socket(
|
||||||
libc::AF_NETLINK,
|
libc::AF_NETLINK,
|
||||||
libc::SOCK_DGRAM | libc::SOCK_CLOEXEC,
|
libc::SOCK_DGRAM | libc::SOCK_CLOEXEC,
|
||||||
Protocol::KObjectUevent as libc::c_int,
|
protocols::NETLINK_KOBJECT_UEVENT as libc::c_int,
|
||||||
);
|
);
|
||||||
socket = Socket::from_raw_fd(fd);
|
socket = TokioSocket::from_raw_fd(fd);
|
||||||
}
|
}
|
||||||
socket.bind(&SocketAddr::new(0, 1)).unwrap();
|
socket.bind(&SocketAddr::new(0, 1)).unwrap();
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user