diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2016-06-14 17:56:33 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2016-06-21 11:29:18 -0300 |
| commit | 4751bbe2ad4d1bfa05774e29376d553ecfe563b0 (patch) | |
| tree | 029d8253f0c76d8ab16f6f477dd53007113e7c55 /sysdeps/unix/sysv/linux/pwritev64.c | |
| parent | df2258c6cb4250e53f12b59785987c338b5cf396 (diff) | |
| download | glibc-4751bbe2ad4d1bfa05774e29376d553ecfe563b0.tar.gz glibc-4751bbe2ad4d1bfa05774e29376d553ecfe563b0.tar.xz glibc-4751bbe2ad4d1bfa05774e29376d553ecfe563b0.zip | |
Fix p{readv,writev}{64} consolidation implementation
This patch fixes the p{readv,writev}{64} consolidation implementation
from commits 4e77815 and af5fdf5. Different from pread/pwrite
implementation, preadv/pwritev implementation does not require
__ALIGNMENT_ARG because kernel syscall prototypes define
the high and low part of the off_t, if it is the case, directly
(different from pread/pwrite where the architecture ABI for passing
64-bit values must be in consideration for passsing the arguments).
It also adds some basic tests for preadv/pwritev.
Tested on x86_64, i686, and armhf.
* misc/Makefile (tests): Add tst-preadvwritev and tst-preadvwritev64.
* misc/tst-preadvwritev.c: New file.
* misc/tst-preadvwritev64.c: Likewise.
* sysdeps/unix/sysv/linux/preadv.c (preadv): Remove SYSCALL_LL{64}
usage.
* sysdeps/unix/sysv/linux/preadv64.c (preadv64): Likewise.
* sysdeps/unix/sysv/linux/pwritev.c (pwritev): Likewise.
* sysdeps/unix/sysv/linux/pwritev64.c (pwritev64): Likewise.
* sysdeps/unix/sysv/linux/sysdep.h (LO_HI_LONG): New macro.
Diffstat (limited to 'sysdeps/unix/sysv/linux/pwritev64.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/pwritev64.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sysdeps/unix/sysv/linux/pwritev64.c b/sysdeps/unix/sysv/linux/pwritev64.c index bed79b7aad..c0cfe4b413 100644 --- a/sysdeps/unix/sysv/linux/pwritev64.c +++ b/sysdeps/unix/sysv/linux/pwritev64.c @@ -27,8 +27,7 @@ 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)); + return SYSCALL_CANCEL (pwritev64, fd, vector, count, LO_HI_LONG (offset)); } #else static ssize_t __atomic_pwritev64_replacement (int, const struct iovec *, @@ -36,9 +35,9 @@ static ssize_t __atomic_pwritev64_replacement (int, const struct iovec *, ssize_t pwritev64 (int fd, const struct iovec *vector, int count, off64_t offset) { -#ifdef __NR_pwrite64v +#ifdef __NR_pwritev64 ssize_t result = SYSCALL_CANCEL (pwritev64, fd, vector, count, - __ALIGNMENT_ARG SYSCALL_LL64 (offset)); + LO_HI_LONG (offset)); if (result >= 0 || errno != ENOSYS) return result; #endif |