diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2017-05-09 20:01:52 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2017-05-09 20:01:52 +0000 |
| commit | 0cb5da5c09e2b2eb47348d110282b92ec27eedf5 (patch) | |
| tree | 52372d318cc72f03ad9690fbb78dafa2f3e7572e /sysdeps/unix/sysv/linux/kernel-features.h | |
| parent | 9a45f54310573c190fa270e1f80d8307750305e9 (diff) | |
| download | glibc-0cb5da5c09e2b2eb47348d110282b92ec27eedf5.tar.gz glibc-0cb5da5c09e2b2eb47348d110282b92ec27eedf5.tar.xz glibc-0cb5da5c09e2b2eb47348d110282b92ec27eedf5.zip | |
Simplify sendmmsg code.
Now we can assume a kernel with sendmmsg support, this patch simplifies the implementation to be similar to that for accept4: either using socketcall or the syscall according to whether the syscall is known to be available, without further fallback implementations. The __ASSUME_SENDMMSG macro is kept (now defined unconditionally), since it's used in resolv/res_send.c. Tested for x86_64 and x86. * sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_SENDMMSG_SYSCALL): Define unconditionally. (__ASSUME_SENDMMSG): Likewise. (__ASSUME_SENDMMSG_SOCKETCALL): Remove macro. * sysdeps/unix/sysv/linux/sendmmsg.c (__sendmmsg): Define using sendmmsg syscall if that can be assumed to be present, socketcall otherwise, with no fallback for runtime failure.
Diffstat (limited to 'sysdeps/unix/sysv/linux/kernel-features.h')
| -rw-r--r-- | sysdeps/unix/sysv/linux/kernel-features.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h index a5c226311c..77285656cd 100644 --- a/sysdeps/unix/sysv/linux/kernel-features.h +++ b/sysdeps/unix/sysv/linux/kernel-features.h @@ -99,13 +99,8 @@ /* Support for sendmmsg functionality was added in 3.0. The macros defined correspond to those for accept4 and recvmmsg. */ -#if __LINUX_KERNEL_VERSION >= 0x030000 -# ifdef __ASSUME_SOCKETCALL -# define __ASSUME_SENDMMSG_SOCKETCALL 1 -# endif -# define __ASSUME_SENDMMSG_SYSCALL 1 -# define __ASSUME_SENDMMSG 1 -#endif +#define __ASSUME_SENDMMSG_SYSCALL 1 +#define __ASSUME_SENDMMSG 1 /* On most architectures, most socket syscalls are supported for all supported kernel versions, but on some socketcall architectures |