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

* select.cc (cygwin_select): Ensure that arguments are zeroed on timeout. 

(select_stuff::wait): Ditto.
This commit is contained in:
Christopher Faylor 2001-08-27 15:59:26 +00:00
parent c2f0f4f466
commit 8d661d3658
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,9 @@
Mon Aug 27 11:58:19 2001 Christopher Faylor <cgf@cygnus.com>
* select.cc (cygwin_select): Ensure that arguments are zeroed on
timeout.
(select_stuff::wait): Ditto.
2001-08-24 Kazuhiro Fujieda <fujieda@jaist.ac.jp> 2001-08-24 Kazuhiro Fujieda <fujieda@jaist.ac.jp>
* syscalls.cc (check_tty_fds): New function. Check whether there is a * syscalls.cc (check_tty_fds): New function. Check whether there is a

26
winsup/cygwin/select.cc
View File

@ -159,6 +159,12 @@ 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. */
fd_set *r = allocfd_set (maxfds);
fd_set *w = allocfd_set (maxfds);
fd_set *e = allocfd_set (maxfds);
/* 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)
{ {
@ -168,23 +174,17 @@ cygwin_select (int maxfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
set_sig_errno (EINTR); set_sig_errno (EINTR);
return -1; return -1;
} }
return 0; timeout = 1;
} }
else if (sel.always_ready || ms == 0)
/* Allocate some fd_set structures using the number of fds as a guide. */
fd_set *r = allocfd_set (maxfds);
fd_set *w = allocfd_set (maxfds);
fd_set *e = allocfd_set (maxfds);
if (sel.always_ready || ms == 0)
/* Don't bother waiting. */; /* Don't bother waiting. */;
else if (sel.wait (r, w, e, ms)) else if ((timeout = sel.wait (r, w, e, ms) < 0))
return -1; /* some kind of error */ return -1; /* some kind of error */
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);
return sel.poll (readfds, writefds, exceptfds); return timeout ? 0 : sel.poll (readfds, writefds, exceptfds);
} }
/* Cleanup */ /* Cleanup */
@ -254,6 +254,7 @@ select_stuff::wait (fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
HANDLE w4[MAXIMUM_WAIT_OBJECTS]; HANDLE w4[MAXIMUM_WAIT_OBJECTS];
select_record *s = &start; select_record *s = &start;
int m = 0; int m = 0;
int res = 0;
w4[m++] = signal_arrived; /* Always wait for the arrival of a signal. */ w4[m++] = signal_arrived; /* Always wait for the arrival of a signal. */
/* Loop through the select chain, starting up anything appropriate and /* Loop through the select chain, starting up anything appropriate and
@ -302,6 +303,7 @@ select_stuff::wait (fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
return -1; return -1;
case WAIT_TIMEOUT: case WAIT_TIMEOUT:
select_printf ("timed out"); select_printf ("timed out");
res = 1;
goto out; goto out;
} }
@ -338,8 +340,8 @@ select_stuff::wait (fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
} }
out: out:
select_printf ("returning 0"); select_printf ("returning %d", res);
return 0; return res;
} }
static int static int