X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/6c9b968485dc8690f81ae6626c07a82a4e085eb1..fa5f32e568e5e1f7bcb548b108379c434d253731:/ev.c?ds=sidebyside diff --git a/ev.c b/ev.c index 5b59ae1..8c3bf01 100644 --- a/ev.c +++ b/ev.c @@ -1,36 +1,78 @@ +/* + * 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. + */ +#if EV_USE_CONFIG_H +# include "config.h" +#endif + #include #include #include #include #include +#include #include #include #include +#include +#include #include #include -#ifdef CLOCK_MONOTONIC -# define HAVE_MONOTONIC 1 +#ifndef EV_USE_MONOTONIC +# ifdef CLOCK_MONOTONIC +# define EV_USE_MONOTONIC 1 +# endif #endif -#define HAVE_REALTIME 1 -#define HAVE_EPOLL 1 -#define HAVE_SELECT 1 +#ifndef EV_USE_SELECT +# define EV_USE_SELECT 1 +#endif + +#ifndef EV_USE_EPOLL +# define EV_USE_EPOLL 0 +#endif + +#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" -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; @@ -47,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; @@ -61,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; @@ -73,11 +115,19 @@ get_clock (void) return ev_time (); } +#define array_nextsize(n) (((n) << 1) | 4 & ~3) +#define array_prevsize(n) (((n) >> 1) | 4 & ~3) + #define array_needsize(base,cur,cnt,init) \ if ((cnt) > cur) \ { \ - int newcnt = cur ? cur << 1 : 16; \ - fprintf (stderr, "resize(" # base ") from %d to %d\n", cur, newcnt);\ + int newcnt = cur; \ + do \ + { \ + newcnt = array_nextsize (newcnt); \ + } \ + while ((cnt) > newcnt); \ + \ base = realloc (base, sizeof (*base) * (newcnt)); \ init (base + cur, newcnt - cur); \ cur = newcnt; \ @@ -88,29 +138,26 @@ 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; } } typedef struct { - struct ev_watcher *w; + W w; int events; } ANPENDING; @@ -118,12 +165,24 @@ static ANPENDING *pendings; static int pendingmax, pendingcnt; static void -event (struct ev_watcher *w, int events) +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; + } +} + +static void +queue_events (W *events, int eventcnt, int type) { - w->pending = ++pendingcnt; - array_needsize (pendings, pendingmax, pendingcnt, ); - pendings [pendingcnt - 1].w = w; - pendings [pendingcnt - 1].events = events; + int i; + + for (i = 0; i < eventcnt; ++i) + event (events [i], type); } static void @@ -137,31 +196,84 @@ fd_event (int fd, int events) int ev = w->events & events; if (ev) - event ((struct ev_watcher *)w, ev); + event ((W)w, ev); } } +/*****************************************************************************/ + +static int *fdchanges; +static int fdchangemax, fdchangecnt; + static void -queue_events (struct ev_watcher **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 */ +static void +fd_recheck (void) +{ + int fd; + + for (fd = 0; fd < anfdmax; ++fd) + if (anfds [fd].events) + if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) + while (anfds [fd].head) + { + event ((W)anfds [fd].head, EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT); + ev_io_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) { @@ -176,9 +288,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)) { @@ -252,7 +364,7 @@ sigcb (struct ev_io *iow, int revents) signals [sig].gotsig = 0; for (w = signals [sig].head; w; w = w->next) - event ((struct ev_watcher *)w, EV_SIGNAL); + event ((W)w, EV_SIGNAL); } } @@ -266,8 +378,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); } /*****************************************************************************/ @@ -275,47 +387,92 @@ 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; /*****************************************************************************/ -#if HAVE_EPOLL +static struct ev_child *childs [PID_HASHSIZE]; +static struct ev_signal childev; + +#ifndef WCONTINUED +# define WCONTINUED 0 +#endif + +static void +childcb (struct ev_signal *sw, int revents) +{ + struct ev_child *w; + int pid, status; + + while ((pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)) != -1) + for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next) + if (w->pid == pid || w->pid == -1) + { + w->status = status; + event ((W)w, EV_CHILD); + } +} + +/*****************************************************************************/ + +#if EV_USE_EPOLL # include "ev_epoll.c" #endif -#if HAVE_SELECT +#if EV_USE_SELECT # include "ev_select.c" #endif +int +ev_version_major (void) +{ + return EV_VERSION_MAJOR; +} + +int +ev_version_minor (void) +{ + return EV_VERSION_MINOR; +} + int ev_init (int flags) { -#if HAVE_MONOTONIC - { - struct timespec ts; - if (!clock_gettime (CLOCK_MONOTONIC, &ts)) - have_monotonic = 1; - } + if (!ev_method) + { +#if EV_USE_MONOTONIC + { + struct timespec ts; + if (!clock_gettime (CLOCK_MONOTONIC, &ts)) + have_monotonic = 1; + } #endif - ev_now = ev_time (); - now = get_clock (); - diff = ev_now - now; + ev_now = ev_time (); + now = get_clock (); + diff = ev_now - now; - if (pipe (sigpipe)) - return 0; + if (pipe (sigpipe)) + return 0; - ev_method = EVMETHOD_NONE; -#if HAVE_EPOLL - if (ev_method == EVMETHOD_NONE) epoll_init (flags); + ev_method = EVMETHOD_NONE; +#if EV_USE_EPOLL + if (ev_method == EVMETHOD_NONE) epoll_init (flags); #endif -#if HAVE_SELECT - if (ev_method == EVMETHOD_NONE) select_init (flags); +#if EV_USE_SELECT + if (ev_method == EVMETHOD_NONE) select_init (flags); #endif - if (ev_method) - { - evw_init (&sigev, sigcb, 0); - siginit (); + if (ev_method) + { + ev_watcher_init (&sigev, sigcb); + siginit (); + + ev_signal_init (&childev, childcb, SIGCHLD); + ev_signal_start (&childev); + } } return ev_method; @@ -323,22 +480,27 @@ int ev_init (int flags) /*****************************************************************************/ -void ev_prefork (void) +void +ev_prefork (void) { + /* nop */ } -void ev_postfork_parent (void) +void +ev_postfork_parent (void) { + /* nop */ } -void ev_postfork_child (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); @@ -348,91 +510,99 @@ void ev_postfork_child (void) /*****************************************************************************/ static void -fd_reify (void) +call_pending (void) { - int i; - - for (i = 0; i < fdchangecnt; ++i) + while (pendingcnt) { - int fd = fdchanges [i]; - ANFD *anfd = anfds + fd; - struct ev_io *w; + ANPENDING *p = pendings + --pendingcnt; - int wev = 0; - - for (w = anfd->head; w; w = w->next) - wev |= w->events; - - if (anfd->wev != wev) + if (p->w) { - method_modify (fd, anfd->wev, wev); - anfd->wev = wev; + p->w->pending = 0; + p->w->cb (p->w, p->events); } } - - fdchangecnt = 0; } static void -call_pending () +timers_reify (void) { - int i; - - for (i = 0; i < pendingcnt; ++i) + while (timercnt && timers [0]->at <= now) { - ANPENDING *p = pendings + i; + struct ev_timer *w = timers [0]; - if (p->w) + event ((W)w, EV_TIMEOUT); + + /* first reschedule or stop timer */ + if (w->repeat) { - p->w->pending = 0; - p->w->cb (p->w, p->events); + w->at = now + w->repeat; + assert (("timer timeout in the past, negative repeat?", w->at > now)); + downheap ((WT *)timers, timercnt, 0); } + else + ev_timer_stop (w); /* nonrepeating: stop timer */ } - - pendingcnt = 0; } static void -timers_reify (struct ev_timer **timers, int timercnt, ev_tstamp now) +periodics_reify (void) { - while (timercnt && timers [0]->at <= now) + while (periodiccnt && periodics [0]->at <= ev_now) { - struct ev_timer *w = timers [0]; + struct ev_periodic *w = periodics [0]; /* first reschedule or stop timer */ - if (w->repeat) + if (w->interval) { - 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 += 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 + ev_periodic_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) { - evtimer_stop (w); /* nonrepeating: stop timer */ - --timercnt; /* maybe pass by reference instead? */ - } + ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval; + + if (fabs (diff) >= 1e-4) + { + ev_periodic_stop (w); + ev_periodic_start (w); - event ((struct ev_watcher *)w, EV_TIMEOUT); + i = 0; /* restart loop, inefficient, but time jumps should be rare */ + } + } } } static void -time_update () +time_update (void) { 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; @@ -443,19 +613,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; } @@ -466,35 +636,41 @@ int ev_loop_done; void ev_loop (int flags) { double block; - ev_loop_done = flags & EVLOOP_ONESHOT; - - if (checkcnt) - { - queue_events (checks, checkcnt, EV_CHECK); - call_pending (); - } + ev_loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 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; } @@ -507,34 +683,36 @@ 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 (idles, idlecnt, EV_IDLE); + queue_events ((W *)idles, idlecnt, EV_IDLE); - /* queue check and possibly idle watchers */ - queue_events (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; } /*****************************************************************************/ 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) { @@ -549,119 +727,151 @@ wlist_del (struct ev_watcher_list **head, struct ev_watcher_list *elem) } static void -ev_start (struct ev_watcher *w, int active) +ev_clear (W w) { - w->pending = 0; - w->active = active; + if (w->pending) + { + pendings [w->pending - 1].w = 0; + w->pending = 0; + } } static void -ev_stop (struct ev_watcher *w) +ev_start (W w, int active) { - if (w->pending) - pendings [w->pending - 1].w = 0; + w->active = active; +} +static void +ev_stop (W w) +{ w->active = 0; - /* nop */ } /*****************************************************************************/ void -evio_start (struct ev_io *w) +ev_io_start (struct ev_io *w) { if (ev_is_active (w)) return; 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, ); - 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)) 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, ); - 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; - 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 ((struct ev_watcher *)w, ++atimercnt); - array_needsize (atimers, atimermax, atimercnt, ); - atimers [atimercnt - 1] = w; - upheap (atimers, atimercnt - 1); - } - else - { - w->at += now; + w->at += now; - ev_start ((struct ev_watcher *)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_timer_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 +ev_timer_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 + ev_timer_stop (w); + } + else if (w->repeat) + ev_timer_start (w); +} + +void +ev_periodic_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 +ev_periodic_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 ((struct ev_watcher *)w); + ev_stop ((W)w); } void -evsignal_start (struct ev_signal *w) +ev_signal_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].head, (struct ev_watcher_list *)w); + wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); if (!w->next) { @@ -674,52 +884,174 @@ 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)) return; - wlist_del ((struct ev_watcher_list **)&signals [w->signum - 1].head, (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) +void +ev_idle_start (struct ev_idle *w) { if (ev_is_active (w)) return; - ev_start ((struct ev_watcher *)w, ++idlecnt); + ev_start ((W)w, ++idlecnt); array_needsize (idles, idlemax, idlecnt, ); 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)) + return; + idles [w->active - 1] = idles [--idlecnt]; - ev_stop ((struct ev_watcher *)w); + ev_stop ((W)w); } -void evcheck_start (struct ev_check *w) +void +ev_prepare_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 +ev_prepare_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 +ev_check_start (struct ev_check *w) { if (ev_is_active (w)) return; - ev_start ((struct ev_watcher *)w, ++checkcnt); + ev_start ((W)w, ++checkcnt); array_needsize (checks, checkmax, checkcnt, ); 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)) + return; + checks [w->active - 1] = checks [--checkcnt]; - ev_stop ((struct ev_watcher *)w); + ev_stop ((W)w); +} + +void +ev_child_start (struct ev_child *w) +{ + if (ev_is_active (w)) + return; + + ev_start ((W)w, 1); + wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); +} + +void +ev_child_stop (struct ev_child *w) +{ + ev_clear ((W)w); + if (ev_is_active (w)) + return; + + wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); + ev_stop ((W)w); } /*****************************************************************************/ -#if 1 + +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; + + ev_io_stop (&once->io); + ev_timer_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 | EV_READ | EV_WRITE | EV_TIMEOUT, arg); + else + { + once->cb = cb; + once->arg = arg; + + ev_watcher_init (&once->io, once_cb_io); + if (fd >= 0) + { + ev_io_set (&once->io, fd, events); + ev_io_start (&once->io); + } + + ev_watcher_init (&once->to, once_cb_to); + if (timeout >= 0.) + { + ev_timer_set (&once->to, timeout, 0.); + ev_timer_start (&once->to); + } + } +} + +/*****************************************************************************/ + +#if 0 + +struct ev_io wio; static void sin_cb (struct ev_io *w, int revents) @@ -731,31 +1063,31 @@ 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); + ev_io_stop (&wio); + ev_io_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); + ev_io_init (&wio, sin_cb, 0, EV_READ); + ev_io_start (&wio); struct ev_timer t[10000]; @@ -764,31 +1096,29 @@ int main (void) 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); + 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; - evw_init (&t1, ocb, 0); - evtimer_set_abs (&t1, 5, 10); - evtimer_start (&t1); + ev_timer_init (&t1, ocb, 5, 10); + ev_timer_start (&t1); struct ev_signal sig; - evw_init (&sig, scb, 65535); - evsignal_set (&sig, SIGQUIT); - evsignal_start (&sig); + ev_signal_init (&sig, scb, SIGQUIT); + ev_signal_start (&sig); struct ev_check cw; - evw_init (&cw, gcb, 0); - evcheck_start (&cw); + ev_check_init (&cw, gcb); + ev_check_start (&cw); struct ev_idle iw; - evw_init (&iw, gcb, 0); - evidle_start (&iw); + ev_idle_init (&iw, gcb); + ev_idle_start (&iw); ev_loop (0);