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

* select.cc (cygwin_select): Remove select_timeout test.

Browse Source 
(select_stuff::wait): Return select_set_zero on timeout.
(thread_socket): Report timeout when debugging.
This commit is contained in:
Christopher Faylor
2012-06-10 01:57:53 +00:00
parent 3791ab4cd5
commit abf1b60039
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/cygwin/select.cc
View File

@@ -168,9 +168,7 @@ cygwin_select (int maxfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
else
res = sel.wait (r, w, e, ms); /* wait for an fd to become
become active or time out */
if (res == select_stuff::select_timeout)
res = 0; /* No fd's were active. */
else if (res >= 0)
if (res >= 0)
{
copyfd_set (readfds, r, maxfds);
copyfd_set (writefds, w, maxfds);
@@ -383,7 +381,7 @@ next_while:;
break;
case WAIT_TIMEOUT:
select_printf ("timed out");
res = select_timeout;
res = select_set_zero;
break;
case WAIT_OBJECT_0 + 1:
if (startfds > 1)
@@ -1305,7 +1303,7 @@ thread_socket (void *arg)
/ MAXIMUM_WAIT_OBJECTS));
bool event = false;
select_printf ("stuff_start %p", si->start);
select_printf ("stuff_start %p, timeout %u", si->start, timeout);
while (!event)
{
for (select_record *s = si->start; (s = s->next); )