X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/60a7a3c0029fc0a57c6548e3175af0a362a37a52..f2f56d433ed4bf97e96e4d1df5fb9f3795b768b3:/ev.c diff --git a/ev.c b/ev.c index 8c05776..2c34141 100644 --- a/ev.c +++ b/ev.c @@ -28,15 +28,44 @@ * (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" + +# if HAVE_CLOCK_GETTIME +# ifndef EV_USE_MONOTONIC +# define EV_USE_MONOTONIC 1 +# endif +# ifndef EV_USE_REALTIME +# define EV_USE_REALTIME 1 +# endif +# endif + +# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT) +# define EV_USE_SELECT 1 +# endif + +# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL) +# define EV_USE_POLL 1 +# endif + +# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL) +# define EV_USE_EPOLL 1 +# endif + +# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE) +# define EV_USE_KQUEUE 1 +# endif + #endif #include #include -#include #include -#include #include #include @@ -44,11 +73,21 @@ #include #include #include -#ifndef WIN32 +#include + +#include + +#ifndef _WIN32 +# include +# include # include +#else +# define WIN32_LEAN_AND_MEAN +# include +# ifndef EV_SELECT_IS_WINSOCKET +# define EV_SELECT_IS_WINSOCKET 1 +# endif #endif -#include -#include /**/ @@ -58,10 +97,15 @@ #ifndef EV_USE_SELECT # define EV_USE_SELECT 1 +# define EV_SELECT_USE_FD_SET 1 #endif -#ifndef EV_USEV_POLL -# define EV_USEV_POLL 0 /* poll is usually slower than select, and not as well tested */ +#ifndef EV_USE_POLL +# ifdef _WIN32 +# define EV_USE_POLL 0 +# else +# define EV_USE_POLL 1 +# endif #endif #ifndef EV_USE_EPOLL @@ -78,6 +122,12 @@ /**/ +/* darwin simply cannot be helped */ +#ifdef __APPLE__ +# undef EV_USE_POLL +# undef EV_USE_KQUEUE +#endif + #ifndef CLOCK_MONOTONIC # undef EV_USE_MONOTONIC # define EV_USE_MONOTONIC 0 @@ -88,6 +138,10 @@ # define EV_USE_REALTIME 0 #endif +#if EV_SELECT_IS_WINSOCKET +# include +#endif + /**/ #define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ @@ -95,7 +149,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)) @@ -111,17 +169,76 @@ #define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) #define ABSPRI(w) ((w)->priority - EV_MINPRI) +#define EMPTY /* required for microsofts broken pseudo-c compiler */ + typedef struct ev_watcher *W; typedef struct ev_watcher_list *WL; typedef struct ev_watcher_time *WT; +static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ + +#ifdef _WIN32 +# include "ev_win32.c" +#endif + +/*****************************************************************************/ + +static void (*syserr_cb)(const char *msg); + +void ev_set_syserr_cb (void (*cb)(const char *msg)) +{ + syserr_cb = cb; +} + +static void +syserr (const char *msg) +{ + if (!msg) + msg = "(libev) system error"; + + if (syserr_cb) + syserr_cb (msg); + else + { + perror (msg); + abort (); + } +} + +static void *(*alloc)(void *ptr, long size); + +void ev_set_allocator (void *(*cb)(void *ptr, long size)) +{ + alloc = cb; +} + +static void * +ev_realloc (void *ptr, long size) +{ + ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); + + if (!ptr && size) + { + fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); + abort (); + } + + return ptr; +} + +#define ev_malloc(size) ev_realloc (0, (size)) +#define ev_free(ptr) ev_realloc ((ptr), 0) + /*****************************************************************************/ typedef struct { - struct ev_watcher_list *head; + WL head; unsigned char events; unsigned char reify; +#if EV_SELECT_IS_WINSOCKET + SOCKET handle; +#endif } ANFD; typedef struct @@ -130,21 +247,35 @@ typedef struct int events; } ANPENDING; -#ifdef EV_MULTIPLICITY -struct ev_loop -{ -# define VAR(name,decl) decl -# include "ev_vars.h" -}; +#if EV_MULTIPLICITY + + struct ev_loop + { + ev_tstamp ev_rt_now; + #define ev_rt_now ((loop)->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" + + ev_tstamp ev_rt_now; + #define VAR(name,decl) static decl; + #include "ev_vars.h" + #undef VAR + + static int default_loop; + #endif -#undef VAR /*****************************************************************************/ -inline ev_tstamp +ev_tstamp ev_time (void) { #if EV_USE_REALTIME @@ -173,29 +304,42 @@ 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(base,n) ((n) | 4 & ~3) +#define array_roundsize(type,n) (((n) | 4) & ~3) + +#define array_needsize(type,base,cur,cnt,init) \ + if (expect_false ((cnt) > cur)) \ + { \ + int newcnt = cur; \ + do \ + { \ + newcnt = array_roundsize (type, newcnt << 1); \ + } \ + while ((cnt) > newcnt); \ + \ + base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\ + init (base + cur, newcnt - cur); \ + cur = newcnt; \ + } -#define array_needsize(base,cur,cnt,init) \ - if (expect_false ((cnt) > cur)) \ - { \ - int newcnt = cur; \ - do \ - { \ - newcnt = array_roundsize (base, newcnt << 1); \ - } \ - while ((cnt) > newcnt); \ - \ - base = realloc (base, sizeof (*base) * (newcnt)); \ - init (base + cur, newcnt - cur); \ - cur = newcnt; \ +#define array_slim(type,stem) \ + if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ + { \ + stem ## max = array_roundsize (stem ## cnt >> 1); \ + base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ + fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ } +#define array_free(stem, idx) \ + ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; + /*****************************************************************************/ static void @@ -211,19 +355,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 (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], ); - 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 @@ -232,24 +378,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 @@ -268,13 +420,19 @@ fd_reify (EV_P) for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) events |= w->events; - anfd->reify = 0; - - if (anfd->events != events) +#if EV_SELECT_IS_WINSOCKET + if (events) { - method_modify (EV_A_ fd, anfd->events, events); - anfd->events = events; + unsigned long argp; + anfd->handle = _get_osfhandle (fd); + assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); } +#endif + + anfd->reify = 0; + + method_modify (EV_A_ fd, anfd->events, events); + anfd->events = events; } fdchangecnt = 0; @@ -283,13 +441,13 @@ fd_reify (EV_P) static void fd_change (EV_P_ int fd) { - if (anfds [fd].reify || fdchangecnt < 0) + if (anfds [fd].reify) return; anfds [fd].reify = 1; ++fdchangecnt; - array_needsize (fdchanges, fdchangemax, fdchangecnt, ); + array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); fdchanges [fdchangecnt - 1] = fd; } @@ -301,10 +459,20 @@ 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); } } +static int +fd_valid (int fd) +{ +#ifdef _WIN32 + return _get_osfhandle (fd) != -1; +#else + return fcntl (fd, F_GETFD) != -1; +#endif +} + /* called on EBADF to verify fds */ static void fd_ebadf (EV_P) @@ -313,7 +481,7 @@ fd_ebadf (EV_P) for (fd = 0; fd < anfdmax; ++fd) if (anfds [fd].events) - if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) + if (!fd_valid (fd) == -1 && errno == EBADF) fd_kill (EV_A_ fd); } @@ -321,65 +489,86 @@ fd_ebadf (EV_P) static void fd_enomem (EV_P) { - int fd = anfdmax; + int fd; - while (fd--) + for (fd = anfdmax; fd--; ) if (anfds [fd].events) { - close (fd); fd_kill (EV_A_ fd); return; } } +/* usually called after fork if method needs to re-arm all fds from scratch */ +static void +fd_rearm_all (EV_P) +{ + int fd; + + /* this should be highly optimised to not do anything but set a flag */ + for (fd = 0; fd < anfdmax; ++fd) + if (anfds [fd].events) + { + anfds [fd].events = 0; + fd_change (EV_A_ fd); + } +} + /*****************************************************************************/ static void -upheap (WT *timers, int k) +upheap (WT *heap, int k) { - WT w = timers [k]; + WT w = heap [k]; - while (k && timers [k >> 1]->at > w->at) + while (k && heap [k >> 1]->at > w->at) { - timers [k] = timers [k >> 1]; - timers [k]->active = k + 1; + heap [k] = heap [k >> 1]; + ((W)heap [k])->active = k + 1; k >>= 1; } - timers [k] = w; - timers [k]->active = k + 1; + heap [k] = w; + ((W)heap [k])->active = k + 1; } static void -downheap (WT *timers, int N, int k) +downheap (WT *heap, int N, int k) { - WT w = timers [k]; + WT w = heap [k]; while (k < (N >> 1)) { int j = k << 1; - if (j + 1 < N && timers [j]->at > timers [j + 1]->at) + if (j + 1 < N && heap [j]->at > heap [j + 1]->at) ++j; - if (w->at <= timers [j]->at) + if (w->at <= heap [j]->at) break; - timers [k] = timers [j]; - timers [k]->active = k + 1; + heap [k] = heap [j]; + ((W)heap [k])->active = k + 1; k = j; } - timers [k] = w; - timers [k]->active = k + 1; + heap [k] = w; + ((W)heap [k])->active = k + 1; +} + +inline void +adjustheap (WT *heap, int N, int k) +{ + upheap (heap, k); + downheap (heap, N, k); } /*****************************************************************************/ typedef struct { - struct ev_watcher_list *head; + WL head; sig_atomic_t volatile gotsig; } ANSIG; @@ -388,6 +577,7 @@ static int signalmax; static int sigpipe [2]; static sig_atomic_t volatile gotsig; +static struct ev_io sigev; static void signals_init (ANSIG *base, int count) @@ -404,6 +594,10 @@ signals_init (ANSIG *base, int count) static void sighandler (int signum) { +#if _WIN32 + signal (signum, sighandler); +#endif + signals [signum - 1].gotsig = 1; if (!gotsig) @@ -415,10 +609,29 @@ sighandler (int signum) } } +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) { - struct ev_watcher_list *w; int signum; read (sigpipe [0], &revents, 1); @@ -426,34 +639,39 @@ sigcb (EV_P_ struct ev_io *iow, int revents) for (signum = signalmax; signum--; ) if (signals [signum].gotsig) - { - signals [signum].gotsig = 0; + ev_feed_signal_event (EV_A_ signum + 1); +} - for (w = signals [signum].head; w; w = w->next) - event (EV_A_ (W)w, EV_SIGNAL); - } +inline void +fd_intern (int fd) +{ +#ifdef _WIN32 + int arg = 1; + ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); +#else + fcntl (fd, F_SETFD, FD_CLOEXEC); + fcntl (fd, F_SETFL, O_NONBLOCK); +#endif } static void siginit (EV_P) { -#ifndef WIN32 - 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); -#endif + fd_intern (sigpipe [0]); + fd_intern (sigpipe [1]); ev_io_set (&sigev, sigpipe [0], EV_READ); - ev_io_start (&sigev); + ev_io_start (EV_A_ &sigev); ev_unref (EV_A); /* child watcher should not keep loop alive */ } /*****************************************************************************/ -#ifndef WIN32 +static struct ev_child *childs [PID_HASHSIZE]; + +#ifndef _WIN32 + +static struct ev_signal childev; #ifndef WCONTINUED # define WCONTINUED 0 @@ -467,10 +685,10 @@ child_reap (EV_P_ struct ev_signal *sw, int chain, int pid, int status) for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next) if (w->pid == pid || !w->pid) { - w->priority = sw->priority; /* need to do it *now* */ - w->rpid = pid; - w->rstatus = status; - event (EV_A_ (W)w, EV_CHILD); + ev_priority (w) = ev_priority (sw); /* need to do it *now* */ + w->rpid = pid; + w->rstatus = status; + ev_feed_event (EV_A_ (W)w, EV_CHILD); } } @@ -482,7 +700,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 */ @@ -499,7 +717,7 @@ childcb (EV_P_ struct ev_signal *sw, int revents) #if EV_USE_EPOLL # include "ev_epoll.c" #endif -#if EV_USEV_POLL +#if EV_USE_POLL # include "ev_poll.c" #endif #if EV_USE_SELECT @@ -522,7 +740,7 @@ ev_version_minor (void) static int enable_secure (void) { -#ifdef WIN32 +#ifdef _WIN32 return 0; #else return getuid () != geteuid () @@ -530,19 +748,15 @@ enable_secure (void) #endif } -int +unsigned int ev_method (EV_P) { return method; } -int -ev_init (EV_P_ int methods) +static void +loop_init (EV_P_ unsigned int flags) { -#ifdef EV_MULTIPLICITY - memset (loop, 0, sizeof (struct ev_loop)); -#endif - if (!method) { #if EV_USE_MONOTONIC @@ -553,83 +767,214 @@ ev_init (EV_P_ int methods) } #endif - rt_now = ev_time (); + ev_rt_now = ev_time (); mn_now = get_clock (); now_floor = mn_now; - diff = rt_now - mn_now; + rtmn_diff = ev_rt_now - mn_now; - if (pipe (sigpipe)) - return 0; + if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS")) + flags = atoi (getenv ("LIBEV_FLAGS")); - if (methods == EVMETHOD_AUTO) - if (!enable_secure () && getenv ("LIBmethodS")) - methods = atoi (getenv ("LIBmethodS")); - else - methods = EVMETHOD_ANY; + if (!(flags & 0x0000ffff)) + flags |= 0x0000ffff; method = 0; #if EV_USE_KQUEUE - if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); + if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags); #endif #if EV_USE_EPOLL - if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); + if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags); #endif -#if EV_USEV_POLL - if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); +#if EV_USE_POLL + if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags); #endif #if EV_USE_SELECT - if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); + if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags); #endif - if (method) + ev_init (&sigev, sigcb); + ev_set_priority (&sigev, EV_MAXPRI); + } +} + +void +loop_destroy (EV_P) +{ + int i; + +#if EV_USE_KQUEUE + if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); +#endif +#if EV_USE_EPOLL + if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); +#endif +#if EV_USE_POLL + if (method == EVMETHOD_POLL ) poll_destroy (EV_A); +#endif +#if EV_USE_SELECT + if (method == EVMETHOD_SELECT) select_destroy (EV_A); +#endif + + for (i = NUMPRI; i--; ) + array_free (pending, [i]); + + /* have to use the microsoft-never-gets-it-right macro */ + array_free (fdchange, EMPTY); + array_free (timer, EMPTY); +#if EV_PERIODICS + array_free (periodic, EMPTY); +#endif + array_free (idle, EMPTY); + array_free (prepare, EMPTY); + array_free (check, EMPTY); + + method = 0; +} + +static void +loop_fork (EV_P) +{ +#if EV_USE_EPOLL + if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); +#endif +#if EV_USE_KQUEUE + if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); +#endif + + if (ev_is_active (&sigev)) + { + /* default loop */ + + ev_ref (EV_A); + ev_io_stop (EV_A_ &sigev); + close (sigpipe [0]); + close (sigpipe [1]); + + while (pipe (sigpipe)) + syserr ("(libev) error creating pipe"); + + siginit (EV_A); + } + + postfork = 0; +} + +#if EV_MULTIPLICITY +struct ev_loop * +ev_loop_new (unsigned int flags) +{ + struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); + + memset (loop, 0, sizeof (struct ev_loop)); + + loop_init (EV_A_ flags); + + if (ev_method (EV_A)) + return loop; + + return 0; +} + +void +ev_loop_destroy (EV_P) +{ + loop_destroy (EV_A); + ev_free (loop); +} + +void +ev_loop_fork (EV_P) +{ + postfork = 1; +} + +#endif + +#if EV_MULTIPLICITY +struct ev_loop * +#else +int +#endif +ev_default_loop (unsigned int flags) +{ + if (sigpipe [0] == sigpipe [1]) + if (pipe (sigpipe)) + return 0; + + if (!default_loop) + { +#if EV_MULTIPLICITY + struct ev_loop *loop = default_loop = &default_loop_struct; +#else + default_loop = 1; +#endif + + loop_init (EV_A_ flags); + + if (ev_method (EV_A)) { - ev_watcher_init (&sigev, sigcb); - ev_set_priority (&sigev, EV_MAXPRI); siginit (EV_A); -#ifndef WIN32 +#ifndef _WIN32 ev_signal_init (&childev, childcb, SIGCHLD); ev_set_priority (&childev, EV_MAXPRI); ev_signal_start (EV_A_ &childev); ev_unref (EV_A); /* child watcher should not keep loop alive */ #endif } + else + default_loop = 0; } - return method; + return default_loop; } -/*****************************************************************************/ - void -ev_fork_prepare (void) +ev_default_destroy (void) { - /* nop */ -} +#if EV_MULTIPLICITY + struct ev_loop *loop = default_loop; +#endif -void -ev_fork_parent (void) -{ - /* nop */ +#ifndef _WIN32 + ev_ref (EV_A); /* child watcher */ + ev_signal_stop (EV_A_ &childev); +#endif + + ev_ref (EV_A); /* signal watcher */ + ev_io_stop (EV_A_ &sigev); + + close (sigpipe [0]); sigpipe [0] = 0; + close (sigpipe [1]); sigpipe [1] = 0; + + loop_destroy (EV_A); } void -ev_fork_child (void) +ev_default_fork (void) { -#if EV_USE_EPOLL - if (method == EVMETHOD_EPOLL) - epoll_postfork_child (); +#if EV_MULTIPLICITY + struct ev_loop *loop = default_loop; #endif - ev_io_stop (&sigev); - close (sigpipe [0]); - close (sigpipe [1]); - pipe (sigpipe); - siginit (); + if (method) + postfork = 1; } /*****************************************************************************/ +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) { @@ -643,7 +988,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); } } } @@ -651,47 +996,62 @@ call_pending (EV_P) static void timers_reify (EV_P) { - while (timercnt && timers [0]->at <= mn_now) + while (timercnt && ((WT)timers [0])->at <= mn_now) { struct ev_timer *w = timers [0]; + assert (("inactive timer on timer heap detected", ev_is_active (w))); + /* first reschedule or stop timer */ if (w->repeat) { assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); - 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 ((W)w, EV_TIMEOUT); + ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); } } +#if EV_PERIODICS static void periodics_reify (EV_P) { - while (periodiccnt && 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) + { + ((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) { - w->at += floor ((rt_now - w->at) / w->interval + 1.) * w->interval; - assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", 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); } } static void -periodics_reschedule (EV_P_ ev_tstamp diff) +periodics_reschedule (EV_P) { int i; @@ -700,20 +1060,17 @@ periodics_reschedule (EV_P_ ev_tstamp diff) { struct ev_periodic *w = periodics [i]; - if (w->interval) - { - ev_tstamp diff = ceil ((rt_now - 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) @@ -722,13 +1079,13 @@ time_update_monotonic (EV_P) if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) { - rt_now = mn_now + diff; + 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; } } @@ -743,39 +1100,44 @@ time_update (EV_P) { if (time_update_monotonic (EV_A)) { - ev_tstamp odiff = diff; + ev_tstamp odiff = rtmn_diff; for (i = 4; --i; ) /* loop a few times, before making important decisions */ { - diff = rt_now - mn_now; + rtmn_diff = ev_rt_now - mn_now; - if (fabs (odiff - diff) < MIN_TIMEJUMP) + 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; } - periodics_reschedule (EV_A_ diff - odiff); +# 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) */ } } 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)) { - periodics_reschedule (EV_A_ rt_now - mn_now); +#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) - timers [i]->at += diff; + ((WT)timers [i])->at += ev_rt_now - mn_now; } - mn_now = rt_now; + mn_now = ev_rt_now; } } @@ -808,12 +1170,16 @@ ev_loop (EV_P_ int flags) call_pending (EV_A); } + /* we might have forked, so reify kernel state if necessary */ + if (expect_false (postfork)) + loop_fork (EV_A); + /* update fd-related kernel structures */ fd_reify (EV_A); /* 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)) @@ -821,8 +1187,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) @@ -833,30 +1199,34 @@ ev_loop (EV_P_ int flags) if (timercnt) { - ev_tstamp to = timers [0]->at - mn_now + method_fudge; + ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; if (block > to) block = to; } +#if EV_PERIODICS if (periodiccnt) { - ev_tstamp to = 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 */ @@ -941,7 +1311,7 @@ ev_io_start (EV_P_ struct ev_io *w) assert (("ev_io_start called with negative fd", fd >= 0)); ev_start (EV_A_ (W)w, 1); - array_needsize (anfds, anfdmax, fd + 1, anfds_init); + array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); wlist_add ((WL *)&anfds[fd].head, (WL)w); fd_change (EV_A_ fd); @@ -954,6 +1324,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); @@ -966,14 +1338,16 @@ ev_timer_start (EV_P_ struct ev_timer *w) if (ev_is_active (w)) return; - w->at += mn_now; + ((WT)w)->at += mn_now; assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); ev_start (EV_A_ (W)w, ++timercnt); - array_needsize (timers, timermax, timercnt, ); + array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); timers [timercnt - 1] = w; upheap ((WT *)timers, timercnt - 1); + + assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); } void @@ -983,13 +1357,15 @@ ev_timer_stop (EV_P_ struct ev_timer *w) if (!ev_is_active (w)) return; - if (w->active < timercnt--) + assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); + + if (((W)w)->active < timercnt--) { - timers [w->active - 1] = timers [timercnt]; - downheap ((WT *)timers, timercnt, w->active - 1); + timers [((W)w)->active - 1] = timers [timercnt]; + adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); } - w->at = w->repeat; + ((WT)w)->at -= mn_now; ev_stop (EV_A_ (W)w); } @@ -1001,32 +1377,41 @@ ev_timer_again (EV_P_ struct ev_timer *w) { if (w->repeat) { - w->at = mn_now + w->repeat; - downheap ((WT *)timers, timercnt, w->active - 1); + ((WT)w)->at = mn_now + w->repeat; + adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); } else ev_timer_stop (EV_A_ w); } else if (w->repeat) - ev_timer_start (EV_A_ w); + { + w->at = w->repeat; + 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) - w->at += ceil ((rt_now - 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 (periodics, periodicmax, periodiccnt, ); + array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); periodics [periodiccnt - 1] = w; upheap ((WT *)periodics, periodiccnt - 1); + + assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); } void @@ -1036,124 +1421,145 @@ ev_periodic_stop (EV_P_ struct ev_periodic *w) if (!ev_is_active (w)) return; - if (w->active < periodiccnt--) + assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); + + if (((W)w)->active < periodiccnt--) { - periodics [w->active - 1] = periodics [periodiccnt]; - downheap ((WT *)periodics, periodiccnt, w->active - 1); + periodics [((W)w)->active - 1] = periodics [periodiccnt]; + adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); } ev_stop (EV_A_ (W)w); } -#ifndef SA_RESTART -# define SA_RESTART 0 +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_signal_start (EV_P_ struct ev_signal *w) +ev_idle_start (EV_P_ struct ev_idle *w) { if (ev_is_active (w)) return; - assert (("ev_signal_start called with illegal signal number", w->signum > 0)); - - ev_start (EV_A_ (W)w, 1); - array_needsize (signals, signalmax, w->signum, signals_init); - 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 = SA_RESTART; /* if restarting works we save one iteration */ - sigaction (w->signum, &sa, 0); - } + ev_start (EV_A_ (W)w, ++idlecnt); + array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); + idles [idlecnt - 1] = w; } void -ev_signal_stop (EV_P_ struct ev_signal *w) +ev_idle_stop (EV_P_ struct ev_idle *w) { ev_clear_pending (EV_A_ (W)w); if (!ev_is_active (w)) return; - wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); + idles [((W)w)->active - 1] = idles [--idlecnt]; ev_stop (EV_A_ (W)w); - - if (!signals [w->signum - 1].head) - signal (w->signum, SIG_DFL); } void -ev_idle_start (EV_P_ struct ev_idle *w) +ev_prepare_start (EV_P_ struct ev_prepare *w) { if (ev_is_active (w)) return; - ev_start (EV_A_ (W)w, ++idlecnt); - array_needsize (idles, idlemax, idlecnt, ); - idles [idlecnt - 1] = w; + ev_start (EV_A_ (W)w, ++preparecnt); + array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); + prepares [preparecnt - 1] = w; } void -ev_idle_stop (EV_P_ struct ev_idle *w) +ev_prepare_stop (EV_P_ struct ev_prepare *w) { ev_clear_pending (EV_A_ (W)w); - if (ev_is_active (w)) + if (!ev_is_active (w)) return; - idles [w->active - 1] = idles [--idlecnt]; + prepares [((W)w)->active - 1] = prepares [--preparecnt]; ev_stop (EV_A_ (W)w); } void -ev_prepare_start (EV_P_ struct ev_prepare *w) +ev_check_start (EV_P_ struct ev_check *w) { if (ev_is_active (w)) return; - ev_start (EV_A_ (W)w, ++preparecnt); - array_needsize (prepares, preparemax, preparecnt, ); - prepares [preparecnt - 1] = w; + ev_start (EV_A_ (W)w, ++checkcnt); + array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); + checks [checkcnt - 1] = w; } void -ev_prepare_stop (EV_P_ struct ev_prepare *w) +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; - prepares [w->active - 1] = prepares [--preparecnt]; + checks [((W)w)->active - 1] = checks [--checkcnt]; ev_stop (EV_A_ (W)w); } +#ifndef SA_RESTART +# define SA_RESTART 0 +#endif + void -ev_check_start (EV_P_ struct ev_check *w) +ev_signal_start (EV_P_ struct ev_signal *w) { +#if EV_MULTIPLICITY + assert (("signal watchers are only supported in the default loop", loop == default_loop)); +#endif if (ev_is_active (w)) return; - ev_start (EV_A_ (W)w, ++checkcnt); - array_needsize (checks, checkmax, checkcnt, ); - checks [checkcnt - 1] = w; + assert (("ev_signal_start called with illegal signal number", w->signum > 0)); + + ev_start (EV_A_ (W)w, 1); + array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); + wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); + + if (!((WL)w)->next) + { +#if _WIN32 + signal (w->signum, sighandler); +#else + struct sigaction sa; + sa.sa_handler = sighandler; + sigfillset (&sa.sa_mask); + sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ + sigaction (w->signum, &sa, 0); +#endif + } } void -ev_check_stop (EV_P_ struct ev_check *w) +ev_signal_stop (EV_P_ struct ev_signal *w) { ev_clear_pending (EV_A_ (W)w); - if (ev_is_active (w)) + if (!ev_is_active (w)) return; - checks [w->active - 1] = checks [--checkcnt]; + wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); ev_stop (EV_A_ (W)w); + + if (!signals [w->signum - 1].head) + signal (w->signum, SIG_DFL); } void ev_child_start (EV_P_ struct ev_child *w) { +#if EV_MULTIPLICITY + assert (("child watchers are only supported in the default loop", loop == default_loop)); +#endif if (ev_is_active (w)) return; @@ -1165,7 +1571,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); @@ -1190,7 +1596,7 @@ once_cb (EV_P_ struct ev_once *once, int revents) ev_io_stop (EV_A_ &once->io); ev_timer_stop (EV_A_ &once->to); - free (once); + ev_free (once); cb (revents, arg); } @@ -1210,7 +1616,7 @@ once_cb_to (EV_P_ struct ev_timer *w, int revents) void ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) { - struct ev_once *once = malloc (sizeof (struct ev_once)); + struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); if (!once) cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); @@ -1219,14 +1625,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.); @@ -1235,86 +1641,7 @@ ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, vo } } -/*****************************************************************************/ - -#if 0 - -struct ev_io wio; - -static void -sin_cb (struct ev_io *w, int revents) -{ - fprintf (stderr, "sin %d, revents %d\n", w->fd, 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); - 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) -{ - ev_init (0); - - ev_io_init (&wio, sin_cb, 0, EV_READ); - ev_io_start (&wio); - - struct ev_timer t[10000]; - -#if 0 - int i; - for (i = 0; i < 10000; ++i) - { - struct ev_timer *w = t + i; - ev_watcher_init (w, ocb, i); - ev_timer_init_abs (w, ocb, drand48 (), 0.99775533); - ev_timer_start (w); - if (drand48 () < 0.5) - ev_timer_stop (w); - } -#endif - - struct ev_timer t1; - ev_timer_init (&t1, ocb, 5, 10); - ev_timer_start (&t1); - - struct ev_signal sig; - ev_signal_init (&sig, scb, SIGQUIT); - ev_signal_start (&sig); - - struct ev_check cw; - ev_check_init (&cw, gcb); - ev_check_start (&cw); - - struct ev_idle iw; - ev_idle_init (&iw, gcb); - ev_idle_start (&iw); - - ev_loop (0); - - return 0; +#ifdef __cplusplus } - #endif - - -