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 pwritev/pwritev64 implementations

Browse Source 
This patch consolidates all the pwritev{64} implementation for Linux
in only one (sysdeps/unix/sysv/linux/pwritev{64}.c).  It also removes the
syscall from the auto-generation using assembly macros.

It was based on previous pwrite/pwrite64 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-pwritev.c): New variable: add cancellation
	required flags.
	(CFLAGS-pwritev64.c): Likewise.
	* sysdeps/unix/sysv/linux/generic/wordsize-32/pwritev.c: Remove file.
	* sysdeps/unix/sysv/linux/generic/wordsize-32/pwritev64.c: Likewise.
	* sysdeps/unix/sysv/linux/mips/mips64/n64/pwritev64.c: Likewise.
	* sysdeps/unix/sysv/linux/wordsize-64/pwritev.c: Likewise.
	* sysdeps/unix/sysv/linux/wordsize-64/pwritev64.: Likwise.
	* sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list (pwritev): Remove
	syscall from auto-generation.
	* sysdeps/unix/sysv/linux/pwritev.c: Rewrite implementation.
	[WORDSIZE == 64] (pwritev64): Remove macro.
	[!PWRITEV] (PWRITEV): Likewise.
	[!PWRITEV] (PWRITEV_REPLACEMENT): Likewise.
	[!PWRITEV] (PWRITE): Likewise.
	[!PWRITEV] (OFF_T): Likewise.
	[!__ASSUME_PWRITEV] (PWRITEV_REPLACEMENT): Likewise.
	(LO_HI_LONG): Remove macro.
	[__WORDSIZE != 64 || __ASSUME_OFF_DIFF_OFF64] (pwritev): Add function.
	* sysdeps/unix/sysv/linux/pwritev64.c: Rewrite implementation.
	(PWRITEV): Remove macro.
	(PWRITEV_REPLACEMENTE): Likewise.
	(PWRITE): Likewise.
	(OFF_T): Likewise.
	(pwritev64): New function.
	* nptl/tst-cancel4.c (tf_writev): Add test.
This commit is contained in:
Adhemerval Zanella
2016-04-11 15:07:12 -03:00
parent 4e77815173
commit af5fdf5a35
11 changed files with 155 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
sysdeps/unix/sysv/linux/pwritev.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 <stdint.h>
#include <sys/param.h>
#if __WORDSIZE == 64 && !defined PWRITEV
/* Hide the pwritev64 declaration. */
# define pwritev64 __redirect_pwritev64
#endif
#include <sys/uio.h>
#include <sysdep-cancel.h>
#include <sys/syscall.h>
#include <kernel-features.h>
#if __WORDSIZE != 64 || defined (__ASSUME_OFF_DIFF_OFF64)
#ifndef PWRITEV
# define PWRITEV pwritev
# define PWRITEV_REPLACEMENT __atomic_pwritev_replacement
# define PWRITE __pwrite
# 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_PWRITEV
static ssize_t PWRITEV_REPLACEMENT (int, const struct iovec *,
int, OFF_T) internal_function;
#endif
# ifdef __ASSUME_PREADV
# ifndef __NR_pwritev
# define __NR_pwritev __NR_pwritev64
# endif
ssize_t
PWRITEV (int fd, const struct iovec *vector, int count, OFF_T offset)
pwritev (int fd, const struct iovec *vector, int count, off_t offset)
{
#ifdef __NR_pwritev
ssize_t result;
result = SYSCALL_CANCEL (pwritev, fd, vector, count, LO_HI_LONG (offset));
# ifdef __ASSUME_PWRITEV
return result;
# endif
#endif
#ifndef __ASSUME_PWRITEV
# ifdef __NR_pwritev
return SYSCALL_CANCEL (pwritev, fd, vector, count,
__ALIGNMENT_ARG SYSCALL_LL (offset));
}
# else
static ssize_t __atomic_pwritev_replacement (int, const struct iovec *,
int, off_t) internal_function;
ssize_t
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));
if (result >= 0 || errno != ENOSYS)
return result;
# endif
return PWRITEV_REPLACEMENT (fd, vector, count, offset);
#endif
# endif
return __atomic_pwritev_replacement (fd, vector, count, offset);
}
#if __WORDSIZE == 64 && defined pwritev64
# undef pwritev64
strong_alias (pwritev, pwritev64)
#endif
#ifndef __ASSUME_PWRITEV
# undef PWRITEV
# define PWRITEV static internal_function PWRITEV_REPLACEMENT
# include <sysdeps/posix/pwritev.c>
# define PWRITEV static internal_function __atomic_pwritev_replacement
# define PWRITE __pwrite
# define OFF_T off_t
# include <sysdeps/posix/pwritev.c>
# endif /* __ASSUME_PREADV */
#endif