[src/trunk]: src Move "shotgun approach to rump syscalls" from rump.h to a se...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src Move "shotgun approach to rump syscalls" from rump.h to a se...
From: pooka <pooka%NetBSD.org@localhost>
Date: Tue, 07 Apr 2020 05:50:02 +0000
details:   https://anonhg.NetBSD.org/src/rev/aef80799c250
branches:  trunk
changeset: 813511:aef80799c250
user:      pooka <pooka%NetBSD.org@localhost>
date:      Sun Jan 31 23:14:34 2016 +0000

description:
Move "shotgun approach to rump syscalls" from rump.h to a separate header,
sort of as a hint that relying on those macros is not necessarily the
way you want to do things in 2016.  Include things from rump.h for compat
for the time being, though.

diffstat:

 distrib/sets/lists/comp/mi                  |    3 +-
 sys/rump/include/rump/Makefile              |    3 +-
 sys/rump/include/rump/rump.h                |   89 +-------------------
 sys/rump/include/rump/rump_syscallshotgun.h |  118 ++++++++++++++++++++++++++++
 4 files changed, 127 insertions(+), 86 deletions(-)

diffs (259 lines):

diff -r f5b9af650f81 -r aef80799c250 distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi        Sun Jan 31 23:11:49 2016 +0000
+++ b/distrib/sets/lists/comp/mi        Sun Jan 31 23:14:34 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: mi,v 1.2015 2016/01/24 17:14:10 christos Exp $
+#      $NetBSD: mi,v 1.2016 2016/01/31 23:14:34 pooka Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.comp                           comp-sys-root
@@ -2661,6 +2661,7 @@
 ./usr/include/rump/rump_namei.h                        comp-c-include  rump
 ./usr/include/rump/rump_syscalls.h             comp-c-include  rump
 ./usr/include/rump/rump_syscalls_compat.h      comp-c-include  rump
+./usr/include/rump/rump_syscallshotgun.h       comp-c-include  rump
 ./usr/include/rump/rumpclient.h                        comp-c-include  rump
 ./usr/include/rump/rumpdefs.h                  comp-c-include  rump
 ./usr/include/rump/rumperr.h                   comp-c-include  rump
diff -r f5b9af650f81 -r aef80799c250 sys/rump/include/rump/Makefile
--- a/sys/rump/include/rump/Makefile    Sun Jan 31 23:11:49 2016 +0000
+++ b/sys/rump/include/rump/Makefile    Sun Jan 31 23:14:34 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2015/09/15 14:57:34 pooka Exp $
+#      $NetBSD: Makefile,v 1.9 2016/01/31 23:14:34 pooka Exp $
 
 .include <bsd.own.mk>
 
@@ -6,6 +6,7 @@
 
 .if (${MKRUMP} != "no")
 INCS=          rump.h rump_namei.h rump_syscalls.h rump_syscalls_compat.h
+INCS+=         rump_syscallshotgun.h
 INCS+=         rumpdefs.h rumperr.h rumperrno2host.h rumpuser.h rumpvnode_if.h
 
 INCS+=         rumpkern_if_pub.h rumpvfs_if_pub.h rumpnet_if_pub.h
diff -r f5b9af650f81 -r aef80799c250 sys/rump/include/rump/rump.h
--- a/sys/rump/include/rump/rump.h      Sun Jan 31 23:11:49 2016 +0000
+++ b/sys/rump/include/rump/rump.h      Sun Jan 31 23:14:34 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rump.h,v 1.67 2016/01/29 20:35:48 christos Exp $       */
+/*     $NetBSD: rump.h,v 1.68 2016/01/31 23:14:34 pooka Exp $  */
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -132,89 +132,10 @@
 #endif
 
 /*
- * Begin rump syscall conditionals.  Yes, something a little better
- * is required here.
+ * Include macros prehistorically provided by this header.
+ * The inclusion might go away some year.  Include the header directly
+ * if you want it to keep working for you.
  */
-#ifdef RUMP_SYS_NETWORKING
-#include <sys/socket.h>
-#define socket(a,b,c) rump_sys_socket(a,b,c)
-#define accept(a,b,c) rump_sys_accept(a,b,c)
-#define bind(a,b,c) rump_sys_bind(a,b,c)
-#define connect(a,b,c) rump_sys_connect(a,b,c)
-#define getpeername(a,b,c) rump_sys_getpeername(a,b,c)
-#define getsockname(a,b,c) rump_sys_getsockname(a,b,c)
-#define listen(a,b) rump_sys_listen(a,b)
-#define recvfrom(a,b,c,d,e,f) rump_sys_recvfrom(a,b,c,d,e,f)
-#define recvmsg(a,b,c) rump_sys_recvmsg(a,b,c)
-#define sendto(a,b,c,d,e,f) rump_sys_sendto(a,b,c,d,e,f)
-#define sendmsg(a,b,c) rump_sys_sendmsg(a,b,c)
-#define getsockopt(a,b,c,d,e) rump_sys_getsockopt(a,b,c,d,e)
-#define setsockopt(a,b,c,d,e) rump_sys_setsockopt(a,b,c,d,e)
-#define shutdown(a,b) rump_sys_shutdown(a,b)
-#endif /* RUMP_SYS_NETWORKING */
-
-#ifdef RUMP_SYS_IOCTL
-#include <sys/ioctl.h>
-#define ioctl(...) rump_sys_ioctl(__VA_ARGS__)
-#define fcntl(...) rump_sys_fcntl(__VA_ARGS__)
-#endif /* RUMP_SYS_IOCTL */
-
-#ifdef RUMP_SYS_CLOSE
-#include <fcntl.h>
-#define close(a) rump_sys_close(a)
-#endif /* RUMP_SYS_CLOSE */
-
-#ifdef RUMP_SYS_OPEN
-#include <fcntl.h>
-#define open(...) rump_sys_open(__VA_ARGS__)
-#endif /* RUMP_SYS_OPEN */
-
-#ifdef RUMP_SYS_READWRITE
-#include <fcntl.h>
-#define read(a,b,c) rump_sys_read(a,b,c)
-#define readv(a,b,c) rump_sys_readv(a,b,c)
-#define pread(a,b,c,d) rump_sys_pread(a,b,c,d)
-#define preadv(a,b,c,d) rump_sys_preadv(a,b,c,d)
-#define write(a,b,c) rump_sys_write(a,b,c)
-#define writev(a,b,c) rump_sys_writev(a,b,c)
-#define pwrite(a,b,c,d) rump_sys_pwrite(a,b,c,d)
-#define pwritev(a,b,c,d) rump_sys_pwritev(a,b,c,d)
-#endif /* RUMP_SYS_READWRITE */
-
-#ifdef RUMP_SYS_FILEOPS
-#include <stdlib.h>
-#include <unistd.h>
-#define mkdir(a,b) rump_sys_mkdir(a,b)
-#define rmdir(a) rump_sys_rmdir(a)
-#define link(a,b) rump_sys_link(a,b)
-#define symlink(a,b) rump_sys_symlink(a,b)
-#define unlink(a) rump_sys_unlink(a)
-#define readlink(a,b,c) rump_sys_readlink(a,b,c)
-#define chdir(a) rump_sys_chdir(a)
-#define fsync(a) rump_sys_fsync(a)
-#define sync() rump_sys_sync()
-#define chown(a,b,c) rump_sys_chown(a,b,c)
-#define fchown(a,b,c) rump_sys_fchown(a,b,c)
-#define lchown(a,b,c) rump_sys_lchown(a,b,c)
-#define lseek(a,b,c) rump_sys_lseek(a,b,c)
-#define mknod(a,b,c) rump_sys_mknod(a,b,c)
-#define rename(a,b) rump_sys_rename(a,b)
-#define truncate(a,b) rump_sys_truncate(a,b)
-#define ftruncate(a,b) rump_sys_ftruncate(a,b)
-#define umask(a) rump_sys_umask(a)
-#define getdents(a,b,c) rump_sys_getdents(a,b,c)
-#endif /* RUMP_SYS_FILEOPS */
-
-#ifdef RUMP_SYS_STAT
-#include <sys/stat.h>
-#define stat(a,b) rump_sys_stat(a,b)
-#define fstat(a,b) rump_sys_fstat(a,b)
-#define lstat(a,b) rump_sys_lstat(a,b)
-#endif /* RUMP_SYS_STAT */
-
-#ifdef RUMP_SYS_PROCOPS
-#include <unistd.h>
-#define getpid() rump_sys_getpid()
-#endif /* RUMP_SYS_PROCOPS */
+#include <rump/rump_syscallshotgun.h>
 
 #endif /* _RUMP_RUMP_H_ */
diff -r f5b9af650f81 -r aef80799c250 sys/rump/include/rump/rump_syscallshotgun.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/include/rump/rump_syscallshotgun.h       Sun Jan 31 23:14:34 2016 +0000
@@ -0,0 +1,118 @@
+/*     $NetBSD: rump_syscallshotgun.h,v 1.1 2016/01/31 23:14:34 pooka Exp $    */
+
+/*
+ * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * "shotgun approach to rump syscalls", as stated in the original
+ * commit message
+ */
+
+#ifndef _RUMP_RUMP_SYSCALLSHOTGUN_H_
+#define _RUMP_RUMP_SYSCALLSHOTGUN_H_
+
+#ifdef RUMP_SYS_NETWORKING
+#include <sys/socket.h>
+#define socket(a,b,c) rump_sys_socket(a,b,c)
+#define accept(a,b,c) rump_sys_accept(a,b,c)
+#define bind(a,b,c) rump_sys_bind(a,b,c)
+#define connect(a,b,c) rump_sys_connect(a,b,c)
+#define getpeername(a,b,c) rump_sys_getpeername(a,b,c)
+#define getsockname(a,b,c) rump_sys_getsockname(a,b,c)
+#define listen(a,b) rump_sys_listen(a,b)
+#define recvfrom(a,b,c,d,e,f) rump_sys_recvfrom(a,b,c,d,e,f)
+#define recvmsg(a,b,c) rump_sys_recvmsg(a,b,c)
+#define sendto(a,b,c,d,e,f) rump_sys_sendto(a,b,c,d,e,f)
+#define sendmsg(a,b,c) rump_sys_sendmsg(a,b,c)
+#define getsockopt(a,b,c,d,e) rump_sys_getsockopt(a,b,c,d,e)
+#define setsockopt(a,b,c,d,e) rump_sys_setsockopt(a,b,c,d,e)
+#define shutdown(a,b) rump_sys_shutdown(a,b)
+#endif /* RUMP_SYS_NETWORKING */
+
+#ifdef RUMP_SYS_IOCTL
+#include <sys/ioctl.h>
+#define ioctl(...) rump_sys_ioctl(__VA_ARGS__)
+#define fcntl(...) rump_sys_fcntl(__VA_ARGS__)
+#endif /* RUMP_SYS_IOCTL */
+
+#ifdef RUMP_SYS_CLOSE
+#include <fcntl.h>
+#define close(a) rump_sys_close(a)
+#endif /* RUMP_SYS_CLOSE */
+
+#ifdef RUMP_SYS_OPEN
+#include <fcntl.h>
+#define open(...) rump_sys_open(__VA_ARGS__)
+#endif /* RUMP_SYS_OPEN */
+
+#ifdef RUMP_SYS_READWRITE
+#include <fcntl.h>
+#define read(a,b,c) rump_sys_read(a,b,c)
+#define readv(a,b,c) rump_sys_readv(a,b,c)
+#define pread(a,b,c,d) rump_sys_pread(a,b,c,d)
+#define preadv(a,b,c,d) rump_sys_preadv(a,b,c,d)
+#define write(a,b,c) rump_sys_write(a,b,c)
+#define writev(a,b,c) rump_sys_writev(a,b,c)
+#define pwrite(a,b,c,d) rump_sys_pwrite(a,b,c,d)
+#define pwritev(a,b,c,d) rump_sys_pwritev(a,b,c,d)
+#endif /* RUMP_SYS_READWRITE */
+
+#ifdef RUMP_SYS_FILEOPS
+#include <stdlib.h>
+#include <unistd.h>
+#define mkdir(a,b) rump_sys_mkdir(a,b)
+#define rmdir(a) rump_sys_rmdir(a)
+#define link(a,b) rump_sys_link(a,b)
+#define symlink(a,b) rump_sys_symlink(a,b)
+#define unlink(a) rump_sys_unlink(a)
+#define readlink(a,b,c) rump_sys_readlink(a,b,c)
+#define chdir(a) rump_sys_chdir(a)
+#define fsync(a) rump_sys_fsync(a)
+#define sync() rump_sys_sync()
+#define chown(a,b,c) rump_sys_chown(a,b,c)
+#define fchown(a,b,c) rump_sys_fchown(a,b,c)
+#define lchown(a,b,c) rump_sys_lchown(a,b,c)
+#define lseek(a,b,c) rump_sys_lseek(a,b,c)
+#define mknod(a,b,c) rump_sys_mknod(a,b,c)
+#define rename(a,b) rump_sys_rename(a,b)
+#define truncate(a,b) rump_sys_truncate(a,b)
+#define ftruncate(a,b) rump_sys_ftruncate(a,b)
+#define umask(a) rump_sys_umask(a)
+#define getdents(a,b,c) rump_sys_getdents(a,b,c)
+#endif /* RUMP_SYS_FILEOPS */
+
+#ifdef RUMP_SYS_STAT
+#include <sys/stat.h>
+#define stat(a,b) rump_sys_stat(a,b)
+#define fstat(a,b) rump_sys_fstat(a,b)
+#define lstat(a,b) rump_sys_lstat(a,b)
+#endif /* RUMP_SYS_STAT */
+
+#ifdef RUMP_SYS_PROCOPS
+#include <unistd.h>
+#define getpid() rump_sys_getpid()
+#endif /* RUMP_SYS_PROCOPS */
+
+#endif /* _RUMP_RUMP_SYSCALLSHOTGUN_H_ */
Prev by Date: [src/trunk]: src/sbin/disklabel fix broken patch
Next by Date: [src/trunk]: src/lib/libc/gen PR/50695: coypu: ctrl-c in su password input br...
Previous by Thread: [src/trunk]: src/sbin/disklabel fix broken patch
Next by Thread: [src/trunk]: src/lib/libc/gen PR/50695: coypu: ctrl-c in su password input br...
Indexes:
Home | Main Index | Thread Index | Old Index