Merge pull request #1002 from Dennisbonke/waitid

managarm · Feb 22, 2024 · c62984d · c62984d
2 parents 2d0473f + 4c7ed4c
commit c62984d
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 3 deletions.
diff --git a/options/posix/generic/sys-wait-stubs.cpp b/options/posix/generic/sys-wait-stubs.cpp
@@ -7,9 +7,13 @@
 #include <mlibc/posix-sysdeps.hpp>
 #include <mlibc/debug.hpp>
 
-int waitid(idtype_t, id_t, siginfo_t *, int) {
-	__ensure(!"Not implemented");
-	__builtin_unreachable();
+int waitid(idtype_t idtype, id_t id, siginfo_t *info, int options) {
+	auto sysdep = MLIBC_CHECK_OR_ENOSYS(mlibc::sys_waitid, -1);
+	if(int e = sysdep(idtype, id, info, options); e) {
+		errno = e;
+		return -1;
+	}
+	return 0;
 }
 
 pid_t waitpid(pid_t pid, int *status, int flags) {

diff --git a/options/posix/include/mlibc/posix-sysdeps.hpp b/options/posix/include/mlibc/posix-sysdeps.hpp
@@ -233,6 +233,8 @@ int sys_vm_unmap(void *pointer, size_t size);
 [[gnu::weak]] int sys_setaffinity(pid_t pid, size_t cpusetsize, const cpu_set_t *mask);
 [[gnu::weak]] int sys_setthreadaffinity(pid_t tid, size_t cpusetsize, const cpu_set_t *mask);
 
+[[gnu::weak]] int sys_waitid(idtype_t idtype, id_t id, siginfo_t *info, int options);
+
 } //namespace mlibc
 
 #endif // MLIBC_POSIX_SYSDEPS
diff --git a/sysdeps/linux/generic/sysdeps.cpp b/sysdeps/linux/generic/sysdeps.cpp
@@ -1492,6 +1492,13 @@ int sys_semctl(int semid, int semnum, int cmd, void *semun, int *out) {
 	return 0;
 }
 
+int sys_waitid(idtype_t idtype, id_t id, siginfo_t *info, int options) {
+	auto ret = do_syscall(SYS_waitid, idtype, id, info, options, 0);
+	if(int e = sc_error(ret); e)
+		return e;
+	return sc_int_result<int>(ret);
+}
+
 #endif // __MLIBC_POSIX_OPTION
 
 #if __MLIBC_LINUX_OPTION

diff --git a/sysdeps/managarm/generic/fork-exec.cpp b/sysdeps/managarm/generic/fork-exec.cpp
@@ -92,6 +92,42 @@ int sys_waitpid(pid_t pid, int *status, int flags, struct rusage *ru, pid_t *ret
 	return 0;
 }
 
+int sys_waitid(idtype_t idtype, id_t id, siginfo_t *info, int options) {
+	SignalGuard sguard;
+
+	managarm::posix::WaitIdRequest<MemoryAllocator> req(getSysdepsAllocator());
+
+	req.set_idtype(idtype);
+	req.set_id(id);
+	req.set_flags(options);
+
+	auto [offer, send_head, recv_resp] =
+		exchangeMsgsSync(
+			getPosixLane(),
+			helix_ng::offer(
+				helix_ng::sendBragiHeadOnly(req, getSysdepsAllocator()),
+				helix_ng::recvInline()
+			)
+		);
+
+	HEL_CHECK(offer.error());
+	HEL_CHECK(send_head.error());
+	HEL_CHECK(recv_resp.error());
+
+	managarm::posix::WaitIdResponse<MemoryAllocator> resp(getSysdepsAllocator());
+	resp.ParseFromArray(recv_resp.data(), recv_resp.length());
+	if(resp.error() == managarm::posix::Errors::ILLEGAL_ARGUMENTS) {
+		return EINVAL;
+	}
+	__ensure(resp.error() == managarm::posix::Errors::SUCCESS);
+	info->si_pid = resp.pid();
+	info->si_uid = resp.uid();
+	info->si_signo = SIGCHLD;
+	info->si_status = resp.sig_status();
+	info->si_code = resp.sig_code();
+	return 0;
+}
+
 void sys_exit(int status) {
 	// This implementation is inherently signal-safe.
 	HEL_CHECK(helSyscall1(kHelCallSuper + posix::superExit, status));

diff --git a/tests/meson.build b/tests/meson.build
@@ -94,6 +94,7 @@ all_test_cases = [
 	'posix/posix-timer',
 	'posix/strdupa',
 	'posix/mkstemp',
+	'posix/waitid',
 	'glibc/getopt',
 	'glibc/ffsl-ffsll',
 	'glibc/error_message_count',

diff --git a/tests/posix/waitid.c b/tests/posix/waitid.c
@@ -0,0 +1,20 @@
+#include <assert.h>
+#include <signal.h>
+#include <stdlib.h>
+#include <sys/wait.h>
+#include <unistd.h>
+
+siginfo_t si;
+
+int main() {
+	int pid = fork();
+
+	if(!pid)
+		exit(69);
+
+	int ret = waitid(P_ALL, 0, &si, WEXITED);
+	assert(ret == 0);
+	assert(si.si_pid == pid);
+	assert(si.si_signo == SIGCHLD);
+	assert(si.si_code == CLD_EXITED);
+}