X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/5e20ccfe261679c78f9aa365ac087fb0700e0f2b..9c468d0cd3a409a8c4b1b37d6e161404350d67cb:/event.c diff --git a/event.c b/event.c index 6e26a48..1666f62 100644 --- a/event.c +++ b/event.c @@ -31,10 +31,17 @@ #include #include -#include #include -#include "event.h" +#ifndef WIN32 +# include +#endif + +#ifdef EV_EVENT_H +# include EV_EVENT_H +#else +# include "event.h" +#endif #if EV_MULTIPLICITY # define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base @@ -84,13 +91,13 @@ void *event_init (void) { #if EV_MULTIPLICITY if (x_cur) - x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO); + x_cur = (struct event_base *)ev_loop_new (EVFLAG_AUTO); else - x_cur = ev_default_loop (EVMETHOD_AUTO); + x_cur = (struct event_base *)ev_default_loop (EVFLAG_AUTO); #else assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur)); - x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO); + x_cur = (struct event_base *)(long)ev_default_loop (EVFLAG_AUTO); #endif return x_cur; @@ -101,7 +108,8 @@ void event_base_free (struct event_base *base) dLOOPbase; #if EV_MULTIPLICITY - ev_loop_delete (loop); + if (ev_default_loop (EVFLAG_AUTO) != loop) + ev_loop_destroy (loop); #endif } @@ -133,13 +141,18 @@ x_cb (struct event *ev, int revents) revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; ev->ev_res = revents; - ev->ev_callback (ev->ev_fd, revents, ev->ev_arg); + ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg); } static void x_cb_sig (EV_P_ struct ev_signal *w, int revents) { - x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.sig)), revents); + struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.sig)); + + if (revents & EV_ERROR) + event_del (ev); + + x_cb (ev, revents); } static void @@ -147,8 +160,13 @@ x_cb_io (EV_P_ struct ev_io *w, int revents) { struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io)); - if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w)) - ev_io_stop (EV_A_ w); + if (revents & EV_ERROR) + event_del (ev); + else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w)) + { + ev_io_stop (EV_A_ w); + ev->ev_flags &= ~EVLIST_INSERTED; + } x_cb (ev, revents); } @@ -156,22 +174,21 @@ x_cb_io (EV_P_ struct ev_io *w, int revents) static void x_cb_to (EV_P_ struct ev_timer *w, int revents) { - x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents); + struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, to)); + + event_del (ev); + + x_cb (ev, revents); } void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) { - if (!ev->initialised) - { - ev->initialised = 1; - - if (events & EV_SIGNAL) - ev_watcher_init (&ev->iosig.sig, x_cb_sig); - else - ev_watcher_init (&ev->iosig.io, x_cb_io); + if (events & EV_SIGNAL) + ev_init (&ev->iosig.sig, x_cb_sig); + else + ev_init (&ev->iosig.io, x_cb_io); - ev_watcher_init (&ev->to, x_cb_to); - } + ev_init (&ev->to, x_cb_to); ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */ ev->ev_fd = fd; @@ -180,6 +197,7 @@ void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, v ev->ev_callback = cb; ev->ev_arg = arg; ev->ev_res = 0; + ev->ev_flags = EVLIST_INIT; } int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) @@ -191,25 +209,38 @@ int event_add (struct event *ev, struct timeval *tv) { dLOOPev; - /* disable all watchers */ - event_del (ev); - if (ev->ev_events & EV_SIGNAL) { - ev_signal_set (&ev->iosig.sig, ev->ev_fd); - ev_signal_start (EV_A_ &ev->iosig.sig); + if (!ev_is_active (&ev->iosig.sig)) + { + ev_signal_set (&ev->iosig.sig, ev->ev_fd); + ev_signal_start (EV_A_ &ev->iosig.sig); + + ev->ev_flags |= EVLIST_SIGNAL; + } } else if (ev->ev_events & (EV_READ | EV_WRITE)) { - ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE)); - ev_io_start (EV_A_ &ev->iosig.io); + if (!ev_is_active (&ev->iosig.io)) + { + ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE)); + ev_io_start (EV_A_ &ev->iosig.io); + + ev->ev_flags |= EVLIST_INSERTED; + } } if (tv) { - ev_timer_set (&ev->to, tv_get (tv), 0.); - ev_timer_start (EV_A_ &ev->to); + ev->to.repeat = tv_get (tv); + ev_timer_again (EV_A_ &ev->to); + ev->ev_flags |= EVLIST_TIMEOUT; } + else + if (ev_is_active (&ev->to)) + ev_timer_stop (EV_A_ &ev->to); + + ev->ev_flags |= EVLIST_ACTIVE; return 0; } @@ -224,7 +255,7 @@ int event_del (struct event *ev) if (ev_is_active (&ev->iosig.sig)) ev_signal_stop (EV_A_ &ev->iosig.sig); } - else + else if (ev->ev_events & (EV_READ | EV_WRITE)) { /* io */ if (ev_is_active (&ev->iosig.io)) @@ -234,29 +265,45 @@ int event_del (struct event *ev) if (ev_is_active (&ev->to)) ev_timer_stop (EV_A_ &ev->to); + ev->ev_flags = EVLIST_INIT; + return 0; } -int event_pending (struct event *ev, short events, struct timeval *tv) +void event_active (struct event *ev, int res, short ncalls) { dLOOPev; + if (res & EV_TIMEOUT) + ev_feed_event (EV_A_ &ev->to, res & EV_TIMEOUT); + + if (res & EV_SIGNAL) + ev_feed_event (EV_A_ &ev->iosig.sig, res & EV_SIGNAL); + + if (res & (EV_READ | EV_WRITE)) + ev_feed_event (EV_A_ &ev->iosig.io, res & (EV_READ | EV_WRITE)); +} + +int event_pending (struct event *ev, short events, struct timeval *tv) +{ short revents = 0; + dLOOPev; + if (ev->ev_events & EV_SIGNAL) { /* sig */ - if (ev->iosig.sig.pending) + if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig)) revents |= EV_SIGNAL; } - else + else if (ev->ev_events & (EV_READ | EV_WRITE)) { /* io */ - if (ev->iosig.io.pending) + if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io)) revents |= ev->ev_events & (EV_READ | EV_WRITE); } - if (ev->to.pending) + if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to)) { revents |= EV_TIMEOUT; @@ -305,13 +352,13 @@ x_loopexit_cb (int revents, void *base) { dLOOPbase; - ev_unloop (EV_A_ EVUNLOOP_ONCE); + ev_unloop (EV_A_ EVUNLOOP_ONE); } int event_base_loopexit (struct event_base *base, struct timeval *tv) { - dLOOPbase; ev_tstamp after = tv_get (tv); + dLOOPbase; ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base); @@ -328,16 +375,16 @@ struct x_once static void x_once_cb (int revents, void *arg) { - struct x_once *once = arg; + struct x_once *once = (struct x_once *)arg; - once->cb (once->fd, revents, once->arg); + once->cb (once->fd, (short)revents, once->arg); free (once); } int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) { + struct x_once *once = (struct x_once *)malloc (sizeof (struct x_once)); dLOOPbase; - struct x_once *once = malloc (sizeof (struct x_once)); if (!once) return -1; @@ -353,7 +400,7 @@ int event_base_once (struct event_base *base, int fd, short events, void (*cb)(i int event_base_priority_init (struct event_base *base, int npri) { - dLOOPbase; + /*dLOOPbase;*/ return 0; }