--- cvsroot/EV/EV.xs 2007/12/08 14:12:04 1.89 +++ cvsroot/EV/EV.xs 2007/12/20 09:26:40 1.93 @@ -5,6 +5,7 @@ /*#include */ #define EV_PROTOTYPES 1 +#define EV_H #include "EV/EVAPI.h" /* fix perl api breakage */ @@ -19,34 +20,35 @@ #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 UNREF(w) \ if (!((w)->flags & WFLAG_KEEPALIVE) \ && !ev_is_active (w)) \ - ev_unref (); + ev_unref (e_loop (w)); #define REF(w) \ if (!((w)->flags & WFLAG_KEEPALIVE) \ && ev_is_active (w)) \ - ev_ref (); + ev_ref (e_loop (w)); #define START(type,w) \ do { \ UNREF (w); \ - ev_ ## type ## _start (w); \ + ev_ ## type ## _start (e_loop (w), 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) \ @@ -59,9 +61,12 @@ typedef int Signal; +static SV *default_loop_sv; + static struct EVAPI evapi; static HV + *stash_loop, *stash_watcher, *stash_io, *stash_timer, @@ -103,7 +108,7 @@ ///////////////////////////////////////////////////////////////////////////// // Event -static void e_cb (ev_watcher *w, int revents); +static void e_cb (EV_P_ ev_watcher *w, int revents); static int sv_fileno (SV *fh) @@ -123,7 +128,7 @@ } static void * -e_new (int size, SV *cb_sv) +e_new (int size, SV *cb_sv, SV *loop) { ev_watcher *w; SV *self = NEWSV (0, size); @@ -134,10 +139,11 @@ ev_init (w, e_cb); + w->loop = SvREFCNT_inc (SvRV (loop)); w->flags = WFLAG_KEEPALIVE; w->data = 0; w->fh = 0; - w->cb_sv = newSVsv (cb_sv); + w->cb_sv = SvTEMP (cb_sv) && SvREFCNT (cb_sv) == 1 ? SvREFCNT_inc (cb_sv) : newSVsv (cb_sv); w->self = self; return (void *)w; @@ -148,6 +154,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; @@ -173,7 +180,7 @@ static SV *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; @@ -356,6 +363,7 @@ 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,46 +375,59 @@ 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); { 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.clear_pending = ev_clear_pending; - evapi.invoke = ev_invoke; + evapi.ver = EV_API_VERSION; + evapi.rev = EV_API_REVISION; + evapi.sv_fileno = sv_fileno; + evapi.sv_signum = sv_signum; + evapi.supported_backends = ev_supported_backends (); + evapi.recommended_backends = ev_recommended_backends (); + evapi.embeddable_backends = ev_embeddable_backends (); + evapi.time = ev_time; + 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.now = ev_now; + evapi.backend = ev_backend; + evapi.unloop = ev_unloop; + 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.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.clear_pending = ev_clear_pending; + evapi.invoke = ev_invoke; sv_setiv (sv, (IV)&evapi); SvREADONLY_on (sv); @@ -416,21 +437,43 @@ #endif } -NV ev_now () +SV *ev_default_loop (unsigned int flags = ev_supported_backends ()) + 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 NV ev_time () -unsigned int ev_default_loop (unsigned int flags = ev_supported_backends ()) +NV ev_now () + C_ARGS: evapi.default_loop + +unsigned int ev_backend () + C_ARGS: evapi.default_loop unsigned int ev_loop_count () + C_ARGS: evapi.default_loop void ev_loop (int flags = 0) + C_ARGS: evapi.default_loop, flags void ev_unloop (int how = 1) + 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: @@ -438,7 +481,7 @@ Signal signum = sv_signum (signal); CHECK_SIG (signal, signum); - ev_feed_signal_event (EV_DEFAULT_ signum); + ev_feed_signal_event (evapi.default_loop, signum); } ev_io *io (SV *fh, int events, SV *cb) @@ -449,7 +492,7 @@ int fd = sv_fileno (fh); 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); @@ -463,7 +506,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: @@ -477,7 +520,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); @@ -494,7 +537,7 @@ Signal signum = sv_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); } @@ -505,7 +548,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: @@ -515,7 +558,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: @@ -525,17 +568,27 @@ 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_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, SV *cb) ALIAS: child_ns = 1 CODE: - RETVAL = e_new (sizeof (ev_child), cb); + RETVAL = e_new (sizeof (ev_child), cb, default_loop_sv); ev_child_set (RETVAL, pid); if (!ix) START (child, RETVAL); OUTPUT: @@ -545,16 +598,28 @@ 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) + ALIAS: + embed_ns = 1 + CODE: + 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 + void once (SV *fh, int events, SV *timeout, SV *cb) CODE: ev_once ( + evapi.default_loop, sv_fileno (fh), events, SvOK (timeout) ? SvNV (timeout) : -1., e_once_cb, @@ -570,10 +635,13 @@ 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: @@ -760,7 +828,7 @@ CHECK_REPEAT (w->repeat); CODE: REF (w); - ev_timer_again (w); + ev_timer_again (e_loop (w), w); UNREF (w); void DESTROY (ev_timer *w) @@ -774,6 +842,12 @@ CODE: RESET (timer, w, (w, after, repeat)); +NV at (ev_timer *w) + CODE: + RETVAL = w->at; + OUTPUT: + RETVAL + MODULE = EV PACKAGE = EV::Periodic PREFIX = ev_periodic_ void ev_periodic_start (ev_periodic *w) @@ -789,7 +863,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) @@ -808,6 +882,12 @@ RESET (periodic, w, (w, at, interval, w->fh ? e_periodic_cb : 0)); } +NV at (ev_periodic *w) + CODE: + RETVAL = w->at; + OUTPUT: + RETVAL + MODULE = EV PACKAGE = EV::Idle PREFIX = ev_idle_ void ev_idle_start (ev_idle *w) @@ -853,6 +933,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) @@ -949,7 +1044,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; @@ -986,52 +1081,45 @@ } } -#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: -{ - HV *stash = gv_stashpv ("EV::HTTP", 1); +void ev_embed_stop (ev_embed *w) + CODE: + STOP (embed, w); - 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) - }; +void DESTROY (ev_embed *w) + CODE: + STOP (embed, w); + e_destroy (w); - for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) - newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); +void set (ev_embed *w, struct ev_loop *loop) + CODE: +{ + sv_setsv (w->fh, ST (1)); + RESET (embed, w, (w, loop)); } -MODULE = EV PACKAGE = EV::HTTP::Request PREFIX = evhttp_request_ - -#HttpRequest new (SV *klass, SV *cb) - -#void DESTROY (struct evhttp_request *req); - -#endif - - - +MODULE = EV PACKAGE = EV::Loop PREFIX = ev_loop_ +SV *new (SV *klass, unsigned int flags = ev_supported_backends ()) + CODE: +{ + struct ev_loop *loop = ev_loop_new (flags); + if (!loop) + XSRETURN_UNDEF; + RETVAL = sv_bless (newRV_noinc (newSViv (PTR2IV (evapi.default_loop))), stash_loop); +} + OUTPUT: + RETVAL +void DESTROY (struct ev_loop *loop) + CODE: + if (loop != evapi.default_loop) /* global destruction sucks */ + ev_loop_destroy (loop);