From af5fdf5a358329161cc3960f5e54fac16dbb8063 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Mon, 11 Apr 2016 15:07:12 -0300 Subject: Consolidate pwritev/pwritev64 implementations This patch consolidates all the pwritev{64} implementation for Linux in only one (sysdeps/unix/sysv/linux/pwritev{64}.c). It also removes the syscall from the auto-generation using assembly macros. It was based on previous pwrite/pwrite64 consolidation patch. The new macro SYSCALL_LL{64} is used to handle the offset argument and alias is created for __ASSUME_OFF_DIFF_OFF64 in case of pread64. Checked on x86_64, i386, aarch64, and powerpc64le. * misc/Makefile (CFLAGS-pwritev.c): New variable: add cancellation required flags. (CFLAGS-pwritev64.c): Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/pwritev.c: Remove file. * sysdeps/unix/sysv/linux/generic/wordsize-32/pwritev64.c: Likewise. * sysdeps/unix/sysv/linux/mips/mips64/n64/pwritev64.c: Likewise. * sysdeps/unix/sysv/linux/wordsize-64/pwritev.c: Likewise. * sysdeps/unix/sysv/linux/wordsize-64/pwritev64.: Likwise. * sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list (pwritev): Remove syscall from auto-generation. * sysdeps/unix/sysv/linux/pwritev.c: Rewrite implementation. [WORDSIZE == 64] (pwritev64): Remove macro. [!PWRITEV] (PWRITEV): Likewise. [!PWRITEV] (PWRITEV_REPLACEMENT): Likewise. [!PWRITEV] (PWRITE): Likewise. [!PWRITEV] (OFF_T): Likewise. [!__ASSUME_PWRITEV] (PWRITEV_REPLACEMENT): Likewise. (LO_HI_LONG): Remove macro. [__WORDSIZE != 64 || __ASSUME_OFF_DIFF_OFF64] (pwritev): Add function. * sysdeps/unix/sysv/linux/pwritev64.c: Rewrite implementation. (PWRITEV): Remove macro. (PWRITEV_REPLACEMENTE): Likewise. (PWRITE): Likewise. (OFF_T): Likewise. (pwritev64): New function. * nptl/tst-cancel4.c (tf_writev): Add test. --- .../unix/sysv/linux/generic/wordsize-32/pwritev.c | 37 ----------- .../sysv/linux/generic/wordsize-32/pwritev64.c | 38 ----------- .../unix/sysv/linux/mips/mips64/n64/pwritev64.c | 1 - sysdeps/unix/sysv/linux/pwritev.c | 77 +++++++--------------- sysdeps/unix/sysv/linux/pwritev64.c | 59 +++++++++++++++-- sysdeps/unix/sysv/linux/wordsize-64/pwritev.c | 64 ------------------ sysdeps/unix/sysv/linux/wordsize-64/pwritev64.c | 1 - sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list | 1 - 8 files changed, 79 insertions(+), 199 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/generic/wordsize-32/pwritev.c delete mode 100644 sysdeps/unix/sysv/linux/generic/wordsize-32/pwritev64.c delete mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/pwritev64.c delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/pwritev.c delete mode 100644 sysdeps/unix/sysv/linux/wordsize-64/pwritev64.c (limited to 'sysdeps') diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/pwritev.c b/sysdeps/unix/sysv/linux/generic/wordsize-32/pwritev.c deleted file mode 100644 index 9ef11b564c..0000000000 --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/pwritev.c +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright (C) 2011-2016 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Chris Metcalf , 2011. - Based on work contributed by Ulrich Drepper , 1997. - - 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 - . */ - -#include -#include -#include -#include -#include - -#include -#include - -ssize_t -__libc_pwritev (int fd, const struct iovec *vector, int count, off_t offset) -{ - assert (sizeof (offset) == 4); - return SYSCALL_CANCEL (pwritev, fd, vector, count, __ALIGNMENT_ARG - __LONG_LONG_PAIR (offset >> 31, offset)); -} -strong_alias (__libc_pwritev, __pwritev) -weak_alias (__libc_pwritev, pwritev) diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/pwritev64.c b/sysdeps/unix/sysv/linux/generic/wordsize-32/pwritev64.c deleted file mode 100644 index 49b723dffe..0000000000 --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/pwritev64.c +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright (C) 2011-2016 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Chris Metcalf , 2011. - Based on work contributed by Ulrich Drepper , 1997. - - 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 - . */ - -#include -#include -#include -#include - -#include -#include - -ssize_t -__libc_pwritev64 (int fd, const struct iovec *vector, int count, - off64_t offset) -{ - return SYSCALL_CANCEL (pwritev, fd, - vector, count, __ALIGNMENT_ARG - __LONG_LONG_PAIR ((off_t) (offset >> 32), - (off_t) (offset & 0xffffffff))); -} -strong_alias (__libc_pwritev64, pwritev64) -weak_alias (__libc_pwritev64, __pwritev64) diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/pwritev64.c b/sysdeps/unix/sysv/linux/mips/mips64/n64/pwritev64.c deleted file mode 100644 index 8b72a2928b..0000000000 --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/pwritev64.c +++ /dev/null @@ -1 +0,0 @@ -/* Empty since the pwritev syscall is equivalent. */ diff --git a/sysdeps/unix/sysv/linux/pwritev.c b/sysdeps/unix/sysv/linux/pwritev.c index e66f08e1d2..b11606cfaf 100644 --- a/sysdeps/unix/sysv/linux/pwritev.c +++ b/sysdeps/unix/sysv/linux/pwritev.c @@ -15,67 +15,40 @@ License along with the GNU C Library; if not, see . */ -#include -#include -#include -#include -#if __WORDSIZE == 64 && !defined PWRITEV -/* Hide the pwritev64 declaration. */ -# define pwritev64 __redirect_pwritev64 -#endif #include - #include -#include -#include +#if __WORDSIZE != 64 || defined (__ASSUME_OFF_DIFF_OFF64) -#ifndef PWRITEV -# define PWRITEV pwritev -# define PWRITEV_REPLACEMENT __atomic_pwritev_replacement -# define PWRITE __pwrite -# define OFF_T off_t -#endif - -#define LO_HI_LONG(val) \ - (off_t) val, \ - (off_t) ((((uint64_t) (val)) >> (sizeof (long) * 4)) >> (sizeof (long) * 4)) - -#ifndef __ASSUME_PWRITEV -static ssize_t PWRITEV_REPLACEMENT (int, const struct iovec *, - int, OFF_T) internal_function; -#endif +# ifdef __ASSUME_PREADV +# ifndef __NR_pwritev +# define __NR_pwritev __NR_pwritev64 +# endif ssize_t -PWRITEV (int fd, const struct iovec *vector, int count, OFF_T offset) +pwritev (int fd, const struct iovec *vector, int count, off_t offset) { -#ifdef __NR_pwritev - ssize_t result; - - result = SYSCALL_CANCEL (pwritev, fd, vector, count, LO_HI_LONG (offset)); - -# ifdef __ASSUME_PWRITEV - return result; -# endif -#endif - -#ifndef __ASSUME_PWRITEV -# ifdef __NR_pwritev + return SYSCALL_CANCEL (pwritev, fd, vector, count, + __ALIGNMENT_ARG SYSCALL_LL (offset)); +} +# else +static ssize_t __atomic_pwritev_replacement (int, const struct iovec *, + int, off_t) internal_function; +ssize_t +pwritev (int fd, const struct iovec *vector, int count, off_t offset) +{ +# ifdef __NR_pwritev + ssize_t result = SYSCALL_CANCEL (pwritev, fd, vector, count, + __ALIGNMENT_ARG SYSCALL_LL (offset)); if (result >= 0 || errno != ENOSYS) return result; -# endif - - return PWRITEV_REPLACEMENT (fd, vector, count, offset); -#endif +# endif + return __atomic_pwritev_replacement (fd, vector, count, offset); } -#if __WORDSIZE == 64 && defined pwritev64 -# undef pwritev64 -strong_alias (pwritev, pwritev64) -#endif - -#ifndef __ASSUME_PWRITEV -# undef PWRITEV -# define PWRITEV static internal_function PWRITEV_REPLACEMENT -# include +# define PWRITEV static internal_function __atomic_pwritev_replacement +# define PWRITE __pwrite +# define OFF_T off_t +# include +# endif /* __ASSUME_PREADV */ #endif diff --git a/sysdeps/unix/sysv/linux/pwritev64.c b/sysdeps/unix/sysv/linux/pwritev64.c index 1e8168f103..bed79b7aad 100644 --- a/sysdeps/unix/sysv/linux/pwritev64.c +++ b/sysdeps/unix/sysv/linux/pwritev64.c @@ -1,6 +1,55 @@ -#define PWRITEV pwritev64 -#define PWRITEV_REPLACEMENT __atomic_pwritev64_replacement -#define PWRITE __pwrite64 -#define OFF_T off64_t +/* Copyright (C) 2016 Free Software Foundation, Inc. + This file is part of the GNU C Library. -#include "pwritev.c" + 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 + . */ + +#include +#include + +#ifdef __ASSUME_PWRITEV + +# ifndef __NR_pwritev64 +# define __NR_pwritev64 __NR_pwritev +# endif + +ssize_t +pwritev64 (int fd, const struct iovec *vector, int count, off64_t offset) +{ + return SYSCALL_CANCEL (pwritev64, fd, vector, count, + __ALIGNMENT_ARG SYSCALL_LL64 (offset)); +} +#else +static ssize_t __atomic_pwritev64_replacement (int, const struct iovec *, + int, off64_t) internal_function; +ssize_t +pwritev64 (int fd, const struct iovec *vector, int count, off64_t offset) +{ +#ifdef __NR_pwrite64v + ssize_t result = SYSCALL_CANCEL (pwritev64, fd, vector, count, + __ALIGNMENT_ARG SYSCALL_LL64 (offset)); + if (result >= 0 || errno != ENOSYS) + return result; +#endif + return __atomic_pwritev64_replacement (fd, vector, count, offset); +} +# define PWRITEV static internal_function __atomic_pwritev64_replacement +# define PWRITE __pwrite64 +# define OFF_T off64_t +# include +#endif + +#if __WORDSIZE == 64 && !defined (__ASSUME_OFF_DIFF_OFF64) +strong_alias (pwritev64, pwritev) +#endif diff --git a/sysdeps/unix/sysv/linux/wordsize-64/pwritev.c b/sysdeps/unix/sysv/linux/wordsize-64/pwritev.c deleted file mode 100644 index 1fa6eb3459..0000000000 --- a/sysdeps/unix/sysv/linux/wordsize-64/pwritev.c +++ /dev/null @@ -1,64 +0,0 @@ -/* 64-bit pwritev. - Copyright (C) 2012-2016 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 - . */ - -#include -#include -#include -/* Hide the pwritev64 declaration. */ -#define pwritev64 __redirect_pwritev64 -#include - -#include -#include -#include - -#ifndef __ASSUME_PWRITEV -static ssize_t __atomic_pwritev_replacement (int, const struct iovec *, - int, off_t) internal_function; -#endif - -ssize_t -pwritev (int fd, const struct iovec *vector, int count, off_t offset) -{ -#ifdef __NR_pwritev - ssize_t result; - - result = SYSCALL_CANCEL (pwritev, fd, vector, count, offset); -# ifdef __ASSUME_PWRITEV - return result; -# endif -#endif - -#ifndef __ASSUME_PWRITEV -# ifdef __NR_pwritev - if (result >= 0 || errno != ENOSYS) - return result; -# endif - - return __atomic_pwritev_replacement (fd, vector, count, offset); -#endif -} -#undef pwritev64 -strong_alias (pwritev, pwritev64) - -#ifndef __ASSUME_PWRITEV -# define PWRITE __pwrite -# define PWRITEV static internal_function __atomic_pwritev_replacement -# define OFF_T off_t -# include -#endif diff --git a/sysdeps/unix/sysv/linux/wordsize-64/pwritev64.c b/sysdeps/unix/sysv/linux/wordsize-64/pwritev64.c deleted file mode 100644 index 8b72a2928b..0000000000 --- a/sysdeps/unix/sysv/linux/wordsize-64/pwritev64.c +++ /dev/null @@ -1 +0,0 @@ -/* Empty since the pwritev syscall is equivalent. */ diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list b/sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list index 58cd7fcfbb..dce4302515 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list +++ b/sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list @@ -4,5 +4,4 @@ fallocate - fallocate Ci:iiii fallocate fallocate64 gettimeofday - gettimeofday:__vdso_gettimeofday@LINUX_2.6 i:pP __gettimeofday gettimeofday personality EXTRA personality Ei:i __personality personality posix_fadvise - fadvise64 Vi:iiii posix_fadvise posix_fadvise64 -pwritev - pwritev Ci:ipii pwritev pwritev64 time - time:__vdso_time@LINUX_2.6 Ei:P time -- cgit 1.4.1