X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/1c07891d9c059843fa4dcc0d0fa340676816d259..73ce65a9122dd90fac253802fe20630572fdd4be:/ev.c diff --git a/ev.c b/ev.c index 916d3e6..1e008e5 100644 --- a/ev.c +++ b/ev.c @@ -34,7 +34,11 @@ extern "C" { #endif #ifndef EV_STANDALONE -# include "config.h" +# ifdef EV_CONFIG_H +# include EV_CONFIG_H +# else +# include "config.h" +# endif # if HAVE_CLOCK_GETTIME # ifndef EV_USE_MONOTONIC @@ -43,22 +47,53 @@ extern "C" { # ifndef EV_USE_REALTIME # define EV_USE_REALTIME 1 # endif +# else +# ifndef EV_USE_MONOTONIC +# define EV_USE_MONOTONIC 0 +# endif +# ifndef EV_USE_REALTIME +# define EV_USE_REALTIME 0 +# endif # endif -# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT) -# define EV_USE_SELECT 1 +# ifndef EV_USE_SELECT +# if HAVE_SELECT && HAVE_SYS_SELECT_H +# define EV_USE_SELECT 1 +# else +# define EV_USE_SELECT 0 +# endif # endif -# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL) -# define EV_USE_POLL 1 +# ifndef EV_USE_POLL +# if HAVE_POLL && HAVE_POLL_H +# define EV_USE_POLL 1 +# else +# define EV_USE_POLL 0 +# endif # endif - -# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL) -# define EV_USE_EPOLL 1 + +# ifndef EV_USE_EPOLL +# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H +# define EV_USE_EPOLL 1 +# else +# define EV_USE_EPOLL 0 +# endif # endif - -# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE) -# define EV_USE_KQUEUE 1 + +# ifndef EV_USE_KQUEUE +# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H +# define EV_USE_KQUEUE 1 +# else +# define EV_USE_KQUEUE 0 +# endif +# endif + +# ifndef EV_USE_PORT +# if HAVE_PORT_H && HAVE_PORT_CREATE +# define EV_USE_PORT 1 +# else +# define EV_USE_PORT 0 +# endif # endif #endif @@ -92,12 +127,15 @@ extern "C" { /**/ #ifndef EV_USE_MONOTONIC -# define EV_USE_MONOTONIC 1 +# define EV_USE_MONOTONIC 0 +#endif + +#ifndef EV_USE_REALTIME +# define EV_USE_REALTIME 0 #endif #ifndef EV_USE_SELECT # define EV_USE_SELECT 1 -# define EV_SELECT_USE_FD_SET 1 #endif #ifndef EV_USE_POLL @@ -116,18 +154,12 @@ extern "C" { # define EV_USE_KQUEUE 0 #endif -#ifndef EV_USE_REALTIME -# define EV_USE_REALTIME 1 +#ifndef EV_USE_PORT +# define EV_USE_PORT 0 #endif /**/ -/* darwin simply cannot be helped */ -#ifdef __APPLE__ -# undef EV_USE_POLL -# undef EV_USE_KQUEUE -#endif - #ifndef CLOCK_MONOTONIC # undef EV_USE_MONOTONIC # define EV_USE_MONOTONIC 0 @@ -145,9 +177,9 @@ extern "C" { /**/ #define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ -#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ +#define MAX_BLOCKTIME 59.743 /* 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 */ +/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */ #ifdef EV_H # include EV_H @@ -157,7 +189,7 @@ extern "C" { #if __GNUC__ >= 3 # define expect(expr,value) __builtin_expect ((expr),(value)) -# define inline inline +# define inline static inline #else # define expect(expr,value) (expr) # define inline static @@ -169,11 +201,12 @@ extern "C" { #define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) #define ABSPRI(w) ((w)->priority - EV_MINPRI) -#define EMPTY /* required for microsofts broken pseudo-c compiler */ +#define EMPTY0 /* required for microsofts broken pseudo-c compiler */ +#define EMPTY2(a,b) /* used to suppress some warnings */ -typedef struct ev_watcher *W; -typedef struct ev_watcher_list *WL; -typedef struct ev_watcher_time *WT; +typedef ev_watcher *W; +typedef ev_watcher_list *WL; +typedef ev_watcher_time *WT; static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ @@ -259,8 +292,8 @@ typedef struct }; #include "ev_wrap.h" - struct ev_loop default_loop_struct; - static struct ev_loop *default_loop; + static struct ev_loop default_loop_struct; + struct ev_loop *ev_default_loop_ptr; #else @@ -269,7 +302,7 @@ typedef struct #include "ev_vars.h" #undef VAR - static int default_loop; + static int ev_default_loop_ptr; #endif @@ -360,14 +393,14 @@ ev_feed_event (EV_P_ void *w, int revents) { W w_ = (W)w; - if (w_->pending) + if (expect_false (w_->pending)) { pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; return; } w_->pending = ++pendingcnt [ABSPRI (w_)]; - array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void)); + array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2); pendings [ABSPRI (w_)][w_->pending - 1].w = w_; pendings [ABSPRI (w_)][w_->pending - 1].events = revents; } @@ -385,9 +418,9 @@ inline void fd_event (EV_P_ int fd, int revents) { ANFD *anfd = anfds + fd; - struct ev_io *w; + ev_io *w; - for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) + for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) { int ev = w->events & revents; @@ -404,7 +437,7 @@ ev_feed_fd_event (EV_P_ int fd, int revents) /*****************************************************************************/ -static void +inline void fd_reify (EV_P) { int i; @@ -413,11 +446,11 @@ fd_reify (EV_P) { int fd = fdchanges [i]; ANFD *anfd = anfds + fd; - struct ev_io *w; + ev_io *w; int events = 0; - for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) + for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) events |= w->events; #if EV_SELECT_IS_WINSOCKET @@ -431,7 +464,7 @@ fd_reify (EV_P) anfd->reify = 0; - method_modify (EV_A_ fd, anfd->events, events); + backend_modify (EV_A_ fd, anfd->events, events); anfd->events = events; } @@ -441,29 +474,29 @@ fd_reify (EV_P) static void fd_change (EV_P_ int fd) { - if (anfds [fd].reify) + if (expect_false (anfds [fd].reify)) return; anfds [fd].reify = 1; ++fdchangecnt; - array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); + array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); fdchanges [fdchangecnt - 1] = fd; } static void fd_kill (EV_P_ int fd) { - struct ev_io *w; + ev_io *w; - while ((w = (struct ev_io *)anfds [fd].head)) + while ((w = (ev_io *)anfds [fd].head)) { ev_io_stop (EV_A_ w); ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); } } -static int +inline int fd_valid (int fd) { #ifdef _WIN32 @@ -499,7 +532,7 @@ fd_enomem (EV_P) } } -/* usually called after fork if method needs to re-arm all fds from scratch */ +/* usually called after fork if backend needs to re-arm all fds from scratch */ static void fd_rearm_all (EV_P) { @@ -577,7 +610,7 @@ static int signalmax; static int sigpipe [2]; static sig_atomic_t volatile gotsig; -static struct ev_io sigev; +static ev_io sigev; static void signals_init (ANSIG *base, int count) @@ -615,7 +648,7 @@ ev_feed_signal_event (EV_P_ int signum) WL w; #if EV_MULTIPLICITY - assert (("feeding signal events is only supported in the default loop", loop == default_loop)); + assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); #endif --signum; @@ -630,7 +663,7 @@ ev_feed_signal_event (EV_P_ int signum) } static void -sigcb (EV_P_ struct ev_io *iow, int revents) +sigcb (EV_P_ ev_io *iow, int revents) { int signum; @@ -642,7 +675,7 @@ sigcb (EV_P_ struct ev_io *iow, int revents) ev_feed_signal_event (EV_A_ signum + 1); } -inline void +static void fd_intern (int fd) { #ifdef _WIN32 @@ -667,22 +700,22 @@ siginit (EV_P) /*****************************************************************************/ -static struct ev_child *childs [PID_HASHSIZE]; +static ev_child *childs [PID_HASHSIZE]; #ifndef _WIN32 -static struct ev_signal childev; +static ev_signal childev; #ifndef WCONTINUED # define WCONTINUED 0 #endif static void -child_reap (EV_P_ struct ev_signal *sw, int chain, int pid, int status) +child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) { - struct ev_child *w; + ev_child *w; - for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next) + for (w = (ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) if (w->pid == pid || !w->pid) { ev_priority (w) = ev_priority (sw); /* need to do it *now* */ @@ -693,17 +726,18 @@ child_reap (EV_P_ struct ev_signal *sw, int chain, int pid, int status) } static void -childcb (EV_P_ struct ev_signal *sw, int revents) +childcb (EV_P_ ev_signal *sw, int revents) { int pid, status; if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) { /* make sure we are called again until all childs have been reaped */ + /* we need to do it this way so that the callback gets called before we continue */ ev_feed_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 */ + child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ } } @@ -711,6 +745,9 @@ childcb (EV_P_ struct ev_signal *sw, int revents) /*****************************************************************************/ +#if EV_USE_PORT +# include "ev_port.c" +#endif #if EV_USE_KQUEUE # include "ev_kqueue.c" #endif @@ -749,15 +786,55 @@ enable_secure (void) } unsigned int -ev_method (EV_P) +ev_supported_backends (void) { - return method; + unsigned int flags = 0; + + if (EV_USE_PORT ) flags |= EVBACKEND_PORT; + if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE; + if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL; + if (EV_USE_POLL ) flags |= EVBACKEND_POLL; + if (EV_USE_SELECT) flags |= EVBACKEND_SELECT; + + return flags; +} + +unsigned int +ev_recommended_backends (void) +{ + unsigned int flags = ev_supported_backends (); + +#ifndef __NetBSD__ + /* kqueue is borked on everything but netbsd apparently */ + /* it usually doesn't work correctly on anything but sockets and pipes */ + flags &= ~EVBACKEND_KQUEUE; +#endif +#ifdef __APPLE__ + // flags &= ~EVBACKEND_KQUEUE; for documentation + flags &= ~EVBACKEND_POLL; +#endif + + return flags; +} + +unsigned int +ev_embeddable_backends (void) +{ + return EVBACKEND_EPOLL + | EVBACKEND_KQUEUE + | EVBACKEND_PORT; +} + +unsigned int +ev_backend (EV_P) +{ + return backend; } static void loop_init (EV_P_ unsigned int flags) { - if (!method) + if (!backend) { #if EV_USE_MONOTONIC { @@ -772,24 +849,29 @@ loop_init (EV_P_ unsigned int flags) now_floor = mn_now; rtmn_diff = ev_rt_now - mn_now; - if (!(flags & EVMETHOD_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS")) + if (!(flags & EVFLAG_NOENV) + && !enable_secure () + && getenv ("LIBEV_FLAGS")) flags = atoi (getenv ("LIBEV_FLAGS")); - if (!(flags & 0x0000ffff)) - flags |= 0x0000ffff; + if (!(flags & 0x0000ffffUL)) + flags |= ev_recommended_backends (); - method = 0; + backend = 0; +#if EV_USE_PORT + if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); +#endif #if EV_USE_KQUEUE - if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags); + if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); #endif #if EV_USE_EPOLL - if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags); + if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags); #endif #if EV_USE_POLL - if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags); + if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags); #endif #if EV_USE_SELECT - if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags); + if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags); #endif ev_init (&sigev, sigcb); @@ -797,48 +879,54 @@ loop_init (EV_P_ unsigned int flags) } } -void +static void loop_destroy (EV_P) { int i; +#if EV_USE_PORT + if (backend == EVBACKEND_PORT ) port_destroy (EV_A); +#endif #if EV_USE_KQUEUE - if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); + if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); #endif #if EV_USE_EPOLL - if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); + if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A); #endif #if EV_USE_POLL - if (method == EVMETHOD_POLL ) poll_destroy (EV_A); + if (backend == EVBACKEND_POLL ) poll_destroy (EV_A); #endif #if EV_USE_SELECT - if (method == EVMETHOD_SELECT) select_destroy (EV_A); + if (backend == EVBACKEND_SELECT) select_destroy (EV_A); #endif for (i = NUMPRI; i--; ) array_free (pending, [i]); /* have to use the microsoft-never-gets-it-right macro */ - array_free (fdchange, EMPTY); - array_free (timer, EMPTY); + array_free (fdchange, EMPTY0); + array_free (timer, EMPTY0); #if EV_PERIODICS - array_free (periodic, EMPTY); + array_free (periodic, EMPTY0); #endif - array_free (idle, EMPTY); - array_free (prepare, EMPTY); - array_free (check, EMPTY); + array_free (idle, EMPTY0); + array_free (prepare, EMPTY0); + array_free (check, EMPTY0); - method = 0; + backend = 0; } static void loop_fork (EV_P) { -#if EV_USE_EPOLL - if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); +#if EV_USE_PORT + if (backend == EVBACKEND_PORT ) port_fork (EV_A); #endif #if EV_USE_KQUEUE - if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); + if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A); +#endif +#if EV_USE_EPOLL + if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A); #endif if (ev_is_active (&sigev)) @@ -869,7 +957,7 @@ ev_loop_new (unsigned int flags) loop_init (EV_A_ flags); - if (ev_method (EV_A)) + if (ev_backend (EV_A)) return loop; return 0; @@ -892,26 +980,27 @@ ev_loop_fork (EV_P) #if EV_MULTIPLICITY struct ev_loop * +ev_default_loop_init (unsigned int flags) #else int -#endif ev_default_loop (unsigned int flags) +#endif { if (sigpipe [0] == sigpipe [1]) if (pipe (sigpipe)) return 0; - if (!default_loop) + if (!ev_default_loop_ptr) { #if EV_MULTIPLICITY - struct ev_loop *loop = default_loop = &default_loop_struct; + struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; #else - default_loop = 1; + ev_default_loop_ptr = 1; #endif loop_init (EV_A_ flags); - if (ev_method (EV_A)) + if (ev_backend (EV_A)) { siginit (EV_A); @@ -923,17 +1012,17 @@ ev_default_loop (unsigned int flags) #endif } else - default_loop = 0; + ev_default_loop_ptr = 0; } - return default_loop; + return ev_default_loop_ptr; } void ev_default_destroy (void) { #if EV_MULTIPLICITY - struct ev_loop *loop = default_loop; + struct ev_loop *loop = ev_default_loop_ptr; #endif #ifndef _WIN32 @@ -954,10 +1043,10 @@ void ev_default_fork (void) { #if EV_MULTIPLICITY - struct ev_loop *loop = default_loop; + struct ev_loop *loop = ev_default_loop_ptr; #endif - if (method) + if (backend) postfork = 1; } @@ -975,7 +1064,7 @@ any_pending (EV_P) return 0; } -static void +inline void call_pending (EV_P) { int pri; @@ -985,7 +1074,7 @@ call_pending (EV_P) { ANPENDING *p = pendings [pri] + --pendingcnt [pri]; - if (p->w) + if (expect_true (p->w)) { p->w->pending = 0; EV_CB_INVOKE (p->w, p->events); @@ -993,12 +1082,12 @@ call_pending (EV_P) } } -static void +inline void timers_reify (EV_P) { while (timercnt && ((WT)timers [0])->at <= mn_now) { - struct ev_timer *w = timers [0]; + ev_timer *w = timers [0]; assert (("inactive timer on timer heap detected", ev_is_active (w))); @@ -1021,12 +1110,12 @@ timers_reify (EV_P) } #if EV_PERIODICS -static void +inline void periodics_reify (EV_P) { while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) { - struct ev_periodic *w = periodics [0]; + ev_periodic *w = periodics [0]; assert (("inactive timer on periodic heap detected", ev_is_active (w))); @@ -1058,7 +1147,7 @@ periodics_reschedule (EV_P) /* adjust periodics after time jump */ for (i = 0; i < periodiccnt; ++i) { - struct ev_periodic *w = periodics [i]; + ev_periodic *w = periodics [i]; if (w->reschedule_cb) ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); @@ -1090,7 +1179,7 @@ time_update_monotonic (EV_P) } } -static void +inline void time_update (EV_P) { int i; @@ -1158,10 +1247,11 @@ static int loop_done; void ev_loop (EV_P_ int flags) { - double block; - loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; + loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) + ? EVUNLOOP_ONE + : EVUNLOOP_CANCEL; - do + while (activecnt) { /* queue check watchers (and execute them) */ if (expect_false (preparecnt)) @@ -1178,43 +1268,45 @@ ev_loop (EV_P_ int flags) fd_reify (EV_A); /* calculate blocking time */ + { + double block; - /* we only need this for !monotonic clock or timers, but as we basically - always have timers, we just calculate it always */ + if (flags & EVLOOP_NONBLOCK || idlecnt) + block = 0.; /* do not block at all */ + else + { + /* update time to cancel out callback processing overhead */ #if EV_USE_MONOTONIC - if (expect_true (have_monotonic)) - time_update_monotonic (EV_A); - else + if (expect_true (have_monotonic)) + time_update_monotonic (EV_A); + else #endif - { - ev_rt_now = ev_time (); - mn_now = ev_rt_now; - } + { + ev_rt_now = ev_time (); + mn_now = ev_rt_now; + } - if (flags & EVLOOP_NONBLOCK || idlecnt) - block = 0.; - else - { - block = MAX_BLOCKTIME; + block = MAX_BLOCKTIME; - if (timercnt) - { - ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; - if (block > to) block = to; - } + if (timercnt) + { + ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; + if (block > to) block = to; + } #if EV_PERIODICS - if (periodiccnt) - { - ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; - if (block > to) block = to; - } + if (periodiccnt) + { + ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; + if (block > to) block = to; + } #endif - if (block < 0.) block = 0.; - } + if (expect_false (block < 0.)) block = 0.; + } - method_poll (EV_A_ block); + backend_poll (EV_A_ block); + } /* update ev_rt_now, do magic */ time_update (EV_A); @@ -1225,20 +1317,22 @@ ev_loop (EV_P_ int flags) periodics_reify (EV_A); /* absolute timers called first */ #endif - /* queue idle watchers unless io or timers are pending */ + /* queue idle watchers unless other events are pending */ if (idlecnt && !any_pending (EV_A)) queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); /* queue check watchers, to be executed first */ - if (checkcnt) + if (expect_false (checkcnt)) queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); call_pending (EV_A); + + if (expect_false (loop_done)) + break; } - while (activecnt && !loop_done); - if (loop_done != 2) - loop_done = 0; + if (loop_done == EVUNLOOP_ONE) + loop_done = EVUNLOOP_CANCEL; } void @@ -1301,11 +1395,11 @@ ev_stop (EV_P_ W w) /*****************************************************************************/ void -ev_io_start (EV_P_ struct ev_io *w) +ev_io_start (EV_P_ ev_io *w) { int fd = w->fd; - if (ev_is_active (w)) + if (expect_false (ev_is_active (w))) return; assert (("ev_io_start called with negative fd", fd >= 0)); @@ -1318,10 +1412,10 @@ ev_io_start (EV_P_ struct ev_io *w) } void -ev_io_stop (EV_P_ struct ev_io *w) +ev_io_stop (EV_P_ ev_io *w) { ev_clear_pending (EV_A_ (W)w); - if (!ev_is_active (w)) + if (expect_false (!ev_is_active (w))) return; assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); @@ -1333,9 +1427,9 @@ ev_io_stop (EV_P_ struct ev_io *w) } void -ev_timer_start (EV_P_ struct ev_timer *w) +ev_timer_start (EV_P_ ev_timer *w) { - if (ev_is_active (w)) + if (expect_false (ev_is_active (w))) return; ((WT)w)->at += mn_now; @@ -1343,7 +1437,7 @@ ev_timer_start (EV_P_ struct ev_timer *w) assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); ev_start (EV_A_ (W)w, ++timercnt); - array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); + array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); timers [timercnt - 1] = w; upheap ((WT *)timers, timercnt - 1); @@ -1351,15 +1445,15 @@ ev_timer_start (EV_P_ struct ev_timer *w) } void -ev_timer_stop (EV_P_ struct ev_timer *w) +ev_timer_stop (EV_P_ ev_timer *w) { ev_clear_pending (EV_A_ (W)w); - if (!ev_is_active (w)) + if (expect_false (!ev_is_active (w))) return; assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); - if (((W)w)->active < timercnt--) + if (expect_true (((W)w)->active < timercnt--)) { timers [((W)w)->active - 1] = timers [timercnt]; adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); @@ -1371,7 +1465,7 @@ ev_timer_stop (EV_P_ struct ev_timer *w) } void -ev_timer_again (EV_P_ struct ev_timer *w) +ev_timer_again (EV_P_ ev_timer *w) { if (ev_is_active (w)) { @@ -1384,14 +1478,17 @@ ev_timer_again (EV_P_ struct ev_timer *w) ev_timer_stop (EV_A_ w); } else if (w->repeat) - ev_timer_start (EV_A_ w); + { + w->at = w->repeat; + ev_timer_start (EV_A_ w); + } } #if EV_PERIODICS void -ev_periodic_start (EV_P_ struct ev_periodic *w) +ev_periodic_start (EV_P_ ev_periodic *w) { - if (ev_is_active (w)) + if (expect_false (ev_is_active (w))) return; if (w->reschedule_cb) @@ -1404,7 +1501,7 @@ ev_periodic_start (EV_P_ struct ev_periodic *w) } ev_start (EV_A_ (W)w, ++periodiccnt); - array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); + array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); periodics [periodiccnt - 1] = w; upheap ((WT *)periodics, periodiccnt - 1); @@ -1412,15 +1509,15 @@ ev_periodic_start (EV_P_ struct ev_periodic *w) } void -ev_periodic_stop (EV_P_ struct ev_periodic *w) +ev_periodic_stop (EV_P_ ev_periodic *w) { ev_clear_pending (EV_A_ (W)w); - if (!ev_is_active (w)) + if (expect_false (!ev_is_active (w))) return; assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); - if (((W)w)->active < periodiccnt--) + if (expect_true (((W)w)->active < periodiccnt--)) { periodics [((W)w)->active - 1] = periodics [periodiccnt]; adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); @@ -1430,7 +1527,7 @@ ev_periodic_stop (EV_P_ struct ev_periodic *w) } void -ev_periodic_again (EV_P_ struct ev_periodic *w) +ev_periodic_again (EV_P_ ev_periodic *w) { /* TODO: use adjustheap and recalculation */ ev_periodic_stop (EV_A_ w); @@ -1439,21 +1536,21 @@ ev_periodic_again (EV_P_ struct ev_periodic *w) #endif void -ev_idle_start (EV_P_ struct ev_idle *w) +ev_idle_start (EV_P_ ev_idle *w) { - if (ev_is_active (w)) + if (expect_false (ev_is_active (w))) return; ev_start (EV_A_ (W)w, ++idlecnt); - array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); + array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2); idles [idlecnt - 1] = w; } void -ev_idle_stop (EV_P_ struct ev_idle *w) +ev_idle_stop (EV_P_ ev_idle *w) { ev_clear_pending (EV_A_ (W)w); - if (!ev_is_active (w)) + if (expect_false (!ev_is_active (w))) return; idles [((W)w)->active - 1] = idles [--idlecnt]; @@ -1461,21 +1558,21 @@ ev_idle_stop (EV_P_ struct ev_idle *w) } void -ev_prepare_start (EV_P_ struct ev_prepare *w) +ev_prepare_start (EV_P_ ev_prepare *w) { - if (ev_is_active (w)) + if (expect_false (ev_is_active (w))) return; ev_start (EV_A_ (W)w, ++preparecnt); - array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); + array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); prepares [preparecnt - 1] = w; } void -ev_prepare_stop (EV_P_ struct ev_prepare *w) +ev_prepare_stop (EV_P_ ev_prepare *w) { ev_clear_pending (EV_A_ (W)w); - if (!ev_is_active (w)) + if (expect_false (!ev_is_active (w))) return; prepares [((W)w)->active - 1] = prepares [--preparecnt]; @@ -1483,21 +1580,21 @@ ev_prepare_stop (EV_P_ struct ev_prepare *w) } void -ev_check_start (EV_P_ struct ev_check *w) +ev_check_start (EV_P_ ev_check *w) { - if (ev_is_active (w)) + if (expect_false (ev_is_active (w))) return; ev_start (EV_A_ (W)w, ++checkcnt); - array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); + array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2); checks [checkcnt - 1] = w; } void -ev_check_stop (EV_P_ struct ev_check *w) +ev_check_stop (EV_P_ ev_check *w) { ev_clear_pending (EV_A_ (W)w); - if (!ev_is_active (w)) + if (expect_false (!ev_is_active (w))) return; checks [((W)w)->active - 1] = checks [--checkcnt]; @@ -1509,12 +1606,12 @@ ev_check_stop (EV_P_ struct ev_check *w) #endif void -ev_signal_start (EV_P_ struct ev_signal *w) +ev_signal_start (EV_P_ ev_signal *w) { #if EV_MULTIPLICITY - assert (("signal watchers are only supported in the default loop", loop == default_loop)); + assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); #endif - if (ev_is_active (w)) + if (expect_false (ev_is_active (w))) return; assert (("ev_signal_start called with illegal signal number", w->signum > 0)); @@ -1538,10 +1635,10 @@ ev_signal_start (EV_P_ struct ev_signal *w) } void -ev_signal_stop (EV_P_ struct ev_signal *w) +ev_signal_stop (EV_P_ ev_signal *w) { ev_clear_pending (EV_A_ (W)w); - if (!ev_is_active (w)) + if (expect_false (!ev_is_active (w))) return; wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); @@ -1552,12 +1649,12 @@ ev_signal_stop (EV_P_ struct ev_signal *w) } void -ev_child_start (EV_P_ struct ev_child *w) +ev_child_start (EV_P_ ev_child *w) { #if EV_MULTIPLICITY - assert (("child watchers are only supported in the default loop", loop == default_loop)); + assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); #endif - if (ev_is_active (w)) + if (expect_false (ev_is_active (w))) return; ev_start (EV_A_ (W)w, 1); @@ -1565,22 +1662,69 @@ ev_child_start (EV_P_ struct ev_child *w) } void -ev_child_stop (EV_P_ struct ev_child *w) +ev_child_stop (EV_P_ ev_child *w) { ev_clear_pending (EV_A_ (W)w); - if (!ev_is_active (w)) + if (expect_false (!ev_is_active (w))) return; wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); ev_stop (EV_A_ (W)w); } +#if EV_MULTIPLICITY +void +ev_embed_sweep (EV_P_ ev_embed *w) +{ + ev_loop (w->loop, EVLOOP_NONBLOCK); +} + +static void +embed_cb (EV_P_ ev_io *io, int revents) +{ + ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); + + if (ev_cb (w)) + ev_feed_event (EV_A_ (W)w, EV_EMBED); + else + ev_embed_sweep (loop, w); +} + +void +ev_embed_start (EV_P_ ev_embed *w) +{ + if (expect_false (ev_is_active (w))) + return; + + { + struct ev_loop *loop = w->loop; + assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); + ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); + } + + ev_set_priority (&w->io, ev_priority (w)); + ev_io_start (EV_A_ &w->io); + ev_start (EV_A_ (W)w, 1); +} + +void +ev_embed_stop (EV_P_ ev_embed *w) +{ + ev_clear_pending (EV_A_ (W)w); + if (expect_false (!ev_is_active (w))) + return; + + ev_io_stop (EV_A_ &w->io); + ev_stop (EV_A_ (W)w); +} +#endif + /*****************************************************************************/ struct ev_once { - struct ev_io io; - struct ev_timer to; + ev_io io; + ev_timer to; void (*cb)(int revents, void *arg); void *arg; }; @@ -1599,13 +1743,13 @@ once_cb (EV_P_ struct ev_once *once, int revents) } static void -once_cb_io (EV_P_ struct ev_io *w, int revents) +once_cb_io (EV_P_ ev_io *w, int revents) { once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); } static void -once_cb_to (EV_P_ struct ev_timer *w, int revents) +once_cb_to (EV_P_ ev_timer *w, int revents) { once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); } @@ -1615,26 +1759,27 @@ ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, vo { struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); - if (!once) - cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); - else + if (expect_false (!once)) { - once->cb = cb; - once->arg = arg; + cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); + return; + } - ev_init (&once->io, once_cb_io); - if (fd >= 0) - { - ev_io_set (&once->io, fd, events); - ev_io_start (EV_A_ &once->io); - } + once->cb = cb; + once->arg = arg; - ev_init (&once->to, once_cb_to); - if (timeout >= 0.) - { - ev_timer_set (&once->to, timeout, 0.); - ev_timer_start (EV_A_ &once->to); - } + ev_init (&once->io, once_cb_io); + if (fd >= 0) + { + ev_io_set (&once->io, fd, events); + ev_io_start (EV_A_ &once->io); + } + + ev_init (&once->to, once_cb_to); + if (timeout >= 0.) + { + ev_timer_set (&once->to, timeout, 0.); + ev_timer_start (EV_A_ &once->to); } }