JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* select.cc (cygwin_select): Make sure that poll is called when appropriate.

Browse Source
This commit is contained in:
Christopher Faylor
2011-12-08 06:49:56 +00:00
parent 5025bf330b
commit 986da7853d
2 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@@ -1,3 +1,8 @@
2011-12-08 Christopher Faylor <me.cygwin2011@cgf.cx>
* select.cc (cygwin_select): Make sure that poll is called when
appropriate.
2011-12-08 Christopher Faylor <me.cygwin2011@cgf.cx> 2011-12-08 Christopher Faylor <me.cygwin2011@cgf.cx>
* dll_init.cc (dll_dllcrt0): Don't try to initialize dll data if we're * dll_init.cc (dll_dllcrt0): Don't try to initialize dll data if we're

42
winsup/cygwin/select.cc
View File

@@ -124,7 +124,6 @@ cygwin_select (int maxfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
select_printf ("sel.always_ready %d", sel.always_ready); select_printf ("sel.always_ready %d", sel.always_ready);
int timeout = 0;
/* Allocate some fd_set structures using the number of fds as a guide. */ /* Allocate some fd_set structures using the number of fds as a guide. */
fd_set *r = allocfd_set (maxfds); fd_set *r = allocfd_set (maxfds);
fd_set *w = allocfd_set (maxfds); fd_set *w = allocfd_set (maxfds);
@@ -133,34 +132,27 @@ cygwin_select (int maxfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
int res = 1; int res = 1;
/* Degenerate case. No fds to wait for. Just wait. */ /* Degenerate case. No fds to wait for. Just wait. */
if (sel.start.next == NULL) if (sel.start.next == NULL)
{ switch (cygWFMO (0, ms))
switch (cygWFMO (0, ms)) {
{ case WAIT_OBJECT_0:
case WAIT_OBJECT_0: select_printf ("signal received");
select_printf ("signal received"); set_sig_errno (EINTR);
set_sig_errno (EINTR); res = -1;
return -1; case WAIT_OBJECT_0 + 1:
case WAIT_OBJECT_0 + 1: sel.destroy ();
sel.destroy (); pthread::static_cancel_self ();
pthread::static_cancel_self (); /*NOTREACHED*/
/*NOTREACHED*/ default:
default: res = 0;
break; break;
} }
res = 0; else if ((sel.always_ready || ms == 0)
} || (res = sel.wait (r, w, e, ms)) == 0)
else if (sel.always_ready || ms == 0)
res = 0;
else if ((timeout = sel.wait (r, w, e, ms) < 0))
res = -1; /* some kind of error */
if (res >= 0)
{ {
copyfd_set (readfds, r, maxfds); copyfd_set (readfds, r, maxfds);
copyfd_set (writefds, w, maxfds); copyfd_set (writefds, w, maxfds);
copyfd_set (exceptfds, e, maxfds); copyfd_set (exceptfds, e, maxfds);
if (res > 0) res = sel.poll (readfds, writefds, exceptfds);
res = sel.poll (readfds, writefds, exceptfds);
} }
syscall_printf ("%R = select (%d, %p, %p, %p, %p)", res, maxfds, readfds, syscall_printf ("%R = select (%d, %p, %p, %p, %p)", res, maxfds, readfds,