diff options
author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2016-04-11 15:06:17 -0300 |
---|---|---|
committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2016-06-06 19:12:36 -0300 |
commit | 4e7781517397b4eabbd012f161ee4bfd9bb734a9 (patch) | |
tree | 2b6b643360e7d3a24a6fbed2011dbcb2bccce80f /sysdeps/unix/sysv/linux/wordsize-64 | |
parent | af0cfbaf1df1549ca0bc70bd6b4bc54004d11680 (diff) | |
download | glibc-4e7781517397b4eabbd012f161ee4bfd9bb734a9.tar.gz glibc-4e7781517397b4eabbd012f161ee4bfd9bb734a9.tar.xz glibc-4e7781517397b4eabbd012f161ee4bfd9bb734a9.zip |
Consolidate preadv/preadv64 implementation
This patch consolidates all the preadv{64} implementation for Linux in only one (sysdeps/unix/sysv/linux/preadv{64}.c). It also removes the syscall from the auto-generation using assembly macros. It was based on previous pread/pread64 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-preadv.c): New variable: add cancellation required flags. (CFLAGS-preadv64.c): Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/preadv.c: Remove file. * sysdeps/unix/sysv/linux/generic/wordsize-32/preadv64.c: Likewise. * sysdeps/unix/sysv/linux/mips/mips64/n64/preadv64.c: Likewise. * sysdeps/unix/sysv/linux/wordsize-64/preadv.c: Likewise. * sysdeps/unix/sysv/linux/wordsize-64/preadv64.: Likwise. * sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list (preadv): Remove syscall from auto-generation. * sysdeps/unix/sysv/linux/preadv.c: Rewrite implementation. [WORDSIZE == 64] (preadv64): Remove macro. [!PREADV] (PREADV): Likewise. [!PREADV] (PREADV_REPLACEMENT): Likewise. [!PREADV] (PREAD): Likewise. [!PREADV] (OFF_T): Likewise. [!__ASSUME_PREADV] (PREADV_REPLACEMENT): Likewise. (LO_HI_LONG): Remove macro. [__WORDSIZE != 64 || __ASSUME_OFF_DIFF_OFF64] (preadv): Add function. * sysdeps/unix/sysv/linux/preadv64.c: Rewrite implementation. (PREADV): Remove macro. (PREADV_REPLACEMENTE): Likewise. (PREAD): Likewise. (OFF_T): Likewise. (preadv64): New function. * nptl/tst-cancel4.c (tf_preadv): Add test.
Diffstat (limited to 'sysdeps/unix/sysv/linux/wordsize-64')
-rw-r--r-- | sysdeps/unix/sysv/linux/wordsize-64/preadv.c | 64 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/wordsize-64/preadv64.c | 1 |
2 files changed, 0 insertions, 65 deletions
diff --git a/sysdeps/unix/sysv/linux/wordsize-64/preadv.c b/sysdeps/unix/sysv/linux/wordsize-64/preadv.c deleted file mode 100644 index e2924acbb9..0000000000 --- a/sysdeps/unix/sysv/linux/wordsize-64/preadv.c +++ /dev/null @@ -1,64 +0,0 @@ -/* 64-bit preadv. - 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 - <http://www.gnu.org/licenses/>. */ - -#include <errno.h> -#include <stddef.h> -#include <sys/param.h> -/* Hide the preadv64 declaration. */ -#define preadv64 __redirect_preadv64 -#include <sys/uio.h> - -#include <sysdep-cancel.h> -#include <sys/syscall.h> -#include <kernel-features.h> - -#ifndef __ASSUME_PREADV -static ssize_t __atomic_preadv_replacement (int, const struct iovec *, - int, off_t) internal_function; -#endif - -ssize_t -preadv (int fd, const struct iovec *vector, int count, off_t offset) -{ -#ifdef __NR_preadv - ssize_t result; - - result = SYSCALL_CANCEL (preadv, fd, vector, count, offset); -# ifdef __ASSUME_PREADV - return result; -# endif -#endif - -#ifndef __ASSUME_PREADV -# ifdef __NR_preadv - if (result >= 0 || errno != ENOSYS) - return result; -# endif - - return __atomic_preadv_replacement (fd, vector, count, offset); -#endif -} -#undef preadv64 -strong_alias (preadv, preadv64) - -#ifndef __ASSUME_PREADV -# define PREADV static internal_function __atomic_preadv_replacement -# define PREAD __pread -# define OFF_T off_t -# include <sysdeps/posix/preadv.c> -#endif diff --git a/sysdeps/unix/sysv/linux/wordsize-64/preadv64.c b/sysdeps/unix/sysv/linux/wordsize-64/preadv64.c deleted file mode 100644 index fd9320cfc7..0000000000 --- a/sysdeps/unix/sysv/linux/wordsize-64/preadv64.c +++ /dev/null @@ -1 +0,0 @@ -/* Empty since the preadv syscall is equivalent. */ |