Module Name: src
Committed By: thorpej
Date: Mon Dec 14 16:54:05 UTC 2020
Modified Files:
src/sys/kern [thorpej-futex]: init_sysent.c syscalls.c
syscalls_autoload.c systrace_args.c
src/sys/rump/include/rump [thorpej-futex]: rump_syscalls.h
src/sys/rump/librump/rumpkern [thorpej-futex]: rump_syscalls.c
src/sys/sys [thorpej-futex]: syscall.h syscallargs.h
Log Message:
Regen for timerfd.
To generate a diff of this commit:
cvs rdiff -u -r1.336.2.2 -r1.336.2.3 src/sys/kern/init_sysent.c
cvs rdiff -u -r1.324.2.2 -r1.324.2.3 src/sys/kern/syscalls.c
cvs rdiff -u -r1.40.2.2 -r1.40.2.3 src/sys/kern/syscalls_autoload.c
cvs rdiff -u -r1.43.2.2 -r1.43.2.3 src/sys/kern/systrace_args.c
cvs rdiff -u -r1.123.2.2 -r1.123.2.3 \
src/sys/rump/include/rump/rump_syscalls.h
cvs rdiff -u -r1.154.2.2 -r1.154.2.3 \
src/sys/rump/librump/rumpkern/rump_syscalls.c
cvs rdiff -u -r1.318.2.2 -r1.318.2.3 src/sys/sys/syscall.h
cvs rdiff -u -r1.302.2.2 -r1.302.2.3 src/sys/sys/syscallargs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/init_sysent.c
diff -u src/sys/kern/init_sysent.c:1.336.2.2 src/sys/kern/init_sysent.c:1.336.2.3
--- src/sys/kern/init_sysent.c:1.336.2.2 Mon Dec 14 16:01:17 2020
+++ src/sys/kern/init_sysent.c Mon Dec 14 16:54:04 2020
@@ -1,14 +1,14 @@
-/* $NetBSD: init_sysent.c,v 1.336.2.2 2020/12/14 16:01:17 thorpej Exp $ */
+/* $NetBSD: init_sysent.c,v 1.336.2.3 2020/12/14 16:54:04 thorpej Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.306.2.2 2020/12/14 16:00:51 thorpej Exp
+ * created from NetBSD: syscalls.master,v 1.306.2.3 2020/12/14 16:53:36 thorpej Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.336.2.2 2020/12/14 16:01:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.336.2.3 2020/12/14 16:54:04 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_modular.h"
@@ -934,14 +934,19 @@ struct sysent sysent[] = {
}, /* 176 = filler */
#endif
{
- .sy_call = sys_nosys,
- }, /* 177 = filler */
+ ns(struct sys_timerfd_create_args),
+ .sy_call = (sy_call_t *)sys_timerfd_create
+ }, /* 177 = timerfd_create */
{
- .sy_call = sys_nosys,
- }, /* 178 = filler */
+ ns(struct sys_timerfd_settime_args),
+ .sy_flags = SYCALL_ARG_PTR,
+ .sy_call = (sy_call_t *)sys_timerfd_settime
+ }, /* 178 = timerfd_settime */
{
- .sy_call = sys_nosys,
- }, /* 179 = filler */
+ ns(struct sys_timerfd_gettime_args),
+ .sy_flags = SYCALL_ARG_PTR,
+ .sy_call = (sy_call_t *)sys_timerfd_gettime
+ }, /* 179 = timerfd_gettime */
{
.sy_call = sys_nosys,
}, /* 180 = filler */
Index: src/sys/kern/syscalls.c
diff -u src/sys/kern/syscalls.c:1.324.2.2 src/sys/kern/syscalls.c:1.324.2.3
--- src/sys/kern/syscalls.c:1.324.2.2 Mon Dec 14 16:01:17 2020
+++ src/sys/kern/syscalls.c Mon Dec 14 16:54:04 2020
@@ -1,14 +1,14 @@
-/* $NetBSD: syscalls.c,v 1.324.2.2 2020/12/14 16:01:17 thorpej Exp $ */
+/* $NetBSD: syscalls.c,v 1.324.2.3 2020/12/14 16:54:04 thorpej Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.306.2.2 2020/12/14 16:00:51 thorpej Exp
+ * created from NetBSD: syscalls.master,v 1.306.2.3 2020/12/14 16:53:36 thorpej Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.324.2.2 2020/12/14 16:01:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.324.2.3 2020/12/14 16:54:04 thorpej Exp $");
#if defined(_KERNEL_OPT)
#ifdef _KERNEL_OPT
@@ -223,9 +223,9 @@ const char *const syscallnames[] = {
#else
/* 176 */ "#176 (excluded ntp_adjtime)",
#endif
- /* 177 */ "#177 (unimplemented)",
- /* 178 */ "#178 (unimplemented)",
- /* 179 */ "#179 (unimplemented)",
+ /* 177 */ "timerfd_create",
+ /* 178 */ "timerfd_settime",
+ /* 179 */ "timerfd_gettime",
/* 180 */ "#180 (unimplemented)",
/* 181 */ "setgid",
/* 182 */ "setegid",
@@ -760,9 +760,9 @@ const char *const altsyscallnames[] = {
#else
/* 176 */ NULL, /* excluded ntp_adjtime */
#endif
- /* 177 */ NULL, /* unimplemented */
- /* 178 */ NULL, /* unimplemented */
- /* 179 */ NULL, /* unimplemented */
+ /* 177 */ NULL, /* timerfd_create */
+ /* 178 */ NULL, /* timerfd_settime */
+ /* 179 */ NULL, /* timerfd_gettime */
/* 180 */ NULL, /* unimplemented */
/* 181 */ NULL, /* setgid */
/* 182 */ NULL, /* setegid */
Index: src/sys/kern/syscalls_autoload.c
diff -u src/sys/kern/syscalls_autoload.c:1.40.2.2 src/sys/kern/syscalls_autoload.c:1.40.2.3
--- src/sys/kern/syscalls_autoload.c:1.40.2.2 Mon Dec 14 16:01:17 2020
+++ src/sys/kern/syscalls_autoload.c Mon Dec 14 16:54:04 2020
@@ -1,14 +1,14 @@
-/* $NetBSD: syscalls_autoload.c,v 1.40.2.2 2020/12/14 16:01:17 thorpej Exp $ */
+/* $NetBSD: syscalls_autoload.c,v 1.40.2.3 2020/12/14 16:54:04 thorpej Exp $ */
/*
* System call autoload table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.306.2.2 2020/12/14 16:00:51 thorpej Exp
+ * created from NetBSD: syscalls.master,v 1.306.2.3 2020/12/14 16:53:36 thorpej Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.40.2.2 2020/12/14 16:01:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.40.2.3 2020/12/14 16:54:04 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_modular.h"
Index: src/sys/kern/systrace_args.c
diff -u src/sys/kern/systrace_args.c:1.43.2.2 src/sys/kern/systrace_args.c:1.43.2.3
--- src/sys/kern/systrace_args.c:1.43.2.2 Mon Dec 14 16:01:17 2020
+++ src/sys/kern/systrace_args.c Mon Dec 14 16:54:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: systrace_args.c,v 1.43.2.2 2020/12/14 16:01:17 thorpej Exp $ */
+/* $NetBSD: systrace_args.c,v 1.43.2.3 2020/12/14 16:54:04 thorpej Exp $ */
/*
* System call argument to DTrace register array converstion.
@@ -1311,6 +1311,32 @@ systrace_args(register_t sysnum, const v
}
#else
#endif
+ /* sys_timerfd_create */
+ case 177: {
+ const struct sys_timerfd_create_args *p = params;
+ iarg[0] = SCARG(p, clock_id); /* clockid_t */
+ iarg[1] = SCARG(p, flags); /* int */
+ *n_args = 2;
+ break;
+ }
+ /* sys_timerfd_settime */
+ case 178: {
+ const struct sys_timerfd_settime_args *p = params;
+ iarg[0] = SCARG(p, fd); /* int */
+ iarg[1] = SCARG(p, flags); /* int */
+ uarg[2] = (intptr_t) SCARG(p, new_value); /* const struct itimerspec * */
+ uarg[3] = (intptr_t) SCARG(p, old_value); /* struct itimerspec * */
+ *n_args = 4;
+ break;
+ }
+ /* sys_timerfd_gettime */
+ case 179: {
+ const struct sys_timerfd_gettime_args *p = params;
+ iarg[0] = SCARG(p, fd); /* int */
+ uarg[1] = (intptr_t) SCARG(p, curr_value); /* struct itimerspec * */
+ *n_args = 2;
+ break;
+ }
/* sys_setgid */
case 181: {
const struct sys_setgid_args *p = params;
@@ -5988,6 +6014,51 @@ systrace_entry_setargdesc(int sysnum, in
break;
#else
#endif
+ /* sys_timerfd_create */
+ case 177:
+ switch(ndx) {
+ case 0:
+ p = "clockid_t";
+ break;
+ case 1:
+ p = "int";
+ break;
+ default:
+ break;
+ };
+ break;
+ /* sys_timerfd_settime */
+ case 178:
+ switch(ndx) {
+ case 0:
+ p = "int";
+ break;
+ case 1:
+ p = "int";
+ break;
+ case 2:
+ p = "const struct itimerspec *";
+ break;
+ case 3:
+ p = "struct itimerspec *";
+ break;
+ default:
+ break;
+ };
+ break;
+ /* sys_timerfd_gettime */
+ case 179:
+ switch(ndx) {
+ case 0:
+ p = "int";
+ break;
+ case 1:
+ p = "struct itimerspec *";
+ break;
+ default:
+ break;
+ };
+ break;
/* sys_setgid */
case 181:
switch(ndx) {
@@ -11180,6 +11251,21 @@ systrace_return_setargdesc(int sysnum, i
break;
#else
#endif
+ /* sys_timerfd_create */
+ case 177:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
+ /* sys_timerfd_settime */
+ case 178:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
+ /* sys_timerfd_gettime */
+ case 179:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
/* sys_setgid */
case 181:
if (ndx == 0 || ndx == 1)
Index: src/sys/rump/include/rump/rump_syscalls.h
diff -u src/sys/rump/include/rump/rump_syscalls.h:1.123.2.2 src/sys/rump/include/rump/rump_syscalls.h:1.123.2.3
--- src/sys/rump/include/rump/rump_syscalls.h:1.123.2.2 Mon Dec 14 16:01:17 2020
+++ src/sys/rump/include/rump/rump_syscalls.h Mon Dec 14 16:54:05 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.h,v 1.123.2.2 2020/12/14 16:01:17 thorpej Exp $ */
+/* $NetBSD: rump_syscalls.h,v 1.123.2.3 2020/12/14 16:54:05 thorpej Exp $ */
/*
* System call protos in rump namespace.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.306.2.2 2020/12/14 16:00:51 thorpej Exp
+ * created from NetBSD: syscalls.master,v 1.306.2.3 2020/12/14 16:53:36 thorpej Exp
*/
#ifndef _RUMP_RUMP_SYSCALLS_H_
Index: src/sys/rump/librump/rumpkern/rump_syscalls.c
diff -u src/sys/rump/librump/rumpkern/rump_syscalls.c:1.154.2.2 src/sys/rump/librump/rumpkern/rump_syscalls.c:1.154.2.3
--- src/sys/rump/librump/rumpkern/rump_syscalls.c:1.154.2.2 Mon Dec 14 16:01:17 2020
+++ src/sys/rump/librump/rumpkern/rump_syscalls.c Mon Dec 14 16:54:05 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.c,v 1.154.2.2 2020/12/14 16:01:17 thorpej Exp $ */
+/* $NetBSD: rump_syscalls.c,v 1.154.2.3 2020/12/14 16:54:05 thorpej Exp $ */
/*
* System call vector and marshalling for rump.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.306.2.2 2020/12/14 16:00:51 thorpej Exp
+ * created from NetBSD: syscalls.master,v 1.306.2.3 2020/12/14 16:53:36 thorpej Exp
*/
#ifdef RUMP_CLIENT
@@ -15,7 +15,7 @@
#ifdef __NetBSD__
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.154.2.2 2020/12/14 16:01:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.154.2.3 2020/12/14 16:54:05 thorpej Exp $");
#include <sys/fstypes.h>
#include <sys/proc.h>
@@ -7347,17 +7347,14 @@ struct sysent rump_sysent[] = {
}, /* 176 = filler */
#endif
{
- .sy_flags = SYCALL_NOSYS,
.sy_call = (sy_call_t *)(void *)rumpns_enosys,
- }, /* 177 = filler */
+}, /* 177 = timerfd_create */
{
- .sy_flags = SYCALL_NOSYS,
.sy_call = (sy_call_t *)(void *)rumpns_enosys,
- }, /* 178 = filler */
+}, /* 178 = timerfd_settime */
{
- .sy_flags = SYCALL_NOSYS,
.sy_call = (sy_call_t *)(void *)rumpns_enosys,
- }, /* 179 = filler */
+}, /* 179 = timerfd_gettime */
{
.sy_flags = SYCALL_NOSYS,
.sy_call = (sy_call_t *)(void *)rumpns_enosys,
Index: src/sys/sys/syscall.h
diff -u src/sys/sys/syscall.h:1.318.2.2 src/sys/sys/syscall.h:1.318.2.3
--- src/sys/sys/syscall.h:1.318.2.2 Mon Dec 14 16:01:17 2020
+++ src/sys/sys/syscall.h Mon Dec 14 16:54:05 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: syscall.h,v 1.318.2.2 2020/12/14 16:01:17 thorpej Exp $ */
+/* $NetBSD: syscall.h,v 1.318.2.3 2020/12/14 16:54:05 thorpej Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.306.2.2 2020/12/14 16:00:51 thorpej Exp
+ * created from NetBSD: syscalls.master,v 1.306.2.3 2020/12/14 16:53:36 thorpej Exp
*/
#ifndef _SYS_SYSCALL_H_
@@ -513,6 +513,15 @@
#else
/* 176 is excluded ntp_adjtime */
#endif
+/* syscall: "timerfd_create" ret: "int" args: "clockid_t" "int" */
+#define SYS_timerfd_create 177
+
+/* syscall: "timerfd_settime" ret: "int" args: "int" "int" "const struct itimerspec *" "struct itimerspec *" */
+#define SYS_timerfd_settime 178
+
+/* syscall: "timerfd_gettime" ret: "int" args: "int" "struct itimerspec *" */
+#define SYS_timerfd_gettime 179
+
/* syscall: "setgid" ret: "int" args: "gid_t" */
#define SYS_setgid 181
Index: src/sys/sys/syscallargs.h
diff -u src/sys/sys/syscallargs.h:1.302.2.2 src/sys/sys/syscallargs.h:1.302.2.3
--- src/sys/sys/syscallargs.h:1.302.2.2 Mon Dec 14 16:01:17 2020
+++ src/sys/sys/syscallargs.h Mon Dec 14 16:54:05 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: syscallargs.h,v 1.302.2.2 2020/12/14 16:01:17 thorpej Exp $ */
+/* $NetBSD: syscallargs.h,v 1.302.2.3 2020/12/14 16:54:05 thorpej Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.306.2.2 2020/12/14 16:00:51 thorpej Exp
+ * created from NetBSD: syscalls.master,v 1.306.2.3 2020/12/14 16:53:36 thorpej Exp
*/
#ifndef _SYS_SYSCALLARGS_H_
@@ -1125,6 +1125,32 @@ check_syscall_args(sys_ntp_adjtime)
#else
#endif
+#ifndef RUMP_CLIENT
+struct sys_timerfd_create_args {
+ syscallarg(clockid_t) clock_id;
+ syscallarg(int) flags;
+};
+check_syscall_args(sys_timerfd_create)
+#endif /* !RUMP_CLIENT */
+
+#ifndef RUMP_CLIENT
+struct sys_timerfd_settime_args {
+ syscallarg(int) fd;
+ syscallarg(int) flags;
+ syscallarg(const struct itimerspec *) new_value;
+ syscallarg(struct itimerspec *) old_value;
+};
+check_syscall_args(sys_timerfd_settime)
+#endif /* !RUMP_CLIENT */
+
+#ifndef RUMP_CLIENT
+struct sys_timerfd_gettime_args {
+ syscallarg(int) fd;
+ syscallarg(struct itimerspec *) curr_value;
+};
+check_syscall_args(sys_timerfd_gettime)
+#endif /* !RUMP_CLIENT */
+
struct sys_setgid_args {
syscallarg(gid_t) gid;
};
@@ -3663,6 +3689,12 @@ int sys_ntp_adjtime(struct lwp *, const
#else
#endif
+int sys_timerfd_create(struct lwp *, const struct sys_timerfd_create_args *, register_t *);
+
+int sys_timerfd_settime(struct lwp *, const struct sys_timerfd_settime_args *, register_t *);
+
+int sys_timerfd_gettime(struct lwp *, const struct sys_timerfd_gettime_args *, register_t *);
+
int sys_setgid(struct lwp *, const struct sys_setgid_args *, register_t *);
int sys_setegid(struct lwp *, const struct sys_setegid_args *, register_t *);
