AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-22 10:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Consolidate Linux send implementation

Browse Source 
This patch consolidates the send Linux syscall implementation on
sysdeps/unix/sysv/linux/send{to}.c.  The changes are:

  1. Remove send from auto-generation syscalls.list on the architecture
     that uses __NR_send.
  2. Define __NR_send for architectures that supports it. It was done instead
     of defining in default kernel-features.h because current Linux practice
     for new ports are to implement only __NR_sendto [1] and it will
     require adding new kernel-features for ports that do not require it
     (aarch64 for instance).
  3. Remove __ASSUME_SENDTO_FOR_SEND_SYSCALL and decide to use
     __NR_sendto for send generation based on __ASSUME_SENDTO_SYSCALL.

Checked on i686-linux-gnu, x86_64-linux-gnu, x86_64-linux-gnux32,
aarch64-linux-gnu, arm-linux-gnueabihf, and powerpc64le-linux-gnu.

	* sysdeps/unix/sysv/linux/sysdep.h (HAVE_INTERNAL_SEND_SYMBOL):
	Define.
	* sysdeps/unix/sysv/linux/aarch64/sysdep.h
	(HAVE_INTERNAL_SEND_SYMBOL): Undefine.
	* sysdeps/unix/sysv/linux/nios2/sysdep.h
	(HAVE_INTERNAL_SEND_SYMBOL): Likewise.
	* sysdeps/unix/sysv/linux/tile/sysdep.h
	(HAVE_INTERNAL_SEND_SYMBOL): Likewise.
	* sysdeps/unix/sysv/linux/alpha/kernel-features.h
	(__ASSUME_RECV_SYSCALL): Define.
	* sysdeps/unix/sysv/linux/arm/kernel-features.h
	(__ASSUME_RECV_SYSCALL): Likewise.
	* sysdeps/unix/sysv/linux/hppa/kernel-features.h
	(__ASSUME_RECV_SYSCALL): Likewise.
	* sysdeps/unix/sysv/linux/ia64/kernel-features.h
	(__ASSUME_RECV_SYSCALL): Likewise.
	* sysdeps/unix/sysv/linux/mips/kernel-features.h
	(__ASSUME_RECV_SYSCALL): Likewise.
	* sysdeps/unix/sysv/linux/i386/kernel-features.h
	(__ASSUME_SENDTO_FOR_SEND_SYSCALL): Remove define.
	* sysdeps/unix/sysv/linux/m68k/kernel-features.h
	(__ASSUME_SENDTO_FOR_SEND_SYSCALL): Likewise.
	* sysdeps/unix/sysv/linux/s390/kernel-features.h
	(__ASSUME_SENDTO_FOR_SEND_SYSCALL): Likewise.
	* sysdeps/unix/sysv/linux/alpha/syscalls.list: Remove send from
	auto-generation list.
	* sysdeps/unix/sysv/linux/arm/syscalls.list: Likewise.
	* sysdeps/unix/sysv/linux/hppa/syscalls.list: Likewise.
	* sysdeps/unix/sysv/linux/ia64/syscalls.list: Likewike.
	* sysdeps/unix/sysv/linux/mips/syscalls.list: Likewise.
	* sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list: Likewise.
	* sysdeps/unix/sysv/linux/send.c: Simplify includes.
	(__ASSUME_SENDTO_FOR_SEND_SYSCALL): Replace by
	__ASSUME_SENDTO_SYSCALL.
	* sysdeps/unix/sysv/linux/x86_64/send.c: Remove file.
	* sysdeps/unix/sysv/linux/mips/mips64/send.c: Likewise.
	* sysdeps/unix/sysv/linux/generic/send.c: Likewise.
This commit is contained in:
Adhemerval Zanella 2017-03-06 15:13:03 +01:00
parent 06cf371e97
commit 60f9423b6b
23 changed files with 62 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ChangeLog
View File

@ -1,5 +1,43 @@
2016-03-08 Adhemerval Zanella <adhemerval.zanella@linaro.org> 2016-03-08 Adhemerval Zanella <adhemerval.zanella@linaro.org>
* sysdeps/unix/sysv/linux/sysdep.h (HAVE_INTERNAL_SEND_SYMBOL):
Define.
* sysdeps/unix/sysv/linux/aarch64/sysdep.h
(HAVE_INTERNAL_SEND_SYMBOL): Undefine.
* sysdeps/unix/sysv/linux/nios2/sysdep.h
(HAVE_INTERNAL_SEND_SYMBOL): Likewise.
* sysdeps/unix/sysv/linux/tile/sysdep.h
(HAVE_INTERNAL_SEND_SYMBOL): Likewise.
* sysdeps/unix/sysv/linux/alpha/kernel-features.h
(__ASSUME_RECV_SYSCALL): Define.
* sysdeps/unix/sysv/linux/arm/kernel-features.h
(__ASSUME_RECV_SYSCALL): Likewise.
* sysdeps/unix/sysv/linux/hppa/kernel-features.h
(__ASSUME_RECV_SYSCALL): Likewise.
* sysdeps/unix/sysv/linux/ia64/kernel-features.h
(__ASSUME_RECV_SYSCALL): Likewise.
* sysdeps/unix/sysv/linux/mips/kernel-features.h
(__ASSUME_RECV_SYSCALL): Likewise.
* sysdeps/unix/sysv/linux/i386/kernel-features.h
(__ASSUME_SENDTO_FOR_SEND_SYSCALL): Remove define.
* sysdeps/unix/sysv/linux/m68k/kernel-features.h
(__ASSUME_SENDTO_FOR_SEND_SYSCALL): Likewise.
* sysdeps/unix/sysv/linux/s390/kernel-features.h
(__ASSUME_SENDTO_FOR_SEND_SYSCALL): Likewise.
* sysdeps/unix/sysv/linux/alpha/syscalls.list: Remove send from
auto-generation list.
* sysdeps/unix/sysv/linux/arm/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/hppa/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/ia64/syscalls.list: Likewike.
* sysdeps/unix/sysv/linux/mips/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/send.c: Simplify includes.
(__ASSUME_SENDTO_FOR_SEND_SYSCALL): Replace by
__ASSUME_SENDTO_SYSCALL.
* sysdeps/unix/sysv/linux/x86_64/send.c: Remove file.
* sysdeps/unix/sysv/linux/mips/mips64/send.c: Likewise.
* sysdeps/unix/sysv/linux/generic/send.c: Likewise.
* sysdeps/unix/sysv/linux/alpha/syscalls.list: Remove sendto from * sysdeps/unix/sysv/linux/alpha/syscalls.list: Remove sendto from
auto-generation list. auto-generation list.
* sysdeps/unix/sysv/linux/arm/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/arm/syscalls.list: Likewise.

4
sysdeps/unix/sysv/linux/aarch64/sysdep.h
View File

@ -157,6 +157,10 @@
# define HAVE_CLOCK_GETTIME_VSYSCALL 1 # define HAVE_CLOCK_GETTIME_VSYSCALL 1
# define HAVE_GETTIMEOFDAY_VSYSCALL 1 # define HAVE_GETTIMEOFDAY_VSYSCALL 1
/* Previously AArch64 used the generic version without the libc_hidden_def
which lead in a non existent __send symbol in libc.so. */
# undef HAVE_INTERNAL_SEND_SYMBOL
/* Define a macro which expands into the inline wrapper code for a system /* Define a macro which expands into the inline wrapper code for a system
call. */ call. */
# undef INLINE_SYSCALL # undef INLINE_SYSCALL

1
sysdeps/unix/sysv/linux/alpha/kernel-features.h
View File

@ -32,6 +32,7 @@
/* Alpha defines SysV ipc shmat syscall with a different name. */ /* Alpha defines SysV ipc shmat syscall with a different name. */
#define __NR_shmat __NR_osf_shmat #define __NR_shmat __NR_osf_shmat
#define __ASSUME_RECV_SYSCALL 1
#define __ASSUME_RECV_SYSCALL 1 #define __ASSUME_RECV_SYSCALL 1
#endif /* _KERNEL_FEATURES_H */ #endif /* _KERNEL_FEATURES_H */

1
sysdeps/unix/sysv/linux/alpha/syscalls.list
View File

@ -10,7 +10,6 @@ getpeername - getpeername i:ipp __getpeername getpeername
getsockname - getsockname i:ipp __getsockname getsockname getsockname - getsockname i:ipp __getsockname getsockname
getsockopt - getsockopt i:iiiBN __getsockopt getsockopt getsockopt - getsockopt i:iiiBN __getsockopt getsockopt
listen - listen i:ii __listen listen listen - listen i:ii __listen listen
send - send Ci:ibni __libc_send __send send
setsockopt - setsockopt i:iiibn __setsockopt setsockopt setsockopt - setsockopt i:iiibn __setsockopt setsockopt
shutdown - shutdown i:ii __shutdown shutdown shutdown - shutdown i:ii __shutdown shutdown
socket - socket i:iii __socket socket socket - socket i:iii __socket socket

1
sysdeps/unix/sysv/linux/arm/kernel-features.h
View File

@ -39,3 +39,4 @@
#define __NR_fadvise64_64 __NR_arm_fadvise64_64 #define __NR_fadvise64_64 __NR_arm_fadvise64_64
#define __ASSUME_RECV_SYSCALL 1 #define __ASSUME_RECV_SYSCALL 1
#define __ASSUME_SEND_SYSCALL 1

1
sysdeps/unix/sysv/linux/arm/syscalls.list
View File

@ -27,7 +27,6 @@ getpeername - getpeername i:ipp __getpeername getpeername
getsockname - getsockname i:ipp __getsockname getsockname getsockname - getsockname i:ipp __getsockname getsockname
getsockopt - getsockopt i:iiiBN __getsockopt getsockopt getsockopt - getsockopt i:iiiBN __getsockopt getsockopt
listen - listen i:ii __listen listen listen - listen i:ii __listen listen
send - send Ci:ibni __libc_send __send send
setsockopt - setsockopt i:iiibn __setsockopt setsockopt setsockopt - setsockopt i:iiibn __setsockopt setsockopt
shutdown - shutdown i:ii __shutdown shutdown shutdown - shutdown i:ii __shutdown shutdown
socket - socket i:iii __socket socket socket - socket i:iii __socket socket

30
sysdeps/unix/sysv/linux/generic/send.c
View File

@ -1,30 +0,0 @@
/* Copyright (C) 2011-2017 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011.
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 <stdlib.h>
#include <sys/types.h>
#include <sysdep-cancel.h>
#include <libc-symbols.h>
ssize_t
__libc_send (int sockfd, const void *buffer, size_t len, int flags)
{
return SYSCALL_CANCEL (sendto, sockfd, buffer, len, flags, NULL, 0);
}
strong_alias (__libc_send, __send)
weak_alias (__libc_send, send)

1
sysdeps/unix/sysv/linux/hppa/kernel-features.h
View File

@ -26,3 +26,4 @@
#include_next <kernel-features.h> #include_next <kernel-features.h>
#define __ASSUME_RECV_SYSCALL 1 #define __ASSUME_RECV_SYSCALL 1
#define __ASSUME_SEND_SYSCALL 1

1
sysdeps/unix/sysv/linux/hppa/syscalls.list
View File

@ -6,7 +6,6 @@ getpeername - getpeername i:ipp __getpeername getpeername
getsockname - getsockname i:ipp __getsockname getsockname getsockname - getsockname i:ipp __getsockname getsockname
getsockopt - getsockopt i:iiiBN __getsockopt getsockopt getsockopt - getsockopt i:iiiBN __getsockopt getsockopt
listen - listen i:ii __listen listen listen - listen i:ii __listen listen
send - send Ci:ibni __libc_send __send send
setsockopt - setsockopt i:iiibn __setsockopt setsockopt setsockopt - setsockopt i:iiibn __setsockopt setsockopt
shutdown - shutdown i:ii __shutdown shutdown shutdown - shutdown i:ii __shutdown shutdown
socket - socket i:iii __socket socket socket - socket i:iii __socket socket

1
sysdeps/unix/sysv/linux/i386/kernel-features.h
View File

@ -36,7 +36,6 @@
# define __ASSUME_SETSOCKOPT_SYSCALL 1 # define __ASSUME_SETSOCKOPT_SYSCALL 1
# define __ASSUME_GETSOCKNAME_SYSCALL 1 # define __ASSUME_GETSOCKNAME_SYSCALL 1
# define __ASSUME_GETPEERNAME_SYSCALL 1 # define __ASSUME_GETPEERNAME_SYSCALL 1
# define __ASSUME_SENDTO_FOR_SEND_SYSCALL 1
# define __ASSUME_SHUTDOWN_SYSCALL 1 # define __ASSUME_SHUTDOWN_SYSCALL 1
#endif #endif

1
sysdeps/unix/sysv/linux/ia64/kernel-features.h
View File

@ -29,5 +29,6 @@
#endif #endif
#define __ASSUME_RECV_SYSCALL 1 #define __ASSUME_RECV_SYSCALL 1
#define __ASSUME_SEND_SYSCALL 1
#endif /* _KERNEL_FEATURES_H */ #endif /* _KERNEL_FEATURES_H */

1
sysdeps/unix/sysv/linux/ia64/syscalls.list
View File

@ -10,7 +10,6 @@ getpeername - getpeername i:ipp __getpeername getpeername
getsockname - getsockname i:ipp __getsockname getsockname getsockname - getsockname i:ipp __getsockname getsockname
getsockopt - getsockopt i:iiiBN __getsockopt getsockopt getsockopt - getsockopt i:iiiBN __getsockopt getsockopt
listen - listen i:ii __listen listen listen - listen i:ii __listen listen
send - send Ci:ibni __libc_send __send send
setsockopt - setsockopt i:iiibn __setsockopt setsockopt setsockopt - setsockopt i:iiibn __setsockopt setsockopt
shutdown - shutdown i:ii __shutdown shutdown shutdown - shutdown i:ii __shutdown shutdown
socket - socket i:iii __socket socket socket - socket i:iii __socket socket

1
sysdeps/unix/sysv/linux/m68k/kernel-features.h
View File

@ -30,7 +30,6 @@
# define __ASSUME_SETSOCKOPT_SYSCALL 1 # define __ASSUME_SETSOCKOPT_SYSCALL 1
# define __ASSUME_GETSOCKNAME_SYSCALL 1 # define __ASSUME_GETSOCKNAME_SYSCALL 1
# define __ASSUME_GETPEERNAME_SYSCALL 1 # define __ASSUME_GETPEERNAME_SYSCALL 1
# define __ASSUME_SENDTO_FOR_SEND_SYSCALL 1
# define __ASSUME_SHUTDOWN_SYSCALL 1 # define __ASSUME_SHUTDOWN_SYSCALL 1
#endif #endif

1
sysdeps/unix/sysv/linux/mips/kernel-features.h
View File

@ -40,6 +40,7 @@
/* mips32 support wire-up network syscalls. */ /* mips32 support wire-up network syscalls. */
# define __ASSUME_RECV_SYSCALL 1 # define __ASSUME_RECV_SYSCALL 1
# define __ASSUME_SEND_SYSCALL 1
#endif #endif
/* Define that mips64-n32 is a ILP32 ABI to set the correct interface to /* Define that mips64-n32 is a ILP32 ABI to set the correct interface to

1
sysdeps/unix/sysv/linux/mips/mips64/send.c
View File

@ -1 +0,0 @@
#include <sysdeps/unix/sysv/linux/x86_64/send.c>

1
sysdeps/unix/sysv/linux/mips/syscalls.list
View File

@ -17,7 +17,6 @@ getpeername - getpeername i:ipp __getpeername getpeername
getsockname - getsockname i:ipp __getsockname getsockname getsockname - getsockname i:ipp __getsockname getsockname
getsockopt - getsockopt i:iiiBN __getsockopt getsockopt getsockopt - getsockopt i:iiiBN __getsockopt getsockopt
listen - listen i:ii __listen listen listen - listen i:ii __listen listen
send - send Ci:ibni __libc_send __send send
setsockopt - setsockopt i:iiibn __setsockopt setsockopt setsockopt - setsockopt i:iiibn __setsockopt setsockopt
shutdown - shutdown i:ii __shutdown shutdown shutdown - shutdown i:ii __shutdown shutdown
socket - socket i:iii __socket socket socket - socket i:iii __socket socket

4
sysdeps/unix/sysv/linux/nios2/sysdep.h
View File

@ -140,6 +140,10 @@
/* In order to get __set_errno() definition in INLINE_SYSCALL. */ /* In order to get __set_errno() definition in INLINE_SYSCALL. */
#include <errno.h> #include <errno.h>
/* Previously Nios2 used the generic version without the libc_hidden_def
which lead in a non existent __send symbol in libc.so. */
# undef HAVE_INTERNAL_SEND_SYMBOL
/* Define a macro which expands into the inline wrapper code for a system /* Define a macro which expands into the inline wrapper code for a system
call. */ call. */
#undef INLINE_SYSCALL #undef INLINE_SYSCALL

1
sysdeps/unix/sysv/linux/s390/kernel-features.h
View File

@ -30,7 +30,6 @@
# define __ASSUME_SETSOCKOPT_SYSCALL 1 # define __ASSUME_SETSOCKOPT_SYSCALL 1
# define __ASSUME_GETSOCKNAME_SYSCALL 1 # define __ASSUME_GETSOCKNAME_SYSCALL 1
# define __ASSUME_GETPEERNAME_SYSCALL 1 # define __ASSUME_GETPEERNAME_SYSCALL 1
# define __ASSUME_SENDTO_FOR_SEND_SYSCALL 1
# define __ASSUME_SHUTDOWN_SYSCALL 1 # define __ASSUME_SHUTDOWN_SYSCALL 1
#endif #endif

9
sysdeps/unix/sysv/linux/send.c
View File

@ -15,21 +15,16 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */ <http://www.gnu.org/licenses/>. */
#include <errno.h>
#include <signal.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sysdep-cancel.h> #include <sysdep-cancel.h>
#include <socketcall.h> #include <socketcall.h>
#include <kernel-features.h>
#include <sys/syscall.h>
ssize_t ssize_t
__libc_send (int fd, const void *buf, size_t len, int flags) __libc_send (int fd, const void *buf, size_t len, int flags)
{ {
#ifdef __ASSUME_SEND_SYSCALL #ifdef __ASSUME_SEND_SYSCALL
return SYSCALL_CANCEL (send, fd, buf, len, flags); return SYSCALL_CANCEL (send, fd, buf, len, flags);
#elif defined __ASSUME_SENDTO_FOR_SEND_SYSCALL #elif defined __ASSUME_SENDTO_SYSCALL
return SYSCALL_CANCEL (sendto, fd, buf, len, flags, NULL, 0); return SYSCALL_CANCEL (sendto, fd, buf, len, flags, NULL, 0);
#else #else
return SOCKETCALL_CANCEL (send, fd, buf, len, flags); return SOCKETCALL_CANCEL (send, fd, buf, len, flags);
@ -37,4 +32,6 @@ __libc_send (int fd, const void *buf, size_t len, int flags)
} }
weak_alias (__libc_send, send) weak_alias (__libc_send, send)
weak_alias (__libc_send, __send) weak_alias (__libc_send, __send)
#ifdef HAVE_INTERNAL_SEND_SYMBOL
libc_hidden_def (__send) libc_hidden_def (__send)
#endif

1
sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list
View File

@ -7,7 +7,6 @@ getpeername - getpeername 3 __getpeername getpeername
getsockname - getsockname 3 __getsockname getsockname getsockname - getsockname 3 __getsockname getsockname
getsockopt - getsockopt 5 __getsockopt getsockopt getsockopt - getsockopt 5 __getsockopt getsockopt
listen - listen 2 __listen listen listen - listen 2 __listen listen
send - send C:4 __libc_send __send send
setsockopt - setsockopt 5 __setsockopt setsockopt setsockopt - setsockopt 5 __setsockopt setsockopt
shutdown - shutdown 2 __shutdown shutdown shutdown - shutdown 2 __shutdown shutdown
socketpair - socketpair 4 __socketpair socketpair socketpair - socketpair 4 __socketpair socketpair

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

@ -62,3 +62,7 @@
#define LO_HI_LONG(val) \ #define LO_HI_LONG(val) \
(long) (val), \ (long) (val), \
(long) (((uint64_t) (val)) >> 32) (long) (((uint64_t) (val)) >> 32)
/* Exports the __send symbol on send.c linux implementation (some ABI have
it missing due the usage of a old generic version without it). */
#define HAVE_INTERNAL_SEND_SYMBOL 1

4
sysdeps/unix/sysv/linux/tile/sysdep.h
View File

@ -218,6 +218,10 @@
#define HAVE_CLOCK_GETTIME_VSYSCALL 1 #define HAVE_CLOCK_GETTIME_VSYSCALL 1
#define HAVE_GETTIMEOFDAY_VSYSCALL 1 #define HAVE_GETTIMEOFDAY_VSYSCALL 1
/* Previously tile used the generic version without the libc_hidden_def
which lead in a non existent __send symbol in libc.so. */
#undef HAVE_INTERNAL_SEND_SYMBOL
#endif /* __ASSEMBLER__ */ #endif /* __ASSEMBLER__ */
/* Pointer mangling support. */ /* Pointer mangling support. */

31
sysdeps/unix/sysv/linux/x86_64/send.c
View File

@ -1,31 +0,0 @@
/* Copyright (C) 2001-2017 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 <sys/socket.h>
#include <sysdep-cancel.h>
/* Send N bytes of BUF to socket FD. Returns the number sent or -1. */
ssize_t
__libc_send (int fd, const void *buf, size_t n, int flags)
{
return SYSCALL_CANCEL (sendto, fd, buf, n, flags, NULL, (size_t) 0);
}
weak_alias (__libc_send, __send)
libc_hidden_weak (__send)
weak_alias (__send, send)