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

Consolidate Linux recv implementation

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

  1. Remove recv from auto-generation syscalls.list on the architecture
     that uses __NR_recv.
  2. Define __NR_recv for architectures that supports it.  It was done
     instead of defining in default kernel-features.h because current Linux
     practice for new ports is to implement only __NR_recvfrom [1] and it will
     require adding new kernel-features for ports that do not require it
     (aarch64 for instance).
  3. Remove __ASSUME_RECVFROM_FOR_RECV_SYSCALL and decide to use
     __NR_recvfrom for recv generation based on __ASSUME_RECVFROM_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/alpha/syscalls.list: Remove recv 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: Likewise.
	* sysdeps/unix/sysv/linux/mips/syscalls.list: Likewise.
	* sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list: Likewise.
	* sysdeps/unix/sysv/linux/alpha/kernel-features.h
	(__ASSUME_RECV_SYSCALL): New 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_RECVFROM_FOR_RECV_SYSCALL): Remove define.
	* sysdeps/unix/sysv/linux/m68k/kernel-features.h
	(__ASSUME_RECVFROM_FOR_RECV_SYSCALL): Remove define.
	* sysdeps/unix/sysv/linux/s390/kernel-features.h
	(__ASSUME_RECVFROM_FOR_RECV_SYSCALL): Remove define.
	* sysdeps/unix/sysv/linux/generic/recv.c: Remove file.
	* sysdeps/unix/sysv/linux/mips/mips64/recv.c: Likewise.
	* sysdeps/unix/sysv/linux/x86_64/recv.c: Likewise.
	* sysdeps/unix/sysv/linux/recv.c: Simplify includes.
	(__libc_recv): Use __ASSUME_RECVFROM_SYSCALL instead of
	__ASSUME_RECVFROM_FOR_RECV_SYSCALL to issue recvfrom syscall.

[1] include/asm-generic/unistd.h (__ARCH_WANT_SYSCALL_DEPRECATED)
This commit is contained in:
Adhemerval Zanella 2016-11-17 18:47:00 -02:00 committed by Adhemerval Zanella
parent 1f8161a801
commit df799d9eb3
19 changed files with 42 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ChangeLog
View File

@ -1,5 +1,35 @@
2016-03-08 Adhemerval Zanella <adhemerval.zanella@linaro.org> 2016-03-08 Adhemerval Zanella <adhemerval.zanella@linaro.org>
* sysdeps/unix/sysv/linux/alpha/syscalls.list: Remove recv 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: Likewise.
* sysdeps/unix/sysv/linux/mips/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/alpha/kernel-features.h
(__ASSUME_RECV_SYSCALL): New 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_RECVFROM_FOR_RECV_SYSCALL): Remove define.
* sysdeps/unix/sysv/linux/m68k/kernel-features.h
(__ASSUME_RECVFROM_FOR_RECV_SYSCALL): Remove define.
* sysdeps/unix/sysv/linux/s390/kernel-features.h
(__ASSUME_RECVFROM_FOR_RECV_SYSCALL): Remove define.
* sysdeps/unix/sysv/linux/generic/recv.c: Remove file.
* sysdeps/unix/sysv/linux/mips/mips64/recv.c: Likewise.
* sysdeps/unix/sysv/linux/x86_64/recv.c: Likewise.
* sysdeps/unix/sysv/linux/recv.c: Simplify includes.
(__libc_recv): Use __ASSUME_RECVFROM_SYSCALL instead of
__ASSUME_RECVFROM_FOR_RECV_SYSCALL to issue recvfrom syscall.
* sysdeps/unix/sysv/linux/alpha/syscalls.list: Remove recvfrom from * sysdeps/unix/sysv/linux/alpha/syscalls.list: Remove recvfrom from
auto-generation list. auto-generation list.
* sysdeps/unix/sysv/linux/arm/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/arm/syscalls.list: Likewise.

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

@ -32,4 +32,6 @@
/* 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
#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
recv - recv Ci:ibni __libc_recv __recv recv
send - send Ci:ibni __libc_send __send send send - send Ci:ibni __libc_send __send send
sendto - sendto Ci:ibnibn __libc_sendto __sendto sendto sendto - sendto Ci:ibnibn __libc_sendto __sendto sendto
setsockopt - setsockopt i:iiibn __setsockopt setsockopt setsockopt - setsockopt i:iiibn __setsockopt setsockopt

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

@ -37,3 +37,5 @@
/* ARM only has a syscall for fadvise64{_64} and it is defined with a /* ARM only has a syscall for fadvise64{_64} and it is defined with a
non-standard name. */ non-standard name. */
#define __NR_fadvise64_64 __NR_arm_fadvise64_64 #define __NR_fadvise64_64 __NR_arm_fadvise64_64
#define __ASSUME_RECV_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
recv - recv Ci:ibni __libc_recv __recv recv
send - send Ci:ibni __libc_send __send send send - send Ci:ibni __libc_send __send send
sendto - sendto Ci:ibnibn __libc_sendto __sendto sendto sendto - sendto Ci:ibnibn __libc_sendto __sendto sendto
setsockopt - setsockopt i:iiibn __setsockopt setsockopt setsockopt - setsockopt i:iiibn __setsockopt setsockopt

32
sysdeps/unix/sysv/linux/generic/recv.c
View File

@ -1,32 +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_recv (int sockfd, void *buffer, size_t len, int flags)
{
return SYSCALL_CANCEL (recvfrom, sockfd, buffer, len, flags,
NULL, NULL);
}
strong_alias (__libc_recv, __recv)
libc_hidden_def (__recv)
weak_alias (__libc_recv, recv)

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

@ -24,3 +24,5 @@
#endif #endif
#include_next <kernel-features.h> #include_next <kernel-features.h>
#define __ASSUME_RECV_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
recv - recv Ci:ibni __libc_recv __recv recv
send - send Ci:ibni __libc_send __send send send - send Ci:ibni __libc_send __send send
sendto - sendto Ci:ibnibn __libc_sendto __sendto sendto sendto - sendto Ci:ibnibn __libc_sendto __sendto sendto
setsockopt - setsockopt i:iiibn __setsockopt setsockopt setsockopt - setsockopt i:iiibn __setsockopt setsockopt

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

@ -38,7 +38,6 @@
# define __ASSUME_GETPEERNAME_SYSCALL 1 # define __ASSUME_GETPEERNAME_SYSCALL 1
# define __ASSUME_SENDTO_SYSCALL 1 # define __ASSUME_SENDTO_SYSCALL 1
# define __ASSUME_SENDTO_FOR_SEND_SYSCALL 1 # define __ASSUME_SENDTO_FOR_SEND_SYSCALL 1
# define __ASSUME_RECVFROM_FOR_RECV_SYSCALL 1
# define __ASSUME_SHUTDOWN_SYSCALL 1 # define __ASSUME_SHUTDOWN_SYSCALL 1
#endif #endif

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

@ -28,4 +28,6 @@
# undef __ASSUME_ACCEPT4 # undef __ASSUME_ACCEPT4
#endif #endif
#define __ASSUME_RECV_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
recv - recv Ci:ibni __libc_recv __recv recv
send - send Ci:ibni __libc_send __send send send - send Ci:ibni __libc_send __send send
sendto - sendto Ci:ibnibn __libc_sendto __sendto sendto sendto - sendto Ci:ibnibn __libc_sendto __sendto sendto
setsockopt - setsockopt i:iiibn __setsockopt setsockopt setsockopt - setsockopt i:iiibn __setsockopt setsockopt

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

@ -32,7 +32,6 @@
# define __ASSUME_GETPEERNAME_SYSCALL 1 # define __ASSUME_GETPEERNAME_SYSCALL 1
# define __ASSUME_SENDTO_SYSCALL 1 # define __ASSUME_SENDTO_SYSCALL 1
# define __ASSUME_SENDTO_FOR_SEND_SYSCALL 1 # define __ASSUME_SENDTO_FOR_SEND_SYSCALL 1
# define __ASSUME_RECVFROM_FOR_RECV_SYSCALL 1
# define __ASSUME_SHUTDOWN_SYSCALL 1 # define __ASSUME_SHUTDOWN_SYSCALL 1
#endif #endif

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

@ -37,6 +37,9 @@
/* The o32 MIPS fadvise64 syscall behaves as fadvise64_64. */ /* The o32 MIPS fadvise64 syscall behaves as fadvise64_64. */
# define __ASSUME_FADVISE64_AS_64_64 1 # define __ASSUME_FADVISE64_AS_64_64 1
/* mips32 support wire-up network syscalls. */
# define __ASSUME_RECV_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/recv.c
View File

@ -1 +0,0 @@
#include <sysdeps/unix/sysv/linux/x86_64/recv.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
recv - recv Ci:ibni __libc_recv __recv recv
send - send Ci:ibni __libc_send __send send send - send Ci:ibni __libc_send __send send
sendto - sendto Ci:ibnibn __libc_sendto __sendto sendto sendto - sendto Ci:ibnibn __libc_sendto __sendto sendto
setsockopt - setsockopt i:iiibn __setsockopt setsockopt setsockopt - setsockopt i:iiibn __setsockopt setsockopt

7
sysdeps/unix/sysv/linux/recv.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_recv (int fd, void *buf, size_t len, int flags) __libc_recv (int fd, void *buf, size_t len, int flags)
{ {
#ifdef __ASSUME_RECV_SYSCALL #ifdef __ASSUME_RECV_SYSCALL
return SYSCALL_CANCEL (recv, fd, buf, len, flags); return SYSCALL_CANCEL (recv, fd, buf, len, flags);
#elif defined __ASSUME_RECVFROM_FOR_RECV_SYSCALL #elif defined __ASSUME_RECVFROM_SYSCALL
return SYSCALL_CANCEL (recvfrom, fd, buf, len, flags, NULL, NULL); return SYSCALL_CANCEL (recvfrom, fd, buf, len, flags, NULL, NULL);
#else #else
return SOCKETCALL_CANCEL (recv, fd, buf, len, flags); return SOCKETCALL_CANCEL (recv, fd, buf, len, flags);

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

@ -32,7 +32,6 @@
# define __ASSUME_GETPEERNAME_SYSCALL 1 # define __ASSUME_GETPEERNAME_SYSCALL 1
# define __ASSUME_SENDTO_SYSCALL 1 # define __ASSUME_SENDTO_SYSCALL 1
# define __ASSUME_SENDTO_FOR_SEND_SYSCALL 1 # define __ASSUME_SENDTO_FOR_SEND_SYSCALL 1
# define __ASSUME_RECVFROM_FOR_RECV_SYSCALL 1
# define __ASSUME_SHUTDOWN_SYSCALL 1 # define __ASSUME_SHUTDOWN_SYSCALL 1
#endif #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
recv - recv C:4 __libc_recv __recv recv
send - send C:4 __libc_send __send send send - send C:4 __libc_send __send send
sendto - sendto C:6 __libc_sendto __sendto sendto sendto - sendto C:6 __libc_sendto __sendto sendto
setsockopt - setsockopt 5 __setsockopt setsockopt setsockopt - setsockopt 5 __setsockopt setsockopt

33
sysdeps/unix/sysv/linux/x86_64/recv.c
View File

@ -1,33 +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>
/* Read N bytes into BUF from socket FD.
Returns the number read or -1 for errors. */
ssize_t
__libc_recv (int fd, void *buf, size_t n, int flags)
{
return SYSCALL_CANCEL (recvfrom, fd, buf, n, flags, NULL, NULL);
}
weak_alias (__libc_recv, __recv)
libc_hidden_weak (__recv)
weak_alias (__recv, recv)