lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

linux: Add time64 pselect support

Browse Source 
The syscall __NR_pselect6_time64 (32-bit) or __NR_pselect6 (64-bit)
is used as default.  For architectures with __ASSUME_TIME64_SYSCALLS
the 32-bit fallback uses __NR_pselec6.

To accomodate microblaze missing pselect6 support on kernel older
than 3.15 the fallback is moved to its own function to the microblaze
specific implementation can override it.

Checked on x86_64-linux-gnu and i686-linux-gnu (on 5.4 and on 4.15
kernel).

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
Adhemerval Zanella
2020-07-06 13:27:12 -03:00
parent 7c437d3778
commit a92f4e6299
5 changed files with 115 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
sysdeps/unix/sysv/linux/pselect.c
View File

@ -18,14 +18,15 @@
#include <sys/select.h>
#include <sysdep-cancel.h>
#include <time64-support.h>
int
__pselect (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
const struct timespec *timeout, const sigset_t *sigmask)
__pselect64 (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
const struct __timespec64 *timeout, const sigset_t *sigmask)
{
/* The Linux kernel can in some situations update the timeout value.
We do not want that so use a local variable. */
struct timespec tval;
struct __timespec64 tval;
if (timeout != NULL)
{
tval = *timeout;
@ -36,18 +37,46 @@ __pselect (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
we can only pass in 6 directly. If there is an architecture with
support for more parameters a new version of this file needs to
be created. */
struct
{
__syscall_ulong_t ss;
__syscall_ulong_t ss_len;
} data;
data.ss = (__syscall_ulong_t) (uintptr_t) sigmask;
data.ss_len = __NSIG_BYTES;
#ifndef __NR_pselect6_time64
# define __NR_pselect6_time64 __NR_pselect6
#endif
int r;
if (supports_time64 ())
{
r = SYSCALL_CANCEL (pselect6_time64, nfds, readfds, writefds, exceptfds,
timeout,
((__syscall_ulong_t[]){ (uintptr_t) sigmask,
__NSIG_BYTES }));
if (r == 0 || errno != ENOSYS)
return r;
return SYSCALL_CANCEL (pselect6, nfds, readfds, writefds, exceptfds,
timeout, &data);
mark_time64_unsupported ();
}
#ifndef __ASSUME_TIME64_SYSCALLS
r = __pselect32 (nfds, readfds, writefds, exceptfds, timeout, sigmask);
#endif
return r;
}
#if __TIMESIZE != 64
libc_hidden_def (__pselect64)
int
__pselect (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
const struct timespec *timeout, const sigset_t *sigmask)
{
struct __timespec64 ts64, *pts64 = NULL;
if (timeout != NULL)
{
ts64 = valid_timespec_to_timespec64 (*timeout);
pts64 = &ts64;
}
return __pselect64 (nfds, readfds, writefds, exceptfds, pts64, sigmask);
}
#endif
#ifndef __pselect
weak_alias (__pselect, pselect)
#endif