X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/2fde047707205b8d8f1c71482d2df57105217e17..0b4c472152d0c1274572fa5fb7223b7bbf4dfe54:/ev.c diff --git a/ev.c b/ev.c index 8a09326..3a177c5 100644 --- a/ev.c +++ b/ev.c @@ -26,6 +26,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. */ +#if EV_USE_CONFIG_H +# include "config.h" +#endif #include #include @@ -43,26 +46,26 @@ #include #include -#ifndef HAVE_MONOTONIC +#ifndef EV_USE_MONOTONIC # ifdef CLOCK_MONOTONIC -# define HAVE_MONOTONIC 1 +# define EV_USE_MONOTONIC 1 # endif #endif -#ifndef HAVE_SELECT -# define HAVE_SELECT 1 +#ifndef EV_USE_SELECT +# define EV_USE_SELECT 1 #endif -#ifndef HAVE_EPOLL -# define HAVE_EPOLL 0 +#ifndef EV_USE_EPOLL +# define EV_USE_EPOLL 0 #endif -#ifndef HAVE_REALTIME -# define HAVE_REALTIME 1 /* posix requirement, but might be slower */ +#ifndef EV_USE_REALTIME +# define EV_USE_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. +#define MAX_BLOCKTIME 59.731 #define PID_HASHSIZE 16 /* size of pid hahs table, must be power of two */ #include "ev.h" @@ -86,7 +89,7 @@ static void (*method_poll)(ev_tstamp timeout); 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; @@ -100,7 +103,7 @@ ev_time (void) static ev_tstamp get_clock (void) { -#if HAVE_MONOTONIC +#if EV_USE_MONOTONIC if (have_monotonic) { struct timespec ts; @@ -112,13 +115,15 @@ get_clock (void) return ev_time (); } +#define array_roundsize(base,n) ((n) | 4 & ~3) + #define array_needsize(base,cur,cnt,init) \ if ((cnt) > cur) \ { \ int newcnt = cur; \ do \ { \ - newcnt = (newcnt << 1) | 4 & ~3; \ + newcnt = array_roundsize (base, newcnt << 1); \ } \ while ((cnt) > newcnt); \ \ @@ -132,22 +137,19 @@ get_clock (void) typedef struct { struct ev_io *head; - unsigned char wev, rev; /* want, received event set */ + int events; } 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; } } @@ -164,13 +166,19 @@ static int pendingmax, pendingcnt; static void event (W w, int events) { - if (w->active) - { - w->pending = ++pendingcnt; - array_needsize (pendings, pendingmax, pendingcnt, ); - pendings [pendingcnt - 1].w = w; - pendings [pendingcnt - 1].events = events; - } + w->pending = ++pendingcnt; + array_needsize (pendings, pendingmax, pendingcnt, ); + pendings [pendingcnt - 1].w = w; + pendings [pendingcnt - 1].events = events; +} + +static void +queue_events (W *events, int eventcnt, int type) +{ + int i; + + for (i = 0; i < eventcnt; ++i) + event (events [i], type); } static void @@ -188,13 +196,50 @@ fd_event (int fd, int events) } } +/*****************************************************************************/ + +static int *fdchanges; +static int fdchangemax, fdchangecnt; + static void -queue_events (W *events, int eventcnt, int type) +fd_reify (void) { 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 = anfd->head; w; w = w->next) + events |= w->events; + + anfd->events &= ~EV_REIFY; + + if (anfd->events != events) + { + method_modify (fd, anfd->events, events); + anfd->events = events; + } + } + + fdchangecnt = 0; +} + +static void +fd_change (int fd) +{ + if (anfds [fd].events & EV_REIFY || fdchangecnt < 0) + return; + + anfds [fd].events |= EV_REIFY; + + ++fdchangecnt; + array_needsize (fdchanges, fdchangemax, fdchangecnt, ); + fdchanges [fdchangecnt - 1] = fd; } /* called on EBADF to verify fds */ @@ -204,12 +249,12 @@ fd_recheck (void) 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); + event ((W)anfds [fd].head, EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT); + ev_io_stop (anfds [fd].head); } } @@ -329,8 +374,8 @@ siginit (void) fcntl (sigpipe [0], F_SETFL, O_NONBLOCK); fcntl (sigpipe [1], F_SETFL, O_NONBLOCK); - evio_set (&sigev, sigpipe [0], EV_READ); - evio_start (&sigev); + ev_io_set (&sigev, sigpipe [0], EV_READ); + ev_io_start (&sigev); } /*****************************************************************************/ @@ -370,10 +415,10 @@ childcb (struct ev_signal *sw, int revents) /*****************************************************************************/ -#if HAVE_EPOLL +#if EV_USE_EPOLL # include "ev_epoll.c" #endif -#if HAVE_SELECT +#if EV_USE_SELECT # include "ev_select.c" #endif @@ -393,7 +438,7 @@ int ev_init (int flags) { if (!ev_method) { -#if HAVE_MONOTONIC +#if EV_USE_MONOTONIC { struct timespec ts; if (!clock_gettime (CLOCK_MONOTONIC, &ts)) @@ -409,20 +454,20 @@ int ev_init (int flags) return 0; ev_method = EVMETHOD_NONE; -#if HAVE_EPOLL +#if EV_USE_EPOLL if (ev_method == EVMETHOD_NONE) epoll_init (flags); #endif -#if HAVE_SELECT +#if EV_USE_SELECT if (ev_method == EVMETHOD_NONE) select_init (flags); #endif if (ev_method) { - evw_init (&sigev, sigcb); + ev_watcher_init (&sigev, sigcb); siginit (); - evsignal_init (&childev, childcb, SIGCHLD); - evsignal_start (&childev); + ev_signal_init (&childev, childcb, SIGCHLD); + ev_signal_start (&childev); } } @@ -446,12 +491,12 @@ ev_postfork_parent (void) void ev_postfork_child (void) { -#if HAVE_EPOLL +#if EV_USE_EPOLL if (ev_method == EVMETHOD_EPOLL) epoll_postfork_child (); #endif - evio_stop (&sigev); + ev_io_stop (&sigev); close (sigpipe [0]); close (sigpipe [1]); pipe (sigpipe); @@ -460,32 +505,6 @@ ev_postfork_child (void) /*****************************************************************************/ -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 call_pending (void) { @@ -508,8 +527,6 @@ timers_reify (void) { struct ev_timer *w = timers [0]; - event ((W)w, EV_TIMEOUT); - /* first reschedule or stop timer */ if (w->repeat) { @@ -518,7 +535,9 @@ timers_reify (void) downheap ((WT *)timers, timercnt, 0); } else - evtimer_stop (w); /* nonrepeating: stop timer */ + ev_timer_stop (w); /* nonrepeating: stop timer */ + + event ((W)w, EV_TIMEOUT); } } @@ -537,7 +556,7 @@ periodics_reify (void) downheap ((WT *)periodics, periodiccnt, 0); } else - evperiodic_stop (w); /* nonrepeating: stop timer */ + ev_periodic_stop (w); /* nonrepeating: stop timer */ event ((W)w, EV_TIMEOUT); } @@ -559,8 +578,8 @@ periodics_reschedule (ev_tstamp diff) if (fabs (diff) >= 1e-4) { - evperiodic_stop (w); - evperiodic_start (w); + ev_periodic_stop (w); + ev_periodic_start (w); i = 0; /* restart loop, inefficient, but time jumps should be rare */ } @@ -613,7 +632,7 @@ int ev_loop_done; void ev_loop (int flags) { double block; - ev_loop_done = flags & EVLOOP_ONESHOT ? 1 : 0; + ev_loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; do { @@ -728,7 +747,7 @@ ev_stop (W w) /*****************************************************************************/ void -evio_start (struct ev_io *w) +ev_io_start (struct ev_io *w) { if (ev_is_active (w)) return; @@ -739,13 +758,11 @@ evio_start (struct ev_io *w) 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; + fd_change (fd); } void -evio_stop (struct ev_io *w) +ev_io_stop (struct ev_io *w) { ev_clear ((W)w); if (!ev_is_active (w)) @@ -754,13 +771,11 @@ evio_stop (struct ev_io *w) wlist_del ((WL *)&anfds[w->fd].head, (WL)w); ev_stop ((W)w); - ++fdchangecnt; - array_needsize (fdchanges, fdchangemax, fdchangecnt, ); - fdchanges [fdchangecnt - 1] = w->fd; + fd_change (w->fd); } void -evtimer_start (struct ev_timer *w) +ev_timer_start (struct ev_timer *w) { if (ev_is_active (w)) return; @@ -776,7 +791,7 @@ evtimer_start (struct ev_timer *w) } void -evtimer_stop (struct ev_timer *w) +ev_timer_stop (struct ev_timer *w) { ev_clear ((W)w); if (!ev_is_active (w)) @@ -794,7 +809,7 @@ evtimer_stop (struct ev_timer *w) } void -evtimer_again (struct ev_timer *w) +ev_timer_again (struct ev_timer *w) { if (ev_is_active (w)) { @@ -804,14 +819,14 @@ evtimer_again (struct ev_timer *w) downheap ((WT *)timers, timercnt, w->active - 1); } else - evtimer_stop (w); + ev_timer_stop (w); } else if (w->repeat) - evtimer_start (w); + ev_timer_start (w); } void -evperiodic_start (struct ev_periodic *w) +ev_periodic_start (struct ev_periodic *w) { if (ev_is_active (w)) return; @@ -829,7 +844,7 @@ evperiodic_start (struct ev_periodic *w) } void -evperiodic_stop (struct ev_periodic *w) +ev_periodic_stop (struct ev_periodic *w) { ev_clear ((W)w); if (!ev_is_active (w)) @@ -845,7 +860,7 @@ evperiodic_stop (struct ev_periodic *w) } void -evsignal_start (struct ev_signal *w) +ev_signal_start (struct ev_signal *w) { if (ev_is_active (w)) return; @@ -865,7 +880,7 @@ evsignal_start (struct ev_signal *w) } void -evsignal_stop (struct ev_signal *w) +ev_signal_stop (struct ev_signal *w) { ev_clear ((W)w); if (!ev_is_active (w)) @@ -878,7 +893,8 @@ evsignal_stop (struct ev_signal *w) signal (w->signum, SIG_DFL); } -void evidle_start (struct ev_idle *w) +void +ev_idle_start (struct ev_idle *w) { if (ev_is_active (w)) return; @@ -888,7 +904,8 @@ void evidle_start (struct ev_idle *w) idles [idlecnt - 1] = w; } -void evidle_stop (struct ev_idle *w) +void +ev_idle_stop (struct ev_idle *w) { ev_clear ((W)w); if (ev_is_active (w)) @@ -898,7 +915,8 @@ void evidle_stop (struct ev_idle *w) ev_stop ((W)w); } -void evprepare_start (struct ev_prepare *w) +void +ev_prepare_start (struct ev_prepare *w) { if (ev_is_active (w)) return; @@ -908,7 +926,8 @@ void evprepare_start (struct ev_prepare *w) prepares [preparecnt - 1] = w; } -void evprepare_stop (struct ev_prepare *w) +void +ev_prepare_stop (struct ev_prepare *w) { ev_clear ((W)w); if (ev_is_active (w)) @@ -918,7 +937,8 @@ void evprepare_stop (struct ev_prepare *w) ev_stop ((W)w); } -void evcheck_start (struct ev_check *w) +void +ev_check_start (struct ev_check *w) { if (ev_is_active (w)) return; @@ -928,7 +948,8 @@ void evcheck_start (struct ev_check *w) checks [checkcnt - 1] = w; } -void evcheck_stop (struct ev_check *w) +void +ev_check_stop (struct ev_check *w) { ev_clear ((W)w); if (ev_is_active (w)) @@ -938,7 +959,8 @@ void evcheck_stop (struct ev_check *w) ev_stop ((W)w); } -void evchild_start (struct ev_child *w) +void +ev_child_start (struct ev_child *w) { if (ev_is_active (w)) return; @@ -947,7 +969,8 @@ void evchild_start (struct ev_child *w) wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); } -void evchild_stop (struct ev_child *w) +void +ev_child_stop (struct ev_child *w) { ev_clear ((W)w); if (ev_is_active (w)) @@ -973,8 +996,8 @@ 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); + ev_io_stop (&once->io); + ev_timer_stop (&once->to); free (once); cb (revents, arg); @@ -998,26 +1021,24 @@ ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *ar 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 (&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 (&once->to); } } } @@ -1038,16 +1059,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 @@ -1061,8 +1082,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]; @@ -1071,29 +1092,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);