--- cvsroot/EV/EV.xs 2007/11/01 06:48:49 1.29 +++ cvsroot/EV/EV.xs 2007/11/02 22:03:00 1.42 @@ -4,13 +4,13 @@ /*#include */ -#define TIMEOUT_NONE HUGE_VAL -#define HAVE_EPOLL 1 - #define EV_PROTOTYPES 1 #include "EV/EVAPI.h" #include "libev/ev.c" +#include "libev/event.h" +#include "libev/event.c" +#include "libev/evdns.c" typedef int Signal; @@ -19,7 +19,6 @@ static HV *stash_watcher, *stash_io, - *stash_time, *stash_timer, *stash_periodic, *stash_signal, @@ -33,13 +32,15 @@ { 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 +60,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; @@ -84,6 +85,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) { @@ -148,7 +158,6 @@ } } -#if 0 ///////////////////////////////////////////////////////////////////////////// // DNS @@ -200,11 +209,13 @@ LEAVE; } -#endif #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 @@ -222,6 +233,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,9 +249,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; ) @@ -245,7 +264,6 @@ stash_watcher = gv_stashpv ("EV::Watcher" , 1); stash_io = gv_stashpv ("EV::Io" , 1); - stash_time = gv_stashpv ("EV::Time" , 1); stash_timer = gv_stashpv ("EV::Timer" , 1); stash_periodic = gv_stashpv ("EV::Periodic", 1); stash_signal = gv_stashpv ("EV::Signal" , 1); @@ -290,6 +308,8 @@ sv_setiv (sv, (IV)&evapi); SvREADONLY_on (sv); } + + pthread_atfork (ev_fork_prepare, ev_fork_parent, ev_fork_child); } NV ev_now () @@ -306,7 +326,7 @@ NV ev_time () -void ev_init (int flags = 0) +void ev_init (int methods = EVMETHOD_AUTO) void ev_loop (int flags = 0) @@ -318,10 +338,15 @@ 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); - ev_io_set (RETVAL, sv_fileno (RETVAL->fh), events); + ev_io_set (RETVAL, fd, events); if (!ix) ev_io_start (RETVAL); +} OUTPUT: RETVAL @@ -421,6 +446,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) @@ -430,15 +488,19 @@ 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); + if (active) ev_io_stop (w); sv_setsv (w->fh, fh); - ev_io_set (w, sv_fileno (w->fh), events); + ev_io_set (w, fd, events); if (active) ev_io_start (w); } @@ -450,7 +512,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); @@ -462,14 +524,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); @@ -489,18 +551,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_ @@ -518,13 +602,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); @@ -541,15 +626,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); } @@ -562,6 +650,7 @@ void DESTROY (struct ev_idle *w) CODE: ev_idle_stop (w); + e_destroy (w); MODULE = EV PACKAGE = EV::Prepare PREFIX = ev_check_ @@ -572,6 +661,7 @@ void DESTROY (struct ev_prepare *w) CODE: ev_prepare_stop (w); + e_destroy (w); MODULE = EV PACKAGE = EV::Check PREFIX = ev_check_ @@ -582,6 +672,7 @@ void DESTROY (struct ev_check *w) CODE: ev_check_stop (w); + e_destroy (w); MODULE = EV PACKAGE = EV::Child PREFIX = ev_child_ @@ -592,24 +683,44 @@ 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 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 status (struct ev_child *w) CODE: RETVAL = w->status; OUTPUT: RETVAL -#if 0 - MODULE = EV PACKAGE = EV::DNS PREFIX = evdns_ BOOT: @@ -701,6 +812,7 @@ void evdns_search_ndots_set (int ndots) +#if 0 MODULE = EV PACKAGE = EV::HTTP PREFIX = evhttp_