X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/c04c7d0577ceddfe470b6fdcaf727ced91a67d1a..692ca25945e1a987acf66bd845ce70a61aa7b160:/ev.c diff --git a/ev.c b/ev.c index 83c643a..0457088 100644 --- a/ev.c +++ b/ev.c @@ -94,6 +94,14 @@ # define EV_USE_KQUEUE 0 #endif +#ifndef EV_USE_WIN32 +# ifdef WIN32 +# define EV_USE_WIN32 1 +# else +# define EV_USE_WIN32 0 +# endif +#endif + #ifndef EV_USE_REALTIME # define EV_USE_REALTIME 1 #endif @@ -139,11 +147,65 @@ typedef struct ev_watcher_time *WT; static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ +#if WIN32 +/* note: the comment below could not be substantiated, but what would I care */ +/* MSDN says this is required to handle SIGFPE */ +volatile double SIGFPE_REQ = 0.0f; +#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; } ANFD; @@ -211,21 +273,32 @@ ev_now (EV_P) #define array_roundsize(base,n) ((n) | 4 & ~3) -#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_needsize(base,cur,cnt,init) \ + if (expect_false ((cnt) > cur)) \ + { \ + int newcnt = cur; \ + do \ + { \ + newcnt = array_roundsize (base, newcnt << 1); \ + } \ + while ((cnt) > newcnt); \ + \ + base = ev_realloc (base, sizeof (*base) * (newcnt)); \ + init (base + cur, newcnt - cur); \ + cur = newcnt; \ + } + +#define array_slim(stem) \ + if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ + { \ + stem ## max = array_roundsize (stem ## cnt >> 1); \ + base = ev_realloc (base, sizeof (*base) * (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 @@ -300,11 +373,8 @@ fd_reify (EV_P) anfd->reify = 0; - if (anfd->events != events) - { - method_modify (EV_A_ fd, anfd->events, events); - anfd->events = events; - } + method_modify (EV_A_ fd, anfd->events, events); + anfd->events = events; } fdchangecnt = 0; @@ -313,7 +383,7 @@ 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; @@ -351,18 +421,17 @@ 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; } } -/* susually called after fork if method needs to re-arm all fds from scratch */ +/* usually called after fork if method needs to re-arm all fds from scratch */ static void fd_rearm_all (EV_P) { @@ -387,12 +456,12 @@ upheap (WT *heap, int k) while (k && heap [k >> 1]->at > w->at) { heap [k] = heap [k >> 1]; - heap [k]->active = k + 1; + ((W)heap [k])->active = k + 1; k >>= 1; } heap [k] = w; - heap [k]->active = k + 1; + ((W)heap [k])->active = k + 1; } @@ -412,19 +481,19 @@ downheap (WT *heap, int N, int k) break; heap [k] = heap [j]; - heap [k]->active = k + 1; + ((W)heap [k])->active = k + 1; k = j; } heap [k] = w; - heap [k]->active = k + 1; + ((W)heap [k])->active = k + 1; } /*****************************************************************************/ typedef struct { - struct ev_watcher_list *head; + WL head; sig_atomic_t volatile gotsig; } ANSIG; @@ -450,6 +519,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) @@ -464,7 +537,7 @@ sighandler (int signum) static void sigcb (EV_P_ struct ev_io *iow, int revents) { - struct ev_watcher_list *w; + WL w; int signum; read (sigpipe [0], &revents, 1); @@ -516,9 +589,9 @@ 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; + ev_priority (w) = ev_priority (sw); /* need to do it *now* */ + w->rpid = pid; + w->rstatus = status; event (EV_A_ (W)w, EV_CHILD); } } @@ -610,6 +683,9 @@ loop_init (EV_P_ int methods) methods = EVMETHOD_ANY; method = 0; +#if EV_USE_WIN32 + if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); +#endif #if EV_USE_KQUEUE if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); #endif @@ -622,12 +698,20 @@ loop_init (EV_P_ int methods) #if EV_USE_SELECT if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); #endif + + ev_watcher_init (&sigev, sigcb); + ev_set_priority (&sigev, EV_MAXPRI); } } void loop_destroy (EV_P) { + int i; + +#if EV_USE_WIN32 + if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); +#endif #if EV_USE_KQUEUE if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); #endif @@ -641,27 +725,54 @@ loop_destroy (EV_P) if (method == EVMETHOD_SELECT) select_destroy (EV_A); #endif + for (i = NUMPRI; i--; ) + array_free (pending, [i]); + + array_free (fdchange, ); + array_free (timer, ); + array_free (periodic, ); + array_free (idle, ); + array_free (prepare, ); + array_free (check, ); + method = 0; - /*TODO*/ } -void +static void loop_fork (EV_P) { - /*TODO*/ #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 (int methods) { - struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop)); + 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); @@ -675,13 +786,13 @@ void ev_loop_destroy (EV_P) { loop_destroy (EV_A); - free (loop); + ev_free (loop); } void ev_loop_fork (EV_P) { - loop_fork (EV_A); + postfork = 1; } #endif @@ -714,8 +825,6 @@ ev_default_loop (int methods) if (ev_method (EV_A)) { - ev_watcher_init (&sigev, sigcb); - ev_set_priority (&sigev, EV_MAXPRI); siginit (EV_A); #ifndef WIN32 @@ -758,15 +867,8 @@ ev_default_fork (void) struct ev_loop *loop = default_loop; #endif - loop_fork (EV_A); - - ev_io_stop (EV_A_ &sigev); - close (sigpipe [0]); - close (sigpipe [1]); - pipe (sigpipe); - - ev_ref (EV_A); /* signal watcher */ - siginit (EV_A); + if (method) + postfork = 1; } /*****************************************************************************/ @@ -792,7 +894,7 @@ 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]; @@ -802,7 +904,7 @@ timers_reify (EV_P) 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 = mn_now + w->repeat; downheap ((WT *)timers, timercnt, 0); } else @@ -815,7 +917,7 @@ timers_reify (EV_P) static void periodics_reify (EV_P) { - while (periodiccnt && periodics [0]->at <= rt_now) + while (periodiccnt && ((WT)periodics [0])->at <= rt_now) { struct ev_periodic *w = periodics [0]; @@ -824,8 +926,8 @@ periodics_reify (EV_P) /* first reschedule or stop timer */ 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 ((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 > rt_now)); downheap ((WT *)periodics, periodiccnt, 0); } else @@ -847,7 +949,7 @@ periodics_reschedule (EV_P) if (w->interval) { - ev_tstamp diff = ceil ((rt_now - w->at) / w->interval) * w->interval; + ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; if (fabs (diff) >= 1e-4) { @@ -918,7 +1020,7 @@ time_update (EV_P) /* adjust timers. this is easy, as the offset is the same for all */ for (i = 0; i < timercnt; ++i) - timers [i]->at += rt_now - mn_now; + ((WT)timers [i])->at += rt_now - mn_now; } mn_now = rt_now; @@ -954,6 +1056,10 @@ 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); @@ -979,13 +1085,13 @@ 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 (periodiccnt) { - ev_tstamp to = periodics [0]->at - rt_now + method_fudge; + ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; if (block > to) block = to; } @@ -1112,7 +1218,7 @@ 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.)); @@ -1120,6 +1226,8 @@ ev_timer_start (EV_P_ struct ev_timer *w) array_needsize (timers, timermax, timercnt, ); timers [timercnt - 1] = w; upheap ((WT *)timers, timercnt - 1); + + assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); } void @@ -1129,13 +1237,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]; + downheap ((WT *)timers, timercnt, ((W)w)->active - 1); } - w->at = w->repeat; + ((WT)w)->at = w->repeat; ev_stop (EV_A_ (W)w); } @@ -1147,8 +1257,8 @@ 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; + downheap ((WT *)timers, timercnt, ((W)w)->active - 1); } else ev_timer_stop (EV_A_ w); @@ -1167,12 +1277,14 @@ ev_periodic_start (EV_P_ struct ev_periodic *w) /* 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; + ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; ev_start (EV_A_ (W)w, ++periodiccnt); array_needsize (periodics, periodicmax, periodiccnt, ); periodics [periodiccnt - 1] = w; upheap ((WT *)periodics, periodiccnt - 1); + + assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); } void @@ -1182,10 +1294,12 @@ 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]; + downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); } ev_stop (EV_A_ (W)w); @@ -1209,7 +1323,7 @@ ev_idle_stop (EV_P_ struct ev_idle *w) if (ev_is_active (w)) return; - idles [w->active - 1] = idles [--idlecnt]; + idles [((W)w)->active - 1] = idles [--idlecnt]; ev_stop (EV_A_ (W)w); } @@ -1231,7 +1345,7 @@ ev_prepare_stop (EV_P_ struct ev_prepare *w) if (ev_is_active (w)) return; - prepares [w->active - 1] = prepares [--preparecnt]; + prepares [((W)w)->active - 1] = prepares [--preparecnt]; ev_stop (EV_A_ (W)w); } @@ -1253,7 +1367,7 @@ ev_check_stop (EV_P_ struct ev_check *w) if (ev_is_active (w)) return; - checks [w->active - 1] = checks [--checkcnt]; + checks [((W)w)->active - 1] = checks [--checkcnt]; ev_stop (EV_A_ (W)w); } @@ -1276,13 +1390,17 @@ ev_signal_start (EV_P_ struct ev_signal *w) array_needsize (signals, signalmax, w->signum, signals_init); wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); - if (!w->next) + 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 } } @@ -1342,7 +1460,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); } @@ -1362,7 +1480,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 = ev_malloc (sizeof (struct ev_once)); if (!once) cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);