--- cvsroot/EV/EV.xs 2007/11/01 12:11:07 1.34 +++ cvsroot/EV/EV.xs 2007/11/23 16:37:37 1.77 @@ -4,13 +4,38 @@ /*#include */ -#define TIMEOUT_NONE HUGE_VAL -#define EV_USE_EPOLL 1 - #define EV_PROTOTYPES 1 #include "EV/EVAPI.h" +/* fix perl api breakage */ +#undef signal +#undef sigaction + +#define EV_SELECT_IS_WINSOCKET 0 +#ifdef _WIN32 +# define EV_SELECT_USE_FD_SET 0 +# define NFDBITS PERL_NFDBITS +# define fd_mask Perl_fd_mask +#endif +/* 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.h" +#include "evdns.c" +#endif + +#ifndef _WIN32 +# include +#endif typedef int Signal; @@ -27,6 +52,12 @@ *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) { @@ -60,7 +91,7 @@ if (SvTYPE (fh) == SVt_PVGV) return PerlIO_fileno (IoIFP (sv_2io (fh))); - if ((SvIV (fh) >= 0) && (SvIV (fh) < 0x7ffffff)) + if (SvOK (fh) && (SvIV (fh) >= 0) && (SvIV (fh) < 0x7fffffffL)) return SvIV (fh); return -1; @@ -76,8 +107,9 @@ w = (struct ev_watcher *)SvPVX (self); - ev_watcher_init (w, e_cb); + ev_init (w, e_cb); + w->data = 0; w->fh = 0; w->cb_sv = newSVsv (cb_sv); w->self = self; @@ -85,13 +117,14 @@ return (void *)w; } -static void * +static void e_destroy (void *w_) { - struct ev_watcher *w = 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; + SvREFCNT_dec (w->data ); w->data = 0; } static SV * @@ -111,13 +144,14 @@ return rv; } +static SV *sv_events_cache; + static void e_cb (struct ev_watcher *w, int revents) { dSP; I32 mark = SP - PL_stack_base; - SV *sv_self, *sv_events, *sv_status = 0; - static SV *sv_events_cache; + SV *sv_self, *sv_events; sv_self = newRV_inc (w->self); /* w->self MUST be blessed by now */ @@ -134,15 +168,10 @@ 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; SvREFCNT_dec (sv_self); - SvREFCNT_dec (sv_status); if (sv_events_cache) SvREFCNT_dec (sv_events); @@ -154,14 +183,98 @@ PUSHMARK (SP); PUTBACK; call_sv (get_sv ("EV::DIED", 1), G_DISCARD | G_VOID | G_EVAL | G_KEEPERR); - SP = PL_stack_base + mark; PUTBACK; } + + SP = PL_stack_base + mark; + PUTBACK; +} + +static void +e_once_cb (int revents, void *arg) +{ + dSP; + I32 mark = SP - PL_stack_base; + SV *sv_events; + + if (sv_events_cache) + { + sv_events = sv_events_cache; sv_events_cache = 0; + SvIV_set (sv_events, revents); + } + else + sv_events = newSViv (revents); + + PUSHMARK (SP); + XPUSHs (sv_events); + + PUTBACK; + call_sv ((SV *)arg, G_DISCARD | G_VOID | G_EVAL); + + SvREFCNT_dec ((SV *)arg); + + if (sv_events_cache) + SvREFCNT_dec (sv_events); + else + sv_events_cache = sv_events; + + if (SvTRUE (ERRSV)) + { + PUSHMARK (SP); + PUTBACK; + call_sv (get_sv ("EV::DIED", 1), G_DISCARD | G_VOID | G_EVAL | G_KEEPERR); + } + + SP = PL_stack_base + mark; + PUTBACK; +} + +static ev_tstamp +e_periodic_cb (struct ev_periodic *w, ev_tstamp now) +{ + ev_tstamp retval; + int count; + dSP; + + ENTER; + SAVETMPS; + + PUSHMARK (SP); + EXTEND (SP, 2); + PUSHs (newRV_inc (w->self)); /* w->self MUST be blessed by now */ + PUSHs (newSVnv (now)); + + PUTBACK; + count = call_sv (w->fh, G_SCALAR | G_EVAL); + SPAGAIN; + + if (SvTRUE (ERRSV)) + { + PUSHMARK (SP); + PUTBACK; + call_sv (get_sv ("EV::DIED", 1), G_DISCARD | G_VOID | G_EVAL | G_KEEPERR); + SPAGAIN; + } + + if (count > 0) + { + retval = SvNV (TOPs); + + if (retval < now) + retval = now; + } + else + retval = now; + + FREETMPS; + LEAVE; + + return retval; } -#if 0 ///////////////////////////////////////////////////////////////////////////// // DNS +#ifndef _WIN32 static void dns_cb (int result, char type, int count, int ttl, void *addresses, void *arg) { @@ -227,7 +340,6 @@ BOOT: { - int i; HV *stash = gv_stashpv ("EV", 1); static const struct { @@ -235,6 +347,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) @@ -247,10 +362,17 @@ const_iv (EV, LOOP_ONESHOT) const_iv (EV, LOOP_NONBLOCK) + const_iv (EV, UNLOOP_ONE) + const_iv (EV, UNLOOP_ALL) - const_iv (EV, METHOD_NONE) - const_iv (EV, METHOD_SELECT) - const_iv (EV, METHOD_EPOLL) + const_iv (EV, BACKEND_SELECT) + const_iv (EV, BACKEND_POLL) + const_iv (EV, BACKEND_EPOLL) + const_iv (EV, BACKEND_KQUEUE) + const_iv (EV, BACKEND_DEVPOLL) + const_iv (EV, BACKEND_PORT) + const_iv (EV, FLAG_AUTO) + const_iv (EV, FLAG_NOENV) }; for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) @@ -275,9 +397,9 @@ 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.backend = ev_backend; + evapi.unloop = ev_unloop; evapi.time = ev_time; evapi.loop = ev_loop; evapi.once = ev_once; @@ -298,35 +420,28 @@ evapi.check_stop = ev_check_stop; evapi.child_start = ev_child_start; evapi.child_stop = ev_child_stop; + evapi.ref = ev_ref; + evapi.unref = ev_unref; sv_setiv (sv, (IV)&evapi); SvREADONLY_on (sv); } - - pthread_atfork (ev_fork_prepare, ev_fork_parent, ev_fork_child); +#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 +unsigned int ev_backend () NV ev_time () -void ev_init (int flags = 0) +unsigned int ev_default_loop (unsigned int flags = ev_supported_backends ()) 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: @@ -356,15 +471,20 @@ OUTPUT: RETVAL -struct ev_periodic *periodic (NV at, NV interval, SV *cb) +SV *periodic (NV at, NV interval, SV *reschedule_cb, SV *cb) ALIAS: periodic_ns = 1 INIT: CHECK_REPEAT (interval); CODE: - RETVAL = e_new (sizeof (struct ev_periodic), cb); - ev_periodic_set (RETVAL, at, interval); - if (!ix) ev_periodic_start (RETVAL); +{ + struct ev_periodic *w; + w = e_new (sizeof (struct ev_periodic), cb); + w->fh = SvTRUE (reschedule_cb) ? newSVsv (reschedule_cb) : 0; + ev_periodic_set (w, at, interval, w->fh ? e_periodic_cb : 0); + RETVAL = e_bless ((struct ev_watcher *)w, stash_periodic); + if (!ix) ev_periodic_start (w); +} OUTPUT: RETVAL @@ -410,14 +530,22 @@ struct ev_child *child (int pid, SV *cb) ALIAS: - check_ns = 1 + child_ns = 1 CODE: - RETVAL = e_new (sizeof (struct ev_check), cb); + RETVAL = e_new (sizeof (struct ev_child), cb); ev_child_set (RETVAL, pid); if (!ix) ev_child_start (RETVAL); OUTPUT: RETVAL +void once (SV *fh, int events, SV *timeout, SV *cb) + CODE: + ev_once ( + sv_fileno (fh), events, + SvOK (timeout) ? SvNV (timeout) : -1., + e_once_cb, + newSVsv (cb) + ); PROTOTYPES: DISABLE @@ -436,10 +564,51 @@ OUTPUT: RETVAL +SV *data (struct ev_watcher *w, SV *new_data = 0) + CODE: +{ + RETVAL = w->data ? newSVsv (w->data) : &PL_sv_undef; +} + OUTPUT: + RETVAL + 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) @@ -454,7 +623,7 @@ void set (struct ev_io *w, SV *fh, int events) CODE: { - int active = w->active; + int active = ev_is_active (w); int fd = sv_fileno (fh); CHECK_FD (fh, fd); @@ -473,7 +642,7 @@ if (items > 1) { - int active = w->active; + int active = ev_is_active (w); if (active) ev_io_stop (w); sv_setsv (w->fh, new_fh); @@ -485,14 +654,14 @@ 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; + int active = ev_is_active (w); if (active) ev_io_stop (w); ev_io_set (w, w->fd, new_events); @@ -514,18 +683,37 @@ 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) 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); + + ev_signal_set (w, signum); + + if (active) ev_signal_start (w); + } +} + OUTPUT: + RETVAL MODULE = EV PACKAGE = EV::Timer PREFIX = ev_timer_ @@ -549,7 +737,7 @@ CHECK_REPEAT (repeat); CODE: { - int active = w->active; + int active = ev_is_active (w); if (active) ev_timer_stop (w); ev_timer_set (w, after, repeat); if (active) ev_timer_start (w); @@ -563,19 +751,25 @@ void ev_periodic_stop (struct ev_periodic *w) +void ev_periodic_again (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.) +void set (struct ev_periodic *w, NV at, NV interval = 0., SV *reschedule_cb = &PL_sv_undef) INIT: CHECK_REPEAT (interval); CODE: { - int active = w->active; + int active = ev_is_active (w); if (active) ev_periodic_stop (w); - ev_periodic_set (w, at, interval); + + SvREFCNT_dec (w->fh); + w->fh = SvTRUE (reschedule_cb) ? newSVsv (reschedule_cb) : 0; + ev_periodic_set (w, at, interval, w->fh ? e_periodic_cb : 0); + if (active) ev_periodic_start (w); } @@ -626,19 +820,42 @@ void set (struct ev_child *w, int pid) CODE: { - int active = w->active; + 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->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 + + +int rstatus (struct ev_child *w) + ALIAS: + rpid = 1 CODE: - RETVAL = w->status; + RETVAL = ix ? w->rpid : w->rstatus; OUTPUT: RETVAL -#if 0 +#ifndef _WIN32 MODULE = EV PACKAGE = EV::DNS PREFIX = evdns_ @@ -719,7 +936,7 @@ int evdns_resolv_conf_parse (int flags, const char *filename) -#ifdef MS_WINDOWS +#ifdef _WIN32 int evdns_config_windows_nameservers () @@ -731,6 +948,7 @@ void evdns_search_ndots_set (int ndots) +#if 0 MODULE = EV PACKAGE = EV::HTTP PREFIX = evhttp_ @@ -772,6 +990,7 @@ #endif +#endif