Module Name: src
Committed By: pooka
Date: Fri Mar 14 00:56:38 UTC 2014
Modified Files:
src/sys/kern: init_sysent.c syscalls.c
src/sys/rump/include/rump: rump_syscalls.h
src/sys/rump/librump/rumpkern: rump_syscalls.c
src/sys/sys: syscall.h syscallargs.h
Log Message:
regen: time/timer related syscalls for rump kernels
To generate a diff of this commit:
cvs rdiff -u -r1.280 -r1.281 src/sys/kern/init_sysent.c
cvs rdiff -u -r1.271 -r1.272 src/sys/kern/syscalls.c
cvs rdiff -u -r1.72 -r1.73 src/sys/rump/include/rump/rump_syscalls.h
cvs rdiff -u -r1.97 -r1.98 src/sys/rump/librump/rumpkern/rump_syscalls.c
cvs rdiff -u -r1.267 -r1.268 src/sys/sys/syscall.h
cvs rdiff -u -r1.250 -r1.251 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.280 src/sys/kern/init_sysent.c:1.281
--- src/sys/kern/init_sysent.c:1.280 Wed Dec 11 09:45:02 2013
+++ src/sys/kern/init_sysent.c Fri Mar 14 00:56:37 2014
@@ -1,14 +1,14 @@
-/* $NetBSD: init_sysent.c,v 1.280 2013/12/11 09:45:02 pooka Exp $ */
+/* $NetBSD: init_sysent.c,v 1.281 2014/03/14 00:56:37 pooka Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.266 2013/12/11 09:40:56 pooka Exp
+ * created from NetBSD: syscalls.master,v 1.267 2014/03/14 00:52:08 pooka Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.280 2013/12/11 09:45:02 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.281 2014/03/14 00:56:37 pooka Exp $");
#include "opt_modular.h"
#include "opt_ntp.h"
Index: src/sys/kern/syscalls.c
diff -u src/sys/kern/syscalls.c:1.271 src/sys/kern/syscalls.c:1.272
--- src/sys/kern/syscalls.c:1.271 Wed Dec 11 09:45:02 2013
+++ src/sys/kern/syscalls.c Fri Mar 14 00:56:37 2014
@@ -1,14 +1,14 @@
-/* $NetBSD: syscalls.c,v 1.271 2013/12/11 09:45:02 pooka Exp $ */
+/* $NetBSD: syscalls.c,v 1.272 2014/03/14 00:56:37 pooka Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.266 2013/12/11 09:40:56 pooka Exp
+ * created from NetBSD: syscalls.master,v 1.267 2014/03/14 00:52:08 pooka Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.271 2013/12/11 09:45:02 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.272 2014/03/14 00:56:37 pooka Exp $");
#if defined(_KERNEL_OPT)
#include "opt_modular.h"
Index: src/sys/rump/include/rump/rump_syscalls.h
diff -u src/sys/rump/include/rump/rump_syscalls.h:1.72 src/sys/rump/include/rump/rump_syscalls.h:1.73
--- src/sys/rump/include/rump/rump_syscalls.h:1.72 Wed Dec 11 09:45:02 2013
+++ src/sys/rump/include/rump/rump_syscalls.h Fri Mar 14 00:56:38 2014
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.h,v 1.72 2013/12/11 09:45:02 pooka Exp $ */
+/* $NetBSD: rump_syscalls.h,v 1.73 2014/03/14 00:56:38 pooka Exp $ */
/*
* System call protos in rump namespace.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.266 2013/12/11 09:40:56 pooka Exp
+ * created from NetBSD: syscalls.master,v 1.267 2014/03/14 00:52:08 pooka Exp
*/
#ifndef _RUMP_RUMP_SYSCALLS_H_
@@ -84,6 +84,10 @@
#define RUMP_SYS_RENAME_KQUEUE1 rump___sysimpl_kqueue1
#endif
+#ifndef RUMP_SYS_RENAME_TIMER_CREATE
+#define RUMP_SYS_RENAME_TIMER_CREATE rump___sysimpl_timer_create
+#endif
+
#ifndef RUMP_SYS_RENAME_FLOCK
#define RUMP_SYS_RENAME_FLOCK rump___sysimpl_flock
#endif
@@ -112,6 +116,14 @@
#define RUMP_SYS_RENAME___GETLOGIN rump___sysimpl___getlogin
#endif
+#ifndef RUMP_SYS_RENAME_CLOCK_SETTIME
+#define RUMP_SYS_RENAME_CLOCK_SETTIME rump___sysimpl_clock_settime50
+#endif
+
+#ifndef RUMP_SYS_RENAME_CLOCK_GETTIME
+#define RUMP_SYS_RENAME_CLOCK_GETTIME rump___sysimpl_clock_gettime50
+#endif
+
#ifndef RUMP_SYS_RENAME_SETEGID
#define RUMP_SYS_RENAME_SETEGID rump___sysimpl_setegid
#endif
@@ -140,6 +152,10 @@
#define RUMP_SYS_RENAME_MKFIFOAT rump___sysimpl_mkfifoat
#endif
+#ifndef RUMP_SYS_RENAME_CLOCK_GETRES
+#define RUMP_SYS_RENAME_CLOCK_GETRES rump___sysimpl_clock_getres50
+#endif
+
#ifndef RUMP_SYS_RENAME_REBOOT
#define RUMP_SYS_RENAME_REBOOT rump___sysimpl_reboot
#endif
@@ -164,6 +180,10 @@
#define RUMP_SYS_RENAME_DUP2 rump___sysimpl_dup2
#endif
+#ifndef RUMP_SYS_RENAME_CLOCK_NANOSLEEP
+#define RUMP_SYS_RENAME_CLOCK_NANOSLEEP rump___sysimpl_clock_nanosleep
+#endif
+
#ifndef RUMP_SYS_RENAME_FCHMODAT
#define RUMP_SYS_RENAME_FCHMODAT rump___sysimpl_fchmodat
#endif
@@ -196,6 +216,10 @@
#define RUMP_SYS_RENAME_FDATASYNC rump___sysimpl_fdatasync
#endif
+#ifndef RUMP_SYS_RENAME_SETITIMER
+#define RUMP_SYS_RENAME_SETITIMER rump___sysimpl_setitimer50
+#endif
+
#ifndef RUMP_SYS_RENAME_PATHCONF
#define RUMP_SYS_RENAME_PATHCONF rump___sysimpl_pathconf
#endif
@@ -240,6 +264,10 @@
#define RUMP_SYS_RENAME_SOCKET rump___sysimpl_socket30
#endif
+#ifndef RUMP_SYS_RENAME_TIMER_GETOVERRUN
+#define RUMP_SYS_RENAME_TIMER_GETOVERRUN rump___sysimpl_timer_getoverrun
+#endif
+
#ifndef RUMP_SYS_RENAME_RMDIR
#define RUMP_SYS_RENAME_RMDIR rump___sysimpl_rmdir
#endif
@@ -352,6 +380,10 @@
#define RUMP_SYS_RENAME_REVOKE rump___sysimpl_revoke
#endif
+#ifndef RUMP_SYS_RENAME_GETITIMER
+#define RUMP_SYS_RENAME_GETITIMER rump___sysimpl_getitimer50
+#endif
+
#ifndef RUMP_SYS_RENAME_SETXATTR
#define RUMP_SYS_RENAME_SETXATTR rump___sysimpl_setxattr
#endif
@@ -404,6 +436,10 @@
#define RUMP_SYS_RENAME_UTIMENSAT rump___sysimpl_utimensat
#endif
+#ifndef RUMP_SYS_RENAME_ADJTIME
+#define RUMP_SYS_RENAME_ADJTIME rump___sysimpl_adjtime50
+#endif
+
#ifndef RUMP_SYS_RENAME_PIPE2
#define RUMP_SYS_RENAME_PIPE2 rump___sysimpl_pipe2
#endif
@@ -436,6 +472,10 @@
#define RUMP_SYS_RENAME_LREMOVEXATTR rump___sysimpl_lremovexattr
#endif
+#ifndef RUMP_SYS_RENAME_TIMER_DELETE
+#define RUMP_SYS_RENAME_TIMER_DELETE rump___sysimpl_timer_delete
+#endif
+
#ifndef RUMP_SYS_RENAME_CHROOT
#define RUMP_SYS_RENAME_CHROOT rump___sysimpl_chroot
#endif
@@ -464,6 +504,10 @@
#define RUMP_SYS_RENAME_LSEEK rump___sysimpl_lseek
#endif
+#ifndef RUMP_SYS_RENAME_SETTIMEOFDAY
+#define RUMP_SYS_RENAME_SETTIMEOFDAY rump___sysimpl_settimeofday50
+#endif
+
#ifndef RUMP_SYS_RENAME_FHSTATVFS1
#define RUMP_SYS_RENAME_FHSTATVFS1 rump___sysimpl_fhstatvfs140
#endif
@@ -540,6 +584,10 @@
#define RUMP_SYS_RENAME_GETPID_WITH_PPID rump___sysimpl_getpid
#endif
+#ifndef RUMP_SYS_RENAME_NANOSLEEP
+#define RUMP_SYS_RENAME_NANOSLEEP rump___sysimpl_nanosleep50
+#endif
+
#ifndef RUMP_SYS_RENAME_FUTIMES
#define RUMP_SYS_RENAME_FUTIMES rump___sysimpl_futimes50
#endif
@@ -548,6 +596,14 @@
#define RUMP_SYS_RENAME_RENAMEAT rump___sysimpl_renameat
#endif
+#ifndef RUMP_SYS_RENAME_TIMER_GETTIME
+#define RUMP_SYS_RENAME_TIMER_GETTIME rump___sysimpl_timer_gettime50
+#endif
+
+#ifndef RUMP_SYS_RENAME_TIMER_SETTIME
+#define RUMP_SYS_RENAME_TIMER_SETTIME rump___sysimpl_timer_settime50
+#endif
+
#ifndef RUMP_SYS_RENAME_LSETXATTR
#define RUMP_SYS_RENAME_LSETXATTR rump___sysimpl_lsetxattr
#endif
@@ -592,6 +648,10 @@
#define RUMP_SYS_RENAME_SYNC rump___sysimpl_sync
#endif
+#ifndef RUMP_SYS_RENAME_GETTIMEOFDAY
+#define RUMP_SYS_RENAME_GETTIMEOFDAY rump___sysimpl_gettimeofday50
+#endif
+
#ifndef RUMP_SYS_RENAME_SELECT
#define RUMP_SYS_RENAME_SELECT rump___sysimpl_select50
#endif
@@ -726,10 +786,13 @@ struct timeval;
struct iovec;
struct rlimit;
struct pollfd;
+struct sigevent;
struct timespec;
struct kevent;
struct statvfs;
struct stat;
+struct itimerval;
+struct itimerspec;
struct quotactl_args;
struct mmsghdr;
@@ -819,6 +882,9 @@ int rump_sys_futimes(int, const struct t
pid_t rump_sys_getpgid(pid_t) __RENAME(RUMP_SYS_RENAME_GETPGID);
int rump_sys_reboot(int, char *) __RENAME(RUMP_SYS_RENAME_REBOOT);
int rump_sys_poll(struct pollfd *, u_int, int) __RENAME(RUMP_SYS_RENAME_POLL);
+int rump_sys_timer_create(clockid_t, struct sigevent *, timer_t *) __RENAME(RUMP_SYS_RENAME_TIMER_CREATE);
+int rump_sys_timer_delete(timer_t) __RENAME(RUMP_SYS_RENAME_TIMER_DELETE);
+int rump_sys_timer_getoverrun(timer_t) __RENAME(RUMP_SYS_RENAME_TIMER_GETOVERRUN);
int rump_sys_fdatasync(int) __RENAME(RUMP_SYS_RENAME_FDATASYNC);
int rump_sys_modctl(int, void *) __RENAME(RUMP_SYS_RENAME_MODCTL);
int rump_sys__ksem_init(unsigned int, intptr_t *) __RENAME(RUMP_SYS_RENAME__KSEM_INIT);
@@ -887,6 +953,17 @@ int rump_sys_fhstatvfs1(const void *, si
int rump_sys_fhstat(const void *, size_t, struct stat *) __RENAME(RUMP_SYS_RENAME_FHSTAT);
int rump_sys_mount(const char *, const char *, int, void *, size_t) __RENAME(RUMP_SYS_RENAME_MOUNT);
int rump_sys_posix_fadvise(int, off_t, off_t, int) __RENAME(RUMP_SYS_RENAME_POSIX_FADVISE);
+int rump_sys_gettimeofday(struct timeval *, void *) __RENAME(RUMP_SYS_RENAME_GETTIMEOFDAY);
+int rump_sys_settimeofday(const struct timeval *, const void *) __RENAME(RUMP_SYS_RENAME_SETTIMEOFDAY);
+int rump_sys_adjtime(const struct timeval *, struct timeval *) __RENAME(RUMP_SYS_RENAME_ADJTIME);
+int rump_sys_setitimer(int, const struct itimerval *, struct itimerval *) __RENAME(RUMP_SYS_RENAME_SETITIMER);
+int rump_sys_getitimer(int, struct itimerval *) __RENAME(RUMP_SYS_RENAME_GETITIMER);
+int rump_sys_clock_gettime(clockid_t, struct timespec *) __RENAME(RUMP_SYS_RENAME_CLOCK_GETTIME);
+int rump_sys_clock_settime(clockid_t, const struct timespec *) __RENAME(RUMP_SYS_RENAME_CLOCK_SETTIME);
+int rump_sys_clock_getres(clockid_t, struct timespec *) __RENAME(RUMP_SYS_RENAME_CLOCK_GETRES);
+int rump_sys_nanosleep(const struct timespec *, struct timespec *) __RENAME(RUMP_SYS_RENAME_NANOSLEEP);
+int rump_sys_timer_settime(timer_t, int, const struct itimerspec *, struct itimerspec *) __RENAME(RUMP_SYS_RENAME_TIMER_SETTIME);
+int rump_sys_timer_gettime(timer_t, struct itimerspec *) __RENAME(RUMP_SYS_RENAME_TIMER_GETTIME);
int rump_sys_pipe2(int *, int) __RENAME(RUMP_SYS_RENAME_PIPE2);
int rump_sys_dup3(int, int, int) __RENAME(RUMP_SYS_RENAME_DUP3);
int rump_sys_kqueue1(int) __RENAME(RUMP_SYS_RENAME_KQUEUE1);
@@ -909,6 +986,7 @@ int rump_sys_futimens(int, const struct
int rump_sys___quotactl(const char *, struct quotactl_args *) __RENAME(RUMP_SYS_RENAME___QUOTACTL);
int rump_sys_recvmmsg(int, struct mmsghdr *, unsigned int, unsigned int, struct timespec *) __RENAME(RUMP_SYS_RENAME_RECVMMSG);
int rump_sys_sendmmsg(int, struct mmsghdr *, unsigned int, unsigned int) __RENAME(RUMP_SYS_RENAME_SENDMMSG);
+int rump_sys_clock_nanosleep(clockid_t, int, const struct timespec *, struct timespec *) __RENAME(RUMP_SYS_RENAME_CLOCK_NANOSLEEP);
int rump_sys_pipe(int *);
#endif /* _RUMP_RUMP_SYSCALLS_H_ */
Index: src/sys/rump/librump/rumpkern/rump_syscalls.c
diff -u src/sys/rump/librump/rumpkern/rump_syscalls.c:1.97 src/sys/rump/librump/rumpkern/rump_syscalls.c:1.98
--- src/sys/rump/librump/rumpkern/rump_syscalls.c:1.97 Wed Dec 11 09:45:02 2013
+++ src/sys/rump/librump/rumpkern/rump_syscalls.c Fri Mar 14 00:56:37 2014
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.c,v 1.97 2013/12/11 09:45:02 pooka Exp $ */
+/* $NetBSD: rump_syscalls.c,v 1.98 2014/03/14 00:56:37 pooka Exp $ */
/*
* System call vector and marshalling for rump.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.266 2013/12/11 09:40:56 pooka Exp
+ * created from NetBSD: syscalls.master,v 1.267 2014/03/14 00:52:08 pooka Exp
*/
#ifdef RUMP_CLIENT
@@ -15,7 +15,7 @@
#ifdef __NetBSD__
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.97 2013/12/11 09:45:02 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.98 2014/03/14 00:56:37 pooka Exp $");
#include <sys/fstypes.h>
#include <sys/proc.h>
@@ -2275,6 +2275,83 @@ rump___sysimpl_poll(struct pollfd * fds,
rsys_define(rumpns_sys_poll);
rsys_aliases(poll,rump___sysimpl_poll);
+int rump___sysimpl_timer_create(clockid_t, struct sigevent *, timer_t *);
+int
+rump___sysimpl_timer_create(clockid_t clock_id, struct sigevent * evp, timer_t * timerid)
+{
+ register_t retval[2];
+ int error = 0;
+ int rv = -1;
+ struct sys_timer_create_args callarg;
+
+ memset(&callarg, 0, sizeof(callarg));
+ SPARG(&callarg, clock_id) = clock_id;
+ SPARG(&callarg, evp) = evp;
+ SPARG(&callarg, timerid) = timerid;
+
+ error = rsys_syscall(SYS_timer_create, &callarg, sizeof(callarg), retval);
+ rsys_seterrno(error);
+ if (error == 0) {
+ if (sizeof(int) > sizeof(register_t))
+ rv = *(int *)retval;
+ else
+ rv = *retval;
+ }
+ return rv;
+}
+rsys_define(rumpns_sys_timer_create);
+rsys_aliases(timer_create,rump___sysimpl_timer_create);
+
+int rump___sysimpl_timer_delete(timer_t);
+int
+rump___sysimpl_timer_delete(timer_t timerid)
+{
+ register_t retval[2];
+ int error = 0;
+ int rv = -1;
+ struct sys_timer_delete_args callarg;
+
+ memset(&callarg, 0, sizeof(callarg));
+ SPARG(&callarg, timerid) = timerid;
+
+ error = rsys_syscall(SYS_timer_delete, &callarg, sizeof(callarg), retval);
+ rsys_seterrno(error);
+ if (error == 0) {
+ if (sizeof(int) > sizeof(register_t))
+ rv = *(int *)retval;
+ else
+ rv = *retval;
+ }
+ return rv;
+}
+rsys_define(rumpns_sys_timer_delete);
+rsys_aliases(timer_delete,rump___sysimpl_timer_delete);
+
+int rump___sysimpl_timer_getoverrun(timer_t);
+int
+rump___sysimpl_timer_getoverrun(timer_t timerid)
+{
+ register_t retval[2];
+ int error = 0;
+ int rv = -1;
+ struct sys_timer_getoverrun_args callarg;
+
+ memset(&callarg, 0, sizeof(callarg));
+ SPARG(&callarg, timerid) = timerid;
+
+ error = rsys_syscall(SYS_timer_getoverrun, &callarg, sizeof(callarg), retval);
+ rsys_seterrno(error);
+ if (error == 0) {
+ if (sizeof(int) > sizeof(register_t))
+ rv = *(int *)retval;
+ else
+ rv = *retval;
+ }
+ return rv;
+}
+rsys_define(rumpns_sys_timer_getoverrun);
+rsys_aliases(timer_getoverrun,rump___sysimpl_timer_getoverrun);
+
int rump___sysimpl_fdatasync(int);
int
rump___sysimpl_fdatasync(int fd)
@@ -4134,6 +4211,58 @@ rump___sysimpl_select50(int nd, fd_set *
rsys_define(rumpns_sys___select50);
rsys_aliases(__select50,rump___sysimpl_select50);
+int rump___sysimpl_gettimeofday50(struct timeval *, void *);
+int
+rump___sysimpl_gettimeofday50(struct timeval * tp, void * tzp)
+{
+ register_t retval[2];
+ int error = 0;
+ int rv = -1;
+ struct sys___gettimeofday50_args callarg;
+
+ memset(&callarg, 0, sizeof(callarg));
+ SPARG(&callarg, tp) = tp;
+ SPARG(&callarg, tzp) = tzp;
+
+ error = rsys_syscall(SYS___gettimeofday50, &callarg, sizeof(callarg), retval);
+ rsys_seterrno(error);
+ if (error == 0) {
+ if (sizeof(int) > sizeof(register_t))
+ rv = *(int *)retval;
+ else
+ rv = *retval;
+ }
+ return rv;
+}
+rsys_define(rumpns_sys___gettimeofday50);
+rsys_aliases(__gettimeofday50,rump___sysimpl_gettimeofday50);
+
+int rump___sysimpl_settimeofday50(const struct timeval *, const void *);
+int
+rump___sysimpl_settimeofday50(const struct timeval * tv, const void * tzp)
+{
+ register_t retval[2];
+ int error = 0;
+ int rv = -1;
+ struct sys___settimeofday50_args callarg;
+
+ memset(&callarg, 0, sizeof(callarg));
+ SPARG(&callarg, tv) = tv;
+ SPARG(&callarg, tzp) = tzp;
+
+ error = rsys_syscall(SYS___settimeofday50, &callarg, sizeof(callarg), retval);
+ rsys_seterrno(error);
+ if (error == 0) {
+ if (sizeof(int) > sizeof(register_t))
+ rv = *(int *)retval;
+ else
+ rv = *retval;
+ }
+ return rv;
+}
+rsys_define(rumpns_sys___settimeofday50);
+rsys_aliases(__settimeofday50,rump___sysimpl_settimeofday50);
+
int rump___sysimpl_utimes50(const char *, const struct timeval *);
int
rump___sysimpl_utimes50(const char * path, const struct timeval * tptr)
@@ -4160,6 +4289,32 @@ rump___sysimpl_utimes50(const char * pat
rsys_define(rumpns_sys___utimes50);
rsys_aliases(__utimes50,rump___sysimpl_utimes50);
+int rump___sysimpl_adjtime50(const struct timeval *, struct timeval *);
+int
+rump___sysimpl_adjtime50(const struct timeval * delta, struct timeval * olddelta)
+{
+ register_t retval[2];
+ int error = 0;
+ int rv = -1;
+ struct sys___adjtime50_args callarg;
+
+ memset(&callarg, 0, sizeof(callarg));
+ SPARG(&callarg, delta) = delta;
+ SPARG(&callarg, olddelta) = olddelta;
+
+ error = rsys_syscall(SYS___adjtime50, &callarg, sizeof(callarg), retval);
+ rsys_seterrno(error);
+ if (error == 0) {
+ if (sizeof(int) > sizeof(register_t))
+ rv = *(int *)retval;
+ else
+ rv = *retval;
+ }
+ return rv;
+}
+rsys_define(rumpns_sys___adjtime50);
+rsys_aliases(__adjtime50,rump___sysimpl_adjtime50);
+
int rump___sysimpl_futimes50(int, const struct timeval *);
int
rump___sysimpl_futimes50(int fd, const struct timeval * tptr)
@@ -4212,6 +4367,163 @@ rump___sysimpl_lutimes50(const char * pa
rsys_define(rumpns_sys___lutimes50);
rsys_aliases(__lutimes50,rump___sysimpl_lutimes50);
+int rump___sysimpl_setitimer50(int, const struct itimerval *, struct itimerval *);
+int
+rump___sysimpl_setitimer50(int which, const struct itimerval * itv, struct itimerval * oitv)
+{
+ register_t retval[2];
+ int error = 0;
+ int rv = -1;
+ struct sys___setitimer50_args callarg;
+
+ memset(&callarg, 0, sizeof(callarg));
+ SPARG(&callarg, which) = which;
+ SPARG(&callarg, itv) = itv;
+ SPARG(&callarg, oitv) = oitv;
+
+ error = rsys_syscall(SYS___setitimer50, &callarg, sizeof(callarg), retval);
+ rsys_seterrno(error);
+ if (error == 0) {
+ if (sizeof(int) > sizeof(register_t))
+ rv = *(int *)retval;
+ else
+ rv = *retval;
+ }
+ return rv;
+}
+rsys_define(rumpns_sys___setitimer50);
+rsys_aliases(__setitimer50,rump___sysimpl_setitimer50);
+
+int rump___sysimpl_getitimer50(int, struct itimerval *);
+int
+rump___sysimpl_getitimer50(int which, struct itimerval * itv)
+{
+ register_t retval[2];
+ int error = 0;
+ int rv = -1;
+ struct sys___getitimer50_args callarg;
+
+ memset(&callarg, 0, sizeof(callarg));
+ SPARG(&callarg, which) = which;
+ SPARG(&callarg, itv) = itv;
+
+ error = rsys_syscall(SYS___getitimer50, &callarg, sizeof(callarg), retval);
+ rsys_seterrno(error);
+ if (error == 0) {
+ if (sizeof(int) > sizeof(register_t))
+ rv = *(int *)retval;
+ else
+ rv = *retval;
+ }
+ return rv;
+}
+rsys_define(rumpns_sys___getitimer50);
+rsys_aliases(__getitimer50,rump___sysimpl_getitimer50);
+
+int rump___sysimpl_clock_gettime50(clockid_t, struct timespec *);
+int
+rump___sysimpl_clock_gettime50(clockid_t clock_id, struct timespec * tp)
+{
+ register_t retval[2];
+ int error = 0;
+ int rv = -1;
+ struct sys___clock_gettime50_args callarg;
+
+ memset(&callarg, 0, sizeof(callarg));
+ SPARG(&callarg, clock_id) = clock_id;
+ SPARG(&callarg, tp) = tp;
+
+ error = rsys_syscall(SYS___clock_gettime50, &callarg, sizeof(callarg), retval);
+ rsys_seterrno(error);
+ if (error == 0) {
+ if (sizeof(int) > sizeof(register_t))
+ rv = *(int *)retval;
+ else
+ rv = *retval;
+ }
+ return rv;
+}
+rsys_define(rumpns_sys___clock_gettime50);
+rsys_aliases(__clock_gettime50,rump___sysimpl_clock_gettime50);
+
+int rump___sysimpl_clock_settime50(clockid_t, const struct timespec *);
+int
+rump___sysimpl_clock_settime50(clockid_t clock_id, const struct timespec * tp)
+{
+ register_t retval[2];
+ int error = 0;
+ int rv = -1;
+ struct sys___clock_settime50_args callarg;
+
+ memset(&callarg, 0, sizeof(callarg));
+ SPARG(&callarg, clock_id) = clock_id;
+ SPARG(&callarg, tp) = tp;
+
+ error = rsys_syscall(SYS___clock_settime50, &callarg, sizeof(callarg), retval);
+ rsys_seterrno(error);
+ if (error == 0) {
+ if (sizeof(int) > sizeof(register_t))
+ rv = *(int *)retval;
+ else
+ rv = *retval;
+ }
+ return rv;
+}
+rsys_define(rumpns_sys___clock_settime50);
+rsys_aliases(__clock_settime50,rump___sysimpl_clock_settime50);
+
+int rump___sysimpl_clock_getres50(clockid_t, struct timespec *);
+int
+rump___sysimpl_clock_getres50(clockid_t clock_id, struct timespec * tp)
+{
+ register_t retval[2];
+ int error = 0;
+ int rv = -1;
+ struct sys___clock_getres50_args callarg;
+
+ memset(&callarg, 0, sizeof(callarg));
+ SPARG(&callarg, clock_id) = clock_id;
+ SPARG(&callarg, tp) = tp;
+
+ error = rsys_syscall(SYS___clock_getres50, &callarg, sizeof(callarg), retval);
+ rsys_seterrno(error);
+ if (error == 0) {
+ if (sizeof(int) > sizeof(register_t))
+ rv = *(int *)retval;
+ else
+ rv = *retval;
+ }
+ return rv;
+}
+rsys_define(rumpns_sys___clock_getres50);
+rsys_aliases(__clock_getres50,rump___sysimpl_clock_getres50);
+
+int rump___sysimpl_nanosleep50(const struct timespec *, struct timespec *);
+int
+rump___sysimpl_nanosleep50(const struct timespec * rqtp, struct timespec * rmtp)
+{
+ register_t retval[2];
+ int error = 0;
+ int rv = -1;
+ struct sys___nanosleep50_args callarg;
+
+ memset(&callarg, 0, sizeof(callarg));
+ SPARG(&callarg, rqtp) = rqtp;
+ SPARG(&callarg, rmtp) = rmtp;
+
+ error = rsys_syscall(SYS___nanosleep50, &callarg, sizeof(callarg), retval);
+ rsys_seterrno(error);
+ if (error == 0) {
+ if (sizeof(int) > sizeof(register_t))
+ rv = *(int *)retval;
+ else
+ rv = *retval;
+ }
+ return rv;
+}
+rsys_define(rumpns_sys___nanosleep50);
+rsys_aliases(__nanosleep50,rump___sysimpl_nanosleep50);
+
int rump___sysimpl_kevent50(int, const struct kevent *, size_t, struct kevent *, size_t, const struct timespec *);
int
rump___sysimpl_kevent50(int fd, const struct kevent * changelist, size_t nchanges, struct kevent * eventlist, size_t nevents, const struct timespec * timeout)
@@ -4378,6 +4690,60 @@ rump___sysimpl_lstat50(const char * path
rsys_define(rumpns_sys___lstat50);
rsys_aliases(__lstat50,rump___sysimpl_lstat50);
+int rump___sysimpl_timer_settime50(timer_t, int, const struct itimerspec *, struct itimerspec *);
+int
+rump___sysimpl_timer_settime50(timer_t timerid, int flags, const struct itimerspec * value, struct itimerspec * ovalue)
+{
+ register_t retval[2];
+ int error = 0;
+ int rv = -1;
+ struct sys___timer_settime50_args callarg;
+
+ memset(&callarg, 0, sizeof(callarg));
+ SPARG(&callarg, timerid) = timerid;
+ SPARG(&callarg, flags) = flags;
+ SPARG(&callarg, value) = value;
+ SPARG(&callarg, ovalue) = ovalue;
+
+ error = rsys_syscall(SYS___timer_settime50, &callarg, sizeof(callarg), retval);
+ rsys_seterrno(error);
+ if (error == 0) {
+ if (sizeof(int) > sizeof(register_t))
+ rv = *(int *)retval;
+ else
+ rv = *retval;
+ }
+ return rv;
+}
+rsys_define(rumpns_sys___timer_settime50);
+rsys_aliases(__timer_settime50,rump___sysimpl_timer_settime50);
+
+int rump___sysimpl_timer_gettime50(timer_t, struct itimerspec *);
+int
+rump___sysimpl_timer_gettime50(timer_t timerid, struct itimerspec * value)
+{
+ register_t retval[2];
+ int error = 0;
+ int rv = -1;
+ struct sys___timer_gettime50_args callarg;
+
+ memset(&callarg, 0, sizeof(callarg));
+ SPARG(&callarg, timerid) = timerid;
+ SPARG(&callarg, value) = value;
+
+ error = rsys_syscall(SYS___timer_gettime50, &callarg, sizeof(callarg), retval);
+ rsys_seterrno(error);
+ if (error == 0) {
+ if (sizeof(int) > sizeof(register_t))
+ rv = *(int *)retval;
+ else
+ rv = *retval;
+ }
+ return rv;
+}
+rsys_define(rumpns_sys___timer_gettime50);
+rsys_aliases(__timer_gettime50,rump___sysimpl_timer_gettime50);
+
int rump___sysimpl_mknod50(const char *, mode_t, dev_t);
int
rump___sysimpl_mknod50(const char * path, mode_t mode, dev_t dev)
@@ -5039,6 +5405,34 @@ rump___sysimpl_sendmmsg(int s, struct mm
rsys_define(rumpns_sys_sendmmsg);
rsys_aliases(sendmmsg,rump___sysimpl_sendmmsg);
+int rump___sysimpl_clock_nanosleep(clockid_t, int, const struct timespec *, struct timespec *);
+int
+rump___sysimpl_clock_nanosleep(clockid_t clock_id, int flags, const struct timespec * rqtp, struct timespec * rmtp)
+{
+ register_t retval[2];
+ int error = 0;
+ int rv = -1;
+ struct sys_clock_nanosleep_args callarg;
+
+ memset(&callarg, 0, sizeof(callarg));
+ SPARG(&callarg, clock_id) = clock_id;
+ SPARG(&callarg, flags) = flags;
+ SPARG(&callarg, rqtp) = rqtp;
+ SPARG(&callarg, rmtp) = rmtp;
+
+ error = rsys_syscall(SYS_clock_nanosleep, &callarg, sizeof(callarg), retval);
+ rsys_seterrno(error);
+ if (error == 0) {
+ if (sizeof(int) > sizeof(register_t))
+ rv = *(int *)retval;
+ else
+ rv = *retval;
+ }
+ return rv;
+}
+rsys_define(rumpns_sys_clock_nanosleep);
+rsys_aliases(clock_nanosleep,rump___sysimpl_clock_nanosleep);
+
int rump_sys_pipe(int *);
int
rump_sys_pipe(int *fd)
@@ -5587,16 +5981,16 @@ struct sysent rump_sysent[] = {
(sy_call_t *)rumpns_sys_nomodule }, /* 233 = clock_settime */
{ 0, 0, 0,
(sy_call_t *)rumpns_sys_nomodule }, /* 234 = clock_getres */
- { 0, 0, SYCALL_NOSYS,
- (sy_call_t *)rump_enosys }, /* 235 = timer_create */
- { 0, 0, SYCALL_NOSYS,
- (sy_call_t *)rump_enosys }, /* 236 = timer_delete */
+ { ns(struct sys_timer_create_args), 0,
+ (sy_call_t *)rumpns_sys_timer_create },/* 235 = timer_create */
+ { ns(struct sys_timer_delete_args), 0,
+ (sy_call_t *)rumpns_sys_timer_delete },/* 236 = timer_delete */
{ 0, 0, 0,
(sy_call_t *)rumpns_sys_nomodule }, /* 237 = timer_settime */
{ 0, 0, 0,
(sy_call_t *)rumpns_sys_nomodule }, /* 238 = timer_gettime */
- { 0, 0, SYCALL_NOSYS,
- (sy_call_t *)rump_enosys }, /* 239 = timer_getoverrun */
+ { ns(struct sys_timer_getoverrun_args), 0,
+ (sy_call_t *)rumpns_sys_timer_getoverrun },/* 239 = timer_getoverrun */
{ 0, 0, 0,
(sy_call_t *)rumpns_sys_nomodule }, /* 240 = nanosleep */
{ ns(struct sys_fdatasync_args), 0,
@@ -5968,32 +6362,32 @@ struct sysent rump_sysent[] = {
(sy_call_t *)rumpns_sys___posix_fadvise50 },/* 416 = __posix_fadvise50 */
{ ns(struct sys___select50_args), 0,
(sy_call_t *)rumpns_sys___select50 },/* 417 = __select50 */
- { 0, 0, SYCALL_NOSYS,
- (sy_call_t *)rump_enosys }, /* 418 = __gettimeofday50 */
- { 0, 0, SYCALL_NOSYS,
- (sy_call_t *)rump_enosys }, /* 419 = __settimeofday50 */
+ { ns(struct sys___gettimeofday50_args), 0,
+ (sy_call_t *)rumpns_sys___gettimeofday50 },/* 418 = __gettimeofday50 */
+ { ns(struct sys___settimeofday50_args), 0,
+ (sy_call_t *)rumpns_sys___settimeofday50 },/* 419 = __settimeofday50 */
{ ns(struct sys___utimes50_args), 0,
(sy_call_t *)rumpns_sys___utimes50 },/* 420 = __utimes50 */
- { 0, 0, SYCALL_NOSYS,
- (sy_call_t *)rump_enosys }, /* 421 = __adjtime50 */
+ { ns(struct sys___adjtime50_args), 0,
+ (sy_call_t *)rumpns_sys___adjtime50 },/* 421 = __adjtime50 */
{ 0, 0, 0,
(sy_call_t *)rumpns_sys_nomodule }, /* 422 = __lfs_segwait50 */
{ ns(struct sys___futimes50_args), 0,
(sy_call_t *)rumpns_sys___futimes50 },/* 423 = __futimes50 */
{ ns(struct sys___lutimes50_args), 0,
(sy_call_t *)rumpns_sys___lutimes50 },/* 424 = __lutimes50 */
- { 0, 0, SYCALL_NOSYS,
- (sy_call_t *)rump_enosys }, /* 425 = __setitimer50 */
- { 0, 0, SYCALL_NOSYS,
- (sy_call_t *)rump_enosys }, /* 426 = __getitimer50 */
- { 0, 0, SYCALL_NOSYS,
- (sy_call_t *)rump_enosys }, /* 427 = __clock_gettime50 */
- { 0, 0, SYCALL_NOSYS,
- (sy_call_t *)rump_enosys }, /* 428 = __clock_settime50 */
- { 0, 0, SYCALL_NOSYS,
- (sy_call_t *)rump_enosys }, /* 429 = __clock_getres50 */
- { 0, 0, SYCALL_NOSYS,
- (sy_call_t *)rump_enosys }, /* 430 = __nanosleep50 */
+ { ns(struct sys___setitimer50_args), 0,
+ (sy_call_t *)rumpns_sys___setitimer50 },/* 425 = __setitimer50 */
+ { ns(struct sys___getitimer50_args), 0,
+ (sy_call_t *)rumpns_sys___getitimer50 },/* 426 = __getitimer50 */
+ { ns(struct sys___clock_gettime50_args), 0,
+ (sy_call_t *)rumpns_sys___clock_gettime50 },/* 427 = __clock_gettime50 */
+ { ns(struct sys___clock_settime50_args), 0,
+ (sy_call_t *)rumpns_sys___clock_settime50 },/* 428 = __clock_settime50 */
+ { ns(struct sys___clock_getres50_args), 0,
+ (sy_call_t *)rumpns_sys___clock_getres50 },/* 429 = __clock_getres50 */
+ { ns(struct sys___nanosleep50_args), 0,
+ (sy_call_t *)rumpns_sys___nanosleep50 },/* 430 = __nanosleep50 */
{ 0, 0, SYCALL_NOSYS,
(sy_call_t *)rump_enosys }, /* 431 = ____sigtimedwait50 */
{ 0, 0, 0,
@@ -6039,10 +6433,10 @@ struct sysent rump_sysent[] = {
#endif
{ 0, 0, SYCALL_NOSYS,
(sy_call_t *)rump_enosys }, /* 445 = __getrusage50 */
- { 0, 0, SYCALL_NOSYS,
- (sy_call_t *)rump_enosys }, /* 446 = __timer_settime50 */
- { 0, 0, SYCALL_NOSYS,
- (sy_call_t *)rump_enosys }, /* 447 = __timer_gettime50 */
+ { ns(struct sys___timer_settime50_args), 0,
+ (sy_call_t *)rumpns_sys___timer_settime50 },/* 446 = __timer_settime50 */
+ { ns(struct sys___timer_gettime50_args), 0,
+ (sy_call_t *)rumpns_sys___timer_gettime50 },/* 447 = __timer_gettime50 */
#if defined(NTP) || !defined(_KERNEL_OPT)
{ 0, 0, SYCALL_NOSYS,
(sy_call_t *)rump_enosys }, /* 448 = __ntp_gettime50 */
@@ -6106,8 +6500,8 @@ struct sysent rump_sysent[] = {
(sy_call_t *)rumpns_sys_recvmmsg }, /* 475 = recvmmsg */
{ ns(struct sys_sendmmsg_args), 0,
(sy_call_t *)rumpns_sys_sendmmsg }, /* 476 = sendmmsg */
- { 0, 0, SYCALL_NOSYS,
- (sy_call_t *)rump_enosys }, /* 477 = clock_nanosleep */
+ { ns(struct sys_clock_nanosleep_args), 0,
+ (sy_call_t *)rumpns_sys_clock_nanosleep },/* 477 = clock_nanosleep */
{ 0, 0, SYCALL_NOSYS,
(sy_call_t *)rump_enosys }, /* 478 = ___lwp_park60 */
{ 0, 0, SYCALL_NOSYS,
Index: src/sys/sys/syscall.h
diff -u src/sys/sys/syscall.h:1.267 src/sys/sys/syscall.h:1.268
--- src/sys/sys/syscall.h:1.267 Wed Dec 11 09:45:01 2013
+++ src/sys/sys/syscall.h Fri Mar 14 00:56:37 2014
@@ -1,10 +1,10 @@
-/* $NetBSD: syscall.h,v 1.267 2013/12/11 09:45:01 pooka Exp $ */
+/* $NetBSD: syscall.h,v 1.268 2014/03/14 00:56:37 pooka Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.266 2013/12/11 09:40:56 pooka Exp
+ * created from NetBSD: syscalls.master,v 1.267 2014/03/14 00:52:08 pooka Exp
*/
#ifndef _SYS_SYSCALL_H_
Index: src/sys/sys/syscallargs.h
diff -u src/sys/sys/syscallargs.h:1.250 src/sys/sys/syscallargs.h:1.251
--- src/sys/sys/syscallargs.h:1.250 Wed Dec 11 09:45:01 2013
+++ src/sys/sys/syscallargs.h Fri Mar 14 00:56:37 2014
@@ -1,10 +1,10 @@
-/* $NetBSD: syscallargs.h,v 1.250 2013/12/11 09:45:01 pooka Exp $ */
+/* $NetBSD: syscallargs.h,v 1.251 2014/03/14 00:56:37 pooka Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.266 2013/12/11 09:40:56 pooka Exp
+ * created from NetBSD: syscalls.master,v 1.267 2014/03/14 00:52:08 pooka Exp
*/
#ifndef _SYS_SYSCALLARGS_H_
@@ -1455,21 +1455,17 @@ struct compat_50_sys_clock_getres_args {
check_syscall_args(compat_50_sys_clock_getres)
#endif /* !RUMP_CLIENT */
-#ifndef RUMP_CLIENT
struct sys_timer_create_args {
syscallarg(clockid_t) clock_id;
syscallarg(struct sigevent *) evp;
syscallarg(timer_t *) timerid;
};
check_syscall_args(sys_timer_create)
-#endif /* !RUMP_CLIENT */
-#ifndef RUMP_CLIENT
struct sys_timer_delete_args {
syscallarg(timer_t) timerid;
};
check_syscall_args(sys_timer_delete)
-#endif /* !RUMP_CLIENT */
#ifndef RUMP_CLIENT
struct compat_50_sys_timer_settime_args {
@@ -1489,12 +1485,10 @@ struct compat_50_sys_timer_gettime_args
check_syscall_args(compat_50_sys_timer_gettime)
#endif /* !RUMP_CLIENT */
-#ifndef RUMP_CLIENT
struct sys_timer_getoverrun_args {
syscallarg(timer_t) timerid;
};
check_syscall_args(sys_timer_getoverrun)
-#endif /* !RUMP_CLIENT */
#ifndef RUMP_CLIENT
struct compat_50_sys_nanosleep_args {
@@ -2691,21 +2685,17 @@ struct sys___select50_args {
};
check_syscall_args(sys___select50)
-#ifndef RUMP_CLIENT
struct sys___gettimeofday50_args {
syscallarg(struct timeval *) tp;
syscallarg(void *) tzp;
};
check_syscall_args(sys___gettimeofday50)
-#endif /* !RUMP_CLIENT */
-#ifndef RUMP_CLIENT
struct sys___settimeofday50_args {
syscallarg(const struct timeval *) tv;
syscallarg(const void *) tzp;
};
check_syscall_args(sys___settimeofday50)
-#endif /* !RUMP_CLIENT */
struct sys___utimes50_args {
syscallarg(const char *) path;
@@ -2713,13 +2703,11 @@ struct sys___utimes50_args {
};
check_syscall_args(sys___utimes50)
-#ifndef RUMP_CLIENT
struct sys___adjtime50_args {
syscallarg(const struct timeval *) delta;
syscallarg(struct timeval *) olddelta;
};
check_syscall_args(sys___adjtime50)
-#endif /* !RUMP_CLIENT */
#ifndef RUMP_CLIENT
struct sys___lfs_segwait50_args {
@@ -2741,54 +2729,42 @@ struct sys___lutimes50_args {
};
check_syscall_args(sys___lutimes50)
-#ifndef RUMP_CLIENT
struct sys___setitimer50_args {
syscallarg(int) which;
syscallarg(const struct itimerval *) itv;
syscallarg(struct itimerval *) oitv;
};
check_syscall_args(sys___setitimer50)
-#endif /* !RUMP_CLIENT */
-#ifndef RUMP_CLIENT
struct sys___getitimer50_args {
syscallarg(int) which;
syscallarg(struct itimerval *) itv;
};
check_syscall_args(sys___getitimer50)
-#endif /* !RUMP_CLIENT */
-#ifndef RUMP_CLIENT
struct sys___clock_gettime50_args {
syscallarg(clockid_t) clock_id;
syscallarg(struct timespec *) tp;
};
check_syscall_args(sys___clock_gettime50)
-#endif /* !RUMP_CLIENT */
-#ifndef RUMP_CLIENT
struct sys___clock_settime50_args {
syscallarg(clockid_t) clock_id;
syscallarg(const struct timespec *) tp;
};
check_syscall_args(sys___clock_settime50)
-#endif /* !RUMP_CLIENT */
-#ifndef RUMP_CLIENT
struct sys___clock_getres50_args {
syscallarg(clockid_t) clock_id;
syscallarg(struct timespec *) tp;
};
check_syscall_args(sys___clock_getres50)
-#endif /* !RUMP_CLIENT */
-#ifndef RUMP_CLIENT
struct sys___nanosleep50_args {
syscallarg(const struct timespec *) rqtp;
syscallarg(struct timespec *) rmtp;
};
check_syscall_args(sys___nanosleep50)
-#endif /* !RUMP_CLIENT */
#ifndef RUMP_CLIENT
struct sys_____sigtimedwait50_args {
@@ -2931,7 +2907,6 @@ struct sys___getrusage50_args {
check_syscall_args(sys___getrusage50)
#endif /* !RUMP_CLIENT */
-#ifndef RUMP_CLIENT
struct sys___timer_settime50_args {
syscallarg(timer_t) timerid;
syscallarg(int) flags;
@@ -2939,15 +2914,12 @@ struct sys___timer_settime50_args {
syscallarg(struct itimerspec *) ovalue;
};
check_syscall_args(sys___timer_settime50)
-#endif /* !RUMP_CLIENT */
-#ifndef RUMP_CLIENT
struct sys___timer_gettime50_args {
syscallarg(timer_t) timerid;
syscallarg(struct itimerspec *) value;
};
check_syscall_args(sys___timer_gettime50)
-#endif /* !RUMP_CLIENT */
#if defined(NTP) || !defined(_KERNEL_OPT)
#ifndef RUMP_CLIENT
@@ -3171,7 +3143,6 @@ struct sys_sendmmsg_args {
};
check_syscall_args(sys_sendmmsg)
-#ifndef RUMP_CLIENT
struct sys_clock_nanosleep_args {
syscallarg(clockid_t) clock_id;
syscallarg(int) flags;
@@ -3179,7 +3150,6 @@ struct sys_clock_nanosleep_args {
syscallarg(struct timespec *) rmtp;
};
check_syscall_args(sys_clock_nanosleep)
-#endif /* !RUMP_CLIENT */
#ifndef RUMP_CLIENT
struct sys____lwp_park60_args {
