X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/1c33c678365888dfd0e9ba9271dc55d6093d490d..9265226edb9bb3d78b5fb0255634878ace52d832:/ev_epoll.c diff --git a/ev_epoll.c b/ev_epoll.c index a7918af..bb56218 100644 --- a/ev_epoll.c +++ b/ev_epoll.c @@ -31,10 +31,8 @@ #include -static int epoll_fd = -1; - static void -epoll_modify (int fd, int oev, int nev) +epoll_modify (EV_P_ int fd, int oev, int nev) { int mode = nev ? oev ? EPOLL_CTL_MOD : EPOLL_CTL_ADD : EPOLL_CTL_DEL; @@ -44,67 +42,79 @@ epoll_modify (int fd, int oev, int nev) (nev & EV_READ ? EPOLLIN : 0) | (nev & EV_WRITE ? EPOLLOUT : 0); - epoll_ctl (epoll_fd, mode, fd, &ev); + if (expect_false (epoll_ctl (backend_fd, mode, fd, &ev))) + if (errno != ENOENT /* on ENOENT the fd went away, so try to do the right thing */ + || (nev && epoll_ctl (backend_fd, EPOLL_CTL_ADD, fd, &ev))) + fd_kill (EV_A_ fd); } static void -epoll_postfork_child (void) +epoll_poll (EV_P_ ev_tstamp timeout) { - int fd; - - epoll_fd = epoll_create (256); - fcntl (epoll_fd, F_SETFD, FD_CLOEXEC); - - /* re-register interest in fds */ - for (fd = 0; fd < anfdmax; ++fd) - if (anfds [fd].events)//D - epoll_modify (fd, EV_NONE, anfds [fd].events); -} - -static struct epoll_event *events; -static int eventmax; - -static void -epoll_poll (ev_tstamp timeout) -{ - int eventcnt = epoll_wait (epoll_fd, events, eventmax, ceil (timeout * 1000.)); int i; + int eventcnt = epoll_wait (backend_fd, epoll_events, epoll_eventmax, (int)ceil (timeout * 1000.)); - if (eventcnt < 0) - return; + if (expect_false (eventcnt < 0)) + { + if (errno != EINTR) + syserr ("(libev) epoll_wait"); + + return; + } for (i = 0; i < eventcnt; ++i) fd_event ( - events [i].data.u64, - (events [i].events & (EPOLLOUT | EPOLLERR | EPOLLHUP) ? EV_WRITE : 0) - | (events [i].events & (EPOLLIN | EPOLLERR | EPOLLHUP) ? EV_READ : 0) + EV_A_ + epoll_events [i].data.u64, + (epoll_events [i].events & (EPOLLOUT | EPOLLERR | EPOLLHUP) ? EV_WRITE : 0) + | (epoll_events [i].events & (EPOLLIN | EPOLLERR | EPOLLHUP) ? EV_READ : 0) ); /* if the receive array was full, increase its size */ - if (expect_false (eventcnt == eventmax)) + if (expect_false (eventcnt == epoll_eventmax)) { - free (events); - eventmax = array_roundsize (events, eventmax << 1); - events = malloc (sizeof (struct epoll_event) * eventmax); + ev_free (epoll_events); + epoll_eventmax = array_nextsize (sizeof (struct epoll_event), epoll_eventmax, epoll_eventmax + 1); + epoll_events = (struct epoll_event *)ev_malloc (sizeof (struct epoll_event) * epoll_eventmax); } } -static void -epoll_init (int flags) +int inline_size +epoll_init (EV_P_ int flags) { - epoll_fd = epoll_create (256); + backend_fd = epoll_create (256); + + if (backend_fd < 0) + return 0; + + fcntl (backend_fd, F_SETFD, FD_CLOEXEC); - if (epoll_fd < 0) - return; + backend_fudge = 0.; /* kernel sources seem to indicate this to be zero */ + backend_modify = epoll_modify; + backend_poll = epoll_poll; + + epoll_eventmax = 64; /* intiial number of events receivable per poll */ + epoll_events = (struct epoll_event *)ev_malloc (sizeof (struct epoll_event) * epoll_eventmax); + + return EVBACKEND_EPOLL; +} + +void inline_size +epoll_destroy (EV_P) +{ + ev_free (epoll_events); +} + +void inline_size +epoll_fork (EV_P) +{ + close (backend_fd); - fcntl (epoll_fd, F_SETFD, FD_CLOEXEC); + while ((backend_fd = epoll_create (256)) < 0) + syserr ("(libev) epoll_create"); - ev_method = EVMETHOD_EPOLL; - method_fudge = 1e-3; /* needed to compensate for epoll returning early */ - method_modify = epoll_modify; - method_poll = epoll_poll; + fcntl (backend_fd, F_SETFD, FD_CLOEXEC); - eventmax = 64; /* intiial number of events receivable per poll */ - events = malloc (sizeof (struct epoll_event) * eventmax); + fd_rearm_all (EV_A); }