drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* poll.cc: Remove variable open_fds, rearrange and add code 

to fix settings of revents.
This commit is contained in:
Corinna Vinschen 2002-03-14 12:15:31 +00:00
parent 62a963ee4d
commit 6ea9c71656
2 changed files with 42 additions and 45 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 @@
2002-03-13 Boris Schaeling <boriss@web.de>
* poll.cc: Remove variable open_fds, rearrange and add code
to fix settings of revents.
2002-03-13 Corinna Vinschen <corina@vinschen.de> 2002-03-13 Corinna Vinschen <corina@vinschen.de>
* mmap.cc (mmap_record::map_map): Return -1 if VirtualProtect fails. * mmap.cc (mmap_record::map_map): Return -1 if VirtualProtect fails.

82
winsup/cygwin/poll.cc
View File

@ -26,7 +26,7 @@ int
poll (struct pollfd *fds, unsigned int nfds, int timeout) poll (struct pollfd *fds, unsigned int nfds, int timeout)
{ {
int max_fd = 0; int max_fd = 0;
fd_set *open_fds, *read_fds, *write_fds, *except_fds; fd_set *read_fds, *write_fds, *except_fds;
struct timeval tv = { timeout / 1000, (timeout % 1000) * 1000 }; struct timeval tv = { timeout / 1000, (timeout % 1000) * 1000 };
sigframe thisframe (mainthread); sigframe thisframe (mainthread);
@ -36,63 +36,55 @@ poll (struct pollfd *fds, unsigned int nfds, int timeout)
size_t fds_size = howmany(max_fd + 1, NFDBITS) * sizeof (fd_mask); size_t fds_size = howmany(max_fd + 1, NFDBITS) * sizeof (fd_mask);
open_fds = (fd_set *) alloca (fds_size);
read_fds = (fd_set *) alloca (fds_size); read_fds = (fd_set *) alloca (fds_size);
write_fds = (fd_set *) alloca (fds_size); write_fds = (fd_set *) alloca (fds_size);
except_fds = (fd_set *) alloca (fds_size); except_fds = (fd_set *) alloca (fds_size);
if (!open_fds || !read_fds || !write_fds || !except_fds) if (!read_fds || !write_fds || !except_fds)
{ {
set_errno (ENOMEM); set_errno (ENOMEM);
return -1; return -1;
} }
memset (open_fds, 0, fds_size);
memset (read_fds, 0, fds_size); memset (read_fds, 0, fds_size);
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 valid_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)) fds[i].revents = 0;
{ if (!cygheap->fdtab.not_open(fds[i].fd))
valid_fds = true; {
fds[i].revents = 0; if (fds[i].events & POLLIN)
FD_SET (fds[i].fd, open_fds); FD_SET(fds[i].fd, read_fds);
if (fds[i].events & POLLIN) if (fds[i].events & POLLOUT)
FD_SET (fds[i].fd, read_fds); FD_SET(fds[i].fd, write_fds);
if (fds[i].events & POLLOUT) if (fds[i].events & POLLPRI)
FD_SET (fds[i].fd, write_fds); FD_SET(fds[i].fd, except_fds);
if (fds[i].events & POLLPRI) }
FD_SET (fds[i].fd, except_fds); }
}
else
fds[i].revents = POLLNVAL;
int ret = 0; int ret = cygwin_select (max_fd + 1, read_fds, write_fds, except_fds, timeout < 0 ? NULL : &tv);
if (valid_fds)
ret = cygwin_select (max_fd + 1, read_fds, write_fds, except_fds,
timeout < 0 ? NULL : &tv);
for (unsigned int i = 0; i < nfds; ++i) if (ret > 0)
{ for (unsigned int i = 0; i < nfds; ++i)
if (fds[i].revents == POLLNVAL && ret >= 0) {
ret++; if (fds[i].fd < 0)
else if (cygheap->fdtab.not_open(fds[i].fd)) fds[i].revents = POLLNVAL;
fds[i].revents = POLLHUP; else if (cygheap->fdtab.not_open(fds[i].fd))
else if (ret < 0) fds[i].revents = POLLHUP;
fds[i].revents = POLLERR; else
else {
{ if (FD_ISSET(fds[i].fd, read_fds))
fds[i].revents = 0; fds[i].revents |= POLLIN;
if (FD_ISSET (fds[i].fd, read_fds)) if (FD_ISSET(fds[i].fd, write_fds))
fds[i].revents |= POLLIN; fds[i].revents |= POLLOUT;
if (FD_ISSET (fds[i].fd, write_fds)) if (FD_ISSET(fds[i].fd, read_fds) && FD_ISSET(fds[i].fd, write_fds))
fds[i].revents |= POLLOUT; fds[i].revents |= POLLERR;
if (FD_ISSET (fds[i].fd, except_fds)) if (FD_ISSET(fds[i].fd, except_fds))
fds[i].revents |= POLLPRI; fds[i].revents |= POLLPRI;
} }
} }
return ret; return ret;
} }