From c3ca794c79df7d921f23d57efe3876f2f02c2d18 Mon Sep 17 00:00:00 2001 From: Riccardo Zaglia Date: Wed, 18 Sep 2024 04:02:51 +0200 Subject: [PATCH] chore: :arrow_up: Update some dependencies --- Cargo.lock | 195 ++++++++------------- alvr/client_core/Cargo.toml | 2 +- alvr/common/Cargo.toml | 2 +- alvr/dashboard/Cargo.toml | 15 +- alvr/dashboard/src/steamvr_launcher/mod.rs | 15 +- alvr/server_core/Cargo.toml | 2 +- alvr/server_core/src/lib.rs | 7 +- alvr/server_openvr/Cargo.toml | 2 +- alvr/vulkan_layer/Cargo.toml | 2 +- 9 files changed, 96 insertions(+), 146 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cfaebdeb2c..92e1f9e1e8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -192,7 +192,7 @@ dependencies = [ "android_logger", "app_dirs2", "bincode", - "bindgen", + "bindgen 0.70.1", "cc", "env_logger", "glow", @@ -273,15 +273,10 @@ dependencies = [ "alvr_session", "bincode", "chrono", - "console_error_panic_hook", "cros-libva", "eframe", "env_logger", - "ewebsock", - "futures", - "gloo-net", "ico", - "instant", "nvml-wrapper", "rand", "serde", @@ -289,10 +284,8 @@ dependencies = [ "settings-schema", "statrs", "sysinfo", - "tungstenite 0.23.0", + "tungstenite 0.24.0", "ureq", - "wasm-bindgen-futures", - "wasm-logger", "wgpu", "winres", ] @@ -413,7 +406,7 @@ dependencies = [ "alvr_server_core", "alvr_server_io", "alvr_session", - "bindgen", + "bindgen 0.70.1", "cc", "pkg-config", "walkdir", @@ -461,7 +454,7 @@ version = "21.0.0-dev01" dependencies = [ "alvr_common", "alvr_filesystem", - "bindgen", + "bindgen 0.70.1", "cc", "pkg-config", "walkdir", @@ -1063,6 +1056,24 @@ dependencies = [ "itertools", "lazy_static", "lazycell", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.70", +] + +[[package]] +name = "bindgen" +version = "0.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" +dependencies = [ + "bitflags 2.6.0", + "cexpr", + "clang-sys", + "itertools", "log", "prettyplease", "proc-macro2", @@ -1071,7 +1082,6 @@ dependencies = [ "rustc-hash", "shlex", "syn 2.0.70", - "which", ] [[package]] @@ -1440,16 +1450,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "console_error_panic_hook" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" -dependencies = [ - "cfg-if", - "wasm-bindgen", -] - [[package]] name = "constant_time_eq" version = "0.3.0" @@ -1531,7 +1531,7 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f01585027057ff5f0a5bf276174ae4c1594a2c5bde93d5f46a016d76270f5a9" dependencies = [ - "bindgen", + "bindgen 0.69.4", ] [[package]] @@ -1593,16 +1593,35 @@ dependencies = [ [[package]] name = "cros-libva" -version = "0.0.6" +version = "0.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f75943ee30eb2f8b4f3beb8f047e69ecc1c91d098c344b34a0fdd8dd8b2614a" +checksum = "1b1546af142fbf11a5cad3d1ee2ef64e4d7b69a28b244a79484024a1bc931c17" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "log", "pkg-config", "thiserror", ] +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "crossbeam-utils" version = "0.8.20" @@ -2086,21 +2105,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "ewebsock" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6177769715c6ec5a324acee995183b22721ea23c58e49af14a828eadec85d120" -dependencies = [ - "document-features", - "js-sys", - "log", - "tungstenite 0.21.0", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - [[package]] name = "exec" version = "0.3.1" @@ -2418,9 +2422,9 @@ dependencies = [ [[package]] name = "glam" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "779ae4bf7e8421cf91c0b3b64e7e8b40b862fba4d393f59150042de7c4965a94" +checksum = "c28091a37a5d09b555cb6628fd954da299b536433834f5b8e59eba78e0cbbf8a" dependencies = [ "serde", ] @@ -2431,40 +2435,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" -[[package]] -name = "gloo-net" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43aaa242d1239a8822c15c645f02166398da4f8b5c4bae795c1f5b44e9eee173" -dependencies = [ - "futures-channel", - "futures-core", - "futures-sink", - "gloo-utils", - "http 0.2.12", - "js-sys", - "pin-project", - "serde", - "serde_json", - "thiserror", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "gloo-utils" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa" -dependencies = [ - "js-sys", - "serde", - "serde_json", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "glow" version = "0.13.1" @@ -3023,9 +2993,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", ] [[package]] @@ -3268,7 +3235,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf0d9716420364790e85cbb9d3ac2c950bde16a7dd36f3209b7dfdfc4a24d01f" dependencies = [ - "bindgen", + "bindgen 0.69.4", "cc", "system-deps", ] @@ -4275,7 +4242,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "849e188f90b1dda88fe2bfe1ad31fe5f158af2c98f80fb5d13726c44f3f01112" dependencies = [ - "bindgen", + "bindgen 0.69.4", "libspa-sys", "system-deps", ] @@ -4541,6 +4508,26 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + [[package]] name = "redox_syscall" version = "0.3.5" @@ -5340,16 +5327,16 @@ checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" [[package]] name = "sysinfo" -version = "0.30.13" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3" +checksum = "355dbe4f8799b304b05e1b0f05fc59b2a18d36645cf169607da45bde2f69a1be" dependencies = [ - "cfg-if", "core-foundation-sys", "libc", + "memchr", "ntapi", - "once_cell", - "windows 0.52.0", + "rayon", + "windows 0.54.0", ] [[package]] @@ -5794,28 +5781,9 @@ dependencies = [ [[package]] name = "tungstenite" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http 1.1.0", - "httparse", - "log", - "rand", - "sha1", - "thiserror", - "url", - "utf-8", -] - -[[package]] -name = "tungstenite" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8" +checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a" dependencies = [ "byteorder", "bytes", @@ -6075,17 +6043,6 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" -[[package]] -name = "wasm-logger" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "074649a66bb306c8f2068c9016395fa65d8e08d2affcbf95acf3c24c3ab19718" -dependencies = [ - "log", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "wasm-streams" version = "0.4.0" diff --git a/alvr/client_core/Cargo.toml b/alvr/client_core/Cargo.toml index 81e5231d3c..d56cf4bb8b 100644 --- a/alvr/client_core/Cargo.toml +++ b/alvr/client_core/Cargo.toml @@ -48,6 +48,6 @@ oboe = "0.6" # todo: remove o env_logger = "0.11" [build-dependencies] -bindgen = "0.69" +bindgen = "0.70" cc = { version = "1", features = ["parallel"] } walkdir = "2" diff --git a/alvr/common/Cargo.toml b/alvr/common/Cargo.toml index 687f26f0fc..bd43908422 100644 --- a/alvr/common/Cargo.toml +++ b/alvr/common/Cargo.toml @@ -12,7 +12,7 @@ enable-messagebox = ["rfd"] [dependencies] anyhow = { version = "1", features = ["backtrace"] } backtrace = "0.3" -glam = { version = "0.28", features = ["serde"] } +glam = { version = "0.29", features = ["serde"] } log = "0.4" once_cell = "1" parking_lot = "0.12" diff --git a/alvr/dashboard/Cargo.toml b/alvr/dashboard/Cargo.toml index 6d599c7c0d..2cc20dbee8 100644 --- a/alvr/dashboard/Cargo.toml +++ b/alvr/dashboard/Cargo.toml @@ -27,22 +27,13 @@ statrs = "0.17" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] alvr_server_io.workspace = true -sysinfo = { version = "0.30", default-features = false } -tungstenite = "0.23" +sysinfo = "0.31" +tungstenite = "0.24" ureq = { version = "2", features = ["json"] } -[target.'cfg(target_arch = "wasm32")'.dependencies] -console_error_panic_hook = "0.1" -ewebsock = "0.5" -futures = "0.3" -gloo-net = "0.5" -instant = { version = "0.1", features = ["wasm-bindgen"] } -wasm-bindgen-futures = "0.4" -wasm-logger = "0.2" - [target.'cfg(target_os = "linux")'.dependencies] wgpu = "0.20" -libva = { package = "cros-libva", version = "0.0.6" } +libva = { package = "cros-libva", version = "0.0.7" } nvml-wrapper = "0.10.0" [target.'cfg(windows)'.build-dependencies] diff --git a/alvr/dashboard/src/steamvr_launcher/mod.rs b/alvr/dashboard/src/steamvr_launcher/mod.rs index 77bb87ff7c..bcd10d4ae5 100644 --- a/alvr/dashboard/src/steamvr_launcher/mod.rs +++ b/alvr/dashboard/src/steamvr_launcher/mod.rs @@ -9,11 +9,12 @@ use alvr_filesystem as afs; use alvr_session::{DriverLaunchAction, DriversBackup}; use std::{ env, + ffi::OsStr, marker::PhantomData, thread, time::{Duration, Instant}, }; -use sysinfo::{ProcessRefreshKind, RefreshKind, System}; +use sysinfo::{ProcessRefreshKind, ProcessesToUpdate, RefreshKind, System}; const SHUTDOWN_TIMEOUT: Duration = Duration::from_secs(10); @@ -21,10 +22,10 @@ pub fn is_steamvr_running() -> bool { let mut system = System::new_with_specifics( RefreshKind::new().with_processes(ProcessRefreshKind::everything()), ); - system.refresh_processes(); + system.refresh_processes(ProcessesToUpdate::All); system - .processes_by_name(&afs::exec_fname("vrserver")) + .processes_by_name(OsStr::new(&afs::exec_fname("vrserver"))) .count() != 0 } @@ -33,12 +34,12 @@ pub fn maybe_kill_steamvr() { let mut system = System::new_with_specifics( RefreshKind::new().with_processes(ProcessRefreshKind::everything()), ); - system.refresh_processes(); + system.refresh_processes(ProcessesToUpdate::All); // first kill vrmonitor, then kill vrserver if it is hung. #[allow(unused_variables)] - for process in system.processes_by_name(&afs::exec_fname("vrmonitor")) { + for process in system.processes_by_name(OsStr::new(&afs::exec_fname("vrmonitor"))) { debug!("Killing vrmonitor"); #[cfg(target_os = "linux")] @@ -49,10 +50,10 @@ pub fn maybe_kill_steamvr() { thread::sleep(Duration::from_secs(1)); } - system.refresh_processes(); + system.refresh_processes(ProcessesToUpdate::All); #[allow(unused_variables)] - for process in system.processes_by_name(&afs::exec_fname("vrserver")) { + for process in system.processes_by_name(OsStr::new(&afs::exec_fname("vrserver"))) { debug!("Killing vrserver"); #[cfg(target_os = "linux")] diff --git a/alvr/server_core/Cargo.toml b/alvr/server_core/Cargo.toml index 00fc6b8459..14558c45cf 100644 --- a/alvr/server_core/Cargo.toml +++ b/alvr/server_core/Cargo.toml @@ -53,4 +53,4 @@ tokio-tungstenite = "0.20" tokio-util = { version = "0.7", features = ["codec"] } serde = "1" serde_json = "1" -sysinfo = { version = "0.30", default-features = false } +sysinfo = "0.31" diff --git a/alvr/server_core/src/lib.rs b/alvr/server_core/src/lib.rs index 76655ad0d4..1ec761b392 100644 --- a/alvr/server_core/src/lib.rs +++ b/alvr/server_core/src/lib.rs @@ -38,6 +38,7 @@ use statistics::StatisticsManager; use std::{ collections::HashSet, env, + ffi::OsStr, fs::File, io::Write, sync::{ @@ -48,7 +49,7 @@ use std::{ thread::{self, JoinHandle}, time::{Duration, Instant}, }; -use sysinfo::{ProcessRefreshKind, RefreshKind}; +use sysinfo::{ProcessRefreshKind, ProcessesToUpdate, RefreshKind}; use tokio::{runtime::Runtime, sync::broadcast}; static FILESYSTEM_LAYOUT: OnceLock = OnceLock::new(); @@ -145,10 +146,10 @@ pub fn notify_restart_driver() { let mut system = sysinfo::System::new_with_specifics( RefreshKind::new().with_processes(ProcessRefreshKind::everything()), ); - system.refresh_processes(); + system.refresh_processes(ProcessesToUpdate::All); if system - .processes_by_name(afs::dashboard_fname()) + .processes_by_name(OsStr::new(&afs::dashboard_fname())) .next() .is_some() { diff --git a/alvr/server_openvr/Cargo.toml b/alvr/server_openvr/Cargo.toml index 4f71252dc7..fa9c500189 100644 --- a/alvr/server_openvr/Cargo.toml +++ b/alvr/server_openvr/Cargo.toml @@ -22,7 +22,7 @@ alvr_session.workspace = true [build-dependencies] alvr_filesystem = { path = "../filesystem" } -bindgen = "0.69" +bindgen = "0.70" cc = { version = "1", features = ["parallel"] } walkdir = "2" diff --git a/alvr/vulkan_layer/Cargo.toml b/alvr/vulkan_layer/Cargo.toml index 3ba0fc0ad3..0b3eaf9792 100644 --- a/alvr/vulkan_layer/Cargo.toml +++ b/alvr/vulkan_layer/Cargo.toml @@ -14,7 +14,7 @@ alvr_common.workspace = true alvr_filesystem.workspace = true [build-dependencies] -bindgen = "0.69" +bindgen = "0.70" cc = { version = "1", features = ["parallel"] } pkg-config = "0.3" walkdir = "2"