X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/6778edc72c8101697c478c40f104fe75c97e336e..cff78812ebbcab7601919f479447150fb7c2c9f4:/ev.c diff --git a/ev.c b/ev.c index 6affeea..6cf394a 100644 --- a/ev.c +++ b/ev.c @@ -37,24 +37,59 @@ extern "C" { # include "config.h" # if HAVE_CLOCK_GETTIME -# define EV_USE_MONOTONIC 1 -# define EV_USE_REALTIME 1 +# ifndef EV_USE_MONOTONIC +# define EV_USE_MONOTONIC 1 +# endif +# ifndef EV_USE_REALTIME +# define EV_USE_REALTIME 1 +# endif +# else +# ifndef EV_USE_MONOTONIC +# define EV_USE_MONOTONIC 0 +# endif +# ifndef EV_USE_REALTIME +# define EV_USE_REALTIME 0 +# endif # endif -# if HAVE_SELECT && HAVE_SYS_SELECT_H -# define EV_USE_SELECT 1 +# ifndef EV_USE_SELECT +# if HAVE_SELECT && HAVE_SYS_SELECT_H +# define EV_USE_SELECT 1 +# else +# define EV_USE_SELECT 0 +# endif # endif -# if HAVE_POLL && HAVE_POLL_H -# define EV_USE_POLL 1 +# ifndef EV_USE_POLL +# if HAVE_POLL && HAVE_POLL_H +# define EV_USE_POLL 1 +# else +# define EV_USE_POLL 0 +# endif # endif - -# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H -# define EV_USE_EPOLL 1 + +# ifndef EV_USE_EPOLL +# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H +# define EV_USE_EPOLL 1 +# else +# define EV_USE_EPOLL 0 +# endif # endif - -# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H -# define EV_USE_KQUEUE 1 + +# ifndef EV_USE_KQUEUE +# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H +# define EV_USE_KQUEUE 1 +# else +# define EV_USE_KQUEUE 0 +# endif +# endif + +# ifndef EV_USE_PORT +# if HAVE_PORT_H && HAVE_PORT_CREATE +# define EV_USE_PORT 1 +# else +# define EV_USE_PORT 0 +# endif # endif #endif @@ -73,15 +108,26 @@ extern "C" { #include -#ifndef WIN32 +#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 + /**/ #ifndef EV_USE_MONOTONIC -# define EV_USE_MONOTONIC 1 +# define EV_USE_MONOTONIC 0 +#endif + +#ifndef EV_USE_REALTIME +# define EV_USE_REALTIME 0 #endif #ifndef EV_USE_SELECT @@ -89,7 +135,11 @@ extern "C" { #endif #ifndef EV_USE_POLL -# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ +# ifdef _WIN32 +# define EV_USE_POLL 0 +# else +# define EV_USE_POLL 1 +# endif #endif #ifndef EV_USE_EPOLL @@ -100,18 +150,8 @@ extern "C" { # define EV_USE_KQUEUE 0 #endif -#ifndef EV_USE_WIN32 -# ifdef WIN32 -# define EV_USE_WIN32 0 /* it does not exist, use select */ -# undef EV_USE_SELECT -# define EV_USE_SELECT 1 -# else -# define EV_USE_WIN32 0 -# endif -#endif - -#ifndef EV_USE_REALTIME -# define EV_USE_REALTIME 1 +#ifndef EV_USE_PORT +# define EV_USE_PORT 0 #endif /**/ @@ -126,12 +166,16 @@ extern "C" { # 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) */ -#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ +#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ #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 */ +/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */ #ifdef EV_H # include EV_H @@ -141,7 +185,7 @@ extern "C" { #if __GNUC__ >= 3 # define expect(expr,value) __builtin_expect ((expr),(value)) -# define inline inline +# define inline static inline #else # define expect(expr,value) (expr) # define inline static @@ -153,13 +197,18 @@ extern "C" { #define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) #define ABSPRI(w) ((w)->priority - EV_MINPRI) +#define EMPTY0 /* required for microsofts broken pseudo-c compiler */ +#define EMPTY2(a,b) /* used to suppress some warnings */ + 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? */ -#include "ev_win32.c" +#ifdef _WIN32 +# include "ev_win32.c" +#endif /*****************************************************************************/ @@ -216,6 +265,9 @@ typedef struct WL head; unsigned char events; unsigned char reify; +#if EV_SELECT_IS_WINSOCKET + SOCKET handle; +#endif } ANFD; typedef struct @@ -229,14 +281,15 @@ typedef struct 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; + static struct ev_loop default_loop_struct; + struct ev_loop *ev_default_loop_ptr; #else @@ -245,7 +298,7 @@ typedef struct #include "ev_vars.h" #undef VAR - static int default_loop; + static int ev_default_loop_ptr; #endif @@ -288,7 +341,7 @@ ev_now (EV_P) } #endif -#define array_roundsize(type,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)) \ @@ -313,11 +366,6 @@ ev_now (EV_P) fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ } -/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */ -/* bringing us everlasting joy in form of stupid extra macros that are not required in C */ -#define array_free_microshit(stem) \ - ev_free (stem ## s); stem ## cnt = stem ## max = 0; - #define array_free(stem, idx) \ ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; @@ -341,14 +389,14 @@ ev_feed_event (EV_P_ void *w, int revents) { W w_ = (W)w; - if (w_->pending) + if (expect_false (w_->pending)) { pendings [ABSPRI (w_)][w_->pending - 1].events |= revents; return; } w_->pending = ++pendingcnt [ABSPRI (w_)]; - array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void)); + array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2); pendings [ABSPRI (w_)][w_->pending - 1].w = w_; pendings [ABSPRI (w_)][w_->pending - 1].events = revents; } @@ -385,7 +433,7 @@ ev_feed_fd_event (EV_P_ int fd, int revents) /*****************************************************************************/ -static void +inline void fd_reify (EV_P) { int i; @@ -401,6 +449,15 @@ fd_reify (EV_P) for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) events |= w->events; +#if EV_SELECT_IS_WINSOCKET + if (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); @@ -413,13 +470,13 @@ fd_reify (EV_P) static void fd_change (EV_P_ int fd) { - if (anfds [fd].reify) + if (expect_false (anfds [fd].reify)) return; anfds [fd].reify = 1; ++fdchangecnt; - array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); + array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); fdchanges [fdchangecnt - 1] = fd; } @@ -435,11 +492,11 @@ fd_kill (EV_P_ int fd) } } -static int +inline int fd_valid (int fd) { -#ifdef WIN32 - return !!win32_get_osfhandle (fd); +#ifdef _WIN32 + return _get_osfhandle (fd) != -1; #else return fcntl (fd, F_GETFD) != -1; #endif @@ -530,15 +587,10 @@ downheap (WT *heap, int N, int k) } inline void -adjustheap (WT *heap, int N, int k, ev_tstamp at) +adjustheap (WT *heap, int N, int k) { - ev_tstamp old_at = heap [k]->at; - heap [k]->at = at; - - if (old_at < at) - downheap (heap, N, k); - else - upheap (heap, k); + upheap (heap, k); + downheap (heap, N, k); } /*****************************************************************************/ @@ -571,7 +623,7 @@ signals_init (ANSIG *base, int count) static void sighandler (int signum) { -#if WIN32 +#if _WIN32 signal (signum, sighandler); #endif @@ -581,11 +633,7 @@ sighandler (int signum) { int old_errno = errno; gotsig = 1; -#ifdef WIN32 - send (sigpipe [1], &signum, 1, MSG_DONTWAIT); -#else write (sigpipe [1], &signum, 1); -#endif errno = old_errno; } } @@ -596,7 +644,7 @@ 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)); + assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); #endif --signum; @@ -615,11 +663,7 @@ sigcb (EV_P_ struct ev_io *iow, int revents) { int signum; -#ifdef WIN32 - recv (sigpipe [0], &revents, 1, MSG_DONTWAIT); -#else read (sigpipe [0], &revents, 1); -#endif gotsig = 0; for (signum = signalmax; signum--; ) @@ -628,16 +672,22 @@ sigcb (EV_P_ struct ev_io *iow, int revents) } static void -siginit (EV_P) +fd_intern (int fd) { -#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); +#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) +{ + fd_intern (sigpipe [0]); + fd_intern (sigpipe [1]); ev_io_set (&sigev, sigpipe [0], EV_READ); ev_io_start (EV_A_ &sigev); @@ -648,7 +698,7 @@ siginit (EV_P) static struct ev_child *childs [PID_HASHSIZE]; -#ifndef WIN32 +#ifndef _WIN32 static struct ev_signal childev; @@ -690,6 +740,9 @@ childcb (EV_P_ struct ev_signal *sw, int revents) /*****************************************************************************/ +#if EV_USE_PORT +# include "ev_port.c" +#endif #if EV_USE_KQUEUE # include "ev_kqueue.c" #endif @@ -719,7 +772,7 @@ ev_version_minor (void) static int enable_secure (void) { -#ifdef WIN32 +#ifdef _WIN32 return 0; #else return getuid () != geteuid () @@ -727,14 +780,45 @@ enable_secure (void) #endif } -int -ev_method (EV_P) +unsigned int +ev_supported_backends (void) { - return method; +} + +unsigned int +ev_recommended_backends (void) +{ + unsigned int flags; + + if (EV_USE_PORT ) flags |= EVBACKEND_PORT; + if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE; + if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL; + if (EV_USE_POLL ) flags |= EVBACKEND_POLL; + if (EV_USE_SELECT) flags |= EVBACKEND_SELECT; + + return flags; +} + +unsigned int +ev_backend (EV_P) +{ + unsigned int flags = ev_recommended_backends (); + +#ifndef __NetBSD__ + /* kqueue is borked on everything but netbsd apparently */ + /* it usually doesn't work correctly on anything but sockets and pipes */ + flags &= ~EVBACKEND_KQUEUE; +#endif +#ifdef __APPLE__ + // flags &= ~EVBACKEND_KQUEUE; for documentation + flags &= ~EVBACKEND_POLL; +#endif + + return flags; } static void -loop_init (EV_P_ int methods) +loop_init (EV_P_ unsigned int flags) { if (!method) { @@ -751,27 +835,29 @@ loop_init (EV_P_ int methods) now_floor = mn_now; rtmn_diff = ev_rt_now - mn_now; - if (methods == EVMETHOD_AUTO) - if (!enable_secure () && getenv ("LIBEV_METHODS")) - methods = atoi (getenv ("LIBEV_METHODS")); - else - methods = EVMETHOD_ANY; + if (!(flags & EVFLAG_NOENV) + && !enable_secure () + && getenv ("LIBEV_FLAGS")) + flags = atoi (getenv ("LIBEV_FLAGS")); + + if (!(flags & 0x0000ffffUL)) + flags |= ev_recommended_backends (); method = 0; -#if EV_USE_WIN32 - if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); +#if EV_USE_PORT + if (!method && (flags & EVBACKEND_PORT )) method = port_init (EV_A_ flags); #endif #if EV_USE_KQUEUE - if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); + if (!method && (flags & EVBACKEND_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 & EVBACKEND_EPOLL )) method = epoll_init (EV_A_ flags); #endif #if EV_USE_POLL - if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); + if (!method && (flags & EVBACKEND_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 & EVBACKEND_SELECT)) method = select_init (EV_A_ flags); #endif ev_init (&sigev, sigcb); @@ -779,37 +865,39 @@ loop_init (EV_P_ int methods) } } -void +static void loop_destroy (EV_P) { int i; -#if EV_USE_WIN32 - if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); +#if EV_USE_PORT + if (method == EVBACKEND_PORT ) port_destroy (EV_A); #endif #if EV_USE_KQUEUE - if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); + if (method == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); #endif #if EV_USE_EPOLL - if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); + if (method == EVBACKEND_EPOLL ) epoll_destroy (EV_A); #endif #if EV_USE_POLL - if (method == EVMETHOD_POLL ) poll_destroy (EV_A); + if (method == EVBACKEND_POLL ) poll_destroy (EV_A); #endif #if EV_USE_SELECT - if (method == EVMETHOD_SELECT) select_destroy (EV_A); + if (method == EVBACKEND_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_microshit (fdchange); - array_free_microshit (timer); - array_free_microshit (periodic); - array_free_microshit (idle); - array_free_microshit (prepare); - array_free_microshit (check); + array_free (fdchange, EMPTY0); + array_free (timer, EMPTY0); +#if EV_PERIODICS + array_free (periodic, EMPTY0); +#endif + array_free (idle, EMPTY0); + array_free (prepare, EMPTY0); + array_free (check, EMPTY0); method = 0; } @@ -817,11 +905,14 @@ loop_destroy (EV_P) static void loop_fork (EV_P) { -#if EV_USE_EPOLL - if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); +#if EV_USE_PORT + if (method == EVBACKEND_PORT ) port_fork (EV_A); #endif #if EV_USE_KQUEUE - if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); + if (method == EVBACKEND_KQUEUE) kqueue_fork (EV_A); +#endif +#if EV_USE_EPOLL + if (method == EVBACKEND_EPOLL ) epoll_fork (EV_A); #endif if (ev_is_active (&sigev)) @@ -844,13 +935,13 @@ loop_fork (EV_P) #if EV_MULTIPLICITY struct ev_loop * -ev_loop_new (int methods) +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_ methods); + loop_init (EV_A_ flags); if (ev_method (EV_A)) return loop; @@ -875,30 +966,31 @@ ev_loop_fork (EV_P) #if EV_MULTIPLICITY struct ev_loop * +ev_default_loop_init (unsigned int flags) #else int +ev_default_loop (unsigned int flags) #endif -ev_default_loop (int methods) { if (sigpipe [0] == sigpipe [1]) if (pipe (sigpipe)) return 0; - if (!default_loop) + if (!ev_default_loop_ptr) { #if EV_MULTIPLICITY - struct ev_loop *loop = default_loop = &default_loop_struct; + struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct; #else - default_loop = 1; + ev_default_loop_ptr = 1; #endif - loop_init (EV_A_ methods); + loop_init (EV_A_ flags); if (ev_method (EV_A)) { 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); @@ -906,20 +998,20 @@ ev_default_loop (int methods) #endif } else - default_loop = 0; + ev_default_loop_ptr = 0; } - return default_loop; + return ev_default_loop_ptr; } void ev_default_destroy (void) { #if EV_MULTIPLICITY - struct ev_loop *loop = default_loop; + struct ev_loop *loop = ev_default_loop_ptr; #endif -#ifndef WIN32 +#ifndef _WIN32 ev_ref (EV_A); /* child watcher */ ev_signal_stop (EV_A_ &childev); #endif @@ -937,7 +1029,7 @@ void ev_default_fork (void) { #if EV_MULTIPLICITY - struct ev_loop *loop = default_loop; + struct ev_loop *loop = ev_default_loop_ptr; #endif if (method) @@ -958,7 +1050,7 @@ any_pending (EV_P) return 0; } -static void +inline void call_pending (EV_P) { int pri; @@ -968,7 +1060,7 @@ call_pending (EV_P) { ANPENDING *p = pendings [pri] + --pendingcnt [pri]; - if (p->w) + if (expect_true (p->w)) { p->w->pending = 0; EV_CB_INVOKE (p->w, p->events); @@ -976,7 +1068,7 @@ call_pending (EV_P) } } -static void +inline void timers_reify (EV_P) { while (timercnt && ((WT)timers [0])->at <= mn_now) @@ -1003,7 +1095,8 @@ timers_reify (EV_P) } } -static void +#if EV_PERIODICS +inline void periodics_reify (EV_P) { while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) @@ -1015,8 +1108,7 @@ periodics_reify (EV_P) /* first reschedule or stop timer */ if (w->reschedule_cb) { - ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); - + ((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); } @@ -1053,6 +1145,7 @@ periodics_reschedule (EV_P) for (i = periodiccnt >> 1; i--; ) downheap ((WT *)periodics, periodiccnt, i); } +#endif inline int time_update_monotonic (EV_P) @@ -1072,7 +1165,7 @@ time_update_monotonic (EV_P) } } -static void +inline void time_update (EV_P) { int i; @@ -1096,7 +1189,9 @@ time_update (EV_P) now_floor = mn_now; } +# 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) */ } @@ -1108,7 +1203,9 @@ time_update (EV_P) if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) { +#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) @@ -1139,7 +1236,7 @@ ev_loop (EV_P_ int flags) double block; loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; - do + while (activecnt) { /* queue check watchers (and execute them) */ if (expect_false (preparecnt)) @@ -1181,13 +1278,15 @@ ev_loop (EV_P_ int flags) if (block > to) block = to; } +#if EV_PERIODICS if (periodiccnt) { ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; if (block > to) block = to; } +#endif - if (block < 0.) block = 0.; + if (expect_false (block < 0.)) block = 0.; } method_poll (EV_A_ block); @@ -1197,19 +1296,23 @@ ev_loop (EV_P_ int flags) /* 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 (idlecnt && !any_pending (EV_A)) queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); /* queue check watchers, to be executed first */ - if (checkcnt) + if (expect_false (checkcnt)) queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); call_pending (EV_A); + + if (expect_false (loop_done)) + break; } - while (activecnt && !loop_done); if (loop_done != 2) loop_done = 0; @@ -1279,7 +1382,7 @@ ev_io_start (EV_P_ struct ev_io *w) { int fd = w->fd; - if (ev_is_active (w)) + if (expect_false (ev_is_active (w))) return; assert (("ev_io_start called with negative fd", fd >= 0)); @@ -1295,7 +1398,7 @@ void ev_io_stop (EV_P_ struct ev_io *w) { ev_clear_pending (EV_A_ (W)w); - if (!ev_is_active (w)) + if (expect_false (!ev_is_active (w))) return; assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); @@ -1309,7 +1412,7 @@ ev_io_stop (EV_P_ struct ev_io *w) void ev_timer_start (EV_P_ struct ev_timer *w) { - if (ev_is_active (w)) + if (expect_false (ev_is_active (w))) return; ((WT)w)->at += mn_now; @@ -1317,7 +1420,7 @@ ev_timer_start (EV_P_ struct ev_timer *w) assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); ev_start (EV_A_ (W)w, ++timercnt); - array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); + array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2); timers [timercnt - 1] = w; upheap ((WT *)timers, timercnt - 1); @@ -1328,15 +1431,15 @@ void ev_timer_stop (EV_P_ struct ev_timer *w) { ev_clear_pending (EV_A_ (W)w); - if (!ev_is_active (w)) + if (expect_false (!ev_is_active (w))) return; assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); - if (((W)w)->active < timercnt--) + if (expect_true (((W)w)->active < timercnt--)) { timers [((W)w)->active - 1] = timers [timercnt]; - downheap ((WT *)timers, timercnt, ((W)w)->active - 1); + adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); } ((WT)w)->at -= mn_now; @@ -1350,18 +1453,25 @@ ev_timer_again (EV_P_ struct ev_timer *w) if (ev_is_active (w)) { if (w->repeat) - adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat); + { + ((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)) + if (expect_false (ev_is_active (w))) return; if (w->reschedule_cb) @@ -1374,7 +1484,7 @@ ev_periodic_start (EV_P_ struct ev_periodic *w) } ev_start (EV_A_ (W)w, ++periodiccnt); - array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); + array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); periodics [periodiccnt - 1] = w; upheap ((WT *)periodics, periodiccnt - 1); @@ -1385,15 +1495,15 @@ void ev_periodic_stop (EV_P_ struct ev_periodic *w) { ev_clear_pending (EV_A_ (W)w); - if (!ev_is_active (w)) + if (expect_false (!ev_is_active (w))) return; assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); - if (((W)w)->active < periodiccnt--) + if (expect_true (((W)w)->active < periodiccnt--)) { periodics [((W)w)->active - 1] = periodics [periodiccnt]; - downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); + adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); } ev_stop (EV_A_ (W)w); @@ -1406,15 +1516,16 @@ ev_periodic_again (EV_P_ struct ev_periodic *w) ev_periodic_stop (EV_A_ w); ev_periodic_start (EV_A_ w); } +#endif void ev_idle_start (EV_P_ struct ev_idle *w) { - if (ev_is_active (w)) + if (expect_false (ev_is_active (w))) return; ev_start (EV_A_ (W)w, ++idlecnt); - array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void)); + array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2); idles [idlecnt - 1] = w; } @@ -1422,7 +1533,7 @@ void ev_idle_stop (EV_P_ struct ev_idle *w) { ev_clear_pending (EV_A_ (W)w); - if (ev_is_active (w)) + if (expect_false (!ev_is_active (w))) return; idles [((W)w)->active - 1] = idles [--idlecnt]; @@ -1432,11 +1543,11 @@ ev_idle_stop (EV_P_ struct ev_idle *w) void ev_prepare_start (EV_P_ struct ev_prepare *w) { - if (ev_is_active (w)) + if (expect_false (ev_is_active (w))) return; ev_start (EV_A_ (W)w, ++preparecnt); - array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void)); + array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2); prepares [preparecnt - 1] = w; } @@ -1444,7 +1555,7 @@ void ev_prepare_stop (EV_P_ struct ev_prepare *w) { ev_clear_pending (EV_A_ (W)w); - if (ev_is_active (w)) + if (expect_false (!ev_is_active (w))) return; prepares [((W)w)->active - 1] = prepares [--preparecnt]; @@ -1454,11 +1565,11 @@ ev_prepare_stop (EV_P_ struct ev_prepare *w) void ev_check_start (EV_P_ struct ev_check *w) { - if (ev_is_active (w)) + if (expect_false (ev_is_active (w))) return; ev_start (EV_A_ (W)w, ++checkcnt); - array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void)); + array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2); checks [checkcnt - 1] = w; } @@ -1466,7 +1577,7 @@ void ev_check_stop (EV_P_ struct ev_check *w) { ev_clear_pending (EV_A_ (W)w); - if (ev_is_active (w)) + if (expect_false (!ev_is_active (w))) return; checks [((W)w)->active - 1] = checks [--checkcnt]; @@ -1481,9 +1592,9 @@ void 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)); + assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); #endif - if (ev_is_active (w)) + if (expect_false (ev_is_active (w))) return; assert (("ev_signal_start called with illegal signal number", w->signum > 0)); @@ -1494,7 +1605,7 @@ ev_signal_start (EV_P_ struct ev_signal *w) if (!((WL)w)->next) { -#if WIN32 +#if _WIN32 signal (w->signum, sighandler); #else struct sigaction sa; @@ -1510,7 +1621,7 @@ void ev_signal_stop (EV_P_ struct ev_signal *w) { ev_clear_pending (EV_A_ (W)w); - if (!ev_is_active (w)) + if (expect_false (!ev_is_active (w))) return; wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); @@ -1524,9 +1635,9 @@ 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)); + assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); #endif - if (ev_is_active (w)) + if (expect_false (ev_is_active (w))) return; ev_start (EV_A_ (W)w, 1); @@ -1537,7 +1648,7 @@ void ev_child_stop (EV_P_ struct ev_child *w) { ev_clear_pending (EV_A_ (W)w); - if (ev_is_active (w)) + if (expect_false (!ev_is_active (w))) return; wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); @@ -1584,26 +1695,27 @@ ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, vo { 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); - else + if (expect_false (!once)) { - once->cb = cb; - once->arg = arg; + cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); + return; + } - ev_init (&once->io, once_cb_io); - if (fd >= 0) - { - ev_io_set (&once->io, fd, events); - ev_io_start (EV_A_ &once->io); - } + once->cb = cb; + once->arg = arg; - ev_init (&once->to, once_cb_to); - if (timeout >= 0.) - { - ev_timer_set (&once->to, timeout, 0.); - ev_timer_start (EV_A_ &once->to); - } + 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_init (&once->to, once_cb_to); + if (timeout >= 0.) + { + ev_timer_set (&once->to, timeout, 0.); + ev_timer_start (EV_A_ &once->to); } }