diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/unix/sysv/linux/kernel-features.h | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/recvmmsg.c | 70 |
2 files changed, 10 insertions, 68 deletions
diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h index 74ac6276e8..a5c226311c 100644 --- a/sysdeps/unix/sysv/linux/kernel-features.h +++ b/sysdeps/unix/sysv/linux/kernel-features.h @@ -90,13 +90,7 @@ /* Support for recvmmsg functionality was added in 2.6.33. The macros defined correspond to those for accept4. */ -#if __LINUX_KERNEL_VERSION >= 0x020621 -# ifdef __ASSUME_SOCKETCALL -# define __ASSUME_RECVMMSG_SOCKETCALL 1 -# endif -# define __ASSUME_RECVMMSG_SYSCALL 1 -# define __ASSUME_RECVMMSG 1 -#endif +#define __ASSUME_RECVMMSG_SYSCALL 1 /* statfs fills in f_flags since 2.6.36. */ #if __LINUX_KERNEL_VERSION >= 0x020624 diff --git a/sysdeps/unix/sysv/linux/recvmmsg.c b/sysdeps/unix/sysv/linux/recvmmsg.c index 28eb678428..de4412972b 100644 --- a/sysdeps/unix/sysv/linux/recvmmsg.c +++ b/sysdeps/unix/sysv/linux/recvmmsg.c @@ -21,73 +21,21 @@ #include <sysdep-cancel.h> #include <sys/syscall.h> +#include <socketcall.h> #include <kernel-features.h> -/* Do not use the recvmmsg syscall on socketcall architectures unless - it was added at the same time as the socketcall support or can be - assumed to be present. */ -#if defined __ASSUME_SOCKETCALL \ - && !defined __ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL \ - && !defined __ASSUME_RECVMMSG_SYSCALL -# undef __NR_recvmmsg -#endif - -#ifdef __NR_recvmmsg -int -recvmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags, - struct timespec *tmo) -{ - return SYSCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags, tmo); -} -#elif defined __NR_socketcall -# include <socketcall.h> -# ifdef __ASSUME_RECVMMSG_SOCKETCALL int recvmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags, struct timespec *tmo) { + /* Do not use the recvmmsg syscall on socketcall architectures unless + it was added at the same time as the socketcall support or can be + assumed to be present. */ +#if defined __ASSUME_SOCKETCALL \ + && !defined __ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL \ + && !defined __ASSUME_RECVMMSG_SYSCALL return SOCKETCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags, tmo); -} -# else -static int have_recvmmsg; - -int -recvmmsg (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags, - struct timespec *tmo) -{ - if (__glibc_likely (have_recvmmsg >= 0)) - { - int ret = SOCKETCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags, - tmo); - /* The kernel returns -EINVAL for unknown socket operations. - We need to convert that error to an ENOSYS error. */ - if (__builtin_expect (ret < 0, 0) - && have_recvmmsg == 0 - && errno == EINVAL) - { - /* Try another call, this time with an invalid file - descriptor and all other parameters cleared. This call - will not cause any harm and it will return - immediately. */ - ret = SOCKETCALL_CANCEL (invalid, -1); - if (errno == EINVAL) - { - have_recvmmsg = -1; - __set_errno (ENOSYS); - } - else - { - have_recvmmsg = 1; - __set_errno (EINVAL); - } - return -1; - } - return ret; - } - __set_errno (ENOSYS); - return -1; -} -# endif /* __ASSUME_RECVMMSG_SOCKETCALL */ #else -# include <socket/recvmmsg.c> + return SYSCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags, tmo); #endif +} |