diff --git a/Cargo.lock b/Cargo.lock index afa1e89..c65b788 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -338,22 +338,6 @@ dependencies = [ "url", ] -[[package]] -name = "cargo_metadata" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e63d2780ac94487eb9f1fea7b0d56300abc9eb488800854ca217f102f5caccca" -dependencies = [ - "semver", - "serde", - "serde-untagged", - "serde-value", - "thiserror 1.0.69", - "toml", - "unicode-xid", - "url", -] - [[package]] name = "cargo_metadata" version = "0.20.0" @@ -1279,7 +1263,7 @@ dependencies = [ [[package]] name = "hyperlight-common" version = "0.7.0" -source = "git+https://github.com/hyperlight-dev/hyperlight?rev=ea6fa8f#ea6fa8f16dae2325d94af39eb6ac3b441b24dcac" +source = "git+https://github.com/hyperlight-dev/hyperlight?rev=c0c5f1f65413dae2a3f4af6945031b4089b8e4da#c0c5f1f65413dae2a3f4af6945031b4089b8e4da" dependencies = [ "anyhow", "flatbuffers", @@ -1291,7 +1275,7 @@ dependencies = [ [[package]] name = "hyperlight-component-macro" version = "0.7.0" -source = "git+https://github.com/hyperlight-dev/hyperlight?rev=ea6fa8f#ea6fa8f16dae2325d94af39eb6ac3b441b24dcac" +source = "git+https://github.com/hyperlight-dev/hyperlight?rev=c0c5f1f65413dae2a3f4af6945031b4089b8e4da#c0c5f1f65413dae2a3f4af6945031b4089b8e4da" dependencies = [ "env_logger", "hyperlight-component-util", @@ -1306,7 +1290,7 @@ dependencies = [ [[package]] name = "hyperlight-component-util" version = "0.7.0" -source = "git+https://github.com/hyperlight-dev/hyperlight?rev=ea6fa8f#ea6fa8f16dae2325d94af39eb6ac3b441b24dcac" +source = "git+https://github.com/hyperlight-dev/hyperlight?rev=c0c5f1f65413dae2a3f4af6945031b4089b8e4da#c0c5f1f65413dae2a3f4af6945031b4089b8e4da" dependencies = [ "itertools 0.14.0", "log", @@ -1320,7 +1304,7 @@ dependencies = [ [[package]] name = "hyperlight-host" version = "0.7.0" -source = "git+https://github.com/hyperlight-dev/hyperlight?rev=ea6fa8f#ea6fa8f16dae2325d94af39eb6ac3b441b24dcac" +source = "git+https://github.com/hyperlight-dev/hyperlight?rev=c0c5f1f65413dae2a3f4af6945031b4089b8e4da#c0c5f1f65413dae2a3f4af6945031b4089b8e4da" dependencies = [ "anyhow", "bitflags 2.9.1", @@ -1336,6 +1320,7 @@ dependencies = [ "kvm-ioctls", "lazy_static", "libc", + "lockfree", "log", "metrics", "mshv-bindings 0.2.1", @@ -1768,6 +1753,15 @@ dependencies = [ "scopeguard", ] +[[package]] +name = "lockfree" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74ee94b5ad113c7cb98c5a040f783d0952ee4fe100993881d1673c2cb002dd23" +dependencies = [ + "owned-alloc", +] + [[package]] name = "log" version = "0.4.27" @@ -2042,6 +2036,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "owned-alloc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30fceb411f9a12ff9222c5f824026be368ff15dc2f13468d850c7d3f502205d6" + [[package]] name = "page_size" version = "0.6.0" diff --git a/Cargo.toml b/Cargo.toml index f7f662b..499cb0a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,4 +13,4 @@ repository = "https://github.com/hyperlight-dev/hyperlight-wasm" readme = "README.md" [workspace.dependencies] -hyperlight-host = { version = "0.7.0", git = "https://github.com/hyperlight-dev/hyperlight", rev = "ea6fa8f", default-features = false, features = ["executable_heap", "init-paging"] } +hyperlight-host = { version = "0.7.0", git = "https://github.com/hyperlight-dev/hyperlight", rev = "c0c5f1f65413dae2a3f4af6945031b4089b8e4da", default-features = false, features = ["executable_heap", "init-paging"] } diff --git a/src/hyperlight_wasm/Cargo.toml b/src/hyperlight_wasm/Cargo.toml index 96e988d..ac5e167 100644 --- a/src/hyperlight_wasm/Cargo.toml +++ b/src/hyperlight_wasm/Cargo.toml @@ -58,7 +58,7 @@ windows = { version = "0.61", features = ["Win32_System_Threading"] } page_size = "0.6.0" [dev-dependencies] -hyperlight-component-macro = { version = "0.7.0", git = "https://github.com/hyperlight-dev/hyperlight", rev = "ea6fa8f" } +hyperlight-component-macro = { version = "0.7.0", git = "https://github.com/hyperlight-dev/hyperlight", rev = "c0c5f1f65413dae2a3f4af6945031b4089b8e4da" } examples_common = { path = "../examples_common" } criterion = { version = "0.6.0", features = ["html_reports"] } crossbeam-queue = "0.3" diff --git a/src/hyperlight_wasm_macro/Cargo.toml b/src/hyperlight_wasm_macro/Cargo.toml index bb9eb05..3364ffb 100644 --- a/src/hyperlight_wasm_macro/Cargo.toml +++ b/src/hyperlight_wasm_macro/Cargo.toml @@ -17,4 +17,4 @@ proc-macro2 = { version = "1.0.93" } syn = { version = "2.0.96" } itertools = { version = "0.14.0" } prettyplease = { version = "0.2.31" } -hyperlight-component-util = { version = "0.7.0", git = "https://github.com/hyperlight-dev/hyperlight", rev = "ea6fa8f" } +hyperlight-component-util = { version = "0.7.0", git = "https://github.com/hyperlight-dev/hyperlight", rev = "c0c5f1f65413dae2a3f4af6945031b4089b8e4da" } diff --git a/src/wasm_runtime/Cargo.lock b/src/wasm_runtime/Cargo.lock index a80dd4a..58371ae 100644 --- a/src/wasm_runtime/Cargo.lock +++ b/src/wasm_runtime/Cargo.lock @@ -601,7 +601,7 @@ dependencies = [ [[package]] name = "hyperlight-common" version = "0.7.0" -source = "git+https://github.com/hyperlight-dev/hyperlight?rev=ea6fa8f#ea6fa8f16dae2325d94af39eb6ac3b441b24dcac" +source = "git+https://github.com/hyperlight-dev/hyperlight?rev=c0c5f1f65413dae2a3f4af6945031b4089b8e4da#c0c5f1f65413dae2a3f4af6945031b4089b8e4da" dependencies = [ "anyhow", "flatbuffers", @@ -612,7 +612,7 @@ dependencies = [ [[package]] name = "hyperlight-component-util" version = "0.7.0" -source = "git+https://github.com/hyperlight-dev/hyperlight?rev=ea6fa8f#ea6fa8f16dae2325d94af39eb6ac3b441b24dcac" +source = "git+https://github.com/hyperlight-dev/hyperlight?rev=c0c5f1f65413dae2a3f4af6945031b4089b8e4da#c0c5f1f65413dae2a3f4af6945031b4089b8e4da" dependencies = [ "itertools", "log", @@ -626,7 +626,7 @@ dependencies = [ [[package]] name = "hyperlight-guest" version = "0.7.0" -source = "git+https://github.com/hyperlight-dev/hyperlight?rev=ea6fa8f#ea6fa8f16dae2325d94af39eb6ac3b441b24dcac" +source = "git+https://github.com/hyperlight-dev/hyperlight?rev=c0c5f1f65413dae2a3f4af6945031b4089b8e4da#c0c5f1f65413dae2a3f4af6945031b4089b8e4da" dependencies = [ "anyhow", "hyperlight-common", @@ -636,7 +636,7 @@ dependencies = [ [[package]] name = "hyperlight-guest-bin" version = "0.7.0" -source = "git+https://github.com/hyperlight-dev/hyperlight?rev=ea6fa8f#ea6fa8f16dae2325d94af39eb6ac3b441b24dcac" +source = "git+https://github.com/hyperlight-dev/hyperlight?rev=c0c5f1f65413dae2a3f4af6945031b4089b8e4da#c0c5f1f65413dae2a3f4af6945031b4089b8e4da" dependencies = [ "buddy_system_allocator", "cc", diff --git a/src/wasm_runtime/Cargo.toml b/src/wasm_runtime/Cargo.toml index a45bd2e..e3205e5 100644 --- a/src/wasm_runtime/Cargo.toml +++ b/src/wasm_runtime/Cargo.toml @@ -11,9 +11,9 @@ doctest = false bench = false [dependencies] -hyperlight-common = { version = "0.7.0", git = "https://github.com/hyperlight-dev/hyperlight", rev = "ea6fa8f", default-features = false } -hyperlight-guest-bin = { version = "0.7.0", git = "https://github.com/hyperlight-dev/hyperlight", rev = "ea6fa8f", features = [ "printf" ] } -hyperlight-guest = { version = "0.7.0", git = "https://github.com/hyperlight-dev/hyperlight", rev = "ea6fa8f" } +hyperlight-common = { version = "0.7.0", git = "https://github.com/hyperlight-dev/hyperlight", rev = "c0c5f1f65413dae2a3f4af6945031b4089b8e4da", default-features = false } +hyperlight-guest-bin = { version = "0.7.0", git = "https://github.com/hyperlight-dev/hyperlight", rev = "c0c5f1f65413dae2a3f4af6945031b4089b8e4da", features = [ "printf" ] } +hyperlight-guest = { version = "0.7.0", git = "https://github.com/hyperlight-dev/hyperlight", rev = "c0c5f1f65413dae2a3f4af6945031b4089b8e4da" } wasmtime = { version = "34.0.1", default-features = false, features = [ "runtime", "custom-virtual-memory", "custom-native-signals", "component-model" ] } hyperlight-wasm-macro = { path = "../hyperlight_wasm_macro" } spin = "0.9.8"