H1: child processes die with Lutra (crates/proc)
New layer-0 crate lutra-proc: spawn(Command) puts the child into a kill-on-close group. Windows: one job object per child with JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE (windows-sys), nested jobs work. Unix: a new process group plus a /bin/sh watchdog that kills the group when Lutra's pipe closes (drop, kill, quit or SIGKILL of Lutra). Child::kill and Drop take the whole group. Phpactor (supervision spawn) and the php -v probe in lutra-lsp start through it. Tests kill a parent hard and check that its child is gone (with and without the parent in a group), plus kill and drop of a tree. Docs: architecture "Child processes", G6 note. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
e5891ddeb4
commit
90d03284f2
13 changed files with 555 additions and 14 deletions
68
crates/proc/src/unix.rs
Normal file
68
crates/proc/src/unix.rs
Normal file
|
|
@ -0,0 +1,68 @@
|
|||
//! Unix: the child leads a new process group, and a watchdog kills that
|
||||
//! group when Lutra's end of a pipe closes.
|
||||
//!
|
||||
//! The watchdog is `/bin/sh` reading its standard input, a pipe whose
|
||||
//! write end only the [`Group`] holds (standard library pipes are
|
||||
//! close-on-exec, so no other child inherits it). `read` returns at end of
|
||||
//! file, which happens when the [`Group`] drops the pipe or when Lutra's
|
||||
//! process ends for any reason, including `SIGKILL`; the watchdog then
|
||||
//! sends `SIGKILL` to the group. It runs in a process group of its own, so
|
||||
//! a Ctrl-C or hangup aimed at Lutra's group does not take it down first.
|
||||
|
||||
use std::io;
|
||||
use std::os::unix::process::CommandExt;
|
||||
use std::process::{ChildStdin, Command, Stdio};
|
||||
|
||||
/// The watchdog script: wait for end of file on stdin, then kill the
|
||||
/// process group given as `$1`.
|
||||
const WATCHDOG: &str = "read -r _; kill -KILL -\"$1\" 2>/dev/null";
|
||||
|
||||
/// The child's process group and its watchdog.
|
||||
pub(crate) struct Group {
|
||||
/// The watchdog process, reaped after it has killed the group.
|
||||
watchdog: std::process::Child,
|
||||
/// Lutra's end of the watchdog's pipe; dropping it fires the watchdog.
|
||||
trigger: Option<ChildStdin>,
|
||||
}
|
||||
|
||||
impl Group {
|
||||
/// Makes the child the leader of a new process group.
|
||||
pub(crate) fn prepare(command: &mut Command) {
|
||||
command.process_group(0);
|
||||
}
|
||||
|
||||
/// Starts the watchdog for the group led by `child`.
|
||||
///
|
||||
/// # Errors
|
||||
/// The error of starting `/bin/sh`, or a missing stdin pipe.
|
||||
pub(crate) fn attach(child: &std::process::Child) -> io::Result<Self> {
|
||||
let mut watchdog = Command::new("/bin/sh")
|
||||
.arg("-c")
|
||||
.arg(WATCHDOG)
|
||||
.arg("lutra-proc-watchdog")
|
||||
.arg(child.id().to_string())
|
||||
.stdin(Stdio::piped())
|
||||
.stdout(Stdio::null())
|
||||
.stderr(Stdio::null())
|
||||
.process_group(0)
|
||||
.spawn()?;
|
||||
let Some(trigger) = watchdog.stdin.take() else {
|
||||
let _ = watchdog.kill();
|
||||
let _ = watchdog.wait();
|
||||
return Err(io::Error::other("the watchdog has no stdin pipe"));
|
||||
};
|
||||
Ok(Self {
|
||||
watchdog,
|
||||
trigger: Some(trigger),
|
||||
})
|
||||
}
|
||||
|
||||
/// Fires the watchdog and waits until it has killed the group. The
|
||||
/// results are ignored on purpose: a watchdog that is gone already has
|
||||
/// nothing left to do, and the caller kills the direct child itself.
|
||||
pub(crate) fn kill(&mut self) {
|
||||
if self.trigger.take().is_some() {
|
||||
let _ = self.watchdog.wait();
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue