--- cvsroot/EV/EV.xs 2007/10/31 20:10:17 1.24 +++ cvsroot/EV/EV.xs 2007/11/06 17:20:42 1.57 @@ -4,13 +4,31 @@ /*#include */ -#define TIMEOUT_NONE HUGE_VAL -#define HAVE_EPOLL 1 - #define EV_PROTOTYPES 1 #include "EV/EVAPI.h" +/* fix perl api breakage */ +#undef signal +#undef sigaction + +/* due to bugs in OS X we have to use libev/ explicitly here */ #include "libev/ev.c" +#include "event.c" + +#ifndef WIN32 +#define DNS_USE_GETTIMEOFDAY_FOR_ID 1 +#if !defined (WIN32) && !defined(__CYGWIN__) +# define HAVE_STRUCT_IN6_ADDR 1 +#endif +#undef HAVE_STRTOK_R +#undef strtok_r +#define strtok_r fake_strtok_r +#include "evdns.c" +#endif + +#ifndef WIN32 +# include +#endif typedef int Signal; @@ -19,7 +37,6 @@ static HV *stash_watcher, *stash_io, - *stash_time, *stash_timer, *stash_periodic, *stash_signal, @@ -28,18 +45,26 @@ *stash_check, *stash_child; +#ifndef SIG_SIZE +/* kudos to Slaven Rezic for the idea */ +static char sig_size [] = { SIG_NUM }; +# define SIG_SIZE (sizeof (sig_size) + 1) +#endif + static int sv_signum (SV *sig) { int signum; - if (SvIV (sig) > 0) - return SvIV (sig); + SvGETMAGIC (sig); for (signum = 1; signum < SIG_SIZE; ++signum) if (strEQ (SvPV_nolen (sig), PL_sig_name [signum])) return signum; + if (SvIV (sig) > 0) + return SvIV (sig); + return -1; } @@ -59,7 +84,7 @@ if (SvTYPE (fh) == SVt_PVGV) return PerlIO_fileno (IoIFP (sv_2io (fh))); - if (SvIOK (fh)) + if ((SvIV (fh) >= 0) && (SvIV (fh) < 0x7ffffff)) return SvIV (fh); return -1; @@ -75,7 +100,7 @@ w = (struct ev_watcher *)SvPVX (self); - evw_init (w, e_cb); + ev_watcher_init (w, e_cb); w->fh = 0; w->cb_sv = newSVsv (cb_sv); @@ -84,6 +109,15 @@ return (void *)w; } +static void +e_destroy (void *w_) +{ + struct ev_watcher *w = (struct ev_watcher *)w_; + + SvREFCNT_dec (w->fh ); w->fh = 0; + SvREFCNT_dec (w->cb_sv); w->cb_sv = 0; +} + static SV * e_bless (struct ev_watcher *w, HV *stash) { @@ -124,9 +158,6 @@ PUSHs (sv_self); PUSHs (sv_events); - if (revents & EV_CHILD) - XPUSHs (sv_status = newSViv (((struct ev_child *)w)->status)); - PUTBACK; call_sv (w->cb_sv, G_DISCARD | G_VOID | G_EVAL); SP = PL_stack_base + mark; PUTBACK; @@ -148,10 +179,10 @@ } } -#if 0 ///////////////////////////////////////////////////////////////////////////// // DNS +#ifndef WIN32 static void dns_cb (int result, char type, int count, int ttl, void *addresses, void *arg) { @@ -205,6 +236,9 @@ #define CHECK_REPEAT(repeat) if (repeat < 0.) \ croak (# repeat " value must be >= 0"); +#define CHECK_FD(fh,fd) if ((fd) < 0) \ + croak ("illegal file descriptor or filehandle (either no attached file descriptor or illegal value): %s", SvPV_nolen (fh)); + ///////////////////////////////////////////////////////////////////////////// // XS interface functions @@ -214,7 +248,6 @@ BOOT: { - int i; HV *stash = gv_stashpv ("EV", 1); static const struct { @@ -222,6 +255,9 @@ IV iv; } *civ, const_iv[] = { # define const_iv(pfx, name) { # name, (IV) pfx ## name }, + const_iv (EV_, MINPRI) + const_iv (EV_, MAXPRI) + const_iv (EV_, UNDEF) const_iv (EV_, NONE) const_iv (EV_, TIMEOUT) @@ -235,17 +271,21 @@ const_iv (EV, LOOP_ONESHOT) const_iv (EV, LOOP_NONBLOCK) - const_iv (EV, METHOD_NONE) + const_iv (EV, METHOD_AUTO) const_iv (EV, METHOD_SELECT) + const_iv (EV, METHOD_POLL) const_iv (EV, METHOD_EPOLL) + const_iv (EV, METHOD_KQUEUE) + const_iv (EV, METHOD_DEVPOLL) + const_iv (EV, METHOD_PORT) + const_iv (EV, METHOD_ANY) }; for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); stash_watcher = gv_stashpv ("EV::Watcher" , 1); - stash_io = gv_stashpv ("EV::IO" , 1); - stash_time = gv_stashpv ("EV::Time" , 1); + stash_io = gv_stashpv ("EV::Io" , 1); stash_timer = gv_stashpv ("EV::Timer" , 1); stash_periodic = gv_stashpv ("EV::Periodic", 1); stash_signal = gv_stashpv ("EV::Signal" , 1); @@ -263,65 +303,63 @@ evapi.rev = EV_API_REVISION; evapi.sv_fileno = sv_fileno; evapi.sv_signum = sv_signum; - evapi.now = &ev_now; - evapi.method = &ev_method; - evapi.loop_done = &ev_loop_done; + evapi.now = ev_now; + evapi.method = ev_method; + evapi.unloop = ev_unloop; evapi.time = ev_time; evapi.loop = ev_loop; evapi.once = ev_once; - evapi.io_start = evio_start; - evapi.io_stop = evio_stop; - evapi.timer_start = evtimer_start; - evapi.timer_stop = evtimer_stop; - evapi.timer_again = evtimer_again; - evapi.periodic_start = evperiodic_start; - evapi.periodic_stop = evperiodic_stop; - evapi.signal_start = evsignal_start; - evapi.signal_stop = evsignal_stop; - evapi.idle_start = evidle_start; - evapi.idle_stop = evidle_stop; - evapi.prepare_start = evprepare_start; - evapi.prepare_stop = evprepare_stop; - evapi.check_start = evcheck_start; - evapi.check_stop = evcheck_stop; - evapi.child_start = evchild_start; - evapi.child_stop = evchild_stop; + evapi.io_start = ev_io_start; + evapi.io_stop = ev_io_stop; + evapi.timer_start = ev_timer_start; + evapi.timer_stop = ev_timer_stop; + evapi.timer_again = ev_timer_again; + evapi.periodic_start = ev_periodic_start; + evapi.periodic_stop = ev_periodic_stop; + evapi.signal_start = ev_signal_start; + evapi.signal_stop = ev_signal_stop; + evapi.idle_start = ev_idle_start; + evapi.idle_stop = ev_idle_stop; + evapi.prepare_start = ev_prepare_start; + evapi.prepare_stop = ev_prepare_stop; + evapi.check_start = ev_check_start; + evapi.check_stop = ev_check_stop; + evapi.child_start = ev_child_start; + evapi.child_stop = ev_child_stop; sv_setiv (sv, (IV)&evapi); SvREADONLY_on (sv); } +#ifndef WIN32 + pthread_atfork (0, 0, ev_default_fork); +#endif } NV ev_now () - CODE: - RETVAL = ev_now; - OUTPUT: - RETVAL int ev_method () - CODE: - RETVAL = ev_method; - OUTPUT: - RETVAL NV ev_time () -void ev_init (int flags = 0) +int ev_default_loop (int methods = EVMETHOD_AUTO) void ev_loop (int flags = 0) -void ev_loop_done (int value = 1) - CODE: - ev_loop_done = value; +void ev_unloop (int how = 1) struct ev_io *io (SV *fh, int events, SV *cb) ALIAS: io_ns = 1 CODE: +{ + int fd = sv_fileno (fh); + CHECK_FD (fh, fd); + RETVAL = e_new (sizeof (struct ev_io), cb); RETVAL->fh = newSVsv (fh); - evio_set (RETVAL, sv_fileno (RETVAL->fh), events); - if (!ix) evio_start (RETVAL); + ev_io_set (RETVAL, fd, events); + if (!ix) ev_io_start (RETVAL); +} OUTPUT: RETVAL @@ -332,8 +370,8 @@ CHECK_REPEAT (repeat); CODE: RETVAL = e_new (sizeof (struct ev_timer), cb); - evtimer_set (RETVAL, after, repeat); - if (!ix) evtimer_start (RETVAL); + ev_timer_set (RETVAL, after, repeat); + if (!ix) ev_timer_start (RETVAL); OUTPUT: RETVAL @@ -344,8 +382,8 @@ CHECK_REPEAT (interval); CODE: RETVAL = e_new (sizeof (struct ev_periodic), cb); - evperiodic_set (RETVAL, at, interval); - if (!ix) evperiodic_start (RETVAL); + ev_periodic_set (RETVAL, at, interval); + if (!ix) ev_periodic_start (RETVAL); OUTPUT: RETVAL @@ -354,8 +392,8 @@ signal_ns = 1 CODE: RETVAL = e_new (sizeof (struct ev_signal), cb); - evsignal_set (RETVAL, signum); - if (!ix) evsignal_start (RETVAL); + ev_signal_set (RETVAL, signum); + if (!ix) ev_signal_start (RETVAL); OUTPUT: RETVAL @@ -364,8 +402,8 @@ idle_ns = 1 CODE: RETVAL = e_new (sizeof (struct ev_idle), cb); - evidle_set (RETVAL); - if (!ix) evidle_start (RETVAL); + ev_idle_set (RETVAL); + if (!ix) ev_idle_start (RETVAL); OUTPUT: RETVAL @@ -374,8 +412,8 @@ prepare_ns = 1 CODE: RETVAL = e_new (sizeof (struct ev_prepare), cb); - evprepare_set (RETVAL); - if (!ix) evprepare_start (RETVAL); + ev_prepare_set (RETVAL); + if (!ix) ev_prepare_start (RETVAL); OUTPUT: RETVAL @@ -384,18 +422,18 @@ check_ns = 1 CODE: RETVAL = e_new (sizeof (struct ev_check), cb); - evcheck_set (RETVAL); - if (!ix) evcheck_start (RETVAL); + ev_check_set (RETVAL); + if (!ix) ev_check_start (RETVAL); OUTPUT: RETVAL -struct ev_child *child (SV *cb, int pid) +struct ev_child *child (int pid, SV *cb) ALIAS: check_ns = 1 CODE: - RETVAL = e_new (sizeof (struct ev_check), cb); - evchild_set (RETVAL, pid); - if (!ix) evchild_start (RETVAL); + RETVAL = e_new (sizeof (struct ev_child), cb); + ev_child_set (RETVAL, pid); + if (!ix) ev_child_start (RETVAL); OUTPUT: RETVAL @@ -417,22 +455,67 @@ OUTPUT: RETVAL -MODULE = EV PACKAGE = EV::IO PREFIX = evio_ +void trigger (struct ev_watcher *w, int revents = EV_NONE) + CODE: + w->cb (w, revents); + +int priority (struct ev_watcher *w, int new_priority = 0) + CODE: +{ + RETVAL = w->priority; + + if (items > 1) + { + int active = ev_is_active (w); + + if (new_priority < EV_MINPRI || new_priority > EV_MAXPRI) + croak ("watcher priority out of range, value must be between %d and %d, inclusive", EV_MINPRI, EV_MAXPRI); + + if (active) + { + /* grrr. */ + PUSHMARK (SP); + XPUSHs (ST (0)); + call_method ("stop", G_DISCARD | G_VOID); + } + + ev_set_priority (w, new_priority); + + if (active) + { + PUSHMARK (SP); + XPUSHs (ST (0)); + call_method ("start", G_DISCARD | G_VOID); + } + } +} + OUTPUT: + RETVAL + +MODULE = EV PACKAGE = EV::Io PREFIX = ev_io_ + +void ev_io_start (struct ev_io *w) -void evio_start (struct ev_io *w) +void ev_io_stop (struct ev_io *w) -void evio_stop (struct ev_io *w) +void DESTROY (struct ev_io *w) + CODE: + ev_io_stop (w); + e_destroy (w); void set (struct ev_io *w, SV *fh, int events) CODE: { - int active = w->active; - if (active) evio_stop (w); + int active = ev_is_active (w); + int fd = sv_fileno (fh); + CHECK_FD (fh, fd); + + if (active) ev_io_stop (w); sv_setsv (w->fh, fh); - evio_set (w, sv_fileno (w->fh), events); + ev_io_set (w, fd, events); - if (active) evio_start (w); + if (active) ev_io_start (w); } SV *fh (struct ev_io *w, SV *new_fh = 0) @@ -442,137 +525,216 @@ if (items > 1) { - int active = w->active; - if (active) evio_stop (w); + int active = ev_is_active (w); + if (active) ev_io_stop (w); sv_setsv (w->fh, new_fh); - evio_set (w, sv_fileno (w->fh), w->events); + ev_io_set (w, sv_fileno (w->fh), w->events); - if (active) evio_start (w); + if (active) ev_io_start (w); } } OUTPUT: RETVAL -short events (struct ev_io *w, short new_events = EV_UNDEF) +int events (struct ev_io *w, int new_events = EV_UNDEF) CODE: { RETVAL = w->events; if (items > 1) { - int active = w->active; - if (active) evio_stop (w); + int active = ev_is_active (w); + if (active) ev_io_stop (w); - evio_set (w, w->fd, new_events); + ev_io_set (w, w->fd, new_events); - if (active) evio_start (w); + if (active) ev_io_start (w); } } OUTPUT: RETVAL -MODULE = EV PACKAGE = EV::Signal PREFIX = evsignal_ +MODULE = EV PACKAGE = EV::Signal PREFIX = ev_signal_ -void evsignal_start (struct ev_signal *w) +void ev_signal_start (struct ev_signal *w) -void evsignal_stop (struct ev_signal *w) +void ev_signal_stop (struct ev_signal *w) + +void DESTROY (struct ev_signal *w) + CODE: + ev_signal_stop (w); + e_destroy (w); -void set (struct ev_signal *w, SV *signal = 0) +void set (struct ev_signal *w, SV *signal) CODE: { Signal signum = sv_signum (signal); /* may croak here */ - int active = w->active; + int active = ev_is_active (w); - if (active) evsignal_stop (w); - evsignal_set (w, signum); - if (active) evsignal_start (w); + if (active) ev_signal_stop (w); + + ev_signal_set (w, signum); + + if (active) ev_signal_start (w); } -MODULE = EV PACKAGE = EV::Time +int signal (struct ev_signal *w, SV *new_signal = 0) + CODE: +{ + RETVAL = w->signum; + + if (items > 1) + { + Signal signum = sv_signum (new_signal); /* may croak here */ + int active = ev_is_active (w); + if (active) ev_signal_stop (w); -MODULE = EV PACKAGE = EV::Timer PREFIX = evtimer_ + ev_signal_set (w, signum); -void evtimer_start (struct ev_timer *w) + if (active) ev_signal_start (w); + } +} + OUTPUT: + RETVAL + +MODULE = EV PACKAGE = EV::Timer PREFIX = ev_timer_ + +void ev_timer_start (struct ev_timer *w) INIT: CHECK_REPEAT (w->repeat); -void evtimer_stop (struct ev_timer *w) +void ev_timer_stop (struct ev_timer *w) -void evtimer_again (struct ev_timer *w) +void ev_timer_again (struct ev_timer *w) INIT: CHECK_REPEAT (w->repeat); +void DESTROY (struct ev_timer *w) + CODE: + ev_timer_stop (w); + e_destroy (w); + void set (struct ev_timer *w, NV after, NV repeat = 0.) INIT: CHECK_REPEAT (repeat); CODE: { - int active = w->active; - if (active) evtimer_stop (w); - evtimer_set (w, after, repeat); - if (active) evtimer_start (w); + int active = ev_is_active (w); + if (active) ev_timer_stop (w); + ev_timer_set (w, after, repeat); + if (active) ev_timer_start (w); } -MODULE = EV PACKAGE = EV::Periodic PREFIX = evperiodic_ +MODULE = EV PACKAGE = EV::Periodic PREFIX = ev_periodic_ -void evperiodic_start (struct ev_periodic *w) +void ev_periodic_start (struct ev_periodic *w) INIT: CHECK_REPEAT (w->interval); -void evperiodic_stop (struct ev_periodic *w) +void ev_periodic_stop (struct ev_periodic *w) + +void DESTROY (struct ev_periodic *w) + CODE: + ev_periodic_stop (w); + e_destroy (w); void set (struct ev_periodic *w, NV at, NV interval = 0.) INIT: CHECK_REPEAT (interval); CODE: { - int active = w->active; - if (active) evperiodic_stop (w); - evperiodic_set (w, at, interval); - if (active) evperiodic_start (w); + int active = ev_is_active (w); + if (active) ev_periodic_stop (w); + + ev_periodic_set (w, at, interval); + + if (active) ev_periodic_start (w); } -MODULE = EV PACKAGE = EV::Idle PREFIX = evidle_ +MODULE = EV PACKAGE = EV::Idle PREFIX = ev_idle_ + +void ev_idle_start (struct ev_idle *w) + +void ev_idle_stop (struct ev_idle *w) -void evidle_start (struct ev_idle *w) +void DESTROY (struct ev_idle *w) + CODE: + ev_idle_stop (w); + e_destroy (w); + +MODULE = EV PACKAGE = EV::Prepare PREFIX = ev_check_ -void evidle_stop (struct ev_idle *w) +void ev_prepare_start (struct ev_prepare *w) -MODULE = EV PACKAGE = EV::Prepare PREFIX = evcheck_ +void ev_prepare_stop (struct ev_prepare *w) -void evprepare_start (struct ev_prepare *w) +void DESTROY (struct ev_prepare *w) + CODE: + ev_prepare_stop (w); + e_destroy (w); -void evprepare_stop (struct ev_prepare *w) +MODULE = EV PACKAGE = EV::Check PREFIX = ev_check_ -MODULE = EV PACKAGE = EV::Check PREFIX = evcheck_ +void ev_check_start (struct ev_check *w) -void evcheck_start (struct ev_check *w) +void ev_check_stop (struct ev_check *w) -void evcheck_stop (struct ev_check *w) +void DESTROY (struct ev_check *w) + CODE: + ev_check_stop (w); + e_destroy (w); -MODULE = EV PACKAGE = EV::Child PREFIX = evchild_ +MODULE = EV PACKAGE = EV::Child PREFIX = ev_child_ -void evchild_start (struct ev_child *w) +void ev_child_start (struct ev_child *w) -void evchild_stop (struct ev_child *w) +void ev_child_stop (struct ev_child *w) + +void DESTROY (struct ev_child *w) + CODE: + ev_child_stop (w); + e_destroy (w); void set (struct ev_child *w, int pid) CODE: { - int active = w->active; - if (active) evchild_stop (w); - evchild_set (w, pid); - if (active) evchild_start (w); + int active = ev_is_active (w); + if (active) ev_child_stop (w); + + ev_child_set (w, pid); + + if (active) ev_child_start (w); } -int status (struct ev_child *w) +int pid (struct ev_child *w, int new_pid = 0) CODE: - RETVAL = w->status; +{ + RETVAL = w->pid; + + if (items > 1) + { + int active = ev_is_active (w); + if (active) ev_child_stop (w); + + ev_child_set (w, new_pid); + + if (active) ev_child_start (w); + } +} OUTPUT: RETVAL -#if 0 + +int rstatus (struct ev_child *w) + ALIAS: + rpid = 1 + CODE: + RETVAL = ix ? w->rpid : w->rstatus; + OUTPUT: + RETVAL + +#ifndef WIN32 MODULE = EV PACKAGE = EV::DNS PREFIX = evdns_ @@ -665,6 +827,7 @@ void evdns_search_ndots_set (int ndots) +#if 0 MODULE = EV PACKAGE = EV::HTTP PREFIX = evhttp_ @@ -706,6 +869,7 @@ #endif +#endif