X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/5729d3bccbc199121ad453715d49f417aa932b00..60a7a3c0029fc0a57c6548e3175af0a362a37a52:/ev.c diff --git a/ev.c b/ev.c index 888c779..8c05776 100644 --- a/ev.c +++ b/ev.c @@ -1,4 +1,6 @@ /* + * libev event processing core, watcher management + * * Copyright (c) 2007 Marc Alexander Lehmann * All rights reserved. * @@ -26,6 +28,9 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#ifndef EV_STANDALONE +# include "config.h" +#endif #include #include @@ -39,54 +44,110 @@ #include #include #include -#include +#ifndef WIN32 +# include +#endif #include #include -#ifndef HAVE_MONOTONIC -# ifdef CLOCK_MONOTONIC -# define HAVE_MONOTONIC 1 -# endif +/**/ + +#ifndef EV_USE_MONOTONIC +# define EV_USE_MONOTONIC 1 +#endif + +#ifndef EV_USE_SELECT +# define EV_USE_SELECT 1 +#endif + +#ifndef EV_USEV_POLL +# define EV_USEV_POLL 0 /* poll is usually slower than select, and not as well tested */ #endif -#ifndef HAVE_SELECT -# define HAVE_SELECT 1 +#ifndef EV_USE_EPOLL +# define EV_USE_EPOLL 0 #endif -#ifndef HAVE_EPOLL -# define HAVE_EPOLL 0 +#ifndef EV_USE_KQUEUE +# define EV_USE_KQUEUE 0 #endif -#ifndef HAVE_REALTIME -# define HAVE_REALTIME 1 /* posix requirement, but might be slower */ +#ifndef EV_USE_REALTIME +# define EV_USE_REALTIME 1 #endif +/**/ + +#ifndef CLOCK_MONOTONIC +# undef EV_USE_MONOTONIC +# define EV_USE_MONOTONIC 0 +#endif + +#ifndef CLOCK_REALTIME +# undef EV_USE_REALTIME +# define EV_USE_REALTIME 0 +#endif + +/**/ + #define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ -#define MAX_BLOCKTIME 60. -#define PID_HASHSIZE 16 /* size of pid hahs table, must be power of two */ +#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ +#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ +/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ #include "ev.h" +#if __GNUC__ >= 3 +# define expect(expr,value) __builtin_expect ((expr),(value)) +# define inline inline +#else +# define expect(expr,value) (expr) +# define inline static +#endif + +#define expect_false(expr) expect ((expr) != 0, 0) +#define expect_true(expr) expect ((expr) != 0, 1) + +#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) +#define ABSPRI(w) ((w)->priority - EV_MINPRI) + typedef struct ev_watcher *W; typedef struct ev_watcher_list *WL; typedef struct ev_watcher_time *WT; -static ev_tstamp now, diff; /* monotonic clock */ -ev_tstamp ev_now; -int ev_method; +/*****************************************************************************/ -static int have_monotonic; /* runtime */ +typedef struct +{ + struct ev_watcher_list *head; + unsigned char events; + unsigned char reify; +} ANFD; -static ev_tstamp method_fudge; /* stupid epoll-returns-early bug */ -static void (*method_modify)(int fd, int oev, int nev); -static void (*method_poll)(ev_tstamp timeout); +typedef struct +{ + W w; + int events; +} ANPENDING; + +#ifdef EV_MULTIPLICITY +struct ev_loop +{ +# define VAR(name,decl) decl +# include "ev_vars.h" +}; +#else +# define VAR(name,decl) static decl +# include "ev_vars.h" +#endif +#undef VAR /*****************************************************************************/ -ev_tstamp +inline ev_tstamp ev_time (void) { -#if HAVE_REALTIME +#if EV_USE_REALTIME struct timespec ts; clock_gettime (CLOCK_REALTIME, &ts); return ts.tv_sec + ts.tv_nsec * 1e-9; @@ -97,11 +158,11 @@ ev_time (void) #endif } -static ev_tstamp +inline ev_tstamp get_clock (void) { -#if HAVE_MONOTONIC - if (have_monotonic) +#if EV_USE_MONOTONIC + if (expect_true (have_monotonic)) { struct timespec ts; clock_gettime (CLOCK_MONOTONIC, &ts); @@ -112,13 +173,21 @@ get_clock (void) return ev_time (); } +ev_tstamp +ev_now (EV_P) +{ + return rt_now; +} + +#define array_roundsize(base,n) ((n) | 4 & ~3) + #define array_needsize(base,cur,cnt,init) \ - if ((cnt) > cur) \ + if (expect_false ((cnt) > cur)) \ { \ int newcnt = cur; \ do \ { \ - newcnt = (newcnt << 1) | 4 & ~3; \ + newcnt = array_roundsize (base, newcnt << 1); \ } \ while ((cnt) > newcnt); \ \ @@ -129,97 +198,141 @@ get_clock (void) /*****************************************************************************/ -typedef struct -{ - struct ev_io *head; - unsigned char wev, rev; /* want, received event set */ -} ANFD; - -static ANFD *anfds; -static int anfdmax; - -static int *fdchanges; -static int fdchangemax, fdchangecnt; - static void anfds_init (ANFD *base, int count) { while (count--) { - base->head = 0; - base->wev = base->rev = EV_NONE; + base->head = 0; + base->events = EV_NONE; + base->reify = 0; + ++base; } } -typedef struct +static void +event (EV_P_ W w, int events) { - W w; - int events; -} ANPENDING; + if (w->pending) + { + pendings [ABSPRI (w)][w->pending - 1].events |= events; + return; + } -static ANPENDING *pendings; -static int pendingmax, pendingcnt; + w->pending = ++pendingcnt [ABSPRI (w)]; + array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], ); + pendings [ABSPRI (w)][w->pending - 1].w = w; + pendings [ABSPRI (w)][w->pending - 1].events = events; +} static void -event (W w, int events) +queue_events (EV_P_ W *events, int eventcnt, int type) { - if (w->active) - { - w->pending = ++pendingcnt; - array_needsize (pendings, pendingmax, pendingcnt, ); - pendings [pendingcnt - 1].w = w; - pendings [pendingcnt - 1].events = events; - } + int i; + + for (i = 0; i < eventcnt; ++i) + event (EV_A_ events [i], type); } static void -fd_event (int fd, int events) +fd_event (EV_P_ int fd, int events) { ANFD *anfd = anfds + fd; struct ev_io *w; - for (w = anfd->head; w; w = w->next) + for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) { int ev = w->events & events; if (ev) - event ((W)w, ev); + event (EV_A_ (W)w, ev); } } +/*****************************************************************************/ + static void -queue_events (W *events, int eventcnt, int type) +fd_reify (EV_P) { int i; - for (i = 0; i < eventcnt; ++i) - event (events [i], type); + for (i = 0; i < fdchangecnt; ++i) + { + int fd = fdchanges [i]; + ANFD *anfd = anfds + fd; + struct ev_io *w; + + int events = 0; + + for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) + events |= w->events; + + anfd->reify = 0; + + if (anfd->events != events) + { + method_modify (EV_A_ fd, anfd->events, events); + anfd->events = events; + } + } + + fdchangecnt = 0; +} + +static void +fd_change (EV_P_ int fd) +{ + if (anfds [fd].reify || fdchangecnt < 0) + return; + + anfds [fd].reify = 1; + + ++fdchangecnt; + array_needsize (fdchanges, fdchangemax, fdchangecnt, ); + fdchanges [fdchangecnt - 1] = fd; +} + +static void +fd_kill (EV_P_ int fd) +{ + struct ev_io *w; + + while ((w = (struct ev_io *)anfds [fd].head)) + { + ev_io_stop (EV_A_ w); + event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); + } } /* called on EBADF to verify fds */ static void -fd_recheck (void) +fd_ebadf (EV_P) { int fd; for (fd = 0; fd < anfdmax; ++fd) - if (anfds [fd].wev) + if (anfds [fd].events) if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) - while (anfds [fd].head) - { - event ((W)anfds [fd].head, EV_ERROR); - evio_stop (anfds [fd].head); - } + fd_kill (EV_A_ fd); } -/*****************************************************************************/ +/* called on ENOMEM in select/poll to kill some fds and retry */ +static void +fd_enomem (EV_P) +{ + int fd = anfdmax; -static struct ev_timer **timers; -static int timermax, timercnt; + while (fd--) + if (anfds [fd].events) + { + close (fd); + fd_kill (EV_A_ fd); + return; + } +} -static struct ev_periodic **periodics; -static int periodicmax, periodiccnt; +/*****************************************************************************/ static void upheap (WT *timers, int k) @@ -266,16 +379,15 @@ downheap (WT *timers, int N, int k) typedef struct { - struct ev_signal *head; - sig_atomic_t gotsig; + struct ev_watcher_list *head; + sig_atomic_t volatile gotsig; } ANSIG; static ANSIG *signals; static int signalmax; static int sigpipe [2]; -static sig_atomic_t gotsig; -static struct ev_io sigev; +static sig_atomic_t volatile gotsig; static void signals_init (ANSIG *base, int count) @@ -284,6 +396,7 @@ signals_init (ANSIG *base, int count) { base->head = 0; base->gotsig = 0; + ++base; } } @@ -295,85 +408,101 @@ sighandler (int signum) if (!gotsig) { + int old_errno = errno; gotsig = 1; - write (sigpipe [1], &gotsig, 1); + write (sigpipe [1], &signum, 1); + errno = old_errno; } } static void -sigcb (struct ev_io *iow, int revents) +sigcb (EV_P_ struct ev_io *iow, int revents) { - struct ev_signal *w; - int sig; + struct ev_watcher_list *w; + int signum; - gotsig = 0; read (sigpipe [0], &revents, 1); + gotsig = 0; - for (sig = signalmax; sig--; ) - if (signals [sig].gotsig) + for (signum = signalmax; signum--; ) + if (signals [signum].gotsig) { - signals [sig].gotsig = 0; + signals [signum].gotsig = 0; - for (w = signals [sig].head; w; w = w->next) - event ((W)w, EV_SIGNAL); + for (w = signals [signum].head; w; w = w->next) + event (EV_A_ (W)w, EV_SIGNAL); } } static void -siginit (void) +siginit (EV_P) { +#ifndef WIN32 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC); /* rather than sort out wether we really need nb, set it */ fcntl (sigpipe [0], F_SETFL, O_NONBLOCK); fcntl (sigpipe [1], F_SETFL, O_NONBLOCK); +#endif - evio_set (&sigev, sigpipe [0], EV_READ); - evio_start (&sigev); + ev_io_set (&sigev, sigpipe [0], EV_READ); + ev_io_start (&sigev); + ev_unref (EV_A); /* child watcher should not keep loop alive */ } /*****************************************************************************/ -static struct ev_idle **idles; -static int idlemax, idlecnt; - -static struct ev_prepare **prepares; -static int preparemax, preparecnt; - -static struct ev_check **checks; -static int checkmax, checkcnt; - -/*****************************************************************************/ - -static struct ev_child *childs [PID_HASHSIZE]; -static struct ev_signal childev; +#ifndef WIN32 #ifndef WCONTINUED # define WCONTINUED 0 #endif static void -childcb (struct ev_signal *sw, int revents) +child_reap (EV_P_ struct ev_signal *sw, int chain, int pid, int status) { struct ev_child *w; + + for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next) + if (w->pid == pid || !w->pid) + { + w->priority = sw->priority; /* need to do it *now* */ + w->rpid = pid; + w->rstatus = status; + event (EV_A_ (W)w, EV_CHILD); + } +} + +static void +childcb (EV_P_ struct ev_signal *sw, int revents) +{ int pid, status; - while ((pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)) != -1) - for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next) - if (w->pid == pid || w->pid == -1) - { - w->status = status; - event ((W)w, EV_CHILD); - } + if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) + { + /* make sure we are called again until all childs have been reaped */ + event (EV_A_ (W)sw, EV_SIGNAL); + + child_reap (EV_A_ sw, pid, pid, status); + child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ + } } +#endif + /*****************************************************************************/ -#if HAVE_EPOLL +#if EV_USE_KQUEUE +# include "ev_kqueue.c" +#endif +#if EV_USE_EPOLL # include "ev_epoll.c" #endif -#if HAVE_SELECT +#if EV_USEV_POLL +# include "ev_poll.c" +#endif +#if EV_USE_SELECT # include "ev_select.c" #endif @@ -389,11 +518,34 @@ ev_version_minor (void) return EV_VERSION_MINOR; } -int ev_init (int flags) +/* return true if we are running with elevated privileges and should ignore env variables */ +static int +enable_secure (void) +{ +#ifdef WIN32 + return 0; +#else + return getuid () != geteuid () + || getgid () != getegid (); +#endif +} + +int +ev_method (EV_P) { - if (!ev_method) + return method; +} + +int +ev_init (EV_P_ int methods) +{ +#ifdef EV_MULTIPLICITY + memset (loop, 0, sizeof (struct ev_loop)); +#endif + + if (!method) { -#if HAVE_MONOTONIC +#if EV_USE_MONOTONIC { struct timespec ts; if (!clock_gettime (CLOCK_MONOTONIC, &ts)) @@ -401,57 +553,75 @@ int ev_init (int flags) } #endif - ev_now = ev_time (); - now = get_clock (); - diff = ev_now - now; + rt_now = ev_time (); + mn_now = get_clock (); + now_floor = mn_now; + diff = rt_now - mn_now; if (pipe (sigpipe)) return 0; - ev_method = EVMETHOD_NONE; -#if HAVE_EPOLL - if (ev_method == EVMETHOD_NONE) epoll_init (flags); + if (methods == EVMETHOD_AUTO) + if (!enable_secure () && getenv ("LIBmethodS")) + methods = atoi (getenv ("LIBmethodS")); + else + methods = EVMETHOD_ANY; + + method = 0; +#if EV_USE_KQUEUE + if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); +#endif +#if EV_USE_EPOLL + if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); #endif -#if HAVE_SELECT - if (ev_method == EVMETHOD_NONE) select_init (flags); +#if EV_USEV_POLL + if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); +#endif +#if EV_USE_SELECT + if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); #endif - if (ev_method) + if (method) { - evw_init (&sigev, sigcb); - siginit (); - - evsignal_init (&childev, childcb, SIGCHLD); - evsignal_start (&childev); + ev_watcher_init (&sigev, sigcb); + ev_set_priority (&sigev, EV_MAXPRI); + siginit (EV_A); + +#ifndef WIN32 + ev_signal_init (&childev, childcb, SIGCHLD); + ev_set_priority (&childev, EV_MAXPRI); + ev_signal_start (EV_A_ &childev); + ev_unref (EV_A); /* child watcher should not keep loop alive */ +#endif } } - return ev_method; + return method; } /*****************************************************************************/ void -ev_prefork (void) +ev_fork_prepare (void) { /* nop */ } void -ev_postfork_parent (void) +ev_fork_parent (void) { /* nop */ } void -ev_postfork_child (void) +ev_fork_child (void) { -#if HAVE_EPOLL - if (ev_method == EVMETHOD_EPOLL) +#if EV_USE_EPOLL + if (method == EVMETHOD_EPOLL) epoll_postfork_child (); #endif - evio_stop (&sigev); + ev_io_stop (&sigev); close (sigpipe [0]); close (sigpipe [1]); pipe (sigpipe); @@ -461,90 +631,67 @@ ev_postfork_child (void) /*****************************************************************************/ static void -fd_reify (void) +call_pending (EV_P) { - int i; + int pri; - for (i = 0; i < fdchangecnt; ++i) - { - int fd = fdchanges [i]; - ANFD *anfd = anfds + fd; - struct ev_io *w; - - int wev = 0; - - for (w = anfd->head; w; w = w->next) - wev |= w->events; - - if (anfd->wev != wev) - { - method_modify (fd, anfd->wev, wev); - anfd->wev = wev; - } - } - - fdchangecnt = 0; -} - -static void -call_pending (void) -{ - while (pendingcnt) - { - ANPENDING *p = pendings + --pendingcnt; + for (pri = NUMPRI; pri--; ) + while (pendingcnt [pri]) + { + ANPENDING *p = pendings [pri] + --pendingcnt [pri]; - if (p->w) - { - p->w->pending = 0; - p->w->cb (p->w, p->events); - } - } + if (p->w) + { + p->w->pending = 0; + p->w->cb (EV_A_ p->w, p->events); + } + } } static void -timers_reify (void) +timers_reify (EV_P) { - while (timercnt && timers [0]->at <= now) + while (timercnt && timers [0]->at <= mn_now) { struct ev_timer *w = timers [0]; - event ((W)w, EV_TIMEOUT); - /* first reschedule or stop timer */ if (w->repeat) { - w->at = now + w->repeat; - assert (("timer timeout in the past, negative repeat?", w->at > now)); + assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); + w->at = mn_now + w->repeat; downheap ((WT *)timers, timercnt, 0); } else - evtimer_stop (w); /* nonrepeating: stop timer */ + ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ + + event ((W)w, EV_TIMEOUT); } } static void -periodics_reify (void) +periodics_reify (EV_P) { - while (periodiccnt && periodics [0]->at <= ev_now) + while (periodiccnt && periodics [0]->at <= rt_now) { struct ev_periodic *w = periodics [0]; /* first reschedule or stop timer */ if (w->interval) { - w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval; - assert (("periodic timeout in the past, negative interval?", w->at > ev_now)); + w->at += floor ((rt_now - w->at) / w->interval + 1.) * w->interval; + assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > rt_now)); downheap ((WT *)periodics, periodiccnt, 0); } else - evperiodic_stop (w); /* nonrepeating: stop timer */ + ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ - event ((W)w, EV_TIMEOUT); + event (EV_A_ (W)w, EV_PERIODIC); } } static void -periodics_reschedule (ev_tstamp diff) +periodics_reschedule (EV_P_ ev_tstamp diff) { int i; @@ -555,12 +702,12 @@ periodics_reschedule (ev_tstamp diff) if (w->interval) { - ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval; + ev_tstamp diff = ceil ((rt_now - w->at) / w->interval) * w->interval; if (fabs (diff) >= 1e-4) { - evperiodic_stop (w); - evperiodic_start (w); + ev_periodic_stop (EV_A_ w); + ev_periodic_start (EV_A_ w); i = 0; /* restart loop, inefficient, but time jumps should be rare */ } @@ -568,70 +715,115 @@ periodics_reschedule (ev_tstamp diff) } } +inline int +time_update_monotonic (EV_P) +{ + mn_now = get_clock (); + + if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) + { + rt_now = mn_now + diff; + return 0; + } + else + { + now_floor = mn_now; + rt_now = ev_time (); + return 1; + } +} + static void -time_update (void) +time_update (EV_P) { int i; - ev_now = ev_time (); - - if (have_monotonic) +#if EV_USE_MONOTONIC + if (expect_true (have_monotonic)) { - ev_tstamp odiff = diff; - - for (i = 4; --i; ) /* loop a few times, before making important decisions */ + if (time_update_monotonic (EV_A)) { - now = get_clock (); - diff = ev_now - now; + ev_tstamp odiff = diff; - if (fabs (odiff - diff) < MIN_TIMEJUMP) - return; /* all is well */ + for (i = 4; --i; ) /* loop a few times, before making important decisions */ + { + diff = rt_now - mn_now; - ev_now = ev_time (); - } + if (fabs (odiff - diff) < MIN_TIMEJUMP) + return; /* all is well */ + + rt_now = ev_time (); + mn_now = get_clock (); + now_floor = mn_now; + } - periodics_reschedule (diff - odiff); - /* no timer adjustment, as the monotonic clock doesn't jump */ + periodics_reschedule (EV_A_ diff - odiff); + /* no timer adjustment, as the monotonic clock doesn't jump */ + } } else +#endif { - if (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP) + rt_now = ev_time (); + + if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) { - periodics_reschedule (ev_now - now); + periodics_reschedule (EV_A_ rt_now - mn_now); /* adjust timers. this is easy, as the offset is the same for all */ for (i = 0; i < timercnt; ++i) timers [i]->at += diff; } - now = ev_now; + mn_now = rt_now; } } -int ev_loop_done; +void +ev_ref (EV_P) +{ + ++activecnt; +} -void ev_loop (int flags) +void +ev_unref (EV_P) +{ + --activecnt; +} + +static int loop_done; + +void +ev_loop (EV_P_ int flags) { double block; - ev_loop_done = flags & EVLOOP_ONESHOT ? 1 : 0; + loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; do { /* queue check watchers (and execute them) */ - if (preparecnt) + if (expect_false (preparecnt)) { - queue_events ((W *)prepares, preparecnt, EV_PREPARE); - call_pending (); + queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); + call_pending (EV_A); } /* update fd-related kernel structures */ - fd_reify (); + fd_reify (EV_A); /* calculate blocking time */ /* we only need this for !monotonic clockor timers, but as we basically always have timers, we just calculate it always */ - ev_now = ev_time (); +#if EV_USE_MONOTONIC + if (expect_true (have_monotonic)) + time_update_monotonic (EV_A); + else +#endif + { + rt_now = ev_time (); + mn_now = rt_now; + } if (flags & EVLOOP_NONBLOCK || idlecnt) block = 0.; @@ -641,54 +833,60 @@ void ev_loop (int flags) if (timercnt) { - ev_tstamp to = timers [0]->at - (have_monotonic ? get_clock () : ev_now) + method_fudge; + ev_tstamp to = timers [0]->at - mn_now + method_fudge; if (block > to) block = to; } if (periodiccnt) { - ev_tstamp to = periodics [0]->at - ev_now + method_fudge; + ev_tstamp to = periodics [0]->at - rt_now + method_fudge; if (block > to) block = to; } if (block < 0.) block = 0.; } - method_poll (block); + method_poll (EV_A_ block); - /* update ev_now, do magic */ - time_update (); + /* update rt_now, do magic */ + time_update (EV_A); /* queue pending timers and reschedule them */ - timers_reify (); /* relative timers called last */ - periodics_reify (); /* absolute timers called first */ + timers_reify (EV_A); /* relative timers called last */ + periodics_reify (EV_A); /* absolute timers called first */ /* queue idle watchers unless io or timers are pending */ if (!pendingcnt) - queue_events ((W *)idles, idlecnt, EV_IDLE); + queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); /* queue check watchers, to be executed first */ if (checkcnt) - queue_events ((W *)checks, checkcnt, EV_CHECK); + queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); - call_pending (); + call_pending (EV_A); } - while (!ev_loop_done); + while (activecnt && !loop_done); + + if (loop_done != 2) + loop_done = 0; +} - if (ev_loop_done != 2) - ev_loop_done = 0; +void +ev_unloop (EV_P_ int how) +{ + loop_done = how; } /*****************************************************************************/ -static void +inline void wlist_add (WL *head, WL elem) { elem->next = *head; *head = elem; } -static void +inline void wlist_del (WL *head, WL elem) { while (*head) @@ -703,87 +901,85 @@ wlist_del (WL *head, WL elem) } } -static void -ev_clear (W w) +inline void +ev_clear_pending (EV_P_ W w) { if (w->pending) { - pendings [w->pending - 1].w = 0; + pendings [ABSPRI (w)][w->pending - 1].w = 0; w->pending = 0; } } -static void -ev_start (W w, int active) +inline void +ev_start (EV_P_ W w, int active) { + if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; + if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI; + w->active = active; + ev_ref (EV_A); } -static void -ev_stop (W w) +inline void +ev_stop (EV_P_ W w) { + ev_unref (EV_A); w->active = 0; } /*****************************************************************************/ void -evio_start (struct ev_io *w) +ev_io_start (EV_P_ struct ev_io *w) { + int fd = w->fd; + if (ev_is_active (w)) return; - int fd = w->fd; + assert (("ev_io_start called with negative fd", fd >= 0)); - ev_start ((W)w, 1); + ev_start (EV_A_ (W)w, 1); array_needsize (anfds, anfdmax, fd + 1, anfds_init); wlist_add ((WL *)&anfds[fd].head, (WL)w); - ++fdchangecnt; - array_needsize (fdchanges, fdchangemax, fdchangecnt, ); - fdchanges [fdchangecnt - 1] = fd; - - if (w->fd == 9) - printf ("start %p:%x\n", w, w->events);//D + fd_change (EV_A_ fd); } void -evio_stop (struct ev_io *w) +ev_io_stop (EV_P_ struct ev_io *w) { - if (w->fd == 9) - printf ("stop %p:%x\n", w, w->events);//D - ev_clear ((W)w); + ev_clear_pending (EV_A_ (W)w); if (!ev_is_active (w)) return; wlist_del ((WL *)&anfds[w->fd].head, (WL)w); - ev_stop ((W)w); + ev_stop (EV_A_ (W)w); - ++fdchangecnt; - array_needsize (fdchanges, fdchangemax, fdchangecnt, ); - fdchanges [fdchangecnt - 1] = w->fd; + fd_change (EV_A_ w->fd); } void -evtimer_start (struct ev_timer *w) +ev_timer_start (EV_P_ struct ev_timer *w) { if (ev_is_active (w)) return; - w->at += now; + w->at += mn_now; - assert (("timer repeat value less than zero not allowed", w->repeat >= 0.)); + assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); - ev_start ((W)w, ++timercnt); + ev_start (EV_A_ (W)w, ++timercnt); array_needsize (timers, timermax, timercnt, ); timers [timercnt - 1] = w; upheap ((WT *)timers, timercnt - 1); } void -evtimer_stop (struct ev_timer *w) +ev_timer_stop (EV_P_ struct ev_timer *w) { - ev_clear ((W)w); + ev_clear_pending (EV_A_ (W)w); if (!ev_is_active (w)) return; @@ -795,48 +991,48 @@ evtimer_stop (struct ev_timer *w) w->at = w->repeat; - ev_stop ((W)w); + ev_stop (EV_A_ (W)w); } void -evtimer_again (struct ev_timer *w) +ev_timer_again (EV_P_ struct ev_timer *w) { if (ev_is_active (w)) { if (w->repeat) { - w->at = now + w->repeat; + w->at = mn_now + w->repeat; downheap ((WT *)timers, timercnt, w->active - 1); } else - evtimer_stop (w); + ev_timer_stop (EV_A_ w); } else if (w->repeat) - evtimer_start (w); + ev_timer_start (EV_A_ w); } void -evperiodic_start (struct ev_periodic *w) +ev_periodic_start (EV_P_ struct ev_periodic *w) { if (ev_is_active (w)) return; - assert (("periodic interval value less than zero not allowed", w->interval >= 0.)); + assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); /* this formula differs from the one in periodic_reify because we do not always round up */ if (w->interval) - w->at += ceil ((ev_now - w->at) / w->interval) * w->interval; + w->at += ceil ((rt_now - w->at) / w->interval) * w->interval; - ev_start ((W)w, ++periodiccnt); + ev_start (EV_A_ (W)w, ++periodiccnt); array_needsize (periodics, periodicmax, periodiccnt, ); periodics [periodiccnt - 1] = w; upheap ((WT *)periodics, periodiccnt - 1); } void -evperiodic_stop (struct ev_periodic *w) +ev_periodic_stop (EV_P_ struct ev_periodic *w) { - ev_clear ((W)w); + ev_clear_pending (EV_A_ (W)w); if (!ev_is_active (w)) return; @@ -846,16 +1042,22 @@ evperiodic_stop (struct ev_periodic *w) downheap ((WT *)periodics, periodiccnt, w->active - 1); } - ev_stop ((W)w); + ev_stop (EV_A_ (W)w); } +#ifndef SA_RESTART +# define SA_RESTART 0 +#endif + void -evsignal_start (struct ev_signal *w) +ev_signal_start (EV_P_ struct ev_signal *w) { if (ev_is_active (w)) return; - ev_start ((W)w, 1); + assert (("ev_signal_start called with illegal signal number", w->signum > 0)); + + ev_start (EV_A_ (W)w, 1); array_needsize (signals, signalmax, w->signum, signals_init); wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); @@ -864,102 +1066,110 @@ evsignal_start (struct ev_signal *w) struct sigaction sa; sa.sa_handler = sighandler; sigfillset (&sa.sa_mask); - sa.sa_flags = 0; + sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ sigaction (w->signum, &sa, 0); } } void -evsignal_stop (struct ev_signal *w) +ev_signal_stop (EV_P_ struct ev_signal *w) { - ev_clear ((W)w); + ev_clear_pending (EV_A_ (W)w); if (!ev_is_active (w)) return; wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); - ev_stop ((W)w); + ev_stop (EV_A_ (W)w); if (!signals [w->signum - 1].head) signal (w->signum, SIG_DFL); } -void evidle_start (struct ev_idle *w) +void +ev_idle_start (EV_P_ struct ev_idle *w) { if (ev_is_active (w)) return; - ev_start ((W)w, ++idlecnt); + ev_start (EV_A_ (W)w, ++idlecnt); array_needsize (idles, idlemax, idlecnt, ); idles [idlecnt - 1] = w; } -void evidle_stop (struct ev_idle *w) +void +ev_idle_stop (EV_P_ struct ev_idle *w) { - ev_clear ((W)w); + ev_clear_pending (EV_A_ (W)w); if (ev_is_active (w)) return; idles [w->active - 1] = idles [--idlecnt]; - ev_stop ((W)w); + ev_stop (EV_A_ (W)w); } -void evprepare_start (struct ev_prepare *w) +void +ev_prepare_start (EV_P_ struct ev_prepare *w) { if (ev_is_active (w)) return; - ev_start ((W)w, ++preparecnt); + ev_start (EV_A_ (W)w, ++preparecnt); array_needsize (prepares, preparemax, preparecnt, ); prepares [preparecnt - 1] = w; } -void evprepare_stop (struct ev_prepare *w) +void +ev_prepare_stop (EV_P_ struct ev_prepare *w) { - ev_clear ((W)w); + ev_clear_pending (EV_A_ (W)w); if (ev_is_active (w)) return; prepares [w->active - 1] = prepares [--preparecnt]; - ev_stop ((W)w); + ev_stop (EV_A_ (W)w); } -void evcheck_start (struct ev_check *w) +void +ev_check_start (EV_P_ struct ev_check *w) { if (ev_is_active (w)) return; - ev_start ((W)w, ++checkcnt); + ev_start (EV_A_ (W)w, ++checkcnt); array_needsize (checks, checkmax, checkcnt, ); checks [checkcnt - 1] = w; } -void evcheck_stop (struct ev_check *w) +void +ev_check_stop (EV_P_ struct ev_check *w) { - ev_clear ((W)w); + ev_clear_pending (EV_A_ (W)w); if (ev_is_active (w)) return; checks [w->active - 1] = checks [--checkcnt]; - ev_stop ((W)w); + ev_stop (EV_A_ (W)w); } -void evchild_start (struct ev_child *w) +void +ev_child_start (EV_P_ struct ev_child *w) { if (ev_is_active (w)) return; - ev_start ((W)w, 1); + ev_start (EV_A_ (W)w, 1); wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); } -void evchild_stop (struct ev_child *w) +void +ev_child_stop (EV_P_ struct ev_child *w) { - ev_clear ((W)w); + ev_clear_pending (EV_A_ (W)w); if (ev_is_active (w)) return; wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); - ev_stop ((W)w); + ev_stop (EV_A_ (W)w); } /*****************************************************************************/ @@ -973,56 +1183,54 @@ struct ev_once }; static void -once_cb (struct ev_once *once, int revents) +once_cb (EV_P_ struct ev_once *once, int revents) { void (*cb)(int revents, void *arg) = once->cb; void *arg = once->arg; - evio_stop (&once->io); - evtimer_stop (&once->to); + ev_io_stop (EV_A_ &once->io); + ev_timer_stop (EV_A_ &once->to); free (once); cb (revents, arg); } static void -once_cb_io (struct ev_io *w, int revents) +once_cb_io (EV_P_ struct ev_io *w, int revents) { - once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); + once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); } static void -once_cb_to (struct ev_timer *w, int revents) +once_cb_to (EV_P_ struct ev_timer *w, int revents) { - once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); + once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); } void -ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) +ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) { struct ev_once *once = malloc (sizeof (struct ev_once)); if (!once) - cb (EV_ERROR, arg); + cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); else { once->cb = cb; once->arg = arg; - evw_init (&once->io, once_cb_io); - + ev_watcher_init (&once->io, once_cb_io); if (fd >= 0) { - evio_set (&once->io, fd, events); - evio_start (&once->io); + ev_io_set (&once->io, fd, events); + ev_io_start (EV_A_ &once->io); } - evw_init (&once->to, once_cb_to); - + ev_watcher_init (&once->to, once_cb_to); if (timeout >= 0.) { - evtimer_set (&once->to, timeout, 0.); - evtimer_start (&once->to); + ev_timer_set (&once->to, timeout, 0.); + ev_timer_start (EV_A_ &once->to); } } } @@ -1043,16 +1251,16 @@ static void ocb (struct ev_timer *w, int revents) { //fprintf (stderr, "timer %f,%f (%x) (%f) d%p\n", w->at, w->repeat, revents, w->at - ev_time (), w->data); - evtimer_stop (w); - evtimer_start (w); + ev_timer_stop (w); + ev_timer_start (w); } static void scb (struct ev_signal *w, int revents) { fprintf (stderr, "signal %x,%d\n", revents, w->signum); - evio_stop (&wio); - evio_start (&wio); + ev_io_stop (&wio); + ev_io_start (&wio); } static void @@ -1066,8 +1274,8 @@ int main (void) { ev_init (0); - evio_init (&wio, sin_cb, 0, EV_READ); - evio_start (&wio); + ev_io_init (&wio, sin_cb, 0, EV_READ); + ev_io_start (&wio); struct ev_timer t[10000]; @@ -1076,29 +1284,29 @@ int main (void) for (i = 0; i < 10000; ++i) { struct ev_timer *w = t + i; - evw_init (w, ocb, i); - evtimer_init_abs (w, ocb, drand48 (), 0.99775533); - evtimer_start (w); + ev_watcher_init (w, ocb, i); + ev_timer_init_abs (w, ocb, drand48 (), 0.99775533); + ev_timer_start (w); if (drand48 () < 0.5) - evtimer_stop (w); + ev_timer_stop (w); } #endif struct ev_timer t1; - evtimer_init (&t1, ocb, 5, 10); - evtimer_start (&t1); + ev_timer_init (&t1, ocb, 5, 10); + ev_timer_start (&t1); struct ev_signal sig; - evsignal_init (&sig, scb, SIGQUIT); - evsignal_start (&sig); + ev_signal_init (&sig, scb, SIGQUIT); + ev_signal_start (&sig); struct ev_check cw; - evcheck_init (&cw, gcb); - evcheck_start (&cw); + ev_check_init (&cw, gcb); + ev_check_start (&cw); struct ev_idle iw; - evidle_init (&iw, gcb); - evidle_start (&iw); + ev_idle_init (&iw, gcb); + ev_idle_start (&iw); ev_loop (0);