962f9a2ccc
* cygserver_ipc.h (ipc_set_proc_info): Use _cygtls::ipc_set_proc_info to set per-thread signal arrived value. * cygthread.cc (cygthread::detach): Use per-thread signal_arrived via set_thread_waiting. * fork.cc (_cygtls::fixup_after_fork): Clear signal_arrived. (_cygtls::remove): Close any signal_arrived handle when thread exists. (_cygtls::find_tls): Remove unneeded function. * cygtls.h: Update copyright. (class _cygtls): Reorganize to help avoid rebuilding newlib when structure changes. (_cygtls::event): Delete. (_cygtls::threadkill): Ditto. (_cygtls::signal_waiting): Declare new bool. (_cygtls::find_tls): Delete declaration. (_cygtls::set_threadkill): Ditto. (_cygtls::reset_threadkill): Ditto. (_cygtls::set_signal_arrived): Declare new function. (class set_thread_waiting): Declare new class. * cygwait.cc (cw_nowait_storage): Define. (cygwait): Set per-thread signal_arrived via set_thread_waiting. Don't special-case _main_tls. * cygwait.h (cw_nowait): Define. (cw_infinite): Ditto. (cygwait): Redefine pathological wait-only case. * dcrt0.cc (dll_crt0_0): Remove call to now-defunct events_init(). (dll_crt0_1): Remove call to now-defunct create_signal_arrived(). * exceptions.cc: Reflect set_signal_mask() argument reordering throughout. Remove signal mask synchronization throughout. (events_init): Delete definition. (mask_sync): Delete now-unneeded mask synchronization. (set_signal_mask): Reverse order of arguments to "standard" to, from layout. Rename "newmask" argument to "setmask". Remove debugging. (sig_handle_tty_stop): Use cancelable_wait rather than WFMO. (_cygtls::interrupt_setup): Don't treat "threadkill" events specially. Conditionally set signal_arrived depending on whether the thread has created it or not. (sigpacket::process): Reorganize to reflect thread-specific sending of signals which is more in line with the way it was actually supposed to work. * fhandler_socket.cc (get_inet_addr): Use cancelable_wait rather than IsEventSignalled to avoid potential race. (fhandler_socket::wait_for_events): Set signal_arrived event using set_thread_waiting(). (fhandler_socket::close): Use cygwait for the case of just waiting 10 ms for a signal. * fhandler_tape.cc (fhandler_dev_tape::_lock): Use cancelable_wait rather than WFMO. Redo switch/case tests accordingly. * fhandler_termios.cc (fhandler_termios::bg_check): Use cygwait for case of just waiting 0 ms for a potential signal. * fhandler_tty.cc (fhandler_pty_master::process_slave_output): Use cancelable_wait rather than WFSO. * fhandler_windows.cc (fhandler_windows::read): Set per-thread signal_arrived via set_thread_waiting(). * flock.cc (lf_setlock): Ditto. * select.cc (pselect): Ditto. Set per-thread signal_arrived using set_thread_waiting(). * gendef: Don't special case handling of _cygtls::sig for threads. * gentls_offsets: Use #pragma once in tlsoffsets.h. * ntdll.h: Use #pragma once. * poll.cc: Reflect set_signal_mask() argument reordering. * posix_ipc.cc (ipc_mutex_lock): Use cancelable_wait rather than WFMO. (ipc_cond_timedwait): Set perl-thread signal arrived using set_thread_waiting(). * security.h: Use #pragma once. * signal.cc (abort): Reflect set_signal_mask() argument reordering. (clock_nanosleep): Ditto. Change call to cancelable_wait to properly specify handling of cancel and interrupt. (sigwaitinfo): Remove handling of per-thread event in favor of per-thread signal_arrived. Use cancelable_wait rather than WFSO. * sigproc.cc (signal_arrived): Delete definition. (create_signal_arrived): Ditto. * sigproc.h (signal_arrived): Delete declaration. (set_signal_mask): Avoid defining as a "C" function. Don't conditionally declare. (create_signal_arrived): Delete declaration. * syscalls.cc (rename): Use cygwait() rather than WFSO. * thread.h (fast_mutex::lock): Use cw_infinite rather than LARGE_NULL. * wait.cc (wait4): Ditto. * thread.cc (pthread_mutex::lock): Ditto. (pthread::join): Ditto. (semaphore::_wait): Ditto. (pthread_kill): Remove set_threadkill() accommodation. * tlsoffsets.h: Regenerate.
161 lines
4.5 KiB
C++
161 lines
4.5 KiB
C++
/* poll.cc. Implements poll(2) via usage of select(2) call.
|
|
|
|
Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
|
|
2011 Red Hat, Inc.
|
|
|
|
This file is part of Cygwin.
|
|
|
|
This software is a copyrighted work licensed under the terms of the
|
|
Cygwin license. Please consult the file "CYGWIN_LICENSE" for
|
|
details. */
|
|
|
|
#define __INSIDE_CYGWIN_NET__
|
|
|
|
#define FD_SETSIZE 16384 // lots of fds
|
|
#include "winsup.h"
|
|
#include <sys/poll.h>
|
|
#include <stdlib.h>
|
|
#define USE_SYS_TYPES_FD_SET
|
|
#include "cygerrno.h"
|
|
#include "path.h"
|
|
#include "fhandler.h"
|
|
#include "dtable.h"
|
|
#include "cygheap.h"
|
|
#include "pinfo.h"
|
|
#include "sigproc.h"
|
|
|
|
extern "C" int
|
|
poll (struct pollfd *fds, nfds_t nfds, int timeout)
|
|
{
|
|
int max_fd = 0;
|
|
int invalid_fds = 0;
|
|
fd_set *read_fds, *write_fds, *except_fds;
|
|
struct timeval tv = { timeout / 1000, (timeout % 1000) * 1000 };
|
|
|
|
for (unsigned int i = 0; i < nfds; ++i)
|
|
if (fds[i].fd > max_fd)
|
|
max_fd = fds[i].fd;
|
|
|
|
size_t fds_size = howmany (max_fd + 1, NFDBITS) * sizeof (fd_mask);
|
|
|
|
read_fds = (fd_set *) alloca (fds_size);
|
|
write_fds = (fd_set *) alloca (fds_size);
|
|
except_fds = (fd_set *) alloca (fds_size);
|
|
|
|
if (!read_fds || !write_fds || !except_fds)
|
|
{
|
|
set_errno (EINVAL); /* According to SUSv3. */
|
|
return -1;
|
|
}
|
|
|
|
memset (read_fds, 0, fds_size);
|
|
memset (write_fds, 0, fds_size);
|
|
memset (except_fds, 0, fds_size);
|
|
|
|
for (unsigned int i = 0; i < nfds; ++i)
|
|
{
|
|
fds[i].revents = 0;
|
|
if (!cygheap->fdtab.not_open (fds[i].fd))
|
|
{
|
|
if (fds[i].events & POLLIN)
|
|
FD_SET(fds[i].fd, read_fds);
|
|
if (fds[i].events & POLLOUT)
|
|
FD_SET(fds[i].fd, write_fds);
|
|
if (fds[i].events & POLLPRI)
|
|
FD_SET(fds[i].fd, except_fds);
|
|
}
|
|
else if (fds[i].fd >= 0)
|
|
{
|
|
++invalid_fds;
|
|
fds[i].revents = POLLNVAL;
|
|
}
|
|
}
|
|
|
|
/* Invalid fds? */
|
|
if (invalid_fds > 0)
|
|
{
|
|
/* Only invalid fds? Return. */
|
|
if ((nfds_t) invalid_fds == nfds)
|
|
return invalid_fds;
|
|
/* POSIX doesn't explicitely define this behaviour, but on Linux,
|
|
the timeout is set to 0 if an error occurs, and POLLNVAL is one
|
|
of these errors. So, for Linux-compatibility's sake... */
|
|
tv.tv_sec = tv.tv_usec = 0;
|
|
}
|
|
|
|
int ret = cygwin_select (max_fd + 1, read_fds, write_fds, except_fds,
|
|
timeout < 0 ? NULL : &tv);
|
|
/* timeout, signal, whatever? Return. If invalid fds exist, return with
|
|
their number. */
|
|
if (ret <= 0)
|
|
return invalid_fds ?: ret;
|
|
|
|
/* Set revents fields and count fds with non-zero revents fields for
|
|
return value. */
|
|
ret = 0;
|
|
for (unsigned int i = 0; i < nfds; ++i)
|
|
{
|
|
if (fds[i].fd >= 0 && fds[i].revents != POLLNVAL)
|
|
{
|
|
fhandler_socket *sock;
|
|
|
|
/* Check if the descriptor has been closed, or if shutdown for the
|
|
read side has been called on a socket. */
|
|
if (cygheap->fdtab.not_open (fds[i].fd)
|
|
|| ((sock = cygheap->fdtab[fds[i].fd]->is_socket ())
|
|
&& sock->saw_shutdown_read ()))
|
|
fds[i].revents = POLLHUP;
|
|
else
|
|
{
|
|
if (FD_ISSET(fds[i].fd, read_fds))
|
|
/* This should be sufficient for sockets, too. Using
|
|
MSG_PEEK, as before, can be considered dangerous at
|
|
best. Quote from W. Richard Stevens: "The presence
|
|
of an error can be considered either normal data or
|
|
an error (POLLERR). In either case, a subsequent read
|
|
will return -1 with errno set to the appropriate value."
|
|
So it looks like there's actually no good reason to
|
|
return POLLERR. */
|
|
fds[i].revents |= POLLIN;
|
|
/* Handle failed connect. */
|
|
if (FD_ISSET(fds[i].fd, write_fds)
|
|
&& (sock = cygheap->fdtab[fds[i].fd]->is_socket ())
|
|
&& sock->connect_state () == connect_failed)
|
|
fds[i].revents |= (POLLIN | POLLERR);
|
|
else
|
|
{
|
|
if (FD_ISSET(fds[i].fd, write_fds))
|
|
fds[i].revents |= POLLOUT;
|
|
if (FD_ISSET(fds[i].fd, except_fds))
|
|
fds[i].revents |= POLLPRI;
|
|
}
|
|
}
|
|
if (fds[i].revents)
|
|
++ret;
|
|
}
|
|
}
|
|
/* Number of fds with event includes the invalid fds. */
|
|
return ret + invalid_fds;
|
|
}
|
|
|
|
extern "C" int
|
|
ppoll (struct pollfd *fds, nfds_t nfds, const struct timespec *timeout_ts,
|
|
const sigset_t *sigmask)
|
|
{
|
|
int timeout;
|
|
sigset_t oldset = _my_tls.sigmask;
|
|
|
|
myfault efault;
|
|
if (efault.faulted (EFAULT))
|
|
return -1;
|
|
timeout = (timeout_ts == NULL)
|
|
? -1
|
|
: (timeout_ts->tv_sec * 1000 + timeout_ts->tv_nsec / 1000000);
|
|
if (sigmask)
|
|
set_signal_mask (_my_tls.sigmask, *sigmask);
|
|
int ret = poll (fds, nfds, timeout);
|
|
if (sigmask)
|
|
set_signal_mask (_my_tls.sigmask, oldset);
|
|
return ret;
|
|
}
|