kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

Merge pull request #762 from mahkoh/jorth/fix-xwayland-info

Browse source 
forker: delay sending pidfd until spawn succeeds
This commit is contained in:
mahkoh 2026-02-27 16:32:25 +01:00 • committed by GitHub
commit 3f70242d32
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 22 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/forker.rs
View file

@ -451,13 +451,7 @@ impl Forker {
let res = match fork_with_pidfd(false) { let res = match fork_with_pidfd(false) {
Ok(o) => o, Ok(o) => o,
Err(e) => { Err(e) => {
if let Some(id) = pidfd_id { self.fail_pidfd(pidfd_id);
self.outgoing.push(ForkerMessage::PidFd {
id,
success: false,
pid: 0,
});
}
self.outgoing.push(ForkerMessage::Log { self.outgoing.push(ForkerMessage::Log {
level: log::Level::Error as usize, level: log::Level::Error as usize,
msg: ErrorFmt(e).to_string(), msg: ErrorFmt(e).to_string(),
@ -467,14 +461,6 @@ impl Forker {
}; };
match res { match res {
Forked::Parent { pid, pidfd } => { Forked::Parent { pid, pidfd } => {
if let Some(id) = pidfd_id {
self.fds.borrow_mut().push(Rc::new(pidfd));
self.outgoing.push(ForkerMessage::PidFd {
id,
success: true,
pid,
});
}
drop(write); drop(write);
let slf = self.clone(); let slf = self.clone();
let spawn = self.ae.spawn("await spawn", async move { let spawn = self.ae.spawn("await spawn", async move {
@ -484,6 +470,7 @@ impl Forker {
"Cannot wait for the child fd to become readable: {}", "Cannot wait for the child fd to become readable: {}",
ErrorFmt(e) ErrorFmt(e)
); );
slf.fail_pidfd(pidfd_id);
} else { } else {
let mut s = String::new(); let mut s = String::new();
let _ = Fd::new(read.raw()).read_to_string(&mut s); let _ = Fd::new(read.raw()).read_to_string(&mut s);
@ -492,6 +479,16 @@ impl Forker {
level: log::Level::Error as _, level: log::Level::Error as _,
msg: format!("Could not spawn `{}`: {}", prog, s), msg: format!("Could not spawn `{}`: {}", prog, s),
}); });
slf.fail_pidfd(pidfd_id);
} else {
if let Some(id) = pidfd_id {
slf.fds.borrow_mut().push(Rc::new(pidfd));
slf.outgoing.push(ForkerMessage::PidFd {
id,
success: true,
pid,
});
}
} }
} }
slf.pending_spawns.remove(&pid); slf.pending_spawns.remove(&pid);
@ -546,6 +543,16 @@ impl Forker {
} }
} }
} }
fn fail_pidfd(&self, pidfd_id: Option<u32>) {
if let Some(id) = pidfd_id {
self.outgoing.push(ForkerMessage::PidFd {
id,
success: false,
pid: 0,
});
}
}
} }
#[derive(Debug, Error)] #[derive(Debug, Error)]