libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fri Sep 7 10:53:34 2001 Jason Tishler <jason@tishler.net> 

* poll.cc (poll): Change implementation to only call select() when no
        invalid file descriptors are specified.
This commit is contained in:
Corinna Vinschen 2001-09-07 17:17:54 +00:00
parent c4857613ca
commit e3f30e9c24
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
Fri Sep 7 10:53:34 2001 Jason Tishler <jason@tishler.net>
* poll.cc (poll): Change implementation to only call select() when no
invalid file descriptors are specified.
Fri Sep 7 10:27:00 2001 Corinna Vinschen <corinna@vinschen.de> Fri Sep 7 10:27:00 2001 Corinna Vinschen <corinna@vinschen.de>
* include/limits.h: Define PIPE_BUF. * include/limits.h: Define PIPE_BUF.

10
winsup/cygwin/poll.cc
View File

@ -50,6 +50,7 @@ poll (struct pollfd *fds, unsigned int nfds, int timeout)
memset (write_fds, 0, fds_size); memset (write_fds, 0, fds_size);
memset (except_fds, 0, fds_size); memset (except_fds, 0, fds_size);
bool invalid_fds = false;
for (unsigned int i = 0; i < nfds; ++i) for (unsigned int i = 0; i < nfds; ++i)
if (!cygheap->fdtab.not_open (fds[i].fd)) if (!cygheap->fdtab.not_open (fds[i].fd))
{ {
@ -61,14 +62,21 @@ poll (struct pollfd *fds, unsigned int nfds, int timeout)
if (fds[i].events & POLLPRI) if (fds[i].events & POLLPRI)
FD_SET (fds[i].fd, except_fds); FD_SET (fds[i].fd, except_fds);
} }
else
invalid_fds = true;
int ret = cygwin_select (max_fd + 1, read_fds, write_fds, except_fds, int ret = 0;
if (!invalid_fds)
ret = cygwin_select (max_fd + 1, read_fds, write_fds, except_fds,
timeout < 0 ? NULL : &tv); timeout < 0 ? NULL : &tv);
for (unsigned int i = 0; i < nfds; ++i) for (unsigned int i = 0; i < nfds; ++i)
{ {
if (!FD_ISSET (fds[i].fd, open_fds)) if (!FD_ISSET (fds[i].fd, open_fds))
{
fds[i].revents = POLLNVAL; fds[i].revents = POLLNVAL;
ret++;
}
else if (cygheap->fdtab.not_open(fds[i].fd)) else if (cygheap->fdtab.not_open(fds[i].fd))
fds[i].revents = POLLHUP; fds[i].revents = POLLHUP;
else if (ret < 0) else if (ret < 0)