diff options
author | Ulrich Drepper <drepper@redhat.com> | 2002-12-15 10:26:23 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2002-12-15 10:26:23 +0000 |
commit | 6ee8d3345646ab0bea91891362a2bbf15503edec (patch) | |
tree | 718ea6deebec61e44b09eb25817ee5c14da35f57 /sysdeps/unix/sysv/linux/poll.c | |
parent | 2fb6444dbb9672aea7766b3790a3cb70a73473d3 (diff) | |
download | glibc-6ee8d3345646ab0bea91891362a2bbf15503edec.tar.gz glibc-6ee8d3345646ab0bea91891362a2bbf15503edec.tar.xz glibc-6ee8d3345646ab0bea91891362a2bbf15503edec.zip |
Update.
2002-12-15 Ulrich Drepper <drepper@redhat.com> * sysdeps/generic/sysdep-cancel.h: Add dummy definitions for SINGLE_THREAD_P, LIBC_CANCEL_ASYNC, and LIBC_CANCEL_RESET. * sysdeps/unix/sysv/linux/open64.c: New file. * sysdeps/generic/pselect.c: Add support for cancellation handling. * sysdeps/posix/open64.c: Likewise. * sysdeps/posix/sigpause.c: Likewise. * sysdeps/posix/sigwait.c: Likewise. * sysdeps/posix/system.c: Likewise. * sysdeps/posix/waitid.c: Likewise. * sysdeps/unix/sysv/linux/accept.S: Likewise. * sysdeps/unix/sysv/linux/connect.S: Likewise. * sysdeps/unix/sysv/linux/llseek.c: Likewise. * sysdeps/unix/sysv/linux/msgrcv.c: Likewise. * sysdeps/unix/sysv/linux/msgsnd.c: Likewise. * sysdeps/unix/sysv/linux/poll.c: Likewise. * sysdeps/unix/sysv/linux/pread.c: Likewise. * sysdeps/unix/sysv/linux/pread64.c: Likewise. * sysdeps/unix/sysv/linux/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/pwrite64.c: Likewise. * sysdeps/unix/sysv/linux/readv.c: Likewise. * sysdeps/unix/sysv/linux/recv.S: Likewise. * sysdeps/unix/sysv/linux/recvfrom.S: Likewise. * sysdeps/unix/sysv/linux/recvmsg.S: Likewise. * sysdeps/unix/sysv/linux/send.S: Likewise. * sysdeps/unix/sysv/linux/sendmsg.S: Likewise. * sysdeps/unix/sysv/linux/sendto.S: Likewise. * sysdeps/unix/sysv/linux/sigsuspend.c: Likewise. * sysdeps/unix/sysv/linux/sigtimedwait.c: Likewise. * sysdeps/unix/sysv/linux/sigwait.c: Likewise. * sysdeps/unix/sysv/linux/sigwaitinfo.c: Likewise. * sysdeps/unix/sysv/linux/tcdrain.c: Likewise. * sysdeps/unix/sysv/linux/wait.c: Likewise. * sysdeps/unix/sysv/linux/waitpid.c: Likewise. * sysdeps/unix/sysv/linux/writev.c: Likewise. * sysdeps/unix/sysv/linux/i386/fcntl.c: Likewise. * sysdeps/unix/sysv/linux/i386/socket.S: Likewise.
Diffstat (limited to 'sysdeps/unix/sysv/linux/poll.c')
-rw-r--r-- | sysdeps/unix/sysv/linux/poll.c | 50 |
1 files changed, 40 insertions, 10 deletions
diff --git a/sysdeps/unix/sysv/linux/poll.c b/sysdeps/unix/sysv/linux/poll.c index 296893d4ca..c136c21dbd 100644 --- a/sysdeps/unix/sysv/linux/poll.c +++ b/sysdeps/unix/sysv/linux/poll.c @@ -20,7 +20,7 @@ #include <errno.h> #include <sys/poll.h> -#include <sysdep.h> +#include <sysdep-cancel.h> #include <sys/syscall.h> #include <bp-checks.h> @@ -36,20 +36,19 @@ static int __emulate_poll (struct pollfd *fds, nfds_t nfds, int timeout) internal_function; # endif -/* The real implementation. */ -int -__poll (fds, nfds, timeout) - struct pollfd *fds; - nfds_t nfds; - int timeout; -{ + # if __ASSUME_POLL_SYSCALL == 0 +/* For loser kernels. */ +static int +loser_poll (struct pollfd *fds, nfds_t nfds, int timeout) +{ static int must_emulate; if (!must_emulate) { int errno_saved = errno; - int retval = INLINE_SYSCALL (poll, 3, CHECK_N (fds, nfds), nfds, timeout); + int retval = INLINE_SYSCALL (poll, 3, CHECK_N (fds, nfds), nfds, + timeout); if (retval >= 0 || errno != ENOSYS) return retval; @@ -59,8 +58,39 @@ __poll (fds, nfds, timeout) } return __emulate_poll (fds, nfds, timeout); +} +# endif + + +/* The real implementation. */ +int +__poll (fds, nfds, timeout) + struct pollfd *fds; + nfds_t nfds; + int timeout; +{ +# if __ASSUME_POLL_SYSCALL == 0 + if (SINGLE_THREAD_P) + return loser_poll (CHECK_N (fds, nfds), nfds, timeout); + + int oldtype = LIBC_CANCEL_ASYNC (); + + int result = loser_poll (CHECK_N (fds, nfds), nfds, timeout); + + LIBC_CANCEL_RESET (oldtype); + + return result; # else - return INLINE_SYSCALL (poll, 3, CHECK_N (fds, nfds), nfds, timeout); + if (SINGLE_THREAD_P) + return INLINE_SYSCALL (poll, 3, CHECK_N (fds, nfds), nfds, timeout); + + int oldtype = LIBC_CANCEL_ASYNC (); + + int result = INLINE_SYSCALL (poll, 3, CHECK_N (fds, nfds), nfds, timeout); + + LIBC_CANCEL_RESET (oldtype); + + return result; # endif } libc_hidden_def (__poll) |