mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-10-27 12:48:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

waitpid: support for process group waits

Browse Source
This commit is contained in:
Matheus
2026-04-14 21:45:48 -03:00
parent 3399c4570c
commit 0f69e2bf2e
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/sys/syscalls/waitpid.c
+12 -10
View File
@@ -3,6 +3,7 @@
#include <arch/cpu.h> #include <arch/cpu.h>
#include <errno.h> #include <errno.h>
#include <logging.h> #include <logging.h>
#include <kernel/jobctl.h>
#define __WALL 0x40000000 #define __WALL 0x40000000
#define WNOHANG 1 #define WNOHANG 1
@@ -10,23 +11,20 @@
#define WCONTINUED 8 #define WCONTINUED 8
#define KNOWN_FLAGS (WNOHANG | WSTOPPED | WCONTINUED | __WALL) #define KNOWN_FLAGS (WNOHANG | WSTOPPED | WCONTINUED | __WALL)
// TODO use events here
syscallret_t syscall_waitpid(context_t *context, pid_t pid, int *status, int options) { syscallret_t syscall_waitpid(context_t *context, pid_t pid, int *status, int options) {
syscallret_t ret = { syscallret_t ret = {
.ret = -1 .ret = -1
}; };
bool check_pgid = false;
if (options & ~KNOWN_FLAGS) if (options & ~KNOWN_FLAGS)
printf("waitpid: unknown %x\n", options); printf("waitpid: unknown %x\n", options);
if (pid == 0) { if (pid < -1 || pid == 0) {
printf("waitpid: pid 0 is a stub, falling back to -1\n") check_pgid = true;
pid = -1; pid = -pid;
}
if (pid < -1) {
printf("waitpid: unhandled pid %d\n", pid);
ret.errno = EOPNOTSUPP;
return ret;
} }
thread_t *thread = current_thread(); thread_t *thread = current_thread();
@@ -70,7 +68,11 @@ syscallret_t syscall_waitpid(context_t *context, pid_t pid, int *status, int opt
continue; continue;
} }
if ((pid > 0 && iterator->pid == pid) || pid == -1) { if ((pid > 0 && iterator->pid == pid) ||
pid == -1 ||
(check_pgid && ((pid == 0 &&
jobctl_getpgid(proc) == jobctl_getpgid(iterator)) ||
jobctl_getpgid(iterator) == pid))) {
desired = iterator; desired = iterator;
if (iterator->signals.continueunwaited && (options & WCONTINUED)) { if (iterator->signals.continueunwaited && (options & WCONTINUED)) {
iterator->signals.continueunwaited = false; iterator->signals.continueunwaited = false;