mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-05 19:21:05 +00:00
e3b0580d0d
The accept4, recvmmsg and sendmmsg functions had macros __ASSUME_*_SYSCALL_WITH_SOCKETCALL. Before we could assume kernels with the relevant functionality, these macros represented the conditions under which, on a socketcall architecture, glibc could just call the syscall unconditionally and not have to deal with socketcall at all for those functions, because if the syscall didn't work for them the socketcall call wouldn't either. Now we can assume kernels with the relevant functionality, the only question is whether we can assume the syscall is present; if not, we are on a socketcall architecture and just use socketcall instead. Thus, this patch removes the macros that are no longer necessary, and simplifies the code for accept4, recvmmsg and sendmmsg to use the same logic as the other C implementations of socket functions that may use a syscall or socketcall depending on kernel support. Tested for x86_64 and x86. * sysdeps/unix/sysv/linux/accept4.c (accept4): Use syscall if [__ASSUME_ACCEPT4_SYSCALL], otherwise socketcall. * sysdeps/unix/sysv/linux/recvmmsg.c (recvmmsg): Use syscall if [__ASSUME_RECVMMSG_SYSCALL], otherwise socketcall. * sysdeps/unix/sysv/linux/sendmmsg.c (__sendmmsg): Use syscall if [__ASSUME_SENDMMSG_SYSCALL], otherwise socketcall. * sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_ACCEPT4_SYSCALL): Move to general list of macros for socket syscalls. (__ASSUME_RECVMMSG_SYSCALL): Likewise. (__ASSUME_SENDMMSG_SYSCALL): Likewise. * sysdeps/unix/sysv/linux/i386/kernel-features.h (__ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL): Remove. (__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL): Likewise. * sysdeps/unix/sysv/linux/microblaze/kernel-features.h (__ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL): Remove. * sysdeps/unix/sysv/linux/powerpc/kernel-features.h (__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL): Likewise. * sysdeps/unix/sysv/linux/sh/kernel-features.h (__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL): Likewise. * sysdeps/unix/sysv/linux/sparc/kernel-features.h (__ASSUME_ACCEPT4_SYSCALL_WITH_SOCKETCALL): Likewise. (__ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL): Likewise. (__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL): Likewise.
51 lines
1.8 KiB
C
51 lines
1.8 KiB
C
/* Set flags signalling availability of kernel features based on given
|
|
kernel version number. i386 version.
|
|
Copyright (C) 1999-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/>. */
|
|
|
|
/* i386 uses socketcall. */
|
|
#define __ASSUME_SOCKETCALL 1
|
|
|
|
/* Direct socketcalls available with kernel 4.3. */
|
|
#if __LINUX_KERNEL_VERSION >= 0x040300
|
|
# define __ASSUME_SOCKET_SYSCALL 1
|
|
# define __ASSUME_SOCKETPAIR_SYSCALL 1
|
|
# define __ASSUME_BIND_SYSCALL 1
|
|
# define __ASSUME_LISTEN_SYSCALL 1
|
|
# define __ASSUME_GETSOCKOPT_SYSCALL 1
|
|
# define __ASSUME_SETSOCKOPT_SYSCALL 1
|
|
# define __ASSUME_GETSOCKNAME_SYSCALL 1
|
|
# define __ASSUME_GETPEERNAME_SYSCALL 1
|
|
# define __ASSUME_SHUTDOWN_SYSCALL 1
|
|
#endif
|
|
|
|
#include_next <kernel-features.h>
|
|
|
|
#undef __ASSUME_ACCEPT_SYSCALL
|
|
|
|
#if __LINUX_KERNEL_VERSION < 0x040300
|
|
# undef __ASSUME_ACCEPT4_SYSCALL
|
|
# undef __ASSUME_SENDMSG_SYSCALL
|
|
# undef __ASSUME_RECVMSG_SYSCALL
|
|
# undef __ASSUME_CONNECT_SYSCALL
|
|
# undef __ASSUME_RECVFROM_SYSCALL
|
|
# undef __ASSUME_SENDTO_SYSCALL
|
|
#endif
|
|
|
|
/* i686 only supports ipc syscall. */
|
|
#undef __ASSUME_DIRECT_SYSVIPC_SYSCALLS
|