libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-02-20 16:01:10 +08:00
Code Issues Projects Releases Wiki Activity

* select.cc (MAKEready): Check for read_ready in loop since select_read could

Browse Source 
set it.
(peek_socket): Check ready/write/except specifically since they could have been
set even prior to peek_socket call.
This commit is contained in:
Christopher Faylor 2001-10-26 04:06:27 +00:00
parent 53c79b98c9
commit fe00cca93e
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,10 @@
2001-10-26 Christopher Faylor <cgf@redhat.com>
* select.cc (MAKEready): Check for read_ready in loop since select_read
could set it.
(peek_socket): Check ready/write/except specifically since they could
have been set even prior to peek_socket call.
2001-10-24 Christopher Faylor <cgf@redhat.com>
* shared_info.h (MOUNT_VERSION): Change to a smaller, still arbitrary

12
winsup/cygwin/select.cc
View File

@ -94,7 +94,8 @@ fhandler_##what::ready_for_read (int fd, DWORD howlong, int ignra) \
select_record me (this); \
me.fd = fd; \
(void) select_read (&me); \
while (!peek_##what (&me, ignra) && howlong == INFINITE) \
while (select_read (&me) && !me.read_ready && \
!peek_##what (&me, ignra) && howlong == INFINITE) \
if (fd >= 0 && cygheap->fdtab.not_open (fd)) \
break; \
else if (WaitForSingleObject (signal_arrived, 10) == WAIT_OBJECT_0) \
@ -1176,7 +1177,6 @@ peek_socket (select_record *me, int)
WINSOCK_FD_ZERO (&ws_readfds);
WINSOCK_FD_ZERO (&ws_writefds);
WINSOCK_FD_ZERO (&ws_exceptfds);
int gotone = 0;
HANDLE h;
set_handle_or_return_if_not_open (h, me);
@ -1210,12 +1210,12 @@ peek_socket (select_record *me, int)
}
if (WINSOCK_FD_ISSET (h, &ws_readfds) || (me->read_selected && me->read_ready))
gotone = me->read_ready = TRUE;
me->read_ready = TRUE;
if (WINSOCK_FD_ISSET (h, &ws_writefds) || (me->write_selected && me->write_ready))
gotone = me->write_ready = TRUE;
me->write_ready = TRUE;
if (WINSOCK_FD_ISSET (h, &ws_exceptfds) || (me->except_selected && me->except_ready))
gotone = me->except_ready = TRUE;
return gotone;
me->except_ready = TRUE;
return me->read_ready || me->write_ready || me->except_ready;
}
static int