mirror of https://gitee.com/Nocallback/glibc.git
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.
hjl/pr20309/master
Adhemerval Zanella
10 years ago
11 changed files with 155 additions and 199 deletions
@ -1,37 +0,0 @@ |
|||
/* Copyright (C) 2011-2016 Free Software Foundation, Inc.
|
|||
This file is part of the GNU C Library. |
|||
Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011. |
|||
Based on work contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. |
|||
|
|||
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 <assert.h> |
|||
#include <errno.h> |
|||
#include <endian.h> |
|||
#include <unistd.h> |
|||
#include <sys/uio.h> |
|||
|
|||
#include <sysdep-cancel.h> |
|||
#include <sys/syscall.h> |
|||
|
|||
ssize_t |
|||
__libc_pwritev (int fd, const struct iovec *vector, int count, off_t offset) |
|||
{ |
|||
assert (sizeof (offset) == 4); |
|||
return SYSCALL_CANCEL (pwritev, fd, vector, count, __ALIGNMENT_ARG |
|||
__LONG_LONG_PAIR (offset >> 31, offset)); |
|||
} |
|||
strong_alias (__libc_pwritev, __pwritev) |
|||
weak_alias (__libc_pwritev, pwritev) |
|||
@ -1,38 +0,0 @@ |
|||
/* Copyright (C) 2011-2016 Free Software Foundation, Inc.
|
|||
This file is part of the GNU C Library. |
|||
Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011. |
|||
Based on work contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. |
|||
|
|||
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 <errno.h> |
|||
#include <endian.h> |
|||
#include <unistd.h> |
|||
#include <sys/uio.h> |
|||
|
|||
#include <sysdep-cancel.h> |
|||
#include <sys/syscall.h> |
|||
|
|||
ssize_t |
|||
__libc_pwritev64 (int fd, const struct iovec *vector, int count, |
|||
off64_t offset) |
|||
{ |
|||
return SYSCALL_CANCEL (pwritev, fd, |
|||
vector, count, __ALIGNMENT_ARG |
|||
__LONG_LONG_PAIR ((off_t) (offset >> 32), |
|||
(off_t) (offset & 0xffffffff))); |
|||
} |
|||
strong_alias (__libc_pwritev64, pwritev64) |
|||
weak_alias (__libc_pwritev64, __pwritev64) |
|||
@ -1 +0,0 @@ |
|||
/* Empty since the pwritev syscall is equivalent. */ |
|||
@ -1,6 +1,55 @@ |
|||
#define PWRITEV pwritev64 |
|||
#define PWRITEV_REPLACEMENT __atomic_pwritev64_replacement |
|||
#define PWRITE __pwrite64 |
|||
#define OFF_T off64_t |
|||
/* Copyright (C) 2016 Free Software Foundation, Inc.
|
|||
This file is part of the GNU C Library. |
|||
|
|||
#include "pwritev.c" |
|||
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> |
|||
|
|||
#ifdef __ASSUME_PWRITEV |
|||
|
|||
# ifndef __NR_pwritev64 |
|||
# define __NR_pwritev64 __NR_pwritev |
|||
# endif |
|||
|
|||
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)); |
|||
} |
|||
#else |
|||
static ssize_t __atomic_pwritev64_replacement (int, const struct iovec *, |
|||
int, off64_t) internal_function; |
|||
ssize_t |
|||
pwritev64 (int fd, const struct iovec *vector, int count, off64_t offset) |
|||
{ |
|||
#ifdef __NR_pwrite64v |
|||
ssize_t result = SYSCALL_CANCEL (pwritev64, fd, vector, count, |
|||
__ALIGNMENT_ARG SYSCALL_LL64 (offset)); |
|||
if (result >= 0 || errno != ENOSYS) |
|||
return result; |
|||
#endif |
|||
return __atomic_pwritev64_replacement (fd, vector, count, offset); |
|||
} |
|||
# define PWRITEV static internal_function __atomic_pwritev64_replacement |
|||
# define PWRITE __pwrite64 |
|||
# define OFF_T off64_t |
|||
# include <sysdeps/posix/pwritev.c> |
|||
#endif |
|||
|
|||
#if __WORDSIZE == 64 && !defined (__ASSUME_OFF_DIFF_OFF64) |
|||
strong_alias (pwritev64, pwritev) |
|||
#endif |
|||
|
|||
@ -1,64 +0,0 @@ |
|||
/* 64-bit pwritev.
|
|||
Copyright (C) 2012-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 <errno.h> |
|||
#include <stddef.h> |
|||
#include <sys/param.h> |
|||
/* Hide the pwritev64 declaration. */ |
|||
#define pwritev64 __redirect_pwritev64 |
|||
#include <sys/uio.h> |
|||
|
|||
#include <sysdep-cancel.h> |
|||
#include <sys/syscall.h> |
|||
#include <kernel-features.h> |
|||
|
|||
#ifndef __ASSUME_PWRITEV |
|||
static ssize_t __atomic_pwritev_replacement (int, const struct iovec *, |
|||
int, off_t) internal_function; |
|||
#endif |
|||
|
|||
ssize_t |
|||
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, offset); |
|||
# ifdef __ASSUME_PWRITEV |
|||
return result; |
|||
# endif |
|||
#endif |
|||
|
|||
#ifndef __ASSUME_PWRITEV |
|||
# ifdef __NR_pwritev |
|||
if (result >= 0 || errno != ENOSYS) |
|||
return result; |
|||
# endif |
|||
|
|||
return __atomic_pwritev_replacement (fd, vector, count, offset); |
|||
#endif |
|||
} |
|||
#undef pwritev64 |
|||
strong_alias (pwritev, pwritev64) |
|||
|
|||
#ifndef __ASSUME_PWRITEV |
|||
# define PWRITE __pwrite |
|||
# define PWRITEV static internal_function __atomic_pwritev_replacement |
|||
# define OFF_T off_t |
|||
# include <sysdeps/posix/pwritev.c> |
|||
#endif |
|||
@ -1 +0,0 @@ |
|||
/* Empty since the pwritev syscall is equivalent. */ |
|||
Loading…
Reference in new issue