diff --git a/demo/carla/bridge/Cargo.lock b/demo/carla/bridge/Cargo.lock index d8ee96f4c3e..c5bf5440d55 100644 --- a/demo/carla/bridge/Cargo.lock +++ b/demo/carla/bridge/Cargo.lock @@ -504,6 +504,16 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" +[[package]] +name = "errno" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e35d6e78f4cebb90e51d543db8fe41528851d6deeef6ef21ebd4bfdc1e784776" +dependencies = [ + "libc", + "windows-sys", +] + [[package]] name = "fast_image_resize" version = "6.1.0" @@ -516,6 +526,12 @@ dependencies = [ "thiserror 2.0.21", ] +[[package]] +name = "fastrand" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da7c62ceae207dd37ea5b845da6a0696c799f85e97da1ab5b7910be3c1c80223" + [[package]] name = "fiat-crypto" version = "0.3.0" @@ -1178,6 +1194,12 @@ dependencies = [ "windows-link", ] +[[package]] +name = "linux-raw-sys" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" + [[package]] name = "litemap" version = "0.8.3" @@ -1229,6 +1251,7 @@ dependencies = [ "moq-video", "parking_lot", "pollster", + "tempfile", "tracing", ] @@ -2070,6 +2093,19 @@ dependencies = [ "semver", ] +[[package]] +name = "rustix" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5e76742e5294153d4dde1207dbec5bdd81eef6fabdc0d2118babadabfd858aa" +dependencies = [ + "bitflags 2.13.2", + "errno", + "libc", + "linux-raw-sys", + "windows-sys", +] + [[package]] name = "rustversion" version = "1.0.23" @@ -2315,6 +2351,19 @@ dependencies = [ "syn 3.0.6", ] +[[package]] +name = "tempfile" +version = "3.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" +dependencies = [ + "fastrand", + "getrandom", + "once_cell", + "rustix", + "windows-sys", +] + [[package]] name = "thiserror" version = "1.0.69" @@ -2687,6 +2736,15 @@ dependencies = [ "windows-link", ] +[[package]] +name = "windows-sys" +version = "0.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" +dependencies = [ + "windows-link", +] + [[package]] name = "windows-threading" version = "0.2.1" diff --git a/demo/carla/bridge/Cargo.toml b/demo/carla/bridge/Cargo.toml index e0c6ad7f2d5..a4b59d9a13b 100644 --- a/demo/carla/bridge/Cargo.toml +++ b/demo/carla/bridge/Cargo.toml @@ -39,6 +39,8 @@ tracing = "0.1" # The stand-in producer: a native Vulkan renderer that hands the bridge # exportable slots exactly the way the CARLA plugin does. ash = "0.38" +# Each test owns the directory its socket and lock file live in. +tempfile = "3" [lints.clippy] # Every suppression says why, so the next lint audit can judge it. diff --git a/demo/carla/bridge/src/lib.rs b/demo/carla/bridge/src/lib.rs index b5e50b86067..488af2b37c9 100644 --- a/demo/carla/bridge/src/lib.rs +++ b/demo/carla/bridge/src/lib.rs @@ -183,13 +183,10 @@ impl Shared { mod tests { use super::*; - fn socket_path(name: &str) -> PathBuf { - std::env::temp_dir().join(format!("carla-bridge-{name}-{}.sock", std::process::id())) - } - #[test] fn a_live_bridge_keeps_its_socket() { - let path = socket_path("live"); + let dir = tempfile::tempdir().unwrap(); + let path = dir.path().join("bridge.sock"); let first = Bridge::listen(&path).unwrap(); let err = Bridge::listen(&path).err().expect("a second bridge on the path"); assert!(err.to_string().contains("another bridge"), "{err:#}"); @@ -200,8 +197,8 @@ mod tests { #[test] fn a_stale_socket_is_replaced() { - let path = socket_path("stale"); - let _ = std::fs::remove_file(&path); + let dir = tempfile::tempdir().unwrap(); + let path = dir.path().join("bridge.sock"); // A listener that exited without unlinking, like a crashed process. drop(UnixListener::bind(&path).unwrap()); let bridge = Bridge::listen(&path).unwrap(); diff --git a/demo/carla/bridge/src/server.rs b/demo/carla/bridge/src/server.rs index 40e7949d08d..dbebfebad7b 100644 --- a/demo/carla/bridge/src/server.rs +++ b/demo/carla/bridge/src/server.rs @@ -294,8 +294,8 @@ mod tests { #[test] fn a_superseded_connection_changes_nothing() { - let path = std::env::temp_dir().join(format!("carla-bridge-superseded-{}.sock", std::process::id())); - let bridge = crate::Bridge::listen(&path).unwrap(); + let dir = tempfile::tempdir().unwrap(); + let bridge = crate::Bridge::listen(dir.path().join("bridge.sock")).unwrap(); // Not the current connection: another worker replaced it (here, none // is current at all). let mut stale = Connection { diff --git a/demo/carla/bridge/tests/gpu.rs b/demo/carla/bridge/tests/gpu.rs index 2cc771d4541..3d062594bfc 100644 --- a/demo/carla/bridge/tests/gpu.rs +++ b/demo/carla/bridge/tests/gpu.rs @@ -11,7 +11,7 @@ mod standin; use std::collections::{HashMap, VecDeque}; use std::io::Write; use std::os::unix::net::UnixStream; -use std::path::{Path, PathBuf}; +use std::path::Path; use std::time::Duration; use carla_bridge::Bridge; @@ -253,15 +253,12 @@ fn step(camera: &mut Camera, worker: &mut Worker, latency: &mut Latency, number: keyframes } -fn socket_path() -> PathBuf { - std::env::temp_dir().join(format!("carla-bridge-test-{}.sock", std::process::id())) -} - #[test] #[ignore = "needs a Linux NVIDIA GPU; run by `just carla bridge-gpu`"] fn gpu_video_reaches_the_worker() { let gpu = Gpu::open().expect("an NVIDIA Vulkan device"); - let bridge = Bridge::listen(socket_path()).expect("listen"); + let dir = tempfile::tempdir().expect("a directory for the socket"); + let bridge = Bridge::listen(dir.path().join("bridge.sock")).expect("listen"); let mut sd = Camera::new(&gpu, &bridge, STREAM, SD, 3); let mut hd = Camera::new(&gpu, &bridge, STREAM, HD, 3); let mut latency = Latency::default(); diff --git a/quest/m1/carla-bridge-test-locks.md b/quest/m1/carla-bridge-test-locks.md deleted file mode 100644 index 8eaa64277e6..00000000000 --- a/quest/m1/carla-bridge-test-locks.md +++ /dev/null @@ -1,24 +0,0 @@ -# [XS] The carla bridge's tests leave no lock files - -## Goal - -Running the carla bridge's tests (`demo/carla/bridge`) leaves no -`carla-bridge-*.sock.lock` file, or socket, behind in TMPDIR. - -## Plan - -Found 2026-11-14 by [kixel-ai/dotfiles#164](https://github.com/kixel-ai/dotfiles/pull/164)'s -trace of what moq leaves in TMPDIR. `Bridge::listen` (`src/lib.rs`) takes an -flock on `.lock` and never removes it. That is right in production: -unlinking a lock file another process may be opening lets two bridges lock -different inodes at one path. The tests in `src/lib.rs`, `src/server.rs`, and -`tests/gpu.rs` name sockets `std::env::temp_dir()/carla-bridge-*-.sock`, -so every run leaves a new lock file. - -Recommendation: each test puts its socket in a temporary directory it owns and -removes, such as with a `tempfile` dev-dependency, leaving `Bridge` unchanged. - -Fixes [moq-dev/moq#5621](https://github.com/moq-dev/moq/pull/5621), which added -the lock and the tests. - -Public API: none. Wire: none.