--- libev/ev_poll.c 2007/11/02 16:54:35 1.2 +++ libev/ev_poll.c 2007/11/06 00:10:04 1.7 @@ -31,11 +31,6 @@ #include -static struct pollfd *polls; -static int pollmax, pollcnt; -static int *pollidxs; /* maps fds into structure indices */ -static int pollidxmax; - static void pollidx_init (int *base, int count) { @@ -44,9 +39,13 @@ } static void -poll_modify (int fd, int oev, int nev) +poll_modify (EV_P_ int fd, int oev, int nev) { int idx; + + if (oev == nev) + return; + array_needsize (pollidxs, pollidxmax, fd + 1, pollidx_init); idx = pollidxs [fd]; @@ -74,35 +73,48 @@ } static void -poll_poll (ev_tstamp timeout) +poll_poll (EV_P_ ev_tstamp timeout) { + int i; int res = poll (polls, pollcnt, ceil (timeout * 1000.)); - if (res > 0) - { - int i; - - for (i = 0; i < pollcnt; ++i) - fd_event ( - 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 (); - else if (errno == ENOMEM) - fd_enomem (); + fd_ebadf (EV_A); + else if (errno == ENOMEM && !syserr_cb) + fd_enomem (EV_A); + else if (errno != EINTR) + syserr (); + + return; } + + 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) + ); } -static void -poll_init (int flags) +static int +poll_init (EV_P_ int flags) { - ev_method = EVMETHOD_POLL; method_fudge = 1e-3; /* needed to compensate for select returning early, very conservative */ method_modify = poll_modify; method_poll = poll_poll; + + pollidxs = 0; pollidxmax = 0; + polls = 0; pollmax = 0; pollcnt = 0; + + return EVMETHOD_POLL; +} + +static void +poll_destroy (EV_P) +{ + ev_free (pollidxs); + ev_free (polls); }