syscalls: sigtimedwait

kernel-src/arch/x86-64/syscall.asm

@@ -88,6 +88,7 @@ extern syscall_seteuid
 extern syscall_setgid
 extern syscall_setegid
 extern syscall_sigsuspend
+extern syscall_sigtimedwait
 syscalltab:
 dq syscall_print
 dq syscall_mmap
@@ -178,7 +179,8 @@ dq syscall_seteuid
 dq syscall_setgid
 dq syscall_setegid
 dq syscall_sigsuspend
-syscallcount equ 89
+dq syscall_sigtimedwait
+syscallcount equ 90
 section .text
 global arch_syscall_entry
 ; on entry:

kernel-src/arch/x86-64/syscalllog.c

@@ -5,7 +5,7 @@
 
 #ifdef SYSCALL_LOGGING
 
-#define SYSCALL_COUNT 89
+#define SYSCALL_COUNT 90
 #define LOGSTR(x) arch_e9_puts(x)
 
 static char *name[] = {
@@ -97,7 +97,8 @@ static char *name[] = {
 	"seteuid",
 	"setgid",
 	"setegid",
-	"sigsuspend"
+	"sigsuspend",
+	"sigtimedwait"
 };
 
 static char *args[] = {
@@ -189,7 +190,8 @@ static char *args[] = {
 	"euid %d", // seteuid
 	"gid %d", // setgid
 	"egid %d", // setegid
-	"sigset %p" // sigsuspend
+	"sigset %p", // sigsuspend
+	"set %p info %p, timespec %p" // sigtimedwait
 };
 
 #endif

kernel-src/sys/syscalls/sigtimedwait.c

@@ -0,0 +1,33 @@
+#include <kernel/syscalls.h>
+#include <kernel/signal.h>
+#include <time.h>
+#include <logging.h>
+
+syscallret_t syscall_sigtimedwait(context_t *, sigset_t *uset, siginfo_t *uinfo, timespec_t *utimeout) {
+	syscallret_t ret = {
+		.ret = -1
+	};
+
+	sigset_t set;
+	timespec_t timeout;
+	siginfo_t info;
+	int signum;
+
+	ret.errno = usercopy_fromuser(&set, uset, sizeof(sigset_t));
+	if (ret.errno)
+		return ret;
+
+	ret.errno = usercopy_fromuser(&timeout, utimeout, sizeof(timespec_t));
+	if (ret.errno)
+		return ret;
+
+	ret.errno = signal_wait(&set, &timeout, &info, &signum);
+	if (ret.errno)
+		return ret;
+
+	if (uinfo)
+		ret.errno = usercopy_touser(uinfo, &info, sizeof(siginfo_t));
+
+	ret.ret = ret.errno ? -1 : 0;
+	return ret;
+}