mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-26 15:00:06 +00:00
4e77815173
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.
55 lines
1.8 KiB
C
55 lines
1.8 KiB
C
/* Copyright (C) 2009-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 <sys/uio.h>
|
|
#include <sysdep-cancel.h>
|
|
|
|
#if __WORDSIZE != 64 || defined (__ASSUME_OFF_DIFF_OFF64)
|
|
|
|
# ifdef __ASSUME_PREADV
|
|
|
|
# ifndef __NR_preadv
|
|
# define __NR_preadv __NR_preadv64
|
|
# endif
|
|
|
|
ssize_t
|
|
preadv (int fd, const struct iovec *vector, int count, off_t offset)
|
|
{
|
|
return SYSCALL_CANCEL (preadv, fd, vector, count,
|
|
__ALIGNMENT_ARG SYSCALL_LL (offset));
|
|
}
|
|
# else
|
|
static ssize_t __atomic_preadv_replacement (int, const struct iovec *,
|
|
int, off_t) internal_function;
|
|
ssize_t
|
|
preadv (int fd, const struct iovec *vector, int count, off_t offset)
|
|
{
|
|
# ifdef __NR_preadv
|
|
ssize_t result = SYSCALL_CANCEL (preadv, fd, vector, count,
|
|
__ALIGNMENT_ARG SYSCALL_LL (offset));
|
|
if (result >= 0 || errno != ENOSYS)
|
|
return result;
|
|
# endif
|
|
return __atomic_preadv_replacement (fd, vector, count, offset);
|
|
}
|
|
# define PREADV static internal_function __atomic_preadv_replacement
|
|
# define PREAD __pread
|
|
# define OFF_T off_t
|
|
# include <sysdeps/posix/preadv.c>
|
|
# endif /* __ASSUME_PREADV */
|
|
#endif
|