--- cvsroot/EV/EV.xs 2007/11/01 11:11:39 1.32 +++ cvsroot/EV/EV.xs 2007/11/04 18:15:27 1.51 @@ -4,13 +4,17 @@ /*#include */ -#define TIMEOUT_NONE HUGE_VAL -#define EV_USE_EPOLL 1 - #define EV_PROTOTYPES 1 #include "EV/EVAPI.h" -#include "libev/ev.c" +#include "ev.c" +#include "event.c" +#define DNS_USE_GETTIMEOFDAY_FOR_ID 1 +#define HAVE_STRUCT_IN6_ADDR 1 +#undef HAVE_STRTOK_R +#undef strtok_r +#define strtok_r fake_strtok_r +#include "evdns.c" typedef int Signal; @@ -27,6 +31,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) { @@ -85,6 +95,15 @@ return (void *)w; } +static void * +e_destroy (void *w_) +{ + struct ev_watcher *w = 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) { @@ -125,9 +144,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; @@ -149,7 +165,6 @@ } } -#if 0 ///////////////////////////////////////////////////////////////////////////// // DNS @@ -201,7 +216,6 @@ LEAVE; } -#endif #define CHECK_REPEAT(repeat) if (repeat < 0.) \ croak (# repeat " value must be >= 0"); @@ -226,6 +240,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) @@ -239,9 +256,14 @@ 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; ) @@ -266,9 +288,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.method = ev_method; + evapi.unloop = ev_unloop; evapi.time = ev_time; evapi.loop = ev_loop; evapi.once = ev_once; @@ -293,29 +315,21 @@ sv_setiv (sv, (IV)&evapi); SvREADONLY_on (sv); } + + pthread_atfork (0, 0, ev_default_fork); } 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: @@ -401,7 +415,7 @@ ALIAS: check_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: @@ -429,6 +443,39 @@ 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) @@ -438,11 +485,12 @@ 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; + int active = ev_is_active (w); int fd = sv_fileno (fh); CHECK_FD (fh, fd); @@ -461,7 +509,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); @@ -473,14 +521,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); @@ -500,18 +548,40 @@ 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) ev_signal_stop (w); + ev_signal_set (w, signum); + if (active) ev_signal_start (w); } +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::Time MODULE = EV PACKAGE = EV::Timer PREFIX = ev_timer_ @@ -529,13 +599,14 @@ 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; + int active = ev_is_active (w); if (active) ev_timer_stop (w); ev_timer_set (w, after, repeat); if (active) ev_timer_start (w); @@ -552,15 +623,18 @@ 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; + int active = ev_is_active (w); if (active) ev_periodic_stop (w); + ev_periodic_set (w, at, interval); + if (active) ev_periodic_start (w); } @@ -573,6 +647,7 @@ void DESTROY (struct ev_idle *w) CODE: ev_idle_stop (w); + e_destroy (w); MODULE = EV PACKAGE = EV::Prepare PREFIX = ev_check_ @@ -583,6 +658,7 @@ void DESTROY (struct ev_prepare *w) CODE: ev_prepare_stop (w); + e_destroy (w); MODULE = EV PACKAGE = EV::Check PREFIX = ev_check_ @@ -593,6 +669,7 @@ void DESTROY (struct ev_check *w) CODE: ev_check_stop (w); + e_destroy (w); MODULE = EV PACKAGE = EV::Child PREFIX = ev_child_ @@ -603,23 +680,45 @@ 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; + 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 MODULE = EV PACKAGE = EV::DNS PREFIX = evdns_ @@ -712,6 +811,7 @@ void evdns_search_ndots_set (int ndots) +#if 0 MODULE = EV PACKAGE = EV::HTTP PREFIX = evhttp_