# 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 && !defined (EV_USE_SELECT)
-# 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 && !defined (EV_USE_POLL)
-# 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_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL)
-# 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 && !defined (EV_USE_KQUEUE)
-# 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
/**/
#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
#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
# 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
/**/
+/* 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
/**/
#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
#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
#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;
};
#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
#include "ev_vars.h"
#undef VAR
- static int default_loop;
+ static int ev_default_loop_ptr;
#endif
}
#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)) \
{
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;
}
/*****************************************************************************/
-static void
+inline void
fd_reify (EV_P)
{
int i;
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;
}
}
}
-static int
+inline int
fd_valid (int fd)
{
#ifdef _WIN32
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;
ev_feed_signal_event (EV_A_ signum + 1);
}
-inline void
+static void
fd_intern (int fd)
{
#ifdef _WIN32
/*****************************************************************************/
+#if EV_USE_PORT
+# include "ev_port.c"
+#endif
#if EV_USE_KQUEUE
# include "ev_kqueue.c"
#endif
#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)
{
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 & EVMETHOD_ALL))
+ {
+ flags |= EVMETHOD_ALL;
+#if EV_USE_KQUEUE && !defined (__NetBSD__)
+ /* kqueue is borked on everything but netbsd apparently */
+ /* it usually doesn't work correctly on anything but sockets and pipes */
+ flags &= ~EVMETHOD_KQUEUE;
+#endif
+ }
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);
}
}
-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
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;
}
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))
{
#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;
#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))
{
#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
ev_default_fork (void)
{
#if EV_MULTIPLICITY
- struct ev_loop *loop = default_loop;
+ struct ev_loop *loop = ev_default_loop_ptr;
#endif
if (method)
return 0;
}
-static void
+inline void
call_pending (EV_P)
{
int pri;
{
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);
}
}
-static void
+inline void
timers_reify (EV_P)
{
while (timercnt && ((WT)timers [0])->at <= mn_now)
}
#if EV_PERIODICS
-static void
+inline void
periodics_reify (EV_P)
{
while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
/* 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);
}
}
}
-static void
+inline void
time_update (EV_P)
{
int i;
double block;
loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
- do
+ while (activecnt)
{
/* queue check watchers (and execute them) */
if (expect_false (preparecnt))
}
#endif
- if (block < 0.) block = 0.;
+ if (expect_false (block < 0.)) block = 0.;
}
method_poll (EV_A_ block);
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;
{
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));
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));
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;
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);
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);
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)
}
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);
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);
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;
}
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];
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;
}
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];
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;
}
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];
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));
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);
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);
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);
{
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);
}
}
projects / software / libev.git / blobdiff