lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-12-24 17:51:17 +03:00
Code Activity

Consolidate preadv/preadv64 implementation

Browse Source 
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.
This commit is contained in:
Adhemerval Zanella
2016-04-11 15:06:17 -03:00
parent af0cfbaf1d
commit 4e77815173
11 changed files with 157 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,67 +15,40 @@
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>
#include <stdint.h>
#if __WORDSIZE == 64
/* Hide the preadv64 declaration. */
# define preadv64 __redirect_preadv64
#endif
#include <sys/uio.h>
#include <sysdep-cancel.h>
#include <sys/syscall.h>
#include <kernel-features.h>
#ifndef PREADV
# define PREADV preadv
# define PREADV_REPLACEMENT __atomic_preadv_replacement
# define PREAD __pread
# 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_PREADV
static ssize_t 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, LO_HI_LONG (offset));
#if __WORDSIZE != 64 || defined (__ASSUME_OFF_DIFF_OFF64)
# ifdef __ASSUME_PREADV
return result;
# endif
#endif
#ifndef __ASSUME_PREADV
# ifdef __NR_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 PREADV_REPLACEMENT (fd, vector, count, offset);
#endif
# endif
return __atomic_preadv_replacement (fd, vector, count, offset);
}
#if __WORDSIZE == 64
# undef preadv64
strong_alias (preadv, preadv64)
#endif
#ifndef __ASSUME_PREADV
# undef PREADV
# define PREADV static internal_function PREADV_REPLACEMENT
# include <sysdeps/posix/preadv.c>
# 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