X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/e0e6405dcc1fa8cdfe05ddc51fe252bd3a4e6fa4..c2e069c80086a655611b636be4465141548393fc:/ev.c?ds=sidebyside diff --git a/ev.c b/ev.c index 46bde95..3903a6c 100644 --- a/ev.c +++ b/ev.c @@ -61,6 +61,10 @@ extern "C" { # define EV_USE_KQUEUE 1 # endif +# if HAVE_PORT_H && HAVE_PORT_CREATE && !defined (EV_USE_PORT) +# define EV_USE_PORT 1 +# endif + #endif #include @@ -92,12 +96,15 @@ extern "C" { /**/ #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 # define EV_USE_SELECT 1 -# define EV_SELECT_USE_FD_SET 1 #endif #ifndef EV_USE_POLL @@ -116,8 +123,8 @@ extern "C" { # define EV_USE_KQUEUE 0 #endif -#ifndef EV_USE_REALTIME -# define EV_USE_REALTIME 1 +#ifndef EV_USE_PORT +# define EV_USE_PORT 0 #endif /**/ @@ -145,9 +152,9 @@ extern "C" { /**/ #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 @@ -157,7 +164,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 @@ -169,7 +176,8 @@ extern "C" { #define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) #define ABSPRI(w) ((w)->priority - EV_MINPRI) -#define EMPTY /* required for microsofts broken pseudo-c compiler */ +#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; @@ -259,8 +267,8 @@ typedef struct }; #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 @@ -269,7 +277,7 @@ typedef struct #include "ev_vars.h" #undef VAR - static int default_loop; + static int ev_default_loop_ptr; #endif @@ -312,7 +320,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)) \ @@ -360,14 +368,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; } @@ -404,7 +412,7 @@ ev_feed_fd_event (EV_P_ int fd, int revents) /*****************************************************************************/ -static void +inline void fd_reify (EV_P) { int i; @@ -441,13 +449,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; } @@ -463,7 +471,7 @@ fd_kill (EV_P_ int fd) } } -static int +inline int fd_valid (int fd) { #ifdef _WIN32 @@ -615,7 +623,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; @@ -642,7 +650,7 @@ sigcb (EV_P_ struct ev_io *iow, int revents) ev_feed_signal_event (EV_A_ signum + 1); } -inline void +static void fd_intern (int fd) { #ifdef _WIN32 @@ -711,6 +719,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 @@ -748,14 +759,14 @@ enable_secure (void) #endif } -int +unsigned int ev_method (EV_P) { return method; } static void -loop_init (EV_P_ int methods) +loop_init (EV_P_ unsigned int flags) { if (!method) { @@ -772,24 +783,27 @@ 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 & 0x0000ffff)) + flags |= 0x0000ffff; method = 0; +#if EV_USE_PORT + if (!method && (flags & EVMETHOD_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 & 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_USE_POLL - if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); + 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 ev_init (&sigev, sigcb); @@ -797,11 +811,14 @@ loop_init (EV_P_ int methods) } } -void +static void loop_destroy (EV_P) { int i; +#if EV_USE_PORT + if (method == EVMETHOD_PORT ) port_destroy (EV_A); +#endif #if EV_USE_KQUEUE if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); #endif @@ -819,14 +836,14 @@ loop_destroy (EV_P) array_free (pending, [i]); /* have to use the microsoft-never-gets-it-right macro */ - array_free (fdchange, EMPTY); - array_free (timer, EMPTY); + array_free (fdchange, EMPTY0); + array_free (timer, EMPTY0); #if EV_PERIODICS - array_free (periodic, EMPTY); + array_free (periodic, EMPTY0); #endif - array_free (idle, EMPTY); - array_free (prepare, EMPTY); - array_free (check, EMPTY); + array_free (idle, EMPTY0); + array_free (prepare, EMPTY0); + array_free (check, EMPTY0); method = 0; } @@ -834,12 +851,15 @@ 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 == EVMETHOD_PORT ) port_fork (EV_A); #endif #if EV_USE_KQUEUE if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); #endif +#if EV_USE_EPOLL + if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); +#endif if (ev_is_active (&sigev)) { @@ -861,13 +881,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; @@ -892,24 +912,25 @@ 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)) { @@ -923,17 +944,17 @@ 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 @@ -954,7 +975,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) @@ -975,7 +996,7 @@ any_pending (EV_P) return 0; } -static void +inline void call_pending (EV_P) { int pri; @@ -985,7 +1006,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); @@ -993,7 +1014,7 @@ call_pending (EV_P) } } -static void +inline void timers_reify (EV_P) { while (timercnt && ((WT)timers [0])->at <= mn_now) @@ -1021,7 +1042,7 @@ timers_reify (EV_P) } #if EV_PERIODICS -static void +inline void periodics_reify (EV_P) { while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) @@ -1033,8 +1054,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); } @@ -1091,7 +1111,7 @@ time_update_monotonic (EV_P) } } -static void +inline void time_update (EV_P) { int i; @@ -1162,7 +1182,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)) @@ -1212,7 +1232,7 @@ ev_loop (EV_P_ int flags) } #endif - if (block < 0.) block = 0.; + if (expect_false (block < 0.)) block = 0.; } method_poll (EV_A_ block); @@ -1231,12 +1251,14 @@ ev_loop (EV_P_ int flags) 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; @@ -1306,7 +1328,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)); @@ -1322,7 +1344,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)); @@ -1336,7 +1358,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; @@ -1344,7 +1366,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); @@ -1355,12 +1377,12 @@ 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]; adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); @@ -1385,14 +1407,17 @@ ev_timer_again (EV_P_ struct ev_timer *w) 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) @@ -1405,7 +1430,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); @@ -1416,12 +1441,12 @@ 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]; adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); @@ -1442,11 +1467,11 @@ ev_periodic_again (EV_P_ struct ev_periodic *w) 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; } @@ -1454,7 +1479,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]; @@ -1464,11 +1489,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; } @@ -1476,7 +1501,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]; @@ -1486,11 +1511,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; } @@ -1498,7 +1523,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]; @@ -1513,9 +1538,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)); @@ -1542,7 +1567,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); @@ -1556,9 +1581,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); @@ -1569,7 +1594,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); @@ -1616,26 +1641,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); } }