--- EV/EV.xs 2007/12/17 07:24:12 1.90 +++ EV/EV.xs 2007/12/20 07:12:57 1.91 @@ -30,23 +30,23 @@ #define UNREF(w) \ if (!((w)->flags & WFLAG_KEEPALIVE) \ && !ev_is_active (w)) \ - ev_unref (); + ev_unref (w->loop); #define REF(w) \ if (!((w)->flags & WFLAG_KEEPALIVE) \ && ev_is_active (w)) \ - ev_ref (); + ev_ref (w->loop); #define START(type,w) \ do { \ UNREF (w); \ - ev_ ## type ## _start (w); \ + ev_ ## type ## _start (w->loop, w); \ } while (0) #define STOP(type,w) \ do { \ REF (w); \ - ev_ ## type ## _stop (w); \ + ev_ ## type ## _stop (w->loop, w); \ } while (0) #define RESET(type,w,seta) \ @@ -103,7 +103,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) @@ -134,6 +134,7 @@ ev_init (w, e_cb); + w->loop = EV_DEFAULT; w->flags = WFLAG_KEEPALIVE; w->data = 0; w->fh = 0; @@ -173,7 +174,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; @@ -367,46 +368,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 +430,38 @@ #endif } -NV ev_now () +SV *ev_default_loop (unsigned int flags = ev_supported_backends ()) + CODE: +{ + evapi.default_loop = ev_default_loop (flags); + if (!evapi.default_loop) + XSRETURN_UNDEF; -unsigned int ev_backend () + RETVAL = sv_bless (newRV_noinc (newSViv (PTR2IV (ev_default_loop (flags)))), + gv_stashpv ("EV::Loop::Default", 1)); +} + 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 +469,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) @@ -531,6 +562,16 @@ OUTPUT: RETVAL +ev_fork *fork (SV *cb) + ALIAS: + fork_ns = 1 + CODE: + RETVAL = e_new (sizeof (ev_fork), cb); + ev_fork_set (RETVAL); + if (!ix) START (fork, RETVAL); + OUTPUT: + RETVAL + ev_child *child (int pid, SV *cb) ALIAS: child_ns = 1 @@ -555,6 +596,7 @@ 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 +612,13 @@ int ev_is_pending (ev_watcher *w) void ev_invoke (ev_watcher *w, int revents = EV_NONE) + C_ARGS: w->loop, w, revents int ev_clear_pending (ev_watcher *w) + C_ARGS: w->loop, w void ev_feed_event (ev_watcher *w, int revents = EV_NONE) + C_ARGS: w->loop, w, revents int keepalive (ev_watcher *w, int new_value = 0) CODE: @@ -760,7 +805,7 @@ CHECK_REPEAT (w->repeat); CODE: REF (w); - ev_timer_again (w); + ev_timer_again (w->loop, w); UNREF (w); void DESTROY (ev_timer *w) @@ -795,7 +840,7 @@ void ev_periodic_again (ev_periodic *w) CODE: REF (w); - ev_periodic_again (w); + ev_periodic_again (w->loop, w); UNREF (w); void DESTROY (ev_periodic *w) @@ -865,6 +910,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) @@ -961,7 +1021,7 @@ ev_statdata *s = ix ? &w->attr : &w->prev; if (ix == 1) - ev_stat_stat (w); + ev_stat_stat (w->loop, w); else if (!s->st_nlink) errno = ENOENT;