X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/f776d56f36abeed4a6091c2ec9b96363213ce2b2..deff62d26ff4c1324816c04c0c6db1e4db435870:/ev_epoll.c diff --git a/ev_epoll.c b/ev_epoll.c index 8bc8658..6bb41bc 100644 --- a/ev_epoll.c +++ b/ev_epoll.c @@ -42,17 +42,25 @@ epoll_modify (EV_P_ int fd, int oev, int nev) (nev & EV_READ ? EPOLLIN : 0) | (nev & EV_WRITE ? EPOLLOUT : 0); - epoll_ctl (epoll_fd, mode, fd, &ev); + if (epoll_ctl (epoll_fd, mode, fd, &ev)) + if (errno != ENOENT /* on ENOENT the fd went away, so try to do the right thing */ + || (nev && epoll_ctl (epoll_fd, EPOLL_CTL_ADD, fd, &ev))) + fd_kill (EV_A_ fd); } static void epoll_poll (EV_P_ ev_tstamp timeout) { - int eventcnt = epoll_wait (epoll_fd, epoll_events, epoll_eventmax, ceil (timeout * 1000.)); int i; + int eventcnt = epoll_wait (epoll_fd, epoll_events, epoll_eventmax, ceil (timeout * 1000.)); if (eventcnt < 0) - return; + { + if (errno != EINTR) + syserr (); + + return; + } for (i = 0; i < eventcnt; ++i) fd_event ( @@ -65,9 +73,9 @@ epoll_poll (EV_P_ ev_tstamp timeout) /* if the receive array was full, increase its size */ if (expect_false (eventcnt == epoll_eventmax)) { - free (epoll_events); + ev_free (epoll_events); epoll_eventmax = array_roundsize (epoll_events, epoll_eventmax << 1); - epoll_events = malloc (sizeof (struct epoll_event) * epoll_eventmax); + epoll_events = ev_malloc (sizeof (struct epoll_event) * epoll_eventmax); } } @@ -86,7 +94,7 @@ epoll_init (EV_P_ int flags) method_poll = epoll_poll; epoll_eventmax = 64; /* intiial number of events receivable per poll */ - epoll_events = malloc (sizeof (struct epoll_event) * epoll_eventmax); + epoll_events = ev_malloc (sizeof (struct epoll_event) * epoll_eventmax); return EVMETHOD_EPOLL; } @@ -96,7 +104,7 @@ epoll_destroy (EV_P) { close (epoll_fd); - free (epoll_events); + ev_free (epoll_events); } static void