diff options
| author | Richard Nyberg <rnyberg@murmeldjur.se> | 2007-05-18 07:45:19 +0000 |
|---|---|---|
| committer | Richard Nyberg <rnyberg@murmeldjur.se> | 2007-05-18 07:45:19 +0000 |
| commit | b2fd196e128fd234e272b25267dca00c19ca0d74 (patch) | |
| tree | 8f9f7b30bcea8d99cba93b773d68d4ebb83e9f20 /libevent/epoll.c | |
| parent | 564fe5afe1e690f39380cdb20695294c32c05b58 (diff) | |
| download | btpd-b2fd196e128fd234e272b25267dca00c19ca0d74.tar.gz btpd-b2fd196e128fd234e272b25267dca00c19ca0d74.zip | |
Update to libevent-1.3b.
Diffstat (limited to 'libevent/epoll.c')
| -rw-r--r-- | libevent/epoll.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/libevent/epoll.c b/libevent/epoll.c index 19a88a1..e089e23 100644 --- a/libevent/epoll.c +++ b/libevent/epoll.c @@ -68,7 +68,6 @@ struct epollop { struct epoll_event *events; int nevents; int epfd; - sigset_t evsigmask; }; void *epoll_init (void); @@ -150,7 +149,7 @@ epoll_init(void) } epollop->nfds = nfiles; - evsignal_init(&epollop->evsigmask); + evsignal_init(); return (epollop); } @@ -179,7 +178,7 @@ epoll_recalc(struct event_base *base, void *arg, int max) epollop->nfds = nfds; } - return (evsignal_recalc(&epollop->evsigmask)); + return (0); } int @@ -190,15 +189,9 @@ epoll_dispatch(struct event_base *base, void *arg, struct timeval *tv) struct evepoll *evep; int i, res, timeout; - if (evsignal_deliver(&epollop->evsigmask) == -1) - return (-1); - timeout = tv->tv_sec * 1000 + (tv->tv_usec + 999) / 1000; res = epoll_wait(epollop->epfd, events, epollop->nevents, timeout); - if (evsignal_recalc(&epollop->evsigmask) == -1) - return (-1); - if (res == -1) { if (errno != EINTR) { event_warn("epoll_wait"); @@ -262,7 +255,7 @@ epoll_add(void *arg, struct event *ev) int fd, op, events; if (ev->ev_events & EV_SIGNAL) - return (evsignal_add(&epollop->evsigmask, ev)); + return (evsignal_add(ev)); fd = ev->ev_fd; if (fd >= epollop->nfds) { @@ -311,7 +304,7 @@ epoll_del(void *arg, struct event *ev) int needwritedelete = 1, needreaddelete = 1; if (ev->ev_events & EV_SIGNAL) - return (evsignal_del(&epollop->evsigmask, ev)); + return (evsignal_del(ev)); fd = ev->ev_fd; if (fd >= epollop->nfds) |