| Message ID | 1494611894-9282-9-git-send-email-adhemerval.zanella@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | [01/13] posix: Consolidate Linux pause syscall | expand |
On Friday 12 May 2017 11:28 PM, Adhemerval Zanella wrote: > This patch consolidates the vmsplice Linux syscall generation on > sysdeps/unix/sysv/linux/vmsplice.c. It basically removes it from > architectures auto-generation list. > > Checked on i686-linux-gnu, x86_64-linux-gnu, x86_64-linux-gnux32, > arch64-linux-gnu, arm-linux-gnueabihf, powerpc64le-linux-gnu, > sparc64-linux-gnu, and sparcv9-linux-gnu. > > * sysdeps/unix/sysv/linux/Makefile (CFLAGS-vmsplice.c): New flag. > * sysdeps/unix/sysv/linux/syscalls.list (vmsplice): Remove from > auto-generation syscall list. > * sysdeps/unix/sysv/linux/vmsplice.c: New file. This is fine. Siddhesh
On Fri, 12 May 2017, Adhemerval Zanella wrote:
> * sysdeps/unix/sysv/linux/Makefile (CFLAGS-vmsplice.c): New flag.
This ChangeLog entry refers to CFLAGS-vmsplice.c in
sysdeps/unix/sysv/linux/Makefile. However, you appear to have committed
an addition of CFLAGS-vmsplice.c to misc/Makefile. That's wrong; vmsplice
is a Linux-specific API, not otherwise mentioned in misc/Makefile at all,
so the CFLAGS setting belongs in sysdeps/unix/sysv/linux/Makefile.
The same applies to splice and open_by_handle_at: when it's a sysdeps
Makefile that causes the source for the API to be built at all (as opposed
to having an ENOSYS system-independent stub and a system-independent
Makefile entry to build the API everywhere), all other relevant Makefile
settings should also be in sysdeps.
--
Joseph S. Myers
joseph@codesourcery.com
On 19/05/2017 08:24, Joseph Myers wrote: > On Fri, 12 May 2017, Adhemerval Zanella wrote: > >> * sysdeps/unix/sysv/linux/Makefile (CFLAGS-vmsplice.c): New flag. > > This ChangeLog entry refers to CFLAGS-vmsplice.c in > sysdeps/unix/sysv/linux/Makefile. However, you appear to have committed > an addition of CFLAGS-vmsplice.c to misc/Makefile. That's wrong; vmsplice > is a Linux-specific API, not otherwise mentioned in misc/Makefile at all, > so the CFLAGS setting belongs in sysdeps/unix/sysv/linux/Makefile. > > The same applies to splice and open_by_handle_at: when it's a sysdeps > Makefile that causes the source for the API to be built at all (as opposed > to having an ENOSYS system-independent stub and a system-independent > Makefile entry to build the API everywhere), all other relevant Makefile > settings should also be in sysdeps. > Thanks for spotting it, I fixed it on 1d71a63.
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index acdd04c..492963b 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -17,7 +17,7 @@ include $(firstword $(wildcard $(sysdirs:=/sysctl.mk))) sysdep_routines += clone umount umount2 readahead \ setfsuid setfsgid epoll_pwait signalfd \ eventfd eventfd_read eventfd_write prlimit \ - personality epoll_wait tee + personality epoll_wait tee vmsplice CFLAGS-gethostid.c = -fexceptions CFLAGS-tst-writev.c += "-DARTIFICIAL_LIMIT=(0x80000000-sysconf(_SC_PAGESIZE))" diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list index c69eff4..9d7bd65 100644 --- a/sysdeps/unix/sysv/linux/syscalls.list +++ b/sysdeps/unix/sysv/linux/syscalls.list @@ -72,7 +72,6 @@ swapoff - swapoff i:s __swapoff swapoff unshare EXTRA unshare i:i unshare uselib EXTRA uselib i:s __compat_uselib uselib@GLIBC_2.0:GLIBC_2.23 utime - utime i:sP utime -vmsplice EXTRA vmsplice Ci:iPii vmsplice wait4 - wait4 i:iWiP __wait4 wait4 chown - chown i:sii __libc_chown __chown chown diff --git a/sysdeps/unix/sysv/linux/vmsplice.c b/sysdeps/unix/sysv/linux/vmsplice.c new file mode 100644 index 0000000..01dac13 --- /dev/null +++ b/sysdeps/unix/sysv/linux/vmsplice.c @@ -0,0 +1,27 @@ +/* Splice user pages into a pipe Linux implementation. + Copyright (C) 2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#include <fcntl.h> +#include <sys/uio.h> +#include <sysdep-cancel.h> + +ssize_t +vmsplice (int fd, const struct iovec *iov, size_t count, unsigned int flags) +{ + return SYSCALL_CANCEL (vmsplice, fd, iov, count, flags); +}