qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(__select): Don't increment GOT only because READ/WRITE/EXCEPTFDS is 0! Don't return without frobbing the bitmasks after a timeout. When clearing the bitmasks, only loop from FIRSTFD to LASTFD.

This commit is contained in:
Miles Bader 1996-03-05 00:07:01 +00:00
parent bba51ac77a
commit e9ef1cf37a
1 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sysdeps/mach/hurd/select.c
View File

@ -266,12 +266,6 @@ DEFUN(__select, (nfds, readfds, writefds, exceptfds, timeout),
but the descriptor may have changed to a different server. */ but the descriptor may have changed to a different server. */
__mach_port_destroy (__mach_task_self (), port); __mach_port_destroy (__mach_task_self (), port);
if (timeout && got == 0 && err == MACH_RCV_TIMED_OUT)
/* No io_select call returned success immediately, and the last call
blocked for our full timeout period and then timed out. So the
multiplex times out too. */
return 0;
if (err) if (err)
return __hurd_fail (err); return __hurd_fail (err);
@ -281,25 +275,25 @@ DEFUN(__select, (nfds, readfds, writefds, exceptfds, timeout),
/* Set the user bitarrays. We only ever have to clear bits, as all desired /* Set the user bitarrays. We only ever have to clear bits, as all desired
ones are initially set. */ ones are initially set. */
for (i = 0; i < nfds; ++i) for (i = firstfd; i < lastfd; ++i)
{ {
int type = types[i]; int type = types[i];
if ((type & SELECT_RETURNED) == 0) if ((type & SELECT_RETURNED) == 0)
type = 0; type = 0;
if (readfds != NULL && (type & SELECT_READ) == 0) if (type & SELECT_READ)
got++;
else
FD_CLR (i, readfds); FD_CLR (i, readfds);
else if (type & SELECT_WRITE)
got++; got++;
if (writefds != NULL && (type & SELECT_WRITE) == 0) else
FD_CLR (i, writefds); FD_CLR (i, writefds);
else if (type & SELECT_URG)
got++; got++;
if (exceptfds != NULL && (type & SELECT_URG) == 0) else
FD_CLR (i, exceptfds); FD_CLR (i, exceptfds);
else
got++;
} }
return got; return got;