X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/4b05fe94e44407cd62092863e204337c521e7d8a..b6461205c4fecf83ffc3ffe41e49519cb71059f1:/ev.c diff --git a/ev.c b/ev.c index e3e7e57..5aca9ec 100644 --- a/ev.c +++ b/ev.c @@ -28,6 +28,11 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + +#ifdef __cplusplus +extern "C" { +#endif + #ifndef EV_STANDALONE # include "config.h" @@ -48,7 +53,7 @@ # define EV_USE_EPOLL 1 # endif -# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H +# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H # define EV_USE_KQUEUE 1 # endif @@ -128,7 +133,11 @@ #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" +#ifdef EV_H +# include EV_H +#else +# include "ev.h" +#endif #if __GNUC__ >= 3 # define expect(expr,value) __builtin_expect ((expr),(value)) @@ -217,25 +226,32 @@ typedef struct #if EV_MULTIPLICITY -struct ev_loop -{ -# define VAR(name,decl) decl; -# include "ev_vars.h" -}; -# undef VAR -# include "ev_wrap.h" + struct ev_loop + { + ev_tstamp ev_rt_now; + #define VAR(name,decl) decl; + #include "ev_vars.h" + #undef VAR + }; + #include "ev_wrap.h" + + struct ev_loop default_loop_struct; + static struct ev_loop *default_loop; #else -# define VAR(name,decl) static decl; -# include "ev_vars.h" -# undef VAR + ev_tstamp ev_rt_now; + #define VAR(name,decl) static decl; + #include "ev_vars.h" + #undef VAR + + static int default_loop; #endif /*****************************************************************************/ -inline ev_tstamp +ev_tstamp ev_time (void) { #if EV_USE_REALTIME @@ -264,11 +280,13 @@ get_clock (void) return ev_time (); } +#if EV_MULTIPLICITY ev_tstamp ev_now (EV_P) { - return rt_now; + return ev_rt_now; } +#endif #define array_roundsize(type,n) ((n) | 4 & ~3) @@ -318,19 +336,21 @@ anfds_init (ANFD *base, int count) } } -static void -event (EV_P_ W w, int events) +void +ev_feed_event (EV_P_ void *w, int revents) { - if (w->pending) + W w_ = (W)w; + + if (w_->pending) { - pendings [ABSPRI (w)][w->pending - 1].events |= events; + 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)); - pendings [ABSPRI (w)][w->pending - 1].w = w; - pendings [ABSPRI (w)][w->pending - 1].events = events; + w_->pending = ++pendingcnt [ABSPRI (w_)]; + array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void)); + pendings [ABSPRI (w_)][w_->pending - 1].w = w_; + pendings [ABSPRI (w_)][w_->pending - 1].events = revents; } static void @@ -339,24 +359,30 @@ queue_events (EV_P_ W *events, int eventcnt, int type) int i; for (i = 0; i < eventcnt; ++i) - event (EV_A_ events [i], type); + ev_feed_event (EV_A_ events [i], type); } -static void -fd_event (EV_P_ int fd, int events) +inline void +fd_event (EV_P_ int fd, int revents) { ANFD *anfd = anfds + fd; struct ev_io *w; for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) { - int ev = w->events & events; + int ev = w->events & revents; if (ev) - event (EV_A_ (W)w, ev); + ev_feed_event (EV_A_ (W)w, ev); } } +void +ev_feed_fd_event (EV_P_ int fd, int revents) +{ + fd_event (EV_A_ fd, revents); +} + /*****************************************************************************/ static void @@ -405,7 +431,7 @@ fd_kill (EV_P_ int fd) 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); + ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); } } @@ -503,6 +529,18 @@ downheap (WT *heap, int N, int k) ((W)heap [k])->active = k + 1; } +inline void +adjustheap (WT *heap, int N, int k, ev_tstamp at) +{ + ev_tstamp old_at = heap [k]->at; + heap [k]->at = at; + + if (old_at < at) + downheap (heap, N, k); + else + upheap (heap, k); +} + /*****************************************************************************/ typedef struct @@ -543,28 +581,50 @@ sighandler (int signum) { int old_errno = errno; gotsig = 1; +#ifdef WIN32 + send (sigpipe [1], &signum, 1, MSG_DONTWAIT); +#else write (sigpipe [1], &signum, 1); +#endif errno = old_errno; } } +void +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)); +#endif + + --signum; + + if (signum < 0 || signum >= signalmax) + return; + + signals [signum].gotsig = 0; + + for (w = signals [signum].head; w; w = w->next) + ev_feed_event (EV_A_ (W)w, EV_SIGNAL); +} + static void sigcb (EV_P_ struct ev_io *iow, int revents) { - WL w; int signum; +#ifdef WIN32 + recv (sigpipe [0], &revents, 1, MSG_DONTWAIT); +#else read (sigpipe [0], &revents, 1); +#endif gotsig = 0; for (signum = signalmax; signum--; ) if (signals [signum].gotsig) - { - signals [signum].gotsig = 0; - - for (w = signals [signum].head; w; w = w->next) - event (EV_A_ (W)w, EV_SIGNAL); - } + ev_feed_signal_event (EV_A_ signum + 1); } static void @@ -607,7 +667,7 @@ child_reap (EV_P_ struct ev_signal *sw, int chain, int pid, int status) ev_priority (w) = ev_priority (sw); /* need to do it *now* */ w->rpid = pid; w->rstatus = status; - event (EV_A_ (W)w, EV_CHILD); + ev_feed_event (EV_A_ (W)w, EV_CHILD); } } @@ -619,7 +679,7 @@ childcb (EV_P_ struct ev_signal *sw, int revents) 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); + 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 */ @@ -686,10 +746,10 @@ loop_init (EV_P_ int methods) } #endif - rt_now = ev_time (); + ev_rt_now = ev_time (); mn_now = get_clock (); now_floor = mn_now; - rtmn_diff = rt_now - mn_now; + rtmn_diff = ev_rt_now - mn_now; if (methods == EVMETHOD_AUTO) if (!enable_secure () && getenv ("LIBEV_METHODS")) @@ -714,7 +774,7 @@ loop_init (EV_P_ int methods) if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); #endif - ev_watcher_init (&sigev, sigcb); + ev_init (&sigev, sigcb); ev_set_priority (&sigev, EV_MAXPRI); } } @@ -746,7 +806,9 @@ loop_destroy (EV_P) /* have to use the microsoft-never-gets-it-right macro */ array_free_microshit (fdchange); array_free_microshit (timer); +#if EV_PERIODICS array_free_microshit (periodic); +#endif array_free_microshit (idle); array_free_microshit (prepare); array_free_microshit (check); @@ -814,13 +876,8 @@ ev_loop_fork (EV_P) #endif #if EV_MULTIPLICITY -struct ev_loop default_loop_struct; -static struct ev_loop *default_loop; - struct ev_loop * #else -static int default_loop; - int #endif ev_default_loop (int methods) @@ -891,6 +948,18 @@ ev_default_fork (void) /*****************************************************************************/ +static int +any_pending (EV_P) +{ + int pri; + + for (pri = NUMPRI; pri--; ) + if (pendingcnt [pri]) + return 1; + + return 0; +} + static void call_pending (EV_P) { @@ -904,7 +973,7 @@ call_pending (EV_P) if (p->w) { p->w->pending = 0; - p->w->cb (EV_A_ p->w, p->events); + EV_CB_INVOKE (p->w, p->events); } } } @@ -922,36 +991,48 @@ timers_reify (EV_P) if (w->repeat) { assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); - ((WT)w)->at = mn_now + w->repeat; + + ((WT)w)->at += w->repeat; + if (((WT)w)->at < mn_now) + ((WT)w)->at = mn_now; + downheap ((WT *)timers, timercnt, 0); } else ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ - event (EV_A_ (W)w, EV_TIMEOUT); + ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); } } +#if EV_PERIODICS static void periodics_reify (EV_P) { - while (periodiccnt && ((WT)periodics [0])->at <= rt_now) + while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) { struct ev_periodic *w = periodics [0]; assert (("inactive timer on periodic heap detected", ev_is_active (w))); /* first reschedule or stop timer */ - if (w->interval) + if (w->reschedule_cb) + { + ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); + + assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); + downheap ((WT *)periodics, periodiccnt, 0); + } + else if (w->interval) { - ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; - assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); + ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; + assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); downheap ((WT *)periodics, periodiccnt, 0); } else ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ - event (EV_A_ (W)w, EV_PERIODIC); + ev_feed_event (EV_A_ (W)w, EV_PERIODIC); } } @@ -965,20 +1046,17 @@ periodics_reschedule (EV_P) { struct ev_periodic *w = periodics [i]; - if (w->interval) - { - ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; - - if (fabs (diff) >= 1e-4) - { - ev_periodic_stop (EV_A_ w); - ev_periodic_start (EV_A_ w); - - i = 0; /* restart loop, inefficient, but time jumps should be rare */ - } - } + if (w->reschedule_cb) + ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); + else if (w->interval) + ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; } + + /* now rebuild the heap */ + for (i = periodiccnt >> 1; i--; ) + downheap ((WT *)periodics, periodiccnt, i); } +#endif inline int time_update_monotonic (EV_P) @@ -987,13 +1065,13 @@ time_update_monotonic (EV_P) if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) { - rt_now = rtmn_diff + mn_now; + ev_rt_now = rtmn_diff + mn_now; return 0; } else { now_floor = mn_now; - rt_now = ev_time (); + ev_rt_now = ev_time (); return 1; } } @@ -1012,17 +1090,19 @@ time_update (EV_P) for (i = 4; --i; ) /* loop a few times, before making important decisions */ { - rtmn_diff = rt_now - mn_now; + rtmn_diff = ev_rt_now - mn_now; if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) return; /* all is well */ - rt_now = ev_time (); + ev_rt_now = ev_time (); mn_now = get_clock (); now_floor = mn_now; } +# if EV_PERIODICS periodics_reschedule (EV_A); +# endif /* no timer adjustment, as the monotonic clock doesn't jump */ /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ } @@ -1030,18 +1110,20 @@ time_update (EV_P) else #endif { - rt_now = ev_time (); + ev_rt_now = ev_time (); - if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) + if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) { +#if EV_PERIODICS periodics_reschedule (EV_A); +#endif /* adjust timers. this is easy, as the offset is the same for all */ for (i = 0; i < timercnt; ++i) - ((WT)timers [i])->at += rt_now - mn_now; + ((WT)timers [i])->at += ev_rt_now - mn_now; } - mn_now = rt_now; + mn_now = ev_rt_now; } } @@ -1083,7 +1165,7 @@ ev_loop (EV_P_ int flags) /* calculate blocking time */ - /* we only need this for !monotonic clockor timers, but as we basically + /* we only need this for !monotonic clock or timers, but as we basically always have timers, we just calculate it always */ #if EV_USE_MONOTONIC if (expect_true (have_monotonic)) @@ -1091,8 +1173,8 @@ ev_loop (EV_P_ int flags) else #endif { - rt_now = ev_time (); - mn_now = rt_now; + ev_rt_now = ev_time (); + mn_now = ev_rt_now; } if (flags & EVLOOP_NONBLOCK || idlecnt) @@ -1107,26 +1189,30 @@ ev_loop (EV_P_ int flags) if (block > to) block = to; } +#if EV_PERIODICS if (periodiccnt) { - ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; + ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; if (block > to) block = to; } +#endif if (block < 0.) block = 0.; } method_poll (EV_A_ block); - /* update rt_now, do magic */ + /* update ev_rt_now, do magic */ time_update (EV_A); /* queue pending timers and reschedule them */ timers_reify (EV_A); /* relative timers called last */ +#if EV_PERIODICS periodics_reify (EV_A); /* absolute timers called first */ +#endif /* queue idle watchers unless io or timers are pending */ - if (!pendingcnt) + if (idlecnt && !any_pending (EV_A)) queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); /* queue check watchers, to be executed first */ @@ -1224,6 +1310,8 @@ ev_io_stop (EV_P_ struct ev_io *w) if (!ev_is_active (w)) return; + assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); + wlist_del ((WL *)&anfds[w->fd].head, (WL)w); ev_stop (EV_A_ (W)w); @@ -1263,7 +1351,7 @@ ev_timer_stop (EV_P_ struct ev_timer *w) downheap ((WT *)timers, timercnt, ((W)w)->active - 1); } - ((WT)w)->at = w->repeat; + ((WT)w)->at -= mn_now; ev_stop (EV_A_ (W)w); } @@ -1274,10 +1362,7 @@ ev_timer_again (EV_P_ struct ev_timer *w) if (ev_is_active (w)) { if (w->repeat) - { - ((WT)w)->at = mn_now + w->repeat; - downheap ((WT *)timers, timercnt, ((W)w)->active - 1); - } + adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat); else ev_timer_stop (EV_A_ w); } @@ -1285,17 +1370,21 @@ ev_timer_again (EV_P_ struct ev_timer *w) ev_timer_start (EV_A_ w); } +#if EV_PERIODICS void ev_periodic_start (EV_P_ struct ev_periodic *w) { if (ev_is_active (w)) return; - 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) - ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; + if (w->reschedule_cb) + ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); + else if (w->interval) + { + 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 */ + ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; + } ev_start (EV_A_ (W)w, ++periodiccnt); array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); @@ -1323,6 +1412,15 @@ ev_periodic_stop (EV_P_ struct ev_periodic *w) ev_stop (EV_A_ (W)w); } +void +ev_periodic_again (EV_P_ struct ev_periodic *w) +{ + /* TODO: use adjustheap and recalculation */ + ev_periodic_stop (EV_A_ w); + ev_periodic_start (EV_A_ w); +} +#endif + void ev_idle_start (EV_P_ struct ev_idle *w) { @@ -1382,7 +1480,7 @@ void ev_check_stop (EV_P_ struct ev_check *w) { ev_clear_pending (EV_A_ (W)w); - if (ev_is_active (w)) + if (!ev_is_active (w)) return; checks [((W)w)->active - 1] = checks [--checkcnt]; @@ -1453,7 +1551,7 @@ void ev_child_stop (EV_P_ struct ev_child *w) { ev_clear_pending (EV_A_ (W)w); - if (ev_is_active (w)) + if (!ev_is_active (w)) return; wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); @@ -1507,14 +1605,14 @@ ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, vo once->cb = cb; once->arg = arg; - ev_watcher_init (&once->io, once_cb_io); + 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_watcher_init (&once->to, once_cb_to); + ev_init (&once->to, once_cb_to); if (timeout >= 0.) { ev_timer_set (&once->to, timeout, 0.); @@ -1523,3 +1621,7 @@ ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, vo } } +#ifdef __cplusplus +} +#endif +