enricobuehler
dd9bbaf1c5
`output_within` read stdout/stderr only after the child exited, and its doc justified that with "these helpers emit at most a few hundred KiB, well under any real pipe pressure". A pipe holds 64 KiB. Anything past that blocks the helper in `write()`, so it never exits, the budget kills it, and a successful query is reported to the caller as `TimedOut` with its answer discarded. The busiest caller is the one that trips it: `pw-dump` on a populated PipeWire graph clears 64 KiB routinely and is polled from the 45 s gamescope loops. Confirmed empirically — a child writing 1 MiB into an undrained pipe never exits. Both pipes are now drained on their own threads, concurrently with the wait. That makes the joins load-bearing, which exposed the second half: the Unix `tree::Guard` was an empty stub whose doc claimed `Child::kill` "already ends the only process there is". It never did for this crate's Linux helpers — `pkexec`, `systemd-run`, `systemctl --user` and the `sh -c` wrappers all fork — and a surviving grandchild holds the pipes' write ends, so a reader would wait for an EOF that never arrives. The child is now the leader of its own process group and the guard `killpg`s it, which is the Unix shape of the Job object the Windows half already used. Also gates `pf-frame`, `pf-gpu` and `pf-encode` to Windows: every use site of all three is `cfg(windows)`, and between them they dragged FFmpeg, ash and openh264 into the Linux build for nothing (sweep item 13.19).
96 lines
5.1 KiB
TOML
96 lines
5.1 KiB
TOML
# Virtual-display orchestration (plan §W6): the on-demand client-sized headless output — per-compositor
|
|
# Linux backends (KWin zkde-screencast, wlroots swaymsg, Mutter RemoteDesktop, Hyprland) and the
|
|
# Windows IddCx/pf-vdisplay driver backend — behind one VirtualDisplay trait, plus the mode-conflict
|
|
# admission registry and the DDC/CI panel control. Extracted into a subsystem crate; depends on the
|
|
# shared leaves (pf-frame's DXGI identity, pf-win-display's CCD helpers, pf-gpu, pf-paths) + pf-encode
|
|
# (the NVENC session-budget admission gate), never on capture/inject or the orchestrator (the display
|
|
# lifecycle events invert to a host-registered sink).
|
|
[package]
|
|
name = "pf-vdisplay"
|
|
version.workspace = true
|
|
edition = "2021"
|
|
rust-version.workspace = true
|
|
license = "MIT OR Apache-2.0"
|
|
description = "punktfunk host virtual-display orchestration: per-compositor Linux backends + the Windows IddCx driver backend behind one VirtualDisplay trait."
|
|
publish = false
|
|
|
|
[dependencies]
|
|
punktfunk-core = { path = "../punktfunk-core", features = ["quic"] }
|
|
pf-host-config = { path = "../pf-host-config" }
|
|
pf-paths = { path = "../pf-paths" }
|
|
pf-win-display = { path = "../pf-win-display" }
|
|
anyhow = "1"
|
|
tracing = "0.1"
|
|
# The platform-neutral policy/identity/custom-preset state is serde-serialized (persisted + the mgmt
|
|
# API), and the policy/preset types derive utoipa `ToSchema` for the OpenAPI document.
|
|
serde = { version = "1", features = ["derive"] }
|
|
serde_json = "1"
|
|
utoipa = { version = "5", features = ["axum_extras"] }
|
|
sha2 = "0.10"
|
|
hex = "0.4"
|
|
|
|
[dev-dependencies]
|
|
# The `#[ignore]`d on-glass cases drive the manager/backend through code paths whose only account of
|
|
# what they chose is `tracing`. A bare test harness installs no subscriber, so those runs were blind:
|
|
# `live_a_failed_first_isolate_is_recovered_by_adopting_the_next` could see the panel stay dark but
|
|
# not whether the adoption arm fired, or whether the dark-desk backstop ran and failed. Dev-only, so
|
|
# the shipped host's dependency closure through this crate is unchanged.
|
|
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
|
|
|
|
# `proc`'s process-group tree guard is Unix-wide, not Linux-only: the module is compiled on every
|
|
# platform and its tests run on whatever the developer is sitting at (macOS, here).
|
|
[target.'cfg(unix)'.dependencies]
|
|
libc = "0.2"
|
|
|
|
[target.'cfg(target_os = "linux")'.dependencies]
|
|
# The Mutter backend drives D-Bus RemoteDesktop + ScreenCast.RecordVirtual via ashpd on a tokio
|
|
# runtime; the gamescope restore worker + portal handshakes use tokio too.
|
|
ashpd = { version = "0.13", features = ["screencast", "remote_desktop"] }
|
|
tokio = { version = "1", features = ["rt", "rt-multi-thread", "macros", "net", "time"] }
|
|
futures-util = "0.3"
|
|
# KWin virtual-output creation via the privileged `zkde_screencast_unstable_v1` protocol (vendored in
|
|
# `protocols/`); the generated interface tables reference `wayland-backend`.
|
|
wayland-client = "0.31"
|
|
wayland-scanner = "0.31"
|
|
wayland-backend = "0.3"
|
|
# wayland-scanner emits `bitflags::bitflags!` for the KDE output-device protocol's bitfield enums
|
|
# (kde-output-device-v2 `capability`/`flags`); needs the crate in scope (kwin_output_mgmt.rs).
|
|
bitflags = "2"
|
|
# The gamescope bare-spawn splash client (gamescope/splash.rs): pure-Rust X11 core protocol (the
|
|
# same no-libxcb-link stance as pf-capture's XFixes cursor source), no extension features needed.
|
|
x11rb = { version = "0.13", default-features = false }
|
|
|
|
[target.'cfg(target_os = "windows")'.dependencies]
|
|
# Windows-only, all three, and gated here rather than unconditionally so the LINUX build does not
|
|
# drag their closures in for nothing: `pf-frame` for the DXGI capture identity + the CTA-861.3 HDR
|
|
# luminance fields, `pf-gpu` for the render-adapter LUID, and `pf-encode` for the admission gate's
|
|
# NVENC session budget (`can_open_another_session`, admission.rs, itself `#[cfg(windows)]`). Every
|
|
# use site of all three is Windows-gated — verified by grep — and between them they pull FFmpeg,
|
|
# ash and openh264, none of which a Linux host reaches through this crate.
|
|
pf-frame = { path = "../pf-frame" }
|
|
pf-gpu = { path = "../pf-gpu" }
|
|
pf-encode = { path = "../pf-encode" }
|
|
# The host<->driver wire contract for the pf-vdisplay IddCx backend (control IOCTLs + Pod structs).
|
|
pf-driver-proto = { path = "../pf-driver-proto" }
|
|
bytemuck = { version = "1.19", features = ["derive"] }
|
|
windows = { version = "0.62", features = [
|
|
"Win32_Foundation",
|
|
# The single-instance mutex is created with an explicit SDDL DACL and its owner is checked, so
|
|
# a lower-privileged process (the LocalService plugin runner) can neither open it nor squat the
|
|
# name unnoticed — see manager/instance.rs (security-review 2026-08-05 L-16).
|
|
"Win32_Security",
|
|
"Win32_Security_Authorization",
|
|
"Win32_Devices_DeviceAndDriverInstallation",
|
|
"Win32_Devices_Display",
|
|
"Win32_Graphics_Gdi",
|
|
"Win32_Storage_FileSystem",
|
|
"Win32_System_IO",
|
|
# `proc`'s budget ends the helper's whole process TREE: every Windows helper is reached through
|
|
# a shell, so the process that hangs is a grandchild `Child::kill` cannot reach.
|
|
"Win32_System_JobObjects",
|
|
"Win32_System_Threading",
|
|
] }
|
|
|
|
[lints]
|
|
workspace = true
|