lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-10-12 19:04:54 +03:00
Code Activity

Fix p{readv,writev}{64} consolidation implementation

Browse Source 
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.
This commit is contained in:
Adhemerval Zanella
2016-06-14 17:56:33 -03:00
parent df2258c6cb
commit 4751bbe2ad
9 changed files with 168 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sysdeps/unix/sysv/linux/preadv.c
View File

@@ -29,8 +29,7 @@
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));
return SYSCALL_CANCEL (preadv, fd, vector, count, LO_HI_LONG (offset));
}
# else
static ssize_t __atomic_preadv_replacement (int, const struct iovec *,
@@ -40,7 +39,7 @@ 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));
LO_HI_LONG (offset));
if (result >= 0 || errno != ENOSYS)
return result;
# endif

5
sysdeps/unix/sysv/linux/preadv64.c
View File

@@ -27,8 +27,7 @@
ssize_t
preadv64 (int fd, const struct iovec *vector, int count, off64_t offset)
{
return SYSCALL_CANCEL (preadv64, fd, vector, count,
__ALIGNMENT_ARG SYSCALL_LL64 (offset));
return SYSCALL_CANCEL (preadv64, fd, vector, count, LO_HI_LONG (offset));
}
#else
static ssize_t __atomic_preadv64_replacement (int, const struct iovec *,
@@ -38,7 +37,7 @@ preadv64 (int fd, const struct iovec *vector, int count, off64_t offset)
{
#ifdef __NR_preadv64
ssize_t result = SYSCALL_CANCEL (preadv64, fd, vector, count,
__ALIGNMENT_ARG SYSCALL_LL64 (offset));
LO_HI_LONG (offset));
if (result >= 0 || errno != ENOSYS)
return result;
#endif

5
sysdeps/unix/sysv/linux/pwritev.c
View File

@@ -29,8 +29,7 @@
ssize_t
pwritev (int fd, const struct iovec *vector, int count, off_t offset)
{
return SYSCALL_CANCEL (pwritev, fd, vector, count,
__ALIGNMENT_ARG SYSCALL_LL (offset));
return SYSCALL_CANCEL (pwritev, fd, vector, count, LO_HI_LONG (offset));
}
# else
static ssize_t __atomic_pwritev_replacement (int, const struct iovec *,
@@ -40,7 +39,7 @@ 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));
LO_HI_LONG (offset));
if (result >= 0 || errno != ENOSYS)
return result;
# endif

7
sysdeps/unix/sysv/linux/pwritev64.c
View File

@@ -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

9
sysdeps/unix/sysv/linux/sysdep.h
View File

@@ -47,3 +47,12 @@
#define SYSCALL_LL64(val) \
__LONG_LONG_PAIR ((long) ((val) >> 32), (long) ((val) & 0xffffffff))
#endif
/* Provide a macro to pass the off{64}_t argument on p{readv,writev}{64}. */
#if __WORDSIZE == 64 || defined __ASSUME_WORDSIZE64_ILP32
# define LO_HI_LONG(val) (val)
#else
# define LO_HI_LONG(val) \
(long) (val), \
(long) (((uint64_t) (val)) >> 32)
#endif