mirror/moss-kernel
1
0
Fork 0
mirror of https://github.com/hexagonal-sun/moss-kernel.git synced 2026-01-31 09:31:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

syscalls: wait4: implement WNOHANG

Browse Source 
Implement WNOHANG logic within the sys_wait4 system call. If this is
flag is set, remove the process from the ChildNotifiers set without
waiting.
This commit is contained in:
Matthew Leach
2026-01-08 21:16:11 +00:00
committed by Ashwin Naren
parent 914126917f
commit e8d6c304ae
1 changed files with 45 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/process/thread_group/wait.rs
View File

@@ -97,6 +97,34 @@ impl ChildNotifiers {
}
}
fn do_wait(
state: &mut BTreeMap<Tgid, ChildState>,
pid: PidT,
flags: WaitFlags,
) -> Option<(Tgid, ChildState)> {
let key = if pid == -1 {
state.iter().find_map(|(k, v)| {
if v.matches_wait_flags(flags) {
Some(*k)
} else {
None
}
})
} else {
state
.get_key_value(&Tgid::from_pid_t(pid))
.and_then(|(k, v)| {
if v.matches_wait_flags(flags) {
Some(*k)
} else {
None
}
})
}?;
Some(state.remove_entry(&key).unwrap())
}
pub async fn sys_wait4(
pid: PidT,
stat_addr: TUA<i32>,
@@ -139,34 +167,24 @@ pub async fn sys_wait4(
let task = current_task_shared();
let (tgid, child_state) = task
.process
.child_notifiers
.inner
.wait_until(|state| {
let key = if pid == -1 {
state.iter().find_map(|(k, v)| {
if v.matches_wait_flags(flags) {
Some(*k)
} else {
None
}
})
} else {
state
.get_key_value(&Tgid::from_pid_t(pid))
.and_then(|(k, v)| {
if v.matches_wait_flags(flags) {
Some(*k)
} else {
None
}
})
}?;
let (tgid, child_state) = if flags.contains(WaitFlags::WNOHANG) {
let mut ret = None;
task.process.child_notifiers.inner.update(|s| {
ret = do_wait(s, pid, flags);
WakeupType::None
});
Some(state.remove_entry(&key).unwrap())
})
.await;
match ret {
None => return Ok(0),
Some(ret) => ret,
}
} else {
task.process
.child_notifiers
.inner
.wait_until(|state| do_wait(state, pid, flags))
.await
};
if !stat_addr.is_null() {
match child_state {