X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/34ce8134fec96758f92d4b5a47d151081c6b74d6..e3cb88fa576a8f24145df1c6962db20c8013700f:/ev.c?ds=sidebyside diff --git a/ev.c b/ev.c index 7995b34..6c2f397 100644 --- a/ev.c +++ b/ev.c @@ -44,43 +44,78 @@ #include #include #include -#include +#ifndef WIN32 +# include +#endif #include #include +/**/ + #ifndef EV_USE_MONOTONIC -# ifdef CLOCK_MONOTONIC -# define EV_USE_MONOTONIC 1 -# endif +# define EV_USE_MONOTONIC 1 #endif #ifndef EV_USE_SELECT # define EV_USE_SELECT 1 #endif +#ifndef EV_USE_POLL +# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ +#endif + #ifndef EV_USE_EPOLL # define EV_USE_EPOLL 0 #endif -#ifndef CLOCK_REALTIME -# define EV_USE_REALTIME 0 +#ifndef EV_USE_KQUEUE +# define EV_USE_KQUEUE 0 #endif + #ifndef EV_USE_REALTIME -# define EV_USE_REALTIME 1 /* posix requirement, but might be slower */ +# define EV_USE_REALTIME 1 +#endif + +/**/ + +#ifndef CLOCK_MONOTONIC +# undef EV_USE_MONOTONIC +# define EV_USE_MONOTONIC 0 +#endif + +#ifndef CLOCK_REALTIME +# undef EV_USE_REALTIME +# define EV_USE_REALTIME 0 #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 detetc time jumps) */ +#define MAX_BLOCKTIME 59.731 /* 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 (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */ +/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ #include "ev.h" +#if __GNUC__ >= 3 +# define expect(expr,value) __builtin_expect ((expr),(value)) +# define inline inline +#else +# define expect(expr,value) (expr) +# define inline static +#endif + +#define expect_false(expr) expect ((expr) != 0, 0) +#define expect_true(expr) expect ((expr) != 0, 1) + +#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) +#define ABSPRI(w) ((w)->priority - EV_MINPRI) + typedef struct ev_watcher *W; typedef struct ev_watcher_list *WL; typedef struct ev_watcher_time *WT; -static ev_tstamp now, diff; /* monotonic clock */ +static ev_tstamp now_floor, now, diff; /* monotonic clock */ ev_tstamp ev_now; int ev_method; @@ -110,7 +145,7 @@ static ev_tstamp get_clock (void) { #if EV_USE_MONOTONIC - if (have_monotonic) + if (expect_true (have_monotonic)) { struct timespec ts; clock_gettime (CLOCK_MONOTONIC, &ts); @@ -124,7 +159,7 @@ get_clock (void) #define array_roundsize(base,n) ((n) | 4 & ~3) #define array_needsize(base,cur,cnt,init) \ - if ((cnt) > cur) \ + if (expect_false ((cnt) > cur)) \ { \ int newcnt = cur; \ do \ @@ -169,22 +204,22 @@ typedef struct int events; } ANPENDING; -static ANPENDING *pendings; -static int pendingmax, pendingcnt; +static ANPENDING *pendings [NUMPRI]; +static int pendingmax [NUMPRI], pendingcnt [NUMPRI]; static void event (W w, int events) { if (w->pending) { - pendings [w->pending - 1].events |= events; + pendings [ABSPRI (w)][w->pending - 1].events |= events; return; } - w->pending = ++pendingcnt; - array_needsize (pendings, pendingmax, pendingcnt, ); - pendings [pendingcnt - 1].w = w; - pendings [pendingcnt - 1].events = events; + 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; } static void @@ -257,20 +292,44 @@ fd_change (int fd) fdchanges [fdchangecnt - 1] = fd; } +static void +fd_kill (int fd) +{ + struct ev_io *w; + + printf ("killing fd %d\n", fd);//D + while ((w = anfds [fd].head)) + { + ev_io_stop (w); + event ((W)w, EV_ERROR | EV_READ | EV_WRITE); + } +} + /* called on EBADF to verify fds */ static void -fd_recheck (void) +fd_ebadf (void) { int fd; for (fd = 0; fd < anfdmax; ++fd) if (anfds [fd].events) if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) - while (anfds [fd].head) - { - ev_io_stop (anfds [fd].head); - event ((W)anfds [fd].head, EV_ERROR | EV_READ | EV_WRITE); - } + fd_kill (fd); +} + +/* called on ENOMEM in select/poll to kill some fds and retry */ +static void +fd_enomem (void) +{ + int fd = anfdmax; + + while (fd--) + if (anfds [fd].events) + { + close (fd); + fd_kill (fd); + return; + } } /*****************************************************************************/ @@ -365,17 +424,17 @@ static void sigcb (struct ev_io *iow, int revents) { struct ev_signal *w; - int sig; + int signum; read (sigpipe [0], &revents, 1); gotsig = 0; - for (sig = signalmax; sig--; ) - if (signals [sig].gotsig) + for (signum = signalmax; signum--; ) + if (signals [signum].gotsig) { - signals [sig].gotsig = 0; + signals [signum].gotsig = 0; - for (w = signals [sig].head; w; w = w->next) + for (w = signals [signum].head; w; w = w->next) event ((W)w, EV_SIGNAL); } } @@ -383,12 +442,14 @@ sigcb (struct ev_io *iow, int revents) static void siginit (void) { +#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 ev_io_set (&sigev, sigpipe [0], EV_READ); ev_io_start (&sigev); @@ -410,6 +471,8 @@ static int checkmax, checkcnt; static struct ev_child *childs [PID_HASHSIZE]; static struct ev_signal childev; +#ifndef WIN32 + #ifndef WCONTINUED # define WCONTINUED 0 #endif @@ -422,18 +485,27 @@ childcb (struct ev_signal *sw, int revents) while ((pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)) != -1) for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next) - if (w->pid == pid || w->pid == -1) + if (w->pid == pid || !w->pid) { - w->status = status; + w->rpid = pid; + w->rstatus = status; event ((W)w, EV_CHILD); } } +#endif + /*****************************************************************************/ +#if EV_USE_KQUEUE +# include "ev_kqueue.c" +#endif #if EV_USE_EPOLL # include "ev_epoll.c" #endif +#if EV_USE_POLL +# include "ev_poll.c" +#endif #if EV_USE_SELECT # include "ev_select.c" #endif @@ -450,7 +522,15 @@ ev_version_minor (void) return EV_VERSION_MINOR; } -int ev_init (int flags) +/* return true if we are running with elevated privileges and ignore env variables */ +static int +enable_secure () +{ + return getuid () != geteuid () + || getgid () != getegid (); +} + +int ev_init (int methods) { if (!ev_method) { @@ -462,19 +542,32 @@ int ev_init (int flags) } #endif - ev_now = ev_time (); - now = get_clock (); - diff = ev_now - now; + ev_now = ev_time (); + now = get_clock (); + now_floor = now; + diff = ev_now - now; if (pipe (sigpipe)) return 0; - ev_method = EVMETHOD_NONE; + if (methods == EVMETHOD_AUTO) + if (!enable_secure () && getenv ("LIBEV_METHODS")) + methods = atoi (getenv ("LIBEV_METHODS")); + else + methods = EVMETHOD_ANY; + + ev_method = 0; +#if EV_USE_KQUEUE + if (!ev_method && (methods & EVMETHOD_KQUEUE)) kqueue_init (methods); +#endif #if EV_USE_EPOLL - if (ev_method == EVMETHOD_NONE) epoll_init (flags); + if (!ev_method && (methods & EVMETHOD_EPOLL )) epoll_init (methods); +#endif +#if EV_USE_POLL + if (!ev_method && (methods & EVMETHOD_POLL )) poll_init (methods); #endif #if EV_USE_SELECT - if (ev_method == EVMETHOD_NONE) select_init (flags); + if (!ev_method && (methods & EVMETHOD_SELECT)) select_init (methods); #endif if (ev_method) @@ -482,8 +575,10 @@ int ev_init (int flags) ev_watcher_init (&sigev, sigcb); siginit (); +#ifndef WIN32 ev_signal_init (&childev, childcb, SIGCHLD); ev_signal_start (&childev); +#endif } } @@ -524,16 +619,19 @@ ev_fork_child (void) static void call_pending (void) { - while (pendingcnt) - { - ANPENDING *p = pendings + --pendingcnt; + int pri; - if (p->w) - { - p->w->pending = 0; - p->w->cb (p->w, p->events); - } - } + for (pri = NUMPRI; pri--; ) + while (pendingcnt [pri]) + { + ANPENDING *p = pendings [pri] + --pendingcnt [pri]; + + if (p->w) + { + p->w->pending = 0; + p->w->cb (p->w, p->events); + } + } } static void @@ -603,34 +701,58 @@ periodics_reschedule (ev_tstamp diff) } } +static int +time_update_monotonic (void) +{ + now = get_clock (); + + if (expect_true (now - now_floor < MIN_TIMEJUMP * .5)) + { + ev_now = now + diff; + return 0; + } + else + { + now_floor = now; + ev_now = ev_time (); + return 1; + } +} + static void time_update (void) { int i; - ev_now = ev_time (); - - if (have_monotonic) +#if EV_USE_MONOTONIC + if (expect_true (have_monotonic)) { - ev_tstamp odiff = diff; - - for (i = 4; --i; ) /* loop a few times, before making important decisions */ + if (time_update_monotonic ()) { - now = get_clock (); - diff = ev_now - now; + ev_tstamp odiff = diff; + + for (i = 4; --i; ) /* loop a few times, before making important decisions */ + { + diff = ev_now - now; - if (fabs (odiff - diff) < MIN_TIMEJUMP) - return; /* all is well */ + if (fabs (odiff - diff) < MIN_TIMEJUMP) + return; /* all is well */ - ev_now = ev_time (); - } + ev_now = ev_time (); + now = get_clock (); + now_floor = now; + } - periodics_reschedule (diff - odiff); - /* no timer adjustment, as the monotonic clock doesn't jump */ + periodics_reschedule (diff - odiff); + /* no timer adjustment, as the monotonic clock doesn't jump */ + } } else +#endif { - if (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP) + ev_now = ev_time (); + + if (expect_false (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) { periodics_reschedule (ev_now - now); @@ -653,7 +775,7 @@ void ev_loop (int flags) do { /* queue check watchers (and execute them) */ - if (preparecnt) + if (expect_false (preparecnt)) { queue_events ((W *)prepares, preparecnt, EV_PREPARE); call_pending (); @@ -666,7 +788,15 @@ void ev_loop (int flags) /* we only need this for !monotonic clockor timers, but as we basically always have timers, we just calculate it always */ - ev_now = ev_time (); +#if EV_USE_MONOTONIC + if (expect_true (have_monotonic)) + time_update_monotonic (); + else +#endif + { + ev_now = ev_time (); + now = ev_now; + } if (flags & EVLOOP_NONBLOCK || idlecnt) block = 0.; @@ -676,7 +806,7 @@ void ev_loop (int flags) if (timercnt) { - ev_tstamp to = timers [0]->at - (have_monotonic ? get_clock () : ev_now) + method_fudge; + ev_tstamp to = timers [0]->at - now + method_fudge; if (block > to) block = to; } @@ -743,7 +873,7 @@ ev_clear_pending (W w) { if (w->pending) { - pendings [w->pending - 1].w = 0; + pendings [ABSPRI (w)][w->pending - 1].w = 0; w->pending = 0; } } @@ -751,6 +881,9 @@ ev_clear_pending (W w) static void ev_start (W w, int active) { + if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; + if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI; + w->active = active; } @@ -765,11 +898,11 @@ ev_stop (W w) void ev_io_start (struct ev_io *w) { + int fd = w->fd; + if (ev_is_active (w)) return; - int fd = w->fd; - assert (("ev_io_start called with negative fd", fd >= 0)); ev_start ((W)w, 1);