--- hurdselect/hurdselect_step2.c 2013-01-24 13:40:59.000000000 +0100 +++ hurdselect/hurdselect_step7x.c 2013-02-12 08:54:59.000000000 +0100 @@ -43,82 +43,111 @@ struct dfd }; /* Helper functions */ -int _io_select_request (int nfds, int firstfd, int lastfd, - error_t err, mach_port_t *portset, struct dfd *d) +int _io_select_request (int ispoll, int firstfd, int lastfd, + error_t *errvec, mach_port_t *portset, struct dfd *d) { - *portset = MACH_PORT_NULL; int i, got = 0; - for (i = firstfd; i <= lastfd; ++i) - if (d[i].type) - { - int type = d[i].type; - d[i].reply_port = __mach_reply_port (); - err = __io_select (d[i].io_port, d[i].reply_port, 0, &type); - switch (err) - { - case MACH_RCV_TIMED_OUT: - /* No immediate response. This is normal. */ - err = 0; - if (firstfd == lastfd) - /* When there's a single descriptor, we don't need a - portset, so just pretend we have one, but really - use the single reply port. */ - *portset = d[i].reply_port; - else if (got == 0) - /* We've got multiple reply ports, so we need a port set to - multiplex them. */ - { - /* We will wait again for a reply later. */ - if (*portset == MACH_PORT_NULL) - /* Create the portset to receive all the replies on. */ - err = __mach_port_allocate (__mach_task_self (), - MACH_PORT_RIGHT_PORT_SET, - portset); - if (! err) - /* Put this reply port in the port set. */ - __mach_port_move_member (__mach_task_self (), - d[i].reply_port, *portset); - } - break; - - default: - /* No other error should happen. Callers of select - don't expect to see errors, so we simulate - readiness of the erring object and the next call - hopefully will get the error again. */ - type = SELECT_ALL; - /* FALLTHROUGH */ - - case 0: - /* We got an answer. */ - if ((type & SELECT_ALL) == 0) - /* Bogus answer; treat like an error, as a fake positive. */ - type = SELECT_ALL; - - /* This port is already ready already. */ - d[i].type &= type; - d[i].type |= SELECT_RETURNED; - ++got; - break; - } /* switch (err) */ - _hurd_port_free (&d[i].cell->port, &d[i].ulink, d[i].io_port); - } /* if (d[i].type) */ - - if (err) + if (firstfd == -1) /* DELAY */ + /* But not if there were no ports to deal with at all. + We are just a pure timeout. */ + *portset = __mach_reply_port (); + else /* POLL || SELECT */ { - errno = err; - got = -1; - } + *portset = MACH_PORT_NULL; + int err = 0, err1 = 0; + + for (i = firstfd; i <= lastfd; ++i) + { + int type = d[i].type; + if (type) + { + d[i].reply_port = __mach_reply_port (); + /* FIXME: Needed for poll to account for the round trip delay */ + if (ispoll) + err = __io_select (d[i].io_port, d[i].reply_port, 1, &type); + else + err = __io_select (d[i].io_port, d[i].reply_port, 0, &type); + switch (err) + { + case MACH_RCV_TIMED_OUT: + /* No immediate response. This is normal. */ + err = 0; + if (firstfd == lastfd) + /* When there's a single descriptor, we don't need a + portset, so just pretend we have one, but really + use the single reply port. */ + *portset = d[i].reply_port; + else if (got == 0) + /* We've got multiple reply ports, so we need a port set to + multiplex them. */ + { + /* We will wait again for a reply later. */ + if (*portset == MACH_PORT_NULL) + /* Create the portset to receive all the replies on. */ + err1 = __mach_port_allocate (__mach_task_self (), + MACH_PORT_RIGHT_PORT_SET, + portset); + if (! err1) + /* Put this reply port in the port set. */ + __mach_port_move_member (__mach_task_self (), + d[i].reply_port, *portset); + } + break; + + /* FIXME: Only for poll */ + if (ispoll) + { + case EPIPE: + case EIO: + errvec[i] = err; + //errno = ENOTCONN; + break; + } + + default: + /* No other error should happen. Callers of select + don't expect to see errors, so we simulate + readiness of the erring object and the next call + hopefully will get the error again. */ + type = SELECT_ALL; + /* FALLTHROUGH */ + + case 0: + /* We got an answer. */ + if ((type & SELECT_ALL) == 0) + /* Bogus answer; treat like an error, as a fake positive. */ + type = SELECT_ALL; + + /* This port is already ready already. */ + d[i].type &= type; + d[i].type |= SELECT_RETURNED; + ++got; + break; + } /* switch (err) */ + _hurd_port_free (&d[i].cell->port, &d[i].ulink, d[i].io_port); + + /* FIXME: Handle only errors EPIPE (pflocal), EIO (pfinet) for POLL*/ + if ((ispoll && (err != 0 && err != EPIPE && err != EIO)) || + (!ispoll && err != 0)) + { + errno = err; + errvec[i] = err; + got = -1; + return got; + } + } /* if (type) */ + } /* for */ + } /* else */ return got; } /* _io_select_request() */ -int _wait_for_replies (int nfds, int firstfd, int lastfd, mach_msg_timeout_t to, +int _wait_for_replies (int nfds, int firstfd, int lastfd, int got, mach_msg_timeout_t to, error_t err, mach_port_t portset, struct dfd *d, const struct timespec *timeout, const sigset_t *sigmask, sigset_t *oset) { - int i, got = 0; + int i; union typeword /* Use this to avoid unkosher casts. */ { @@ -230,7 +259,7 @@ int _wait_for_replies (int nfds, int fir } assert (got > had); } - } /* ) { */ + } /* if (decode message) */ if (msg.head.msgh_remote_port != MACH_PORT_NULL) __mach_port_deallocate (__mach_task_self (), @@ -295,20 +324,21 @@ _hurd_select (int nfds, struct dfd d[nfds]; sigset_t oset; + /* case POLL */ + int j, i_index[nfds]; + error_t errvec[nfds]; + enum { - DELAY = -1, SELECT = 0, POLL = 1 } ispoll; - if (nfds == 0) - ispoll = DELAY; - else if (pollfds) + if (pollfds) ispoll = POLL; else ispoll = SELECT; - if (nfds < 0 || nfds > FD_SETSIZE) + if (nfds < 0 || nfds >= FD_SETSIZE) { errno = EINVAL; return -1; @@ -331,26 +361,13 @@ _hurd_select (int nfds, if (sigmask && __sigprocmask (SIG_SETMASK, sigmask, &oset)) return -1; + /* Send them all io_select request messages. */ + err = 0; got = 0; - /* Send them all io_select request messages. */ - switch (ispoll) { - case DELAY: - /* But not if there were no ports to deal with at all. - We are just a pure timeout. */ - portset = __mach_reply_port (); - firstfd = lastfd = -1; - - got = _wait_for_replies (nfds, firstfd, lastfd, to, - err, portset, d, - timeout, sigmask, &oset); - if (got == -1) - return -1; - break; - case POLL: /* Collect interesting descriptors from the user's `pollfd' array. We do a first pass that reads the user's array before taking @@ -358,25 +375,32 @@ _hurd_select (int nfds, and gets the port references. */ for (i = 0; i < nfds; ++i) - if (pollfds[i].fd >= 0) - { - int type = 0; - if (pollfds[i].events & POLLIN) - type |= SELECT_READ; - if (pollfds[i].events & POLLOUT) - type |= SELECT_WRITE; - if (pollfds[i].events & POLLPRI) - type |= SELECT_URG; + { + errvec[i] = 0; + /* Mark all FDs as bad with -1 */ + i_index[i] = -1; - d[i].io_port = pollfds[i].fd; - d[i].type = type; - } - else - d[i].type = 0; + if (pollfds[i].fd >= 0) + { + int type = 0; + if (pollfds[i].events & POLLIN) + type |= SELECT_READ; + if (pollfds[i].events & POLLOUT) + type |= SELECT_WRITE; + if (pollfds[i].events & POLLPRI) + type |= SELECT_URG; + + d[i].io_port = pollfds[i].fd; + d[i].type = type; + } + else + d[i].type = 0; + } HURD_CRITICAL_BEGIN; __mutex_lock (&_hurd_dtable_lock); + j = 0; for (i = 0; i < nfds; ++i) if (d[i].type != 0) { @@ -386,39 +410,31 @@ _hurd_select (int nfds, { d[i].cell = _hurd_dtable[fd]; d[i].io_port = _hurd_port_get (&d[i].cell->port, &d[i].ulink); - if (d[i].io_port != MACH_PORT_NULL) - continue; - } - /* FIXME: This is a bug */ - /* If one descriptor is bogus, we fail completely. */ - while (i-- > 0) - if (d[i].type != 0) - _hurd_port_free (&d[i].cell->port, - &d[i].ulink, d[i].io_port); - break; + /* If one descriptor is bogus, mark and remove it. */ + if (d[i].io_port == MACH_PORT_NULL) + { + _hurd_port_free (&d[i].cell->port, + &d[i].ulink, d[i].io_port); + continue; /* Next i */ + } + /* Mark all good FDs with its index number */ + i_index[j] = i; + j++; + } } __mutex_unlock (&_hurd_dtable_lock); HURD_CRITICAL_END; - if (i < nfds) - { - if (sigmask) - __sigprocmask (SIG_SETMASK, &oset, NULL); - errno = EBADF; - return -1; - } - - lastfd = i - 1; - firstfd = i == 0 ? lastfd : 0; + lastfd = j - 1; + firstfd = (j == 0) ? lastfd : i_index[0]; - got = _io_select_request (nfds, firstfd, lastfd, - err, &portset, d); + got = _io_select_request (ispoll, firstfd, lastfd, errvec, &portset, d); if (got == -1) return -1; - got = _wait_for_replies (nfds, firstfd, lastfd, to, + got = _wait_for_replies (nfds, firstfd, lastfd, got, to, err, portset, d, timeout, sigmask, &oset); if (got == -1) @@ -429,19 +445,46 @@ _hurd_select (int nfds, { int type = d[i].type; int_fast16_t revents = 0; + int k = i_index[i]; + /* Clear all revents entries before filling in */ + pollfds[i].revents = 0; - if (type & SELECT_RETURNED) + /* Return revents for good file descriptors */ + if (k == i) + { + if (type & SELECT_RETURNED) + { + if (type & SELECT_READ) + revents |= POLLIN; + if (type & SELECT_WRITE) + revents |= POLLOUT; + if (type & SELECT_URG) + revents |= POLLPRI; + pollfds[i].revents = revents; + } + /* Return revents for broken file descriptors */ + else + { + if (errvec[i] == EPIPE) + { + pollfds[i].revents = POLLHUP; + ++got; + } + if (errvec[i] == EIO) + { + pollfds[i].revents = POLLERR; + ++got; + } + } + } + /* Return revents for bad file descriptors */ + if (k == -1 && pollfds[i].fd >= 0) { - if (type & SELECT_READ) - revents |= POLLIN; - if (type & SELECT_WRITE) - revents |= POLLOUT; - if (type & SELECT_URG) - revents |= POLLPRI; + pollfds[i].revents = POLLNVAL; + ++got; } - - pollfds[i].revents = revents; } + return got; break; case SELECT: @@ -464,13 +507,17 @@ _hurd_select (int nfds, HURD_CRITICAL_BEGIN; __mutex_lock (&_hurd_dtable_lock); + /* FIXME: limit nfds upwards */ if (nfds > _hurd_dtablesize) - nfds = _hurd_dtablesize; + { + nfds = _hurd_dtablesize; + } /* Collect the ports for interesting FDs. */ firstfd = lastfd = -1; for (i = 0; i < nfds; ++i) { + errvec[i] = 0; int type = 0; if (readfds != NULL && FD_ISSET (i, &rfds)) type |= SELECT_READ; @@ -509,12 +556,11 @@ _hurd_select (int nfds, return -1; } - got = _io_select_request (nfds, firstfd, lastfd, - err, &portset, d); + got = _io_select_request (ispoll, firstfd, lastfd, errvec, &portset, d); if (got == -1) return -1; - got = _wait_for_replies (nfds, firstfd, lastfd, to, + got = _wait_for_replies (nfds, firstfd, lastfd, got, to, err, portset, d, timeout, sigmask, &oset); if (got == -1) @@ -548,6 +594,7 @@ _hurd_select (int nfds, FD_CLR (i, exceptfds); } break; + } /* switch (ispoll) */ if (sigmask && __sigprocmask (SIG_SETMASK, &oset, NULL))