X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/f776d56f36abeed4a6091c2ec9b96363213ce2b2..7f6dfe23db62e882dee94d2bf154fcd3686ca09f:/ev_poll.c diff --git a/ev_poll.c b/ev_poll.c index b858b45..626aa27 100644 --- a/ev_poll.c +++ b/ev_poll.c @@ -42,26 +42,33 @@ static void poll_modify (EV_P_ int fd, int oev, int nev) { int idx; - array_needsize (pollidxs, pollidxmax, fd + 1, pollidx_init); + + if (oev == nev) + return; + + array_needsize (int, pollidxs, pollidxmax, fd + 1, pollidx_init); idx = pollidxs [fd]; if (idx < 0) /* need to allocate a new pollfd */ { - idx = pollcnt++; - array_needsize (polls, pollmax, pollcnt, ); + pollidxs [fd] = idx = pollcnt++; + array_needsize (struct pollfd, polls, pollmax, pollcnt, EMPTY2); polls [idx].fd = fd; } + assert (polls [idx].fd == fd); + if (nev) polls [idx].events = (nev & EV_READ ? POLLIN : 0) | (nev & EV_WRITE ? POLLOUT : 0); else /* remove pollfd */ { - if (idx < pollcnt--) + pollidxs [fd] = -1; + + if (idx < --pollcnt) { - pollidxs [fd] = -1; polls [idx] = polls [pollcnt]; pollidxs [polls [idx].fd] = idx; } @@ -71,27 +78,31 @@ poll_modify (EV_P_ int fd, int oev, int nev) static void poll_poll (EV_P_ ev_tstamp timeout) { - int res = poll (polls, pollcnt, ceil (timeout * 1000.)); + int i; + int res = poll (polls, pollcnt, (int)ceil (timeout * 1000.)); - if (res > 0) - { - int i; - - for (i = 0; i < pollcnt; ++i) - fd_event ( - EV_A_ - polls [i].fd, - (polls [i].revents & (POLLOUT | POLLERR | POLLHUP) ? EV_WRITE : 0) - | (polls [i].revents & (POLLIN | POLLERR | POLLHUP) ? EV_READ : 0) - ); - } - else if (res < 0) + if (res < 0) { if (errno == EBADF) fd_ebadf (EV_A); - else if (errno == ENOMEM) + else if (errno == ENOMEM && !syserr_cb) fd_enomem (EV_A); + else if (errno != EINTR) + syserr ("(libev) poll"); + + return; } + + for (i = 0; i < pollcnt; ++i) + if (polls [i].revents & POLLNVAL) + fd_kill (EV_A_ polls [i].fd); + else + fd_event ( + EV_A_ + polls [i].fd, + (polls [i].revents & (POLLOUT | POLLERR | POLLHUP) ? EV_WRITE : 0) + | (polls [i].revents & (POLLIN | POLLERR | POLLHUP) ? EV_READ : 0) + ); } static int @@ -110,6 +121,7 @@ poll_init (EV_P_ int flags) static void poll_destroy (EV_P) { - free (pollidxs); - free (polls); + ev_free (pollidxs); + ev_free (polls); } +