X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/d0d4f6a5ab9ce9be2753919a7fe70983f8c48725..b2ebd839862b60e3a71179138dd201e7c8a4fa61:/ev.c?ds=sidebyside diff --git a/ev.c b/ev.c index 5df23b6..ffd19c6 100644 --- a/ev.c +++ b/ev.c @@ -1,8 +1,38 @@ +/* + * Copyright (c) 2007 Marc Alexander Lehmann + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + #include #include #include #include #include +#include #include @@ -34,16 +64,9 @@ #include "ev.h" -struct ev_watcher { - EV_WATCHER (ev_watcher); -}; - -struct ev_watcher_list { - EV_WATCHER_LIST (ev_watcher_list); -}; - 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; @@ -90,7 +113,6 @@ get_clock (void) if ((cnt) > cur) \ { \ int newcnt = cur ? cur << 1 : 16; \ - fprintf (stderr, "resize(" # base ") from %d to %d\n", cur, newcnt);\ base = realloc (base, sizeof (*base) * (newcnt)); \ init (base + cur, newcnt - cur); \ cur = newcnt; \ @@ -133,10 +155,13 @@ static int pendingmax, pendingcnt; static void event (W w, int events) { - w->pending = ++pendingcnt; - array_needsize (pendings, pendingmax, pendingcnt, ); - pendings [pendingcnt - 1].w = w; - pendings [pendingcnt - 1].events = events; + if (w->active) + { + w->pending = ++pendingcnt; + array_needsize (pendings, pendingmax, pendingcnt, ); + pendings [pendingcnt - 1].w = w; + pendings [pendingcnt - 1].events = events; + } } static void @@ -163,18 +188,31 @@ queue_events (W *events, int eventcnt, int type) event (events [i], type); } +/* called on EBADF to verify fds */ +static void +fd_recheck () +{ + int fd; + + for (fd = 0; fd < anfdmax; ++fd) + if (anfds [fd].wev) + if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) + while (anfds [fd].head) + evio_stop (anfds [fd].head); +} + /*****************************************************************************/ -static struct ev_timer **atimers; -static int atimermax, atimercnt; +static struct ev_timer **timers; +static int timermax, timercnt; -static struct ev_timer **rtimers; -static int rtimermax, rtimercnt; +static struct ev_periodic **periodics; +static int periodicmax, periodiccnt; static void -upheap (struct ev_timer **timers, int k) +upheap (WT *timers, int k) { - struct ev_timer *w = timers [k]; + WT w = timers [k]; while (k && timers [k >> 1]->at > w->at) { @@ -189,9 +227,9 @@ upheap (struct ev_timer **timers, int k) } static void -downheap (struct ev_timer **timers, int N, int k) +downheap (WT *timers, int N, int k) { - struct ev_timer *w = timers [k]; + WT w = timers [k]; while (k < (N >> 1)) { @@ -288,6 +326,9 @@ siginit (void) 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; @@ -327,7 +368,7 @@ int ev_init (int flags) if (ev_method) { - evw_init (&sigev, sigcb, 0); + evw_init (&sigev, sigcb); siginit (); } @@ -391,11 +432,9 @@ fd_reify (void) static void call_pending () { - int i; - - for (i = 0; i < pendingcnt; ++i) + while (pendingcnt) { - ANPENDING *p = pendings + i; + ANPENDING *p = pendings + --pendingcnt; if (p->w) { @@ -403,51 +442,87 @@ call_pending () p->w->cb (p->w, p->events); } } - - pendingcnt = 0; } static void -timers_reify (struct ev_timer **timers, int timercnt, ev_tstamp now) +timers_reify () { while (timercnt && timers [0]->at <= now) { struct ev_timer *w = timers [0]; + event ((W)w, EV_TIMEOUT); + /* first reschedule or stop timer */ if (w->repeat) { - if (w->is_abs) - w->at += floor ((now - w->at) / w->repeat + 1.) * w->repeat; - else - w->at = now + w->repeat; - - assert (w->at > now); - - downheap (timers, timercnt, 0); + w->at = now + w->repeat; + assert (("timer timeout in the past, negative repeat?", w->at > now)); + downheap ((WT *)timers, timercnt, 0); } else + evtimer_stop (w); /* nonrepeating: stop timer */ + } +} + +static void +periodics_reify () +{ + while (periodiccnt && periodics [0]->at <= ev_now) + { + struct ev_periodic *w = periodics [0]; + + /* first reschedule or stop timer */ + if (w->interval) { - evtimer_stop (w); /* nonrepeating: stop timer */ - --timercnt; /* maybe pass by reference instead? */ + w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval; + assert (("periodic timeout in the past, negative interval?", w->at > ev_now)); + downheap ((WT *)periodics, periodiccnt, 0); } + else + evperiodic_stop (w); /* nonrepeating: stop timer */ event ((W)w, EV_TIMEOUT); } } +static void +periodics_reschedule (ev_tstamp diff) +{ + int i; + + /* adjust periodics after time jump */ + for (i = 0; i < periodiccnt; ++i) + { + struct ev_periodic *w = periodics [i]; + + if (w->interval) + { + ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval; + + if (fabs (diff) >= 1e-4) + { + evperiodic_stop (w); + evperiodic_start (w); + + i = 0; /* restart loop, inefficient, but time jumps should be rare */ + } + } + } +} + static void time_update () { int i; + ev_now = ev_time (); if (have_monotonic) { ev_tstamp odiff = diff; - /* detecting time jumps is much more difficult */ - for (i = 2; --i; ) /* loop a few times, before making important decisions */ + for (i = 4; --i; ) /* loop a few times, before making important decisions */ { now = get_clock (); diff = ev_now - now; @@ -458,19 +533,19 @@ time_update () ev_now = ev_time (); } - /* time jump detected, reschedule atimers */ - for (i = 0; i < atimercnt; ++i) - { - struct ev_timer *w = atimers [i]; - w->at += ceil ((ev_now - w->at) / w->repeat + 1.) * w->repeat; - } + periodics_reschedule (diff - odiff); + /* no timer adjustment, as the monotonic clock doesn't jump */ } else { if (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP) - /* time jump detected, adjust rtimers */ - for (i = 0; i < rtimercnt; ++i) - rtimers [i]->at += ev_now - now; + { + periodics_reschedule (ev_now - 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; } @@ -481,35 +556,41 @@ int ev_loop_done; void ev_loop (int flags) { double block; - ev_loop_done = flags & EVLOOP_ONESHOT; - - if (checkcnt) - { - queue_events ((W *)checks, checkcnt, EV_CHECK); - call_pending (); - } + ev_loop_done = flags & EVLOOP_ONESHOT ? 1 : 0; do { + /* queue check watchers (and execute them) */ + if (preparecnt) + { + queue_events ((W *)prepares, preparecnt, EV_PREPARE); + call_pending (); + } + /* update fd-related kernel structures */ fd_reify (); /* 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 (flags & EVLOOP_NONBLOCK || idlecnt) block = 0.; else { block = MAX_BLOCKTIME; - if (rtimercnt) + if (timercnt) { - ev_tstamp to = rtimers [0]->at - get_clock () + method_fudge; + ev_tstamp to = timers [0]->at - (have_monotonic ? get_clock () : ev_now) + method_fudge; if (block > to) block = to; } - if (atimercnt) + if (periodiccnt) { - ev_tstamp to = atimers [0]->at - ev_time () + method_fudge; + ev_tstamp to = periodics [0]->at - ev_now + method_fudge; if (block > to) block = to; } @@ -522,21 +603,23 @@ void ev_loop (int flags) time_update (); /* queue pending timers and reschedule them */ - /* absolute timers first */ - timers_reify (atimers, atimercnt, ev_now); - /* relative timers second */ - timers_reify (rtimers, rtimercnt, now); + timers_reify (); /* relative timers called last */ + periodics_reify (); /* absolute timers called first */ /* queue idle watchers unless io or timers are pending */ if (!pendingcnt) queue_events ((W *)idles, idlecnt, EV_IDLE); - /* queue check and possibly idle watchers */ - queue_events ((W *)checks, checkcnt, EV_CHECK); + /* queue check watchers, to be executed first */ + if (checkcnt) + queue_events ((W *)checks, checkcnt, EV_CHECK); call_pending (); } while (!ev_loop_done); + + if (ev_loop_done != 2) + ev_loop_done = 0; } /*****************************************************************************/ @@ -563,19 +646,25 @@ wlist_del (WL *head, WL elem) } } +static void +ev_clear (W w) +{ + if (w->pending) + { + pendings [w->pending - 1].w = 0; + w->pending = 0; + } +} + static void ev_start (W w, int active) { - w->pending = 0; w->active = active; } static void ev_stop (W w) { - if (w->pending) - pendings [w->pending - 1].w = 0; - w->active = 0; } @@ -601,6 +690,7 @@ evio_start (struct ev_io *w) void evio_stop (struct ev_io *w) { + ev_clear ((W)w); if (!ev_is_active (w)) return; @@ -618,50 +708,80 @@ evtimer_start (struct ev_timer *w) if (ev_is_active (w)) return; - if (w->is_abs) - { - /* this formula differs from the one in timer_reify becuse we do not round up */ - if (w->repeat) - w->at += ceil ((ev_now - w->at) / w->repeat) * w->repeat; - - ev_start ((W)w, ++atimercnt); - array_needsize (atimers, atimermax, atimercnt, ); - atimers [atimercnt - 1] = w; - upheap (atimers, atimercnt - 1); - } - else - { - w->at += now; + w->at += now; - ev_start ((W)w, ++rtimercnt); - array_needsize (rtimers, rtimermax, rtimercnt, ); - rtimers [rtimercnt - 1] = w; - upheap (rtimers, rtimercnt - 1); - } + assert (("timer repeat value less than zero not allowed", w->repeat >= 0.)); + ev_start ((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_clear ((W)w); if (!ev_is_active (w)) return; - if (w->is_abs) + if (w->active < timercnt--) { - if (w->active < atimercnt--) - { - atimers [w->active - 1] = atimers [atimercnt]; - downheap (atimers, atimercnt, w->active - 1); - } + timers [w->active - 1] = timers [timercnt]; + downheap ((WT *)timers, timercnt, w->active - 1); } - else + + w->at = w->repeat; + + ev_stop ((W)w); +} + +void +evtimer_again (struct ev_timer *w) +{ + if (ev_is_active (w)) { - if (w->active < rtimercnt--) + if (w->repeat) { - rtimers [w->active - 1] = rtimers [rtimercnt]; - downheap (rtimers, rtimercnt, w->active - 1); + w->at = now + w->repeat; + downheap ((WT *)timers, timercnt, w->active - 1); } + else + evtimer_stop (w); + } + else if (w->repeat) + evtimer_start (w); +} + +void +evperiodic_start (struct ev_periodic *w) +{ + if (ev_is_active (w)) + return; + + assert (("periodic interval value less than zero not allowed", 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; + + ev_start ((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_clear ((W)w); + if (!ev_is_active (w)) + return; + + if (w->active < periodiccnt--) + { + periodics [w->active - 1] = periodics [periodiccnt]; + downheap ((WT *)periodics, periodiccnt, w->active - 1); } ev_stop ((W)w); @@ -690,6 +810,7 @@ evsignal_start (struct ev_signal *w) void evsignal_stop (struct ev_signal *w) { + ev_clear ((W)w); if (!ev_is_active (w)) return; @@ -712,10 +833,34 @@ void evidle_start (struct ev_idle *w) void evidle_stop (struct ev_idle *w) { + ev_clear ((W)w); + if (ev_is_active (w)) + return; + idles [w->active - 1] = idles [--idlecnt]; ev_stop ((W)w); } +void evprepare_start (struct ev_prepare *w) +{ + if (ev_is_active (w)) + return; + + ev_start ((W)w, ++preparecnt); + array_needsize (prepares, preparemax, preparecnt, ); + prepares [preparecnt - 1] = w; +} + +void evprepare_stop (struct ev_prepare *w) +{ + ev_clear ((W)w); + if (ev_is_active (w)) + return; + + prepares [w->active - 1] = prepares [--preparecnt]; + ev_stop ((W)w); +} + void evcheck_start (struct ev_check *w) { if (ev_is_active (w)) @@ -728,14 +873,85 @@ void evcheck_start (struct ev_check *w) void evcheck_stop (struct ev_check *w) { + ev_clear ((W)w); + if (ev_is_active (w)) + return; + checks [w->active - 1] = checks [--checkcnt]; ev_stop ((W)w); } /*****************************************************************************/ +struct ev_once +{ + struct ev_io io; + struct ev_timer to; + void (*cb)(int revents, void *arg); + void *arg; +}; + +static void +once_cb (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); + free (once); + + cb (revents, arg); +} + +static void +once_cb_io (struct ev_io *w, int revents) +{ + once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); +} + +static void +once_cb_to (struct ev_timer *w, int revents) +{ + once_cb ((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) +{ + struct ev_once *once = malloc (sizeof (struct ev_once)); + + if (!once) + cb (EV_ERROR, arg); + else + { + once->cb = cb; + once->arg = arg; + + evw_init (&once->io, once_cb_io); + + if (fd >= 0) + { + evio_set (&once->io, fd, events); + evio_start (&once->io); + } + + evw_init (&once->to, once_cb_to); + + if (timeout >= 0.) + { + evtimer_set (&once->to, timeout, 0.); + evtimer_start (&once->to); + } + } +} + +/*****************************************************************************/ + #if 0 +struct ev_io wio; + static void sin_cb (struct ev_io *w, int revents) { @@ -754,23 +970,23 @@ static void scb (struct ev_signal *w, int revents) { fprintf (stderr, "signal %x,%d\n", revents, w->signum); + evio_stop (&wio); + evio_start (&wio); } static void gcb (struct ev_signal *w, int revents) { fprintf (stderr, "generic %x\n", revents); + } int main (void) { - struct ev_io sin; - ev_init (0); - evw_init (&sin, sin_cb, 55); - evio_set (&sin, 0, EV_READ); - evio_start (&sin); + evio_init (&wio, sin_cb, 0, EV_READ); + evio_start (&wio); struct ev_timer t[10000]; @@ -780,7 +996,7 @@ int main (void) { struct ev_timer *w = t + i; evw_init (w, ocb, i); - evtimer_set_abs (w, drand48 (), 0.99775533); + evtimer_init_abs (w, ocb, drand48 (), 0.99775533); evtimer_start (w); if (drand48 () < 0.5) evtimer_stop (w); @@ -788,21 +1004,19 @@ int main (void) #endif struct ev_timer t1; - evw_init (&t1, ocb, 0); - evtimer_set_abs (&t1, 5, 10); + evtimer_init (&t1, ocb, 5, 10); evtimer_start (&t1); struct ev_signal sig; - evw_init (&sig, scb, 65535); - evsignal_set (&sig, SIGQUIT); + evsignal_init (&sig, scb, SIGQUIT); evsignal_start (&sig); struct ev_check cw; - evw_init (&cw, gcb, 0); + evcheck_init (&cw, gcb); evcheck_start (&cw); struct ev_idle iw; - evw_init (&iw, gcb, 0); + evidle_init (&iw, gcb); evidle_start (&iw); ev_loop (0);