X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/cc75a05531d9d05ac14fdaec7960b1c970c87bbb..a83988732901602a5dd2f2301f1bc1c00a9e7cbe:/ev.c diff --git a/ev.c b/ev.c index 898cdeb..01b9df2 100644 --- a/ev.c +++ b/ev.c @@ -1,20 +1,35 @@ #include #include +#include +#include +#include #include +#include #include #include #include -#ifdef CLOCK_MONOTONIC -# define HAVE_MONOTONIC 1 +#ifndef HAVE_MONOTONIC +# ifdef CLOCK_MONOTONIC +# define HAVE_MONOTONIC 1 +# endif #endif -#define HAVE_EPOLL 1 -#define HAVE_REALTIME 1 -#define HAVE_SELECT 0 +#ifndef HAVE_SELECT +# define HAVE_SELECT 1 +#endif + +#ifndef HAVE_EPOLL +# define HAVE_EPOLL 0 +#endif +#ifndef HAVE_REALTIME +# define HAVE_REALTIME 1 /* posix requirement, but might be slower */ +#endif + +#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ #define MAX_BLOCKTIME 60. #include "ev.h" @@ -27,15 +42,21 @@ struct ev_watcher_list { EV_WATCHER_LIST (ev_watcher_list); }; +typedef struct ev_watcher *W; +typedef struct ev_watcher_list *WL; + +static ev_tstamp now, diff; /* monotonic clock */ ev_tstamp ev_now; int ev_method; static int have_monotonic; /* runtime */ static ev_tstamp method_fudge; /* stupid epoll-returns-early bug */ -static void (*method_reify)(void); +static void (*method_modify)(int fd, int oev, int nev); static void (*method_poll)(ev_tstamp timeout); +/*****************************************************************************/ + ev_tstamp ev_time (void) { @@ -68,18 +89,15 @@ get_clock (void) #define array_needsize(base,cur,cnt,init) \ if ((cnt) > cur) \ { \ - int newcnt = cur; \ - do \ - { \ - newcnt += (newcnt >> 1) + 16; \ - } \ - while ((cnt) > newcnt); \ + 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; \ } +/*****************************************************************************/ + typedef struct { struct ev_io *head; @@ -105,7 +123,7 @@ anfds_init (ANFD *base, int count) typedef struct { - struct ev_watcher *w; + W w; int events; } ANPENDING; @@ -113,7 +131,7 @@ static ANPENDING *pendings; static int pendingmax, pendingcnt; static void -event (struct ev_watcher *w, int events) +event (W w, int events) { w->pending = ++pendingcnt; array_needsize (pendings, pendingmax, pendingcnt, ); @@ -132,15 +150,29 @@ fd_event (int fd, int events) int ev = w->events & events; if (ev) - event ((struct ev_watcher *)w, ev); + event ((W)w, ev); } } -static struct ev_timer **timers; -static int timermax, timercnt; +static void +queue_events (W *events, int eventcnt, int type) +{ + int i; + + for (i = 0; i < eventcnt; ++i) + event (events [i], type); +} + +/*****************************************************************************/ + +static struct ev_timer **atimers; +static int atimermax, atimercnt; + +static struct ev_timer **rtimers; +static int rtimermax, rtimercnt; static void -upheap (int k) +upheap (struct ev_timer **timers, int k) { struct ev_timer *w = timers [k]; @@ -157,22 +189,22 @@ upheap (int k) } static void -downheap (int k) +downheap (struct ev_timer **timers, int N, int k) { struct ev_timer *w = timers [k]; - while (k <= (timercnt >> 1)) + while (k < (N >> 1)) { int j = k << 1; - if (j + 1 < timercnt && timers [j]->at > timers [j + 1]->at) + if (j + 1 < N && timers [j]->at > timers [j + 1]->at) ++j; if (w->at <= timers [j]->at) break; timers [k] = timers [j]; - timers [k]->active = k; + timers [k]->active = k + 1; k = j; } @@ -180,16 +212,87 @@ downheap (int k) timers [k]->active = k + 1; } -static struct ev_signal **signals; -static int signalmax, signalcnt; +/*****************************************************************************/ + +typedef struct +{ + struct ev_signal *head; + sig_atomic_t gotsig; +} ANSIG; + +static ANSIG *signals; +static int signalmax; + +static int sigpipe [2]; +static sig_atomic_t gotsig; +static struct ev_io sigev; static void -signals_init (struct ev_signal **base, int count) +signals_init (ANSIG *base, int count) { while (count--) - *base++ = 0; + { + base->head = 0; + base->gotsig = 0; + ++base; + } +} + +static void +sighandler (int signum) +{ + signals [signum - 1].gotsig = 1; + + if (!gotsig) + { + gotsig = 1; + write (sigpipe [1], &gotsig, 1); + } } +static void +sigcb (struct ev_io *iow, int revents) +{ + struct ev_signal *w; + int sig; + + gotsig = 0; + read (sigpipe [0], &revents, 1); + + for (sig = signalmax; sig--; ) + if (signals [sig].gotsig) + { + signals [sig].gotsig = 0; + + for (w = signals [sig].head; w; w = w->next) + event ((W)w, EV_SIGNAL); + } +} + +static void +siginit (void) +{ + 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); + + evio_set (&sigev, sigpipe [0], EV_READ); + evio_start (&sigev); +} + +/*****************************************************************************/ + +static struct ev_idle **idles; +static int idlemax, idlecnt; + +static struct ev_check **checks; +static int checkmax, checkcnt; + +/*****************************************************************************/ + #if HAVE_EPOLL # include "ev_epoll.c" #endif @@ -208,20 +311,31 @@ int ev_init (int flags) #endif ev_now = ev_time (); + now = get_clock (); + diff = ev_now - now; + if (pipe (sigpipe)) + return 0; + + ev_method = EVMETHOD_NONE; #if HAVE_EPOLL - if (epoll_init (flags)) - return ev_method; + if (ev_method == EVMETHOD_NONE) epoll_init (flags); #endif #if HAVE_SELECT - if (select_init (flags)) - return ev_method; + if (ev_method == EVMETHOD_NONE) select_init (flags); #endif - ev_method = EVMETHOD_NONE; + if (ev_method) + { + evw_init (&sigev, sigcb, 0); + siginit (); + } + return ev_method; } +/*****************************************************************************/ + void ev_prefork (void) { } @@ -233,8 +347,43 @@ void ev_postfork_parent (void) void ev_postfork_child (void) { #if HAVE_EPOLL - epoll_postfork_child (); + if (ev_method == EVMETHOD_EPOLL) + epoll_postfork_child (); #endif + + evio_stop (&sigev); + close (sigpipe [0]); + close (sigpipe [1]); + pipe (sigpipe); + siginit (); +} + +/*****************************************************************************/ + +static void +fd_reify (void) +{ + int i; + + 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 @@ -257,79 +406,148 @@ call_pending () } static void -timer_reify (void) +timers_reify (struct ev_timer **timers, int timercnt, ev_tstamp now) { - while (timercnt && timers [0]->at <= ev_now) + while (timercnt && timers [0]->at <= now) { struct ev_timer *w = timers [0]; - /* first reschedule timer */ + /* first reschedule or stop timer */ if (w->repeat) { - fprintf (stderr, "a %f now %f repeat %f, %f\n", w->at, ev_now, w->repeat, w->repeat *1e30);//D if (w->is_abs) - w->at += floor ((ev_now - w->at) / w->repeat + 1.) * w->repeat; + w->at += floor ((now - w->at) / w->repeat + 1.) * w->repeat; else - w->at = ev_now + w->repeat; + w->at = now + w->repeat; - fprintf (stderr, "b %f\n", w->at);//D + assert (w->at > now); - downheap (0); + downheap (timers, timercnt, 0); } else - evtimer_stop (w); /* nonrepeating: stop timer */ + { + evtimer_stop (w); /* nonrepeating: stop timer */ + --timercnt; /* maybe pass by reference instead? */ + } - event ((struct ev_watcher *)w, EV_TIMEOUT); + event ((W)w, EV_TIMEOUT); + } +} + +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 */ + { + now = get_clock (); + diff = ev_now - now; + + if (fabs (odiff - diff) < MIN_TIMEJUMP) + return; /* all is well */ + + 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; + } + } + 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; + + now = ev_now; } } int ev_loop_done; -int ev_loop (int flags) +void ev_loop (int flags) { double block; ev_loop_done = flags & EVLOOP_ONESHOT; + if (checkcnt) + { + queue_events ((W *)checks, checkcnt, EV_CHECK); + call_pending (); + } + do { /* update fd-related kernel structures */ - method_reify (); fdchangecnt = 0; + fd_reify (); /* calculate blocking time */ - ev_now = ev_time (); - - if (flags & EVLOOP_NONBLOCK) + if (flags & EVLOOP_NONBLOCK || idlecnt) block = 0.; - else if (!timercnt) - block = MAX_BLOCKTIME; else { - block = timers [0]->at - ev_now + method_fudge; + block = MAX_BLOCKTIME; + + if (rtimercnt) + { + ev_tstamp to = rtimers [0]->at - get_clock () + method_fudge; + if (block > to) block = to; + } + + if (atimercnt) + { + ev_tstamp to = atimers [0]->at - ev_time () + method_fudge; + if (block > to) block = to; + } + if (block < 0.) block = 0.; - else if (block > MAX_BLOCKTIME) block = MAX_BLOCKTIME; } - fprintf (stderr, "block %f\n", block);//D method_poll (block); - /* put pending timers into pendign queue and reschedule them */ - timer_reify (); + /* update ev_now, do magic */ + 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); + + /* 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); - ev_now = ev_time (); call_pending (); } while (!ev_loop_done); } +/*****************************************************************************/ + static void -wlist_add (struct ev_watcher_list **head, struct ev_watcher_list *elem) +wlist_add (WL *head, WL elem) { elem->next = *head; *head = elem; } static void -wlist_del (struct ev_watcher_list **head, struct ev_watcher_list *elem) +wlist_del (WL *head, WL elem) { while (*head) { @@ -344,14 +562,14 @@ wlist_del (struct ev_watcher_list **head, struct ev_watcher_list *elem) } static void -ev_start (struct ev_watcher *w, int active) +ev_start (W w, int active) { w->pending = 0; w->active = active; } static void -ev_stop (struct ev_watcher *w) +ev_stop (W w) { if (w->pending) pendings [w->pending - 1].w = 0; @@ -360,6 +578,8 @@ ev_stop (struct ev_watcher *w) /* nop */ } +/*****************************************************************************/ + void evio_start (struct ev_io *w) { @@ -368,9 +588,9 @@ evio_start (struct ev_io *w) int fd = w->fd; - ev_start ((struct ev_watcher *)w, 1); + ev_start ((W)w, 1); array_needsize (anfds, anfdmax, fd + 1, anfds_init); - wlist_add ((struct ev_watcher_list **)&anfds[fd].head, (struct ev_watcher_list *)w); + wlist_add ((WL *)&anfds[fd].head, (WL)w); ++fdchangecnt; array_needsize (fdchanges, fdchangemax, fdchangecnt, ); @@ -383,8 +603,8 @@ evio_stop (struct ev_io *w) if (!ev_is_active (w)) return; - wlist_del ((struct ev_watcher_list **)&anfds[w->fd].head, (struct ev_watcher_list *)w); - ev_stop ((struct ev_watcher *)w); + wlist_del ((WL *)&anfds[w->fd].head, (WL)w); + ev_stop ((W)w); ++fdchangecnt; array_needsize (fdchanges, fdchangemax, fdchangecnt, ); @@ -397,20 +617,27 @@ evtimer_start (struct ev_timer *w) if (ev_is_active (w)) return; - fprintf (stderr, "t1 %f a %d\n", w->at, w->is_abs);//D 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 += ev_now; - fprintf (stderr, "t2 %f a %d\n", w->at, w->is_abs);//D + { + w->at += now; + + ev_start ((W)w, ++rtimercnt); + array_needsize (rtimers, rtimermax, rtimercnt, ); + rtimers [rtimercnt - 1] = w; + upheap (rtimers, rtimercnt - 1); + } - ev_start ((struct ev_watcher *)w, ++timercnt); - array_needsize (timers, timermax, timercnt, ); - timers [timercnt - 1] = w; - upheap (timercnt - 1); } void @@ -419,9 +646,24 @@ evtimer_stop (struct ev_timer *w) if (!ev_is_active (w)) return; - timers [w->active - 1] = timers [--timercnt]; - downheap (w->active - 1); - ev_stop ((struct ev_watcher *)w); + if (w->is_abs) + { + if (w->active < atimercnt--) + { + atimers [w->active - 1] = atimers [atimercnt]; + downheap (atimers, atimercnt, w->active - 1); + } + } + else + { + if (w->active < rtimercnt--) + { + rtimers [w->active - 1] = rtimers [rtimercnt]; + downheap (rtimers, rtimercnt, w->active - 1); + } + } + + ev_stop ((W)w); } void @@ -430,9 +672,18 @@ evsignal_start (struct ev_signal *w) if (ev_is_active (w)) return; - ev_start ((struct ev_watcher *)w, 1); + ev_start ((W)w, 1); array_needsize (signals, signalmax, w->signum, signals_init); - wlist_add ((struct ev_watcher_list **)&signals [w->signum - 1], (struct ev_watcher_list *)w); + wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); + + if (!w->next) + { + struct sigaction sa; + sa.sa_handler = sighandler; + sigfillset (&sa.sa_mask); + sa.sa_flags = 0; + sigaction (w->signum, &sa, 0); + } } void @@ -441,12 +692,48 @@ evsignal_stop (struct ev_signal *w) if (!ev_is_active (w)) return; - wlist_del ((struct ev_watcher_list **)&signals [w->signum - 1], (struct ev_watcher_list *)w); - ev_stop ((struct ev_watcher *)w); + wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); + ev_stop ((W)w); + + if (!signals [w->signum - 1].head) + signal (w->signum, SIG_DFL); +} + +void evidle_start (struct ev_idle *w) +{ + if (ev_is_active (w)) + return; + + ev_start ((W)w, ++idlecnt); + array_needsize (idles, idlemax, idlecnt, ); + idles [idlecnt - 1] = w; +} + +void evidle_stop (struct ev_idle *w) +{ + idles [w->active - 1] = idles [--idlecnt]; + ev_stop ((W)w); +} + +void evcheck_start (struct ev_check *w) +{ + if (ev_is_active (w)) + return; + + ev_start ((W)w, ++checkcnt); + array_needsize (checks, checkmax, checkcnt, ); + checks [checkcnt - 1] = w; +} + +void evcheck_stop (struct ev_check *w) +{ + checks [w->active - 1] = checks [--checkcnt]; + ev_stop ((W)w); } /*****************************************************************************/ -#if 1 + +#if 0 static void sin_cb (struct ev_io *w, int revents) @@ -457,7 +744,21 @@ sin_cb (struct ev_io *w, int revents) 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); + //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); +} + +static void +scb (struct ev_signal *w, int revents) +{ + fprintf (stderr, "signal %x,%d\n", revents, w->signum); +} + +static void +gcb (struct ev_signal *w, int revents) +{ + fprintf (stderr, "generic %x\n", revents); } int main (void) @@ -470,15 +771,38 @@ int main (void) evio_set (&sin, 0, EV_READ); evio_start (&sin); + struct ev_timer t[10000]; + +#if 0 + int i; + for (i = 0; i < 10000; ++i) + { + struct ev_timer *w = t + i; + evw_init (w, ocb, i); + evtimer_set_abs (w, drand48 (), 0.99775533); + evtimer_start (w); + if (drand48 () < 0.5) + evtimer_stop (w); + } +#endif + struct ev_timer t1; - evw_init (&t1, ocb, 1); - evtimer_set_rel (&t1, 1, 0); + evw_init (&t1, ocb, 0); + evtimer_set_abs (&t1, 5, 10); evtimer_start (&t1); - struct ev_timer t2; - evw_init (&t2, ocb, 2); - evtimer_set_abs (&t2, ev_time () + 2, 0); - evtimer_start (&t2); + struct ev_signal sig; + evw_init (&sig, scb, 65535); + evsignal_set (&sig, SIGQUIT); + evsignal_start (&sig); + + struct ev_check cw; + evw_init (&cw, gcb, 0); + evcheck_start (&cw); + + struct ev_idle iw; + evw_init (&iw, gcb, 0); + evidle_start (&iw); ev_loop (0);