Module Name: src
Committed By: pooka
Date: Mon Dec 9 17:15:11 UTC 2013
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
To generate a diff of this commit:
cvs rdiff -u -r1.276 -r1.277 src/sys/kern/init_sysent.c
cvs rdiff -u -r1.267 -r1.268 src/sys/kern/syscalls.c
cvs rdiff -u -r1.68 -r1.69 src/sys/rump/include/rump/rump_syscalls.h
cvs rdiff -u -r1.93 -r1.94 src/sys/rump/librump/rumpkern/rump_syscalls.c
cvs rdiff -u -r1.263 -r1.264 src/sys/sys/syscall.h
cvs rdiff -u -r1.246 -r1.247 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.276 src/sys/kern/init_sysent.c:1.277
--- src/sys/kern/init_sysent.c:1.276 Mon Dec 9 16:35:12 2013
+++ src/sys/kern/init_sysent.c Mon Dec 9 17:15:11 2013
@@ -1,14 +1,14 @@
-/* $NetBSD: init_sysent.c,v 1.276 2013/12/09 16:35:12 pooka Exp $ */
+/* $NetBSD: init_sysent.c,v 1.277 2013/12/09 17:15:11 pooka Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.264 2013/10/17 18:01:11 njoly Exp
+ * created from NetBSD: syscalls.master,v 1.265 2013/12/09 17:13:17 pooka Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.276 2013/12/09 16:35:12 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.277 2013/12/09 17:15:11 pooka Exp $");
#include "opt_modular.h"
#include "opt_ntp.h"
Index: src/sys/kern/syscalls.c
diff -u src/sys/kern/syscalls.c:1.267 src/sys/kern/syscalls.c:1.268
--- src/sys/kern/syscalls.c:1.267 Mon Dec 9 16:35:12 2013
+++ src/sys/kern/syscalls.c Mon Dec 9 17:15:11 2013
@@ -1,14 +1,14 @@
-/* $NetBSD: syscalls.c,v 1.267 2013/12/09 16:35:12 pooka Exp $ */
+/* $NetBSD: syscalls.c,v 1.268 2013/12/09 17:15:11 pooka Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.264 2013/10/17 18:01:11 njoly Exp
+ * created from NetBSD: syscalls.master,v 1.265 2013/12/09 17:13:17 pooka Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.267 2013/12/09 16:35:12 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.268 2013/12/09 17:15:11 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.68 src/sys/rump/include/rump/rump_syscalls.h:1.69
--- src/sys/rump/include/rump/rump_syscalls.h:1.68 Mon Dec 9 16:35:12 2013
+++ src/sys/rump/include/rump/rump_syscalls.h Mon Dec 9 17:15:11 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.h,v 1.68 2013/12/09 16:35:12 pooka Exp $ */
+/* $NetBSD: rump_syscalls.h,v 1.69 2013/12/09 17:15:11 pooka Exp $ */
/*
* System call protos in rump namespace.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.264 2013/10/17 18:01:11 njoly Exp
+ * created from NetBSD: syscalls.master,v 1.265 2013/12/09 17:13:17 pooka Exp
*/
#ifndef _RUMP_RUMP_SYSCALLS_H_
@@ -272,6 +272,10 @@
#define RUMP_SYS_RENAME_EXTATTR_DELETE_FD rump___sysimpl_extattr_delete_fd
#endif
+#ifndef RUMP_SYS_RENAME_FKTRACE
+#define RUMP_SYS_RENAME_FKTRACE rump___sysimpl_fktrace
+#endif
+
#ifndef RUMP_SYS_RENAME_MODCTL
#define RUMP_SYS_RENAME_MODCTL rump___sysimpl_modctl
#endif
@@ -696,6 +700,10 @@
#define RUMP_SYS_RENAME_SETGID rump___sysimpl_setgid
#endif
+#ifndef RUMP_SYS_RENAME_KTRACE
+#define RUMP_SYS_RENAME_KTRACE rump___sysimpl_ktrace
+#endif
+
#ifndef RUMP_SYS_RENAME_LLISTXATTR
#define RUMP_SYS_RENAME_LLISTXATTR rump___sysimpl_llistxattr
#endif
@@ -750,6 +758,7 @@ void rump_sys_sync(void) __RENAME(RUMP_S
pid_t rump_sys_getppid(void) __RENAME(RUMP_SYS_RENAME_GETPPID);
int rump_sys_dup(int) __RENAME(RUMP_SYS_RENAME_DUP);
gid_t rump_sys_getegid(void) __RENAME(RUMP_SYS_RENAME_GETEGID);
+int rump_sys_ktrace(const char *, int, int, pid_t) __RENAME(RUMP_SYS_RENAME_KTRACE);
gid_t rump_sys_getgid(void) __RENAME(RUMP_SYS_RENAME_GETGID_WITH_EGID);
int rump_sys___getlogin(char *, size_t) __RENAME(RUMP_SYS_RENAME___GETLOGIN);
int rump_sys___setlogin(const char *) __RENAME(RUMP_SYS_RENAME___SETLOGIN);
@@ -822,6 +831,7 @@ int rump_sys_lchmod(const char *, mode_t
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);
+int rump_sys_fktrace(int, int, int, pid_t) __RENAME(RUMP_SYS_RENAME_FKTRACE);
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);
Index: src/sys/rump/librump/rumpkern/rump_syscalls.c
diff -u src/sys/rump/librump/rumpkern/rump_syscalls.c:1.93 src/sys/rump/librump/rumpkern/rump_syscalls.c:1.94
--- src/sys/rump/librump/rumpkern/rump_syscalls.c:1.93 Mon Dec 9 16:35:12 2013
+++ src/sys/rump/librump/rumpkern/rump_syscalls.c Mon Dec 9 17:15:11 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.c,v 1.93 2013/12/09 16:35:12 pooka Exp $ */
+/* $NetBSD: rump_syscalls.c,v 1.94 2013/12/09 17:15:11 pooka Exp $ */
/*
* System call vector and marshalling for rump.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.264 2013/10/17 18:01:11 njoly Exp
+ * created from NetBSD: syscalls.master,v 1.265 2013/12/09 17:13:17 pooka Exp
*/
#ifdef RUMP_CLIENT
@@ -15,7 +15,7 @@
#ifdef __NetBSD__
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.93 2013/12/09 16:35:12 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.94 2013/12/09 17:15:11 pooka Exp $");
#include <sys/fstypes.h>
#include <sys/proc.h>
@@ -758,6 +758,33 @@ rump___sysimpl_getegid(void )
rsys_define(rumpns_sys_getegid);
rsys_aliases(getegid,rump___sysimpl_getegid);
+int rump___sysimpl_ktrace(const char *, int, int, pid_t);
+int
+rump___sysimpl_ktrace(const char * fname, int ops, int facs, pid_t pid)
+{
+ register_t retval[2];
+ int error = 0;
+ int rv = -1;
+ struct sys_ktrace_args callarg;
+
+ SPARG(&callarg, fname) = fname;
+ SPARG(&callarg, ops) = ops;
+ SPARG(&callarg, facs) = facs;
+ SPARG(&callarg, pid) = pid;
+
+ error = rsys_syscall(SYS_ktrace, &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_ktrace);
+rsys_aliases(ktrace,rump___sysimpl_ktrace);
+
gid_t rump___sysimpl_getgid(void);
gid_t
rump___sysimpl_getgid(void )
@@ -2566,6 +2593,33 @@ rump___sysimpl_getsid(pid_t pid)
rsys_define(rumpns_sys_getsid);
rsys_aliases(getsid,rump___sysimpl_getsid);
+int rump___sysimpl_fktrace(int, int, int, pid_t);
+int
+rump___sysimpl_fktrace(int fd, int ops, int facs, pid_t pid)
+{
+ register_t retval[2];
+ int error = 0;
+ int rv = -1;
+ struct sys_fktrace_args callarg;
+
+ SPARG(&callarg, fd) = fd;
+ SPARG(&callarg, ops) = ops;
+ SPARG(&callarg, facs) = facs;
+ SPARG(&callarg, pid) = pid;
+
+ error = rsys_syscall(SYS_fktrace, &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_fktrace);
+rsys_aliases(fktrace,rump___sysimpl_fktrace);
+
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)
@@ -4896,8 +4950,8 @@ struct sysent rump_sysent[] = {
(sy_call_t *)rumpns_sys_getegid }, /* 43 = getegid */
{ 0, 0, SYCALL_NOSYS,
(sy_call_t *)rump_enosys }, /* 44 = profil */
- { 0, 0, SYCALL_NOSYS,
- (sy_call_t *)rump_enosys }, /* 45 = ktrace */
+ { ns(struct sys_ktrace_args), 0,
+ (sy_call_t *)rumpns_sys_ktrace }, /* 45 = ktrace */
{ 0, 0, 0,
(sy_call_t *)rumpns_sys_nomodule }, /* 46 = sigaction13 */
{ 0, 0, 0,
@@ -5435,8 +5489,8 @@ struct sysent rump_sysent[] = {
(sy_call_t *)rumpns_sys_getsid }, /* 286 = getsid */
{ 0, 0, SYCALL_NOSYS,
(sy_call_t *)rump_enosys }, /* 287 = __clone */
- { 0, 0, SYCALL_NOSYS,
- (sy_call_t *)rump_enosys }, /* 288 = fktrace */
+ { ns(struct sys_fktrace_args), 0,
+ (sy_call_t *)rumpns_sys_fktrace }, /* 288 = fktrace */
{ ns(struct sys_preadv_args), 0,
(sy_call_t *)rumpns_sys_preadv }, /* 289 = preadv */
{ ns(struct sys_pwritev_args), 0,
Index: src/sys/sys/syscall.h
diff -u src/sys/sys/syscall.h:1.263 src/sys/sys/syscall.h:1.264
--- src/sys/sys/syscall.h:1.263 Mon Dec 9 16:35:12 2013
+++ src/sys/sys/syscall.h Mon Dec 9 17:15:11 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: syscall.h,v 1.263 2013/12/09 16:35:12 pooka Exp $ */
+/* $NetBSD: syscall.h,v 1.264 2013/12/09 17:15:11 pooka Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.264 2013/10/17 18:01:11 njoly Exp
+ * created from NetBSD: syscalls.master,v 1.265 2013/12/09 17:13:17 pooka Exp
*/
#ifndef _SYS_SYSCALL_H_
Index: src/sys/sys/syscallargs.h
diff -u src/sys/sys/syscallargs.h:1.246 src/sys/sys/syscallargs.h:1.247
--- src/sys/sys/syscallargs.h:1.246 Mon Dec 9 16:35:12 2013
+++ src/sys/sys/syscallargs.h Mon Dec 9 17:15:11 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: syscallargs.h,v 1.246 2013/12/09 16:35:12 pooka Exp $ */
+/* $NetBSD: syscallargs.h,v 1.247 2013/12/09 17:15:11 pooka Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.264 2013/10/17 18:01:11 njoly Exp
+ * created from NetBSD: syscalls.master,v 1.265 2013/12/09 17:13:17 pooka Exp
*/
#ifndef _SYS_SYSCALLARGS_H_
@@ -294,7 +294,6 @@ struct sys_profil_args {
check_syscall_args(sys_profil)
#endif /* !RUMP_CLIENT */
-#ifndef RUMP_CLIENT
struct sys_ktrace_args {
syscallarg(const char *) fname;
syscallarg(int) ops;
@@ -302,7 +301,6 @@ struct sys_ktrace_args {
syscallarg(pid_t) pid;
};
check_syscall_args(sys_ktrace)
-#endif /* !RUMP_CLIENT */
#ifndef RUMP_CLIENT
struct compat_13_sys_sigaction_args {
@@ -1824,7 +1822,6 @@ struct sys___clone_args {
check_syscall_args(sys___clone)
#endif /* !RUMP_CLIENT */
-#ifndef RUMP_CLIENT
struct sys_fktrace_args {
syscallarg(int) fd;
syscallarg(int) ops;
@@ -1832,7 +1829,6 @@ struct sys_fktrace_args {
syscallarg(pid_t) pid;
};
check_syscall_args(sys_fktrace)
-#endif /* !RUMP_CLIENT */
struct sys_preadv_args {
syscallarg(int) fd;
