aboutsummaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2019-11-14 18:18:24 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2019-11-22 14:40:57 -0300
commit8781c1301d55db0a95398eb24c11b99205706bae (patch)
tree2f8e6ef91bb2d96eeb8cee0c39239a42a5d83b34 /misc
parent102b5b0cafaf09758a62f62a53fafb6db2f71136 (diff)
downloadglibc-8781c1301d55db0a95398eb24c11b99205706bae.zip
glibc-8781c1301d55db0a95398eb24c11b99205706bae.tar.gz
glibc-8781c1301d55db0a95398eb24c11b99205706bae.tar.bz2
misc: Set generic pselect as ENOSYS
The generic pselect implementation has the very specific race condition that motived the creation of the pselect syscall (no atomicity in signal mask set/reset). Using it as generic implementation is counterproductive Also currently only microblaze uses it as fallback when used on kernel prior 3.15. This patch moves the generic implementation to a microblaze specific one, sets the generic internal as a ENOSYS, and cleanups the Linux generic implementation. The microblaze implementation mimics the previous Linux generic one, where it either uses pselect6 directly if __ASSUME_PSELECT or a first try pselect6 then the fallback otherwise. Checked on x86_64-linux-gnu and microblaze-linux-gnu.
Diffstat (limited to 'misc')
-rw-r--r--misc/pselect.c46
1 files changed, 3 insertions, 43 deletions
diff --git a/misc/pselect.c b/misc/pselect.c
index 76ded85..b53d9cd 100644
--- a/misc/pselect.c
+++ b/misc/pselect.c
@@ -17,12 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <errno.h>
-#include <signal.h>
-#include <stddef.h> /* For NULL. */
-#include <sys/time.h>
#include <sys/select.h>
-#include <sysdep-cancel.h>
-
/* Check the first NFDS descriptors each in READFDS (if not NULL) for read
readiness, in WRITEFDS (if not NULL) for write readiness, and in EXCEPTFDS
@@ -34,43 +29,8 @@ int
__pselect (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
const struct timespec *timeout, const sigset_t *sigmask)
{
- struct timeval tval;
- int retval;
- sigset_t savemask;
-
- /* Change nanosecond number to microseconds. This might mean losing
- precision and therefore the `pselect` should be available. But
- for now it is hardly found. */
- if (timeout != NULL)
- {
- /* Catch bugs which would be hidden by the TIMESPEC_TO_TIMEVAL
- computations. The division by 1000 truncates values. */
- if (__glibc_unlikely (timeout->tv_nsec < 0))
- {
- __set_errno (EINVAL);
- return -1;
- }
-
- TIMESPEC_TO_TIMEVAL (&tval, timeout);
- }
-
- /* The setting and restoring of the signal mask and the select call
- should be an atomic operation. This can't be done without kernel
- help. */
- if (sigmask != NULL)
- __sigprocmask (SIG_SETMASK, sigmask, &savemask);
-
- /* Note the pselect() is a cancellation point. But since we call
- select() which itself is a cancellation point we do not have
- to do anything here. */
- retval = __select (nfds, readfds, writefds, exceptfds,
- timeout != NULL ? &tval : NULL);
-
- if (sigmask != NULL)
- __sigprocmask (SIG_SETMASK, &savemask, NULL);
-
- return retval;
+ __set_errno (ENOSYS);
+ return -1;
}
-#ifndef __pselect
weak_alias (__pselect, pselect)
-#endif
+stub_warning (pselect)