--- cvsroot/EV/EV.xs 2007/12/03 13:41:24 1.86 +++ cvsroot/EV/EV.xs 2009/07/19 21:59:55 1.132 @@ -2,15 +2,24 @@ #include "perl.h" #include "XSUB.h" -/*#include */ - -#define EV_PROTOTYPES 1 -#include "EV/EVAPI.h" - /* fix perl api breakage */ #undef signal #undef sigaction +#include "schmorp.h" + +/* old API compatibility */ +static int +sv_fileno (SV *fh) +{ + return s_fileno (fh, 0); +} + +#define EV_PROTOTYPES 1 +#define EV_USE_NANOSLEEP EV_USE_MONOTONIC +#define EV_H +#include "EV/EVAPI.h" + #define EV_SELECT_IS_WINSOCKET 0 #ifdef _WIN32 # define EV_SELECT_USE_FD_SET 0 @@ -19,49 +28,82 @@ #endif /* due to bugs in OS X we have to use libev/ explicitly here */ #include "libev/ev.c" -#include "event.c" #ifndef _WIN32 # include #endif +#define e_loop(w) INT2PTR (struct ev_loop *, SvIVX ((w)->loop)) + #define WFLAG_KEEPALIVE 1 +#define WFLAG_UNREFED 2 /* has been unref'ed */ #define UNREF(w) \ - if (!((w)->flags & WFLAG_KEEPALIVE) \ - && !ev_is_active (w)) \ - ev_unref (); + if (!((w)->e_flags & (WFLAG_KEEPALIVE | WFLAG_UNREFED)) \ + && ev_is_active (w)) \ + { \ + ev_unref (e_loop (w)); \ + (w)->e_flags |= WFLAG_UNREFED; \ + } #define REF(w) \ - if (!((w)->flags & WFLAG_KEEPALIVE) \ - && ev_is_active (w)) \ - ev_ref (); + if ((w)->e_flags & WFLAG_UNREFED) \ + { \ + (w)->e_flags &= ~WFLAG_UNREFED; \ + ev_ref (e_loop (w)); \ + } #define START(type,w) \ do { \ + ev_ ## type ## _start (e_loop (w), w); \ UNREF (w); \ - ev_ ## type ## _start (w); \ } while (0) #define STOP(type,w) \ do { \ REF (w); \ - ev_ ## type ## _stop (w); \ + ev_ ## type ## _stop (e_loop (w), w); \ } while (0) #define RESET(type,w,seta) \ - do { \ - int active = ev_is_active (w); \ - if (active) STOP (type, w); \ - ev_ ## type ## _set seta; \ - if (active) START (type, w); \ - } while (0) + do { \ + int active = ev_is_active (w); \ + if (active) STOP (type, w); \ + ev_ ## type ## _set seta; \ + if (active) START (type, w); \ + } while (0) typedef int Signal; +/* horrible... */ +#define CHECK_SIGNAL_CAN_START(w) \ + do { \ + /* dive into the internals of libev to avoid aborting in libev */ \ + if (signals [(w)->signum - 1].loop \ + && signals [(w)->signum - 1].loop != e_loop (w)) \ + croak ("unable to start signal watcher, signal %d already registered in another loop", w->signum); \ + } while (0) + +#define START_SIGNAL(w) \ + do { \ + CHECK_SIGNAL_CAN_START (w); \ + START (signal, w); \ + } while (0) \ + +#define RESET_SIGNAL(w,seta) \ + do { \ + int active = ev_is_active (w); \ + if (active) STOP (signal, w); \ + ev_ ## signal ## _set seta; \ + if (active) START_SIGNAL (w); \ + } while (0) + +static SV *default_loop_sv; + static struct EVAPI evapi; static HV + *stash_loop, *stash_watcher, *stash_io, *stash_timer, @@ -73,58 +115,18 @@ *stash_prepare, *stash_check, *stash_embed, - *stash_fork; - -#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 Signal -sv_signum (SV *sig) -{ - Signal signum; - - SvGETMAGIC (sig); - - for (signum = 1; signum < SIG_SIZE; ++signum) - if (strEQ (SvPV_nolen (sig), PL_sig_name [signum])) - return signum; - - signum = SvIV (sig); - - if (signum > 0 && signum < SIG_SIZE) - return signum; - - return -1; -} + *stash_fork, + *stash_async; ///////////////////////////////////////////////////////////////////////////// // Event -static void e_cb (ev_watcher *w, int revents); - -static int -sv_fileno (SV *fh) -{ - SvGETMAGIC (fh); - - if (SvROK (fh)) - fh = SvRV (fh); - - if (SvTYPE (fh) == SVt_PVGV) - return PerlIO_fileno (IoIFP (sv_2io (fh))); - - if (SvOK (fh) && (SvIV (fh) >= 0) && (SvIV (fh) < 0x7fffffffL)) - return SvIV (fh); - - return -1; -} +static void e_cb (EV_P_ ev_watcher *w, int revents); static void * -e_new (int size, SV *cb_sv) +e_new (int size, SV *cb_sv, SV *loop) { + SV *cv = cb_sv ? s_get_cv_croak (cb_sv) : 0; ev_watcher *w; SV *self = NEWSV (0, size); SvPOK_only (self); @@ -132,13 +134,14 @@ w = (ev_watcher *)SvPVX (self); - ev_init (w, e_cb); + ev_init (w, cv ? e_cb : 0); - w->flags = WFLAG_KEEPALIVE; - w->data = 0; - w->fh = 0; - w->cb_sv = newSVsv (cb_sv); - w->self = self; + w->loop = SvREFCNT_inc (SvRV (loop)); + w->e_flags = WFLAG_KEEPALIVE; + w->data = 0; + w->fh = 0; + w->cb_sv = SvREFCNT_inc (cv); + w->self = self; return (void *)w; } @@ -148,6 +151,7 @@ { ev_watcher *w = (ev_watcher *)w_; + SvREFCNT_dec (w->loop ); w->loop = 0; SvREFCNT_dec (w->fh ); w->fh = 0; SvREFCNT_dec (w->cb_sv); w->cb_sv = 0; SvREFCNT_dec (w->data ); w->data = 0; @@ -170,24 +174,41 @@ return rv; } -static SV *sv_events_cache; +static SV *sv_self_cache, *sv_events_cache; static void -e_cb (ev_watcher *w, int revents) +e_cb (EV_P_ ev_watcher *w, int revents) { dSP; I32 mark = SP - PL_stack_base; SV *sv_self, *sv_events; - sv_self = newRV_inc (w->self); /* w->self MUST be blessed by now */ + /* libev might have stopped the watcher */ + if (expect_false (w->e_flags & WFLAG_UNREFED) + && !ev_is_active (w)) + REF (w); - if (sv_events_cache) + if (expect_true (sv_self_cache)) + { + sv_self = sv_self_cache; sv_self_cache = 0; + SvRV_set (sv_self, SvREFCNT_inc_NN (w->self)); + } + else + { + sv_self = newRV_inc (w->self); /* w->self MUST be blessed by now */ + SvREADONLY_on (sv_self); + } + + if (expect_true (sv_events_cache)) { sv_events = sv_events_cache; sv_events_cache = 0; SvIV_set (sv_events, revents); } else - sv_events = newSViv (revents); + { + sv_events = newSViv (revents); + SvREADONLY_on (sv_events); + } PUSHMARK (SP); EXTEND (SP, 2); @@ -197,14 +218,21 @@ PUTBACK; call_sv (w->cb_sv, G_DISCARD | G_VOID | G_EVAL); - SvREFCNT_dec (sv_self); + if (expect_false (SvREFCNT (sv_self) != 1 || sv_self_cache)) + SvREFCNT_dec (sv_self); + else + { + SvREFCNT_dec (SvRV (sv_self)); + SvRV_set (sv_self, &PL_sv_undef); + sv_self_cache = sv_self; + } - if (sv_events_cache) + if (expect_false (SvREFCNT (sv_events) != 1 || sv_events_cache)) SvREFCNT_dec (sv_events); else sv_events_cache = sv_events; - if (SvTRUE (ERRSV)) + if (expect_false (SvTRUE (ERRSV))) { SPAGAIN; PUSHMARK (SP); @@ -329,16 +357,28 @@ const_iv (EV_, UNDEF) const_iv (EV_, NONE) - const_iv (EV_, TIMEOUT) const_iv (EV_, READ) const_iv (EV_, WRITE) + const_iv (EV_, IO) + const_iv (EV_, TIMEOUT) + const_iv (EV_, TIMER) + const_iv (EV_, PERIODIC) const_iv (EV_, SIGNAL) + const_iv (EV_, CHILD) + const_iv (EV_, STAT) const_iv (EV_, IDLE) + const_iv (EV_, PREPARE) const_iv (EV_, CHECK) + const_iv (EV_, EMBED) + const_iv (EV_, FORK) + const_iv (EV_, ASYNC) + const_iv (EV_, CUSTOM) const_iv (EV_, ERROR) - const_iv (EV, LOOP_ONESHOT) const_iv (EV, LOOP_NONBLOCK) + const_iv (EV, LOOP_ONESHOT) + + const_iv (EV, UNLOOP_CANCEL) const_iv (EV, UNLOOP_ONE) const_iv (EV, UNLOOP_ALL) @@ -351,11 +391,15 @@ const_iv (EV, FLAG_AUTO) const_iv (EV, FLAG_NOENV) const_iv (EV, FLAG_FORKCHECK) + + const_iv (EV_, VERSION_MAJOR) + const_iv (EV_, VERSION_MINOR) }; for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); + stash_loop = gv_stashpv ("EV::Loop" , 1); stash_watcher = gv_stashpv ("EV::Watcher" , 1); stash_io = gv_stashpv ("EV::IO" , 1); stash_timer = gv_stashpv ("EV::Timer" , 1); @@ -367,44 +411,75 @@ stash_child = gv_stashpv ("EV::Child" , 1); stash_embed = gv_stashpv ("EV::Embed" , 1); stash_stat = gv_stashpv ("EV::Stat" , 1); + stash_fork = gv_stashpv ("EV::Fork" , 1); + stash_async = gv_stashpv ("EV::Async" , 1); { SV *sv = perl_get_sv ("EV::API", TRUE); perl_get_sv ("EV::API", TRUE); /* silence 5.10 warning */ /* the poor man's shared library emulator */ - evapi.ver = EV_API_VERSION; - evapi.rev = EV_API_REVISION; - evapi.sv_fileno = sv_fileno; - evapi.sv_signum = sv_signum; - evapi.now = ev_now; - evapi.backend = ev_backend; - evapi.unloop = ev_unloop; - evapi.ref = ev_ref; - evapi.unref = ev_unref; - evapi.time = ev_time; - evapi.loop = ev_loop; - evapi.once = ev_once; - 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; - evapi.stat_start = ev_stat_start; - evapi.stat_stop = ev_stat_stop; - evapi.stat_stat = ev_stat_stat; + evapi.ver = EV_API_VERSION; + evapi.rev = EV_API_REVISION; + evapi.sv_fileno = sv_fileno; + evapi.sv_signum = s_signum; + evapi.supported_backends = ev_supported_backends (); + evapi.recommended_backends = ev_recommended_backends (); + evapi.embeddable_backends = ev_embeddable_backends (); + evapi.time_ = ev_time; + evapi.sleep_ = ev_sleep; + evapi.loop_new = ev_loop_new; + evapi.loop_destroy = ev_loop_destroy; + evapi.loop_fork = ev_loop_fork; + evapi.loop_count = ev_loop_count; + evapi.loop_depth = ev_loop_depth; + evapi.set_userdata = ev_set_userdata; + evapi.userdata = ev_userdata; + evapi.now = ev_now; + evapi.now_update = ev_now_update; + evapi.suspend = ev_suspend; + evapi.resume = ev_resume; + evapi.backend = ev_backend; + evapi.unloop = ev_unloop; + evapi.invoke_pending = ev_invoke_pending; + evapi.pending_count = ev_pending_count; + evapi.set_loop_release_cb = ev_set_loop_release_cb; + evapi.set_invoke_pending_cb= ev_set_invoke_pending_cb; + evapi.ref = ev_ref; + evapi.unref = ev_unref; + evapi.loop = ev_loop; + evapi.once = ev_once; + 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.timer_remaining = ev_timer_remaining; + 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; + evapi.stat_start = ev_stat_start; + evapi.stat_stop = ev_stat_stop; + evapi.stat_stat = ev_stat_stat; + evapi.embed_start = ev_embed_start; + evapi.embed_stop = ev_embed_stop; + evapi.embed_sweep = ev_embed_sweep; + evapi.fork_start = ev_fork_start; + evapi.fork_stop = ev_fork_stop; + evapi.async_start = ev_async_start; + evapi.async_stop = ev_async_stop; + evapi.async_send = ev_async_send; + evapi.clear_pending = ev_clear_pending; + evapi.invoke = ev_invoke; sv_setiv (sv, (IV)&evapi); SvREADONLY_on (sv); @@ -414,29 +489,103 @@ #endif } -NV ev_now () +SV *ev_default_loop (unsigned int flags = 0) + CODE: +{ + if (!default_loop_sv) + { + evapi.default_loop = ev_default_loop (flags); -unsigned int ev_backend () + if (!evapi.default_loop) + XSRETURN_UNDEF; + + default_loop_sv = sv_bless (newRV_noinc (newSViv (PTR2IV (evapi.default_loop))), stash_loop); + } + + RETVAL = newSVsv (default_loop_sv); +} + OUTPUT: + RETVAL + +void ev_default_destroy () + CODE: + ev_default_destroy (); + SvREFCNT_dec (default_loop_sv); + default_loop_sv = 0; + +unsigned int ev_supported_backends () + +unsigned int ev_recommended_backends () + +unsigned int ev_embeddable_backends () + +void ev_sleep (NV interval) NV ev_time () -unsigned int ev_default_loop (unsigned int flags = ev_supported_backends ()) +NV ev_now () + C_ARGS: evapi.default_loop + +void ev_now_update () + C_ARGS: evapi.default_loop + +void ev_suspend () + C_ARGS: evapi.default_loop + +void ev_resume () + C_ARGS: evapi.default_loop + +unsigned int ev_backend () + C_ARGS: evapi.default_loop + +void ev_loop_verify () + C_ARGS: evapi.default_loop unsigned int ev_loop_count () + C_ARGS: evapi.default_loop + +unsigned int ev_loop_depth () + C_ARGS: evapi.default_loop + +void ev_set_io_collect_interval (NV interval) + C_ARGS: evapi.default_loop, interval + +void ev_set_timeout_collect_interval (NV interval) + C_ARGS: evapi.default_loop, interval void ev_loop (int flags = 0) + C_ARGS: evapi.default_loop, flags + +void ev_unloop (int how = EVUNLOOP_ONE) + C_ARGS: evapi.default_loop, how + +void ev_feed_fd_event (int fd, int revents = EV_NONE) + C_ARGS: evapi.default_loop, fd, revents + +void ev_feed_signal_event (SV *signal) + CODE: +{ + Signal signum = s_signum (signal); + CHECK_SIG (signal, signum); + + ev_feed_signal_event (evapi.default_loop, signum); +} + +unsigned int ev_pending_count () + C_ARGS: evapi.default_loop -void ev_unloop (int how = 1) +void ev_invoke_pending () + C_ARGS: evapi.default_loop ev_io *io (SV *fh, int events, SV *cb) ALIAS: io_ns = 1 CODE: { - int fd = sv_fileno (fh); + int fd = s_fileno (fh, events & EV_WRITE); CHECK_FD (fh, fd); - RETVAL = e_new (sizeof (ev_io), cb); + RETVAL = e_new (sizeof (ev_io), cb, default_loop_sv); RETVAL->fh = newSVsv (fh); ev_io_set (RETVAL, fd, events); if (!ix) START (io, RETVAL); @@ -450,7 +599,7 @@ INIT: CHECK_REPEAT (repeat); CODE: - RETVAL = e_new (sizeof (ev_timer), cb); + RETVAL = e_new (sizeof (ev_timer), cb, default_loop_sv); ev_timer_set (RETVAL, after, repeat); if (!ix) START (timer, RETVAL); OUTPUT: @@ -464,7 +613,7 @@ CODE: { ev_periodic *w; - w = e_new (sizeof (ev_periodic), cb); + w = e_new (sizeof (ev_periodic), cb, default_loop_sv); w->fh = SvTRUE (reschedule_cb) ? newSVsv (reschedule_cb) : 0; ev_periodic_set (w, at, interval, w->fh ? e_periodic_cb : 0); RETVAL = e_bless ((ev_watcher *)w, stash_periodic); @@ -478,12 +627,12 @@ signal_ns = 1 CODE: { - Signal signum = sv_signum (signal); + Signal signum = s_signum (signal); CHECK_SIG (signal, signum); - RETVAL = e_new (sizeof (ev_signal), cb); + RETVAL = e_new (sizeof (ev_signal), cb, default_loop_sv); ev_signal_set (RETVAL, signum); - if (!ix) START (signal, RETVAL); + if (!ix) START_SIGNAL (RETVAL); } OUTPUT: RETVAL @@ -492,7 +641,7 @@ ALIAS: idle_ns = 1 CODE: - RETVAL = e_new (sizeof (ev_idle), cb); + RETVAL = e_new (sizeof (ev_idle), cb, default_loop_sv); ev_idle_set (RETVAL); if (!ix) START (idle, RETVAL); OUTPUT: @@ -502,7 +651,7 @@ ALIAS: prepare_ns = 1 CODE: - RETVAL = e_new (sizeof (ev_prepare), cb); + RETVAL = e_new (sizeof (ev_prepare), cb, default_loop_sv); ev_prepare_set (RETVAL); if (!ix) START (prepare, RETVAL); OUTPUT: @@ -512,18 +661,28 @@ ALIAS: check_ns = 1 CODE: - RETVAL = e_new (sizeof (ev_check), cb); + RETVAL = e_new (sizeof (ev_check), cb, default_loop_sv); ev_check_set (RETVAL); if (!ix) START (check, RETVAL); OUTPUT: RETVAL -ev_child *child (int pid, SV *cb) +ev_fork *fork (SV *cb) + ALIAS: + fork_ns = 1 + CODE: + RETVAL = e_new (sizeof (ev_fork), cb, default_loop_sv); + ev_fork_set (RETVAL); + if (!ix) START (fork, RETVAL); + OUTPUT: + RETVAL + +ev_child *child (int pid, int trace, SV *cb) ALIAS: child_ns = 1 CODE: - RETVAL = e_new (sizeof (ev_child), cb); - ev_child_set (RETVAL, pid); + RETVAL = e_new (sizeof (ev_child), cb, default_loop_sv); + ev_child_set (RETVAL, pid, trace); if (!ix) START (child, RETVAL); OUTPUT: RETVAL @@ -532,17 +691,44 @@ ALIAS: stat_ns = 1 CODE: - RETVAL = e_new (sizeof (ev_stat), cb); + RETVAL = e_new (sizeof (ev_stat), cb, default_loop_sv); RETVAL->fh = newSVsv (path); ev_stat_set (RETVAL, SvPVbyte_nolen (RETVAL->fh), interval); if (!ix) START (stat, RETVAL); OUTPUT: RETVAL +ev_embed *embed (struct ev_loop *loop, SV *cb = 0) + ALIAS: + embed_ns = 1 + CODE: +{ + if (!(ev_backend (loop) & ev_embeddable_backends ())) + croak ("passed loop is not embeddable via EV::embed,"); + + RETVAL = e_new (sizeof (ev_embed), cb, default_loop_sv); + RETVAL->fh = newSVsv (ST (0)); + ev_embed_set (RETVAL, loop); + if (!ix) START (embed, RETVAL); +} + OUTPUT: + RETVAL + +ev_async *async (SV *cb) + ALIAS: + async_ns = 1 + CODE: + RETVAL = e_new (sizeof (ev_async), cb, default_loop_sv); + ev_async_set (RETVAL); + if (!ix) START (async, RETVAL); + OUTPUT: + RETVAL + void once (SV *fh, int events, SV *timeout, SV *cb) CODE: ev_once ( - sv_fileno (fh), events, + evapi.default_loop, + s_fileno (fh, events & EV_WRITE), events, SvOK (timeout) ? SvNV (timeout) : -1., e_once_cb, newSVsv (cb) @@ -556,16 +742,25 @@ int ev_is_pending (ev_watcher *w) +void ev_invoke (ev_watcher *w, int revents = EV_NONE) + C_ARGS: e_loop (w), w, revents + +int ev_clear_pending (ev_watcher *w) + C_ARGS: e_loop (w), w + +void ev_feed_event (ev_watcher *w, int revents = EV_NONE) + C_ARGS: e_loop (w), w, revents + int keepalive (ev_watcher *w, int new_value = 0) CODE: { - RETVAL = w->flags & WFLAG_KEEPALIVE; + RETVAL = w->e_flags & WFLAG_KEEPALIVE; new_value = new_value ? WFLAG_KEEPALIVE : 0; - if (items > 1 && ((new_value ^ w->flags) & WFLAG_KEEPALIVE)) + if (items > 1 && ((new_value ^ w->e_flags) & WFLAG_KEEPALIVE)) { + w->e_flags = (w->e_flags & ~WFLAG_KEEPALIVE) | new_value; REF (w); - w->flags = (w->flags & ~WFLAG_KEEPALIVE) | new_value; UNREF (w); } } @@ -575,10 +770,14 @@ SV *cb (ev_watcher *w, SV *new_cb = 0) CODE: { - RETVAL = newSVsv (w->cb_sv); - if (items > 1) - sv_setsv (w->cb_sv, new_cb); + { + new_cb = s_get_cv_croak (new_cb); + RETVAL = newRV_noinc (w->cb_sv); + w->cb_sv = SvREFCNT_inc (new_cb); + } + else + RETVAL = newRV_inc (w->cb_sv); } OUTPUT: RETVAL @@ -597,9 +796,11 @@ OUTPUT: RETVAL -void trigger (ev_watcher *w, int revents = EV_NONE) +SV *loop (ev_watcher *w) CODE: - w->cb (w, revents); + RETVAL = newRV_inc (w->loop); + OUTPUT: + RETVAL int priority (ev_watcher *w, int new_priority = 0) CODE: @@ -610,14 +811,12 @@ { 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)); + PUTBACK; call_method ("stop", G_DISCARD | G_VOID); } @@ -627,6 +826,7 @@ { PUSHMARK (SP); XPUSHs (ST (0)); + PUTBACK; call_method ("start", G_DISCARD | G_VOID); } } @@ -652,7 +852,7 @@ void set (ev_io *w, SV *fh, int events) CODE: { - int fd = sv_fileno (fh); + int fd = s_fileno (fh, events & EV_WRITE); CHECK_FD (fh, fd); sv_setsv (w->fh, fh); @@ -664,7 +864,7 @@ { if (items > 1) { - int fd = sv_fileno (new_fh); + int fd = s_fileno (new_fh, w->events & EV_WRITE); CHECK_FD (new_fh, fd); RETVAL = w->fh; @@ -693,7 +893,7 @@ void ev_signal_start (ev_signal *w) CODE: - START (signal, w); + START_SIGNAL (w); void ev_signal_stop (ev_signal *w) CODE: @@ -707,10 +907,10 @@ void set (ev_signal *w, SV *signal) CODE: { - Signal signum = sv_signum (signal); + Signal signum = s_signum (signal); CHECK_SIG (signal, signum); - RESET (signal, w, (w, signum)); + RESET_SIGNAL (w, (w, signum)); } int signal (ev_signal *w, SV *new_signal = 0) @@ -720,10 +920,10 @@ if (items > 1) { - Signal signum = sv_signum (new_signal); + Signal signum = s_signum (new_signal); CHECK_SIG (new_signal, signum); - RESET (signal, w, (w, signum)); + RESET_SIGNAL (w, (w, signum)); } } OUTPUT: @@ -745,10 +945,12 @@ INIT: CHECK_REPEAT (w->repeat); CODE: - REF (w); - ev_timer_again (w); + ev_timer_again (e_loop (w), w); UNREF (w); +NV ev_timer_remaining (ev_timer *w) + C_ARGS: e_loop (w), w + void DESTROY (ev_timer *w) CODE: STOP (timer, w); @@ -774,8 +976,7 @@ void ev_periodic_again (ev_periodic *w) CODE: - REF (w); - ev_periodic_again (w); + ev_periodic_again (e_loop (w), w); UNREF (w); void DESTROY (ev_periodic *w) @@ -794,6 +995,12 @@ RESET (periodic, w, (w, at, interval, w->fh ? e_periodic_cb : 0)); } +NV at (ev_periodic *w) + CODE: + RETVAL = ev_periodic_at (w); + OUTPUT: + RETVAL + MODULE = EV PACKAGE = EV::Idle PREFIX = ev_idle_ void ev_idle_start (ev_idle *w) @@ -809,7 +1016,7 @@ STOP (idle, w); e_destroy (w); -MODULE = EV PACKAGE = EV::Prepare PREFIX = ev_check_ +MODULE = EV PACKAGE = EV::Prepare PREFIX = ev_prepare_ void ev_prepare_start (ev_prepare *w) CODE: @@ -839,6 +1046,21 @@ STOP (check, w); e_destroy (w); +MODULE = EV PACKAGE = EV::Fork PREFIX = ev_fork_ + +void ev_fork_start (ev_fork *w) + CODE: + START (fork, w); + +void ev_fork_stop (ev_fork *w) + CODE: + STOP (fork, w); + +void DESTROY (ev_fork *w) + CODE: + STOP (fork, w); + e_destroy (w); + MODULE = EV PACKAGE = EV::Child PREFIX = ev_child_ void ev_child_start (ev_child *w) @@ -854,27 +1076,18 @@ STOP (child, w); e_destroy (w); -void set (ev_child *w, int pid) - CODE: - RESET (child, w, (w, pid)); - -int pid (ev_child *w, int new_pid = 0) +void set (ev_child *w, int pid, int trace) CODE: -{ - RETVAL = w->pid; - - if (items > 1) - RESET (child, w, (w, new_pid)); -} - OUTPUT: - RETVAL - + RESET (child, w, (w, pid, trace)); -int rstatus (ev_child *w) +int pid (ev_child *w) ALIAS: - rpid = 1 + rpid = 1 + rstatus = 2 CODE: - RETVAL = ix ? w->rpid : w->rstatus; + RETVAL = ix == 0 ? w->pid + : ix == 1 ? w->rpid + : w->rstatus; OUTPUT: RETVAL @@ -935,7 +1148,7 @@ ev_statdata *s = ix ? &w->attr : &w->prev; if (ix == 1) - ev_stat_stat (w); + ev_stat_stat (e_loop (w), w); else if (!s->st_nlink) errno = ENOENT; @@ -972,52 +1185,280 @@ } } -#if 0 +MODULE = EV PACKAGE = EV::Embed PREFIX = ev_embed_ -MODULE = EV PACKAGE = EV::HTTP PREFIX = evhttp_ +void ev_embed_start (ev_embed *w) + CODE: + START (embed, w); -BOOT: +void ev_embed_stop (ev_embed *w) + CODE: + STOP (embed, w); + +void DESTROY (ev_embed *w) + CODE: + STOP (embed, w); + e_destroy (w); + +void set (ev_embed *w, struct ev_loop *loop) + CODE: +{ + sv_setsv (w->fh, ST (1)); + RESET (embed, w, (w, loop)); +} + +SV *other (ev_embed *w) + CODE: + RETVAL = newSVsv (w->fh); + OUTPUT: + RETVAL + +void ev_embed_sweep (ev_embed *w) + C_ARGS: e_loop (w), w + +MODULE = EV PACKAGE = EV::Async PREFIX = ev_async_ + +void ev_async_start (ev_async *w) + CODE: + START (async, w); + +void ev_async_stop (ev_async *w) + CODE: + STOP (async, w); + +void DESTROY (ev_async *w) + CODE: + STOP (async, w); + e_destroy (w); + +void ev_async_send (ev_async *w) + C_ARGS: e_loop (w), w + +SV *ev_async_async_pending (ev_async *w) + CODE: + RETVAL = boolSV (ev_async_pending (w)); + OUTPUT: + RETVAL + +MODULE = EV PACKAGE = EV::Loop PREFIX = ev_ + +SV *new (SV *klass, unsigned int flags = 0) + CODE: { - HV *stash = gv_stashpv ("EV::HTTP", 1); + struct ev_loop *loop = ev_loop_new (flags); - static const struct { - const char *name; - IV iv; - } *civ, const_iv[] = { -# define const_iv(pfx, name) { # name, (IV) pfx ## name }, - const_iv (HTTP_, OK) - const_iv (HTTP_, NOCONTENT) - const_iv (HTTP_, MOVEPERM) - const_iv (HTTP_, MOVETEMP) - const_iv (HTTP_, NOTMODIFIED) - const_iv (HTTP_, BADREQUEST) - const_iv (HTTP_, NOTFOUND) - const_iv (HTTP_, SERVUNAVAIL) - const_iv (EVHTTP_, REQ_OWN_CONNECTION) - const_iv (EVHTTP_, PROXY_REQUEST) - const_iv (EVHTTP_, REQ_GET) - const_iv (EVHTTP_, REQ_POST) - const_iv (EVHTTP_, REQ_HEAD) - const_iv (EVHTTP_, REQUEST) - const_iv (EVHTTP_, RESPONSE) - }; + if (!loop) + XSRETURN_UNDEF; - for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) - newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); + RETVAL = sv_bless (newRV_noinc (newSViv (PTR2IV (loop))), stash_loop); } + OUTPUT: + RETVAL + +void DESTROY (struct ev_loop *loop) + CODE: + if (loop != evapi.default_loop) /* global destruction sucks */ + ev_loop_destroy (loop); + +void ev_loop_fork (struct ev_loop *loop) + +void ev_loop_verify (struct ev_loop *loop) + +NV ev_now (struct ev_loop *loop) + +void ev_now_update (struct ev_loop *loop) + +void ev_suspend (struct ev_loop *loop) + +void ev_resume (struct ev_loop *loop) + +void ev_set_io_collect_interval (struct ev_loop *loop, NV interval) -MODULE = EV PACKAGE = EV::HTTP::Request PREFIX = evhttp_request_ +void ev_set_timeout_collect_interval (struct ev_loop *loop, NV interval) -#HttpRequest new (SV *klass, SV *cb) +unsigned int ev_backend (struct ev_loop *loop) -#void DESTROY (struct evhttp_request *req); +unsigned int ev_loop_count (struct ev_loop *loop) + +unsigned int ev_loop_depth (struct ev_loop *loop) + +void ev_loop (struct ev_loop *loop, int flags = 0) + +void ev_unloop (struct ev_loop *loop, int how = 1) + +void ev_feed_fd_event (struct ev_loop *loop, int fd, int revents = EV_NONE) + +unsigned int ev_pending_count (struct ev_loop *loop) + +void ev_invoke_pending (struct ev_loop *loop) + +#if 0 + +void ev_feed_signal_event (struct ev_loop *loop, SV *signal) + CODE: +{ + Signal signum = s_signum (signal); + CHECK_SIG (signal, signum); + + ev_feed_signal_event (loop, signum); +} #endif +ev_io *io (struct ev_loop *loop, SV *fh, int events, SV *cb) + ALIAS: + io_ns = 1 + CODE: +{ + int fd = s_fileno (fh, events & EV_WRITE); + CHECK_FD (fh, fd); + + RETVAL = e_new (sizeof (ev_io), cb, ST (0)); + RETVAL->fh = newSVsv (fh); + ev_io_set (RETVAL, fd, events); + if (!ix) START (io, RETVAL); +} + OUTPUT: + RETVAL + +ev_timer *timer (struct ev_loop *loop, NV after, NV repeat, SV *cb) + ALIAS: + timer_ns = 1 + INIT: + CHECK_REPEAT (repeat); + CODE: + RETVAL = e_new (sizeof (ev_timer), cb, ST (0)); + ev_timer_set (RETVAL, after, repeat); + if (!ix) START (timer, RETVAL); + OUTPUT: + RETVAL + +SV *periodic (struct ev_loop *loop, NV at, NV interval, SV *reschedule_cb, SV *cb) + ALIAS: + periodic_ns = 1 + INIT: + CHECK_REPEAT (interval); + CODE: +{ + ev_periodic *w; + w = e_new (sizeof (ev_periodic), cb, ST (0)); + w->fh = SvTRUE (reschedule_cb) ? newSVsv (reschedule_cb) : 0; + ev_periodic_set (w, at, interval, w->fh ? e_periodic_cb : 0); + RETVAL = e_bless ((ev_watcher *)w, stash_periodic); + if (!ix) START (periodic, w); +} + OUTPUT: + RETVAL + +ev_signal *signal (struct ev_loop *loop, SV *signal, SV *cb) + ALIAS: + signal_ns = 1 + CODE: +{ + Signal signum = s_signum (signal); + CHECK_SIG (signal, signum); + RETVAL = e_new (sizeof (ev_signal), cb, ST (0)); + ev_signal_set (RETVAL, signum); + if (!ix) START_SIGNAL (RETVAL); +} + OUTPUT: + RETVAL +ev_idle *idle (struct ev_loop *loop, SV *cb) + ALIAS: + idle_ns = 1 + CODE: + RETVAL = e_new (sizeof (ev_idle), cb, ST (0)); + ev_idle_set (RETVAL); + if (!ix) START (idle, RETVAL); + OUTPUT: + RETVAL +ev_prepare *prepare (struct ev_loop *loop, SV *cb) + ALIAS: + prepare_ns = 1 + CODE: + RETVAL = e_new (sizeof (ev_prepare), cb, ST (0)); + ev_prepare_set (RETVAL); + if (!ix) START (prepare, RETVAL); + OUTPUT: + RETVAL +ev_check *check (struct ev_loop *loop, SV *cb) + ALIAS: + check_ns = 1 + CODE: + RETVAL = e_new (sizeof (ev_check), cb, ST (0)); + ev_check_set (RETVAL); + if (!ix) START (check, RETVAL); + OUTPUT: + RETVAL + +ev_fork *fork (struct ev_loop *loop, SV *cb) + ALIAS: + fork_ns = 1 + CODE: + RETVAL = e_new (sizeof (ev_fork), cb, ST (0)); + ev_fork_set (RETVAL); + if (!ix) START (fork, RETVAL); + OUTPUT: + RETVAL + +ev_child *child (struct ev_loop *loop, int pid, int trace, SV *cb) + ALIAS: + child_ns = 1 + CODE: + RETVAL = e_new (sizeof (ev_child), cb, ST (0)); + ev_child_set (RETVAL, pid, trace); + if (!ix) START (child, RETVAL); + OUTPUT: + RETVAL + +ev_stat *stat (struct ev_loop *loop, SV *path, NV interval, SV *cb) + ALIAS: + stat_ns = 1 + CODE: + RETVAL = e_new (sizeof (ev_stat), cb, ST (0)); + RETVAL->fh = newSVsv (path); + ev_stat_set (RETVAL, SvPVbyte_nolen (RETVAL->fh), interval); + if (!ix) START (stat, RETVAL); + OUTPUT: + RETVAL + +ev_embed *embed (struct ev_loop *loop, struct ev_loop *other, SV *cb = 0) + ALIAS: + embed_ns = 1 + CODE: +{ + if (!(ev_backend (other) & ev_embeddable_backends ())) + croak ("passed loop is not embeddable via EV::embed,"); + + RETVAL = e_new (sizeof (ev_embed), cb, ST (0)); + RETVAL->fh = newSVsv (ST (1)); + ev_embed_set (RETVAL, other); + if (!ix) START (embed, RETVAL); +} + OUTPUT: + RETVAL +ev_async *async (struct ev_loop *loop, SV *cb) + ALIAS: + async_ns = 1 + CODE: + RETVAL = e_new (sizeof (ev_async), cb, ST (0)); + ev_async_set (RETVAL); + if (!ix) START (async, RETVAL); + OUTPUT: + RETVAL +void once (struct ev_loop *loop, SV *fh, int events, SV *timeout, SV *cb) + CODE: + ev_once ( + loop, + s_fileno (fh, events & EV_WRITE), events, + SvOK (timeout) ? SvNV (timeout) : -1., + e_once_cb, + newSVsv (cb) + );