mirrors/krata
1
0
Fork 0
mirror of https://github.com/edera-dev/krata.git synced 2025-08-06 14:41:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(zone): waitpid should be limited when no child processes exist (fixes #304) (#305)

Browse Source
This commit is contained in:
Alex Zenla
2024-08-05 18:48:30 -07:00
committed by GitHub
parent 08b30c2eaa
commit 99091df3cf
2 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
crates/zone/src/childwait.rs
View File

@ -1,3 +1,9 @@
use anyhow::Result;
use libc::{c_int, waitpid, WEXITSTATUS, WIFEXITED};
use log::warn;
use nix::unistd::Pid;
use std::thread::sleep;
use std::time::Duration;
use std::{
ptr::addr_of_mut,
sync::{
@ -6,11 +12,6 @@ use std::{
},
thread::{self, JoinHandle},
};
use anyhow::Result;
use libc::{c_int, waitpid, WEXITSTATUS, WIFEXITED};
use log::warn;
use nix::unistd::Pid;
use tokio::sync::broadcast::{channel, Receiver, Sender};
const CHILD_WAIT_QUEUE_LEN: usize = 10;
@ -29,8 +30,8 @@ pub struct ChildWait {
}
impl ChildWait {
pub fn new() -> Result<ChildWait> {
let (sender, _) = channel(CHILD_WAIT_QUEUE_LEN);
pub fn new() -> Result<(ChildWait, Receiver<ChildEvent>)> {
let (sender, receiver) = channel(CHILD_WAIT_QUEUE_LEN);
let signal = Arc::new(AtomicBool::new(false));
let mut processor = ChildWaitTask {
sender: sender.clone(),
@ -41,11 +42,14 @@ impl ChildWait {
warn!("failed to process child updates: {}", error);
}
});
Ok(ChildWait {
sender,
signal,
_task: Arc::new(task),
})
Ok((
ChildWait {
sender,
signal,
_task: Arc::new(task),
},
receiver,
))
}
pub async fn subscribe(&self) -> Result<Receiver<ChildEvent>> {
@ -63,7 +67,13 @@ impl ChildWaitTask {
loop {
let mut status: c_int = 0;
let pid = unsafe { waitpid(-1, addr_of_mut!(status), 0) };
// pid being -1 indicates an error occurred, wait 100 microseconds to avoid
// overloading the channel. Right now we don't consider any other errors
// but that is fine for now, as waitpid shouldn't ever stop anyway.
if pid == -1 {
sleep(Duration::from_micros(100));
continue;
}
if WIFEXITED(status) {
let event = ChildEvent {
pid: Pid::from_raw(pid),