Module Name: src
Committed By: pooka
Date: Mon Feb 21 12:49:49 UTC 2011
Modified Files:
src/sys/rump/include/rump: rump_syscalls.h
src/sys/rump/librump/rumpkern: rump_syscalls.c
Log Message:
regen: preadv/pwritev
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/rump/include/rump/rump_syscalls.h
cvs rdiff -u -r1.63 -r1.64 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.41 src/sys/rump/include/rump/rump_syscalls.h:1.42
--- src/sys/rump/include/rump/rump_syscalls.h:1.41 Mon Feb 21 11:33:36 2011
+++ src/sys/rump/include/rump/rump_syscalls.h Mon Feb 21 12:49:49 2011
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.h,v 1.41 2011/02/21 11:33:36 pooka Exp $ */
+/* $NetBSD: rump_syscalls.h,v 1.42 2011/02/21 12:49:49 pooka Exp $ */
/*
* System call protos in rump namespace.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.243 2011/01/31 00:05:29 christos Exp
+ * created from NetBSD: syscalls.master,v 1.244 2011/02/21 12:49:06 pooka Exp
*/
#ifndef _RUMP_RUMP_SYSCALLS_H_
@@ -41,6 +41,10 @@
#define RUMP_SYS_RENAME_FHSTATVFS1 rump___sysimpl_fhstatvfs140
#endif
+#ifndef RUMP_SYS_RENAME_PWRITEV
+#define RUMP_SYS_RENAME_PWRITEV rump___sysimpl_pwritev
+#endif
+
#ifndef RUMP_SYS_RENAME_EXTATTR_GET_LINK
#define RUMP_SYS_RENAME_EXTATTR_GET_LINK rump___sysimpl_extattr_get_link
#endif
@@ -113,6 +117,10 @@
#define RUMP_SYS_RENAME_EXTATTR_SET_FD rump___sysimpl_extattr_set_fd
#endif
+#ifndef RUMP_SYS_RENAME_PREADV
+#define RUMP_SYS_RENAME_PREADV rump___sysimpl_preadv
+#endif
+
#ifndef RUMP_SYS_RENAME_PATHCONF
#define RUMP_SYS_RENAME_PATHCONF rump___sysimpl_pathconf
#endif
@@ -724,6 +732,8 @@
int rump_sys_lchown(const char *, uid_t, gid_t) __RENAME(RUMP_SYS_RENAME_LCHOWN);
int rump_sys_lutimes(const char *, const struct timeval *) __RENAME(RUMP_SYS_RENAME_LUTIMES);
pid_t rump_sys_getsid(pid_t) __RENAME(RUMP_SYS_RENAME_GETSID);
+ssize_t rump_sys_preadv(int, const struct iovec *, int, off_t) __RENAME(RUMP_SYS_RENAME_PREADV);
+ssize_t rump_sys_pwritev(int, const struct iovec *, int, off_t) __RENAME(RUMP_SYS_RENAME_PWRITEV);
int rump_sys___getcwd(char *, size_t) __RENAME(RUMP_SYS_RENAME___GETCWD);
int rump_sys_fchroot(int) __RENAME(RUMP_SYS_RENAME_FCHROOT);
int rump_sys_lchflags(const char *, u_long) __RENAME(RUMP_SYS_RENAME_LCHFLAGS);
Index: src/sys/rump/librump/rumpkern/rump_syscalls.c
diff -u src/sys/rump/librump/rumpkern/rump_syscalls.c:1.63 src/sys/rump/librump/rumpkern/rump_syscalls.c:1.64
--- src/sys/rump/librump/rumpkern/rump_syscalls.c:1.63 Mon Feb 21 11:33:36 2011
+++ src/sys/rump/librump/rumpkern/rump_syscalls.c Mon Feb 21 12:49:49 2011
@@ -1,14 +1,14 @@
-/* $NetBSD: rump_syscalls.c,v 1.63 2011/02/21 11:33:36 pooka Exp $ */
+/* $NetBSD: rump_syscalls.c,v 1.64 2011/02/21 12:49:49 pooka Exp $ */
/*
* System call vector and marshalling for rump.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.243 2011/01/31 00:05:29 christos Exp
+ * created from NetBSD: syscalls.master,v 1.244 2011/02/21 12:49:06 pooka Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.63 2011/02/21 11:33:36 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.64 2011/02/21 12:49:49 pooka Exp $");
#include <sys/param.h>
#include <sys/fstypes.h>
@@ -2060,6 +2060,52 @@
}
rsys_alias(sys_getsid,rump_enosys)
+ssize_t rump___sysimpl_preadv(int, const struct iovec *, int, off_t);
+ssize_t
+rump___sysimpl_preadv(int fd, const struct iovec * iovp, int iovcnt, off_t offset)
+{
+ register_t rval[2] = {0, 0};
+ int error = 0;
+ struct sys_preadv_args callarg;
+
+ SPARG(&callarg, fd) = fd;
+ SPARG(&callarg, iovp) = iovp;
+ SPARG(&callarg, iovcnt) = iovcnt;
+ SPARG(&callarg, PAD) = 0;
+ SPARG(&callarg, offset) = offset;
+
+ error = rsys_syscall(SYS_preadv, &callarg, sizeof(callarg), rval);
+ rsys_seterrno(error);
+ if (error) {
+ rval[0] = -1;
+ }
+ return rval[0];
+}
+rsys_alias(sys_preadv,rump_enosys)
+
+ssize_t rump___sysimpl_pwritev(int, const struct iovec *, int, off_t);
+ssize_t
+rump___sysimpl_pwritev(int fd, const struct iovec * iovp, int iovcnt, off_t offset)
+{
+ register_t rval[2] = {0, 0};
+ int error = 0;
+ struct sys_pwritev_args callarg;
+
+ SPARG(&callarg, fd) = fd;
+ SPARG(&callarg, iovp) = iovp;
+ SPARG(&callarg, iovcnt) = iovcnt;
+ SPARG(&callarg, PAD) = 0;
+ SPARG(&callarg, offset) = offset;
+
+ error = rsys_syscall(SYS_pwritev, &callarg, sizeof(callarg), rval);
+ rsys_seterrno(error);
+ if (error) {
+ rval[0] = -1;
+ }
+ return rval[0];
+}
+rsys_alias(sys_pwritev,rump_enosys)
+
int rump___sysimpl___getcwd(char *, size_t);
int
rump___sysimpl___getcwd(char * bufp, size_t length)
@@ -3996,10 +4042,10 @@
(sy_call_t *)rump_enosys }, /* 287 = __clone */
{ 0, 0, SYCALL_NOSYS,
(sy_call_t *)rump_enosys }, /* 288 = fktrace */
- { 0, 0, SYCALL_NOSYS,
- (sy_call_t *)rump_enosys }, /* 289 = preadv */
- { 0, 0, SYCALL_NOSYS,
- (sy_call_t *)rump_enosys }, /* 290 = pwritev */
+ { ns(struct sys_preadv_args), 0,
+ (sy_call_t *)sys_preadv }, /* 289 = preadv */
+ { ns(struct sys_pwritev_args), 0,
+ (sy_call_t *)sys_pwritev }, /* 290 = pwritev */
{ 0, 0, 0,
(sy_call_t *)sys_nomodule }, /* 291 = __sigaction14 */
{ 0, 0, SYCALL_NOSYS,
