Qualify FreeBSD kernel time and supervise bounded POSIX process groups natively
This commit is contained in:
@@ -114,7 +114,7 @@ pub(crate) fn run_controlled(
|
||||
let state = unsafe {
|
||||
libc::waitid(
|
||||
libc::P_PID,
|
||||
child.id(),
|
||||
child.id() as libc::id_t,
|
||||
info.as_mut_ptr(),
|
||||
libc::WEXITED | libc::WNOHANG | libc::WNOWAIT,
|
||||
)
|
||||
@@ -232,6 +232,7 @@ fn drain(
|
||||
}
|
||||
Ok(false)
|
||||
}
|
||||
#[cfg(not(target_os = "freebsd"))]
|
||||
fn group_has_no_live_members(pgid: u32) -> bool {
|
||||
let Ok(entries) = std::fs::read_dir("/proc") else {
|
||||
return false;
|
||||
@@ -265,6 +266,48 @@ fn group_has_no_live_members(pgid: u32) -> bool {
|
||||
true
|
||||
}
|
||||
|
||||
#[cfg(target_os = "freebsd")]
|
||||
fn group_has_no_live_members(pgid: u32) -> bool {
|
||||
// FreeBSD has no Linux /proc/<pid>/stat. Ask the kernel for this
|
||||
// process group while its original leader's PID is still reserved.
|
||||
use std::{mem, ptr};
|
||||
let mib = [
|
||||
libc::CTL_KERN,
|
||||
libc::KERN_PROC,
|
||||
libc::KERN_PROC_PGRP,
|
||||
pgid as i32,
|
||||
];
|
||||
let mut size = 0;
|
||||
let query = |out, n: &mut usize| unsafe {
|
||||
libc::sysctl(mib.as_ptr(), mib.len() as _, out, n, ptr::null(), 0)
|
||||
};
|
||||
let unit = mem::size_of::<libc::kinfo_proc>();
|
||||
if query(ptr::null_mut(), &mut size) != 0 || size == 0 || size > 16 * 1024 * 1024 {
|
||||
return false;
|
||||
}
|
||||
let mut rows = vec![mem::MaybeUninit::<libc::kinfo_proc>::zeroed(); size.div_ceil(unit) + 1];
|
||||
size = rows.len() * unit;
|
||||
if query(rows.as_mut_ptr().cast(), &mut size) != 0
|
||||
|| !size.is_multiple_of(unit)
|
||||
|| size / unit > rows.len()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
let mut leader = false;
|
||||
for row in &rows[..size / unit] {
|
||||
// A successful MIB read returned this complete aligned record.
|
||||
let row = unsafe { row.assume_init_ref() };
|
||||
if row.ki_structsize as usize != unit
|
||||
|| row.ki_pgid != pgid as i32
|
||||
|| row.ki_stat != libc::SZOMB
|
||||
{
|
||||
return false;
|
||||
}
|
||||
leader |= row.ki_pid == pgid as i32;
|
||||
}
|
||||
leader
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
Reference in New Issue
Block a user