Module Name: src
Committed By: pooka
Date: Fri Aug 30 10:34:39 UTC 2013
Modified Files:
src/sys/rump/include/rump: rump_syscalls.h
src/sys/rump/librump/rumpkern: rump_syscalls.c
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/rump/include/rump/rump_syscalls.h
cvs rdiff -u -r1.88 -r1.89 src/sys/rump/librump/rumpkern/rump_syscalls.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/include/rump/rump_syscalls.h
diff -u src/sys/rump/include/rump/rump_syscalls.h:1.63 src/sys/rump/include/rump/rump_syscalls.h:1.64
--- src/sys/rump/include/rump/rump_syscalls.h:1.63 Thu Aug 15 21:19:14 2013
+++ src/sys/rump/include/rump/rump_syscalls.h Fri Aug 30 10:34:39 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.h,v 1.63 2013/08/15 21:19:14 pooka Exp $ */
+/* $NetBSD: rump_syscalls.h,v 1.64 2013/08/30 10:34:39 pooka Exp $ */
/*
* System call protos in rump namespace.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.262 2013/03/29 01:08:17 christos Exp
+ * created from NetBSD: syscalls.master,v 1.263 2013/08/30 10:33:10 pooka Exp
*/
#ifndef _RUMP_RUMP_SYSCALLS_H_
@@ -272,6 +272,10 @@
#define RUMP_SYS_RENAME_FREMOVEXATTR rump___sysimpl_fremovexattr
#endif
+#ifndef RUMP_SYS_RENAME_RECVMMSG
+#define RUMP_SYS_RENAME_RECVMMSG rump___sysimpl_recvmmsg
+#endif
+
#ifndef RUMP_SYS_RENAME_MOUNT
#define RUMP_SYS_RENAME_MOUNT rump___sysimpl_mount50
#endif
@@ -324,10 +328,6 @@
#define RUMP_SYS_RENAME_SHUTDOWN rump___sysimpl_shutdown
#endif
-#ifndef RUMP_SYS_RENAME_FEXECVE
-#define RUMP_SYS_RENAME_FEXECVE rump___sysimpl_fexecve
-#endif
-
#ifndef RUMP_SYS_RENAME_PREADV
#define RUMP_SYS_RENAME_PREADV rump___sysimpl_preadv
#endif
@@ -612,6 +612,10 @@
#define RUMP_SYS_RENAME_GETPGRP rump___sysimpl_getpgrp
#endif
+#ifndef RUMP_SYS_RENAME_SENDMMSG
+#define RUMP_SYS_RENAME_SENDMMSG rump___sysimpl_sendmmsg
+#endif
+
#ifndef RUMP_SYS_RENAME___SYSCTL
#define RUMP_SYS_RENAME___SYSCTL rump___sysimpl___sysctl
#endif
@@ -715,6 +719,7 @@ struct kevent;
struct statvfs;
struct stat;
struct quotactl_args;
+struct mmsghdr;
ssize_t rump_sys_read(int, void *, size_t) __RENAME(RUMP_SYS_RENAME_READ);
ssize_t rump_sys_write(int, const void *, size_t) __RENAME(RUMP_SYS_RENAME_WRITE);
@@ -879,7 +884,6 @@ int rump_sys_mkdirat(int, const char *,
int rump_sys_faccessat(int, const char *, int, int) __RENAME(RUMP_SYS_RENAME_FACCESSAT);
int rump_sys_fchmodat(int, const char *, mode_t, int) __RENAME(RUMP_SYS_RENAME_FCHMODAT);
int rump_sys_fchownat(int, const char *, uid_t, gid_t, int) __RENAME(RUMP_SYS_RENAME_FCHOWNAT);
-int rump_sys_fexecve(int, char *const *, char *const *) __RENAME(RUMP_SYS_RENAME_FEXECVE);
int rump_sys_fstatat(int, const char *, struct stat *, int) __RENAME(RUMP_SYS_RENAME_FSTATAT);
int rump_sys_utimensat(int, const char *, const struct timespec *, int) __RENAME(RUMP_SYS_RENAME_UTIMENSAT);
int rump_sys_openat(int, const char *, int, ...) __RENAME(RUMP_SYS_RENAME_OPENAT);
@@ -888,6 +892,8 @@ int rump_sys_symlinkat(const char *, int
int rump_sys_unlinkat(int, const char *, int) __RENAME(RUMP_SYS_RENAME_UNLINKAT);
int rump_sys_futimens(int, const struct timespec *) __RENAME(RUMP_SYS_RENAME_FUTIMENS);
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_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.88 src/sys/rump/librump/rumpkern/rump_syscalls.c:1.89
--- src/sys/rump/librump/rumpkern/rump_syscalls.c:1.88 Thu Aug 15 21:19:13 2013
+++ src/sys/rump/librump/rumpkern/rump_syscalls.c Fri Aug 30 10:34:39 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.c,v 1.88 2013/08/15 21:19:13 pooka Exp $ */
+/* $NetBSD: rump_syscalls.c,v 1.89 2013/08/30 10:34:39 pooka Exp $ */
/*
* System call vector and marshalling for rump.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.262 2013/03/29 01:08:17 christos Exp
+ * created from NetBSD: syscalls.master,v 1.263 2013/08/30 10:33:10 pooka Exp
*/
#ifdef RUMP_CLIENT
@@ -15,7 +15,7 @@
#ifdef __NetBSD__
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.88 2013/08/15 21:19:13 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.89 2013/08/30 10:34:39 pooka Exp $");
#include <sys/fstypes.h>
#include <sys/proc.h>
@@ -4347,31 +4347,6 @@ rump___sysimpl_fchownat(int fd, const ch
}
rsys_alias(sys_fchownat,rump_enosys)
-int rump___sysimpl_fexecve(int, char *const *, char *const *);
-int
-rump___sysimpl_fexecve(int fd, char *const * argp, char *const * envp)
-{
- register_t retval[2] = {0, 0};
- int error = 0;
- int rv = -1;
- struct sys_fexecve_args callarg;
-
- SPARG(&callarg, fd) = fd;
- SPARG(&callarg, argp) = argp;
- SPARG(&callarg, envp) = envp;
-
- error = rsys_syscall(SYS_fexecve, &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_alias(sys_fexecve,rump_enosys)
-
int rump___sysimpl_fstatat(int, const char *, struct stat *, int);
int
rump___sysimpl_fstatat(int fd, const char * path, struct stat * buf, int flag)
@@ -4574,6 +4549,59 @@ rump___sysimpl___quotactl(const char * p
}
rsys_alias(sys___quotactl,rump_enosys)
+int rump___sysimpl_recvmmsg(int, struct mmsghdr *, unsigned int, unsigned int, struct timespec *);
+int
+rump___sysimpl_recvmmsg(int s, struct mmsghdr * mmsg, unsigned int vlen, unsigned int flags, struct timespec * timeout)
+{
+ register_t retval[2] = {0, 0};
+ int error = 0;
+ int rv = -1;
+ struct sys_recvmmsg_args callarg;
+
+ SPARG(&callarg, s) = s;
+ SPARG(&callarg, mmsg) = mmsg;
+ SPARG(&callarg, vlen) = vlen;
+ SPARG(&callarg, flags) = flags;
+ SPARG(&callarg, timeout) = timeout;
+
+ error = rsys_syscall(SYS_recvmmsg, &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_alias(sys_recvmmsg,rump_enosys)
+
+int rump___sysimpl_sendmmsg(int, struct mmsghdr *, unsigned int, unsigned int);
+int
+rump___sysimpl_sendmmsg(int s, struct mmsghdr * mmsg, unsigned int vlen, unsigned int flags)
+{
+ register_t retval[2] = {0, 0};
+ int error = 0;
+ int rv = -1;
+ struct sys_sendmmsg_args callarg;
+
+ SPARG(&callarg, s) = s;
+ SPARG(&callarg, mmsg) = mmsg;
+ SPARG(&callarg, vlen) = vlen;
+ SPARG(&callarg, flags) = flags;
+
+ error = rsys_syscall(SYS_sendmmsg, &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_alias(sys_sendmmsg,rump_enosys)
+
int rump_sys_pipe(int *);
int
rump_sys_pipe(int *fd)
@@ -5615,8 +5643,8 @@ struct sysent rump_sysent[] = {
(sy_call_t *)sys_fchmodat }, /* 463 = fchmodat */
{ ns(struct sys_fchownat_args), 0,
(sy_call_t *)sys_fchownat }, /* 464 = fchownat */
- { ns(struct sys_fexecve_args), 0,
- (sy_call_t *)sys_fexecve }, /* 465 = fexecve */
+ { 0, 0, SYCALL_NOSYS,
+ (sy_call_t *)rump_enosys }, /* 465 = fexecve */
{ ns(struct sys_fstatat_args), 0,
(sy_call_t *)sys_fstatat }, /* 466 = fstatat */
{ ns(struct sys_utimensat_args), 0,
@@ -5635,10 +5663,10 @@ struct sysent rump_sysent[] = {
(sy_call_t *)sys___quotactl }, /* 473 = __quotactl */
{ 0, 0, SYCALL_NOSYS,
(sy_call_t *)rump_enosys }, /* 474 = posix_spawn */
- { 0, 0, SYCALL_NOSYS,
- (sy_call_t *)rump_enosys }, /* 475 = recvmmsg */
- { 0, 0, SYCALL_NOSYS,
- (sy_call_t *)rump_enosys }, /* 476 = sendmmsg */
+ { ns(struct sys_recvmmsg_args), 0,
+ (sy_call_t *)sys_recvmmsg }, /* 475 = recvmmsg */
+ { ns(struct sys_sendmmsg_args), 0,
+ (sy_call_t *)sys_sendmmsg }, /* 476 = sendmmsg */
{ 0, 0, SYCALL_NOSYS,
(sy_call_t *)rump_enosys }, /* 477 = clock_nanosleep */
{ 0, 0, SYCALL_NOSYS,
