--- cvsroot/EV/EV.xs 2007/12/21 09:43:57 1.100 +++ cvsroot/EV/EV.xs 2008/11/20 11:25:15 1.119 @@ -4,14 +4,15 @@ /*#include */ -#define EV_PROTOTYPES 1 -#define EV_H -#include "EV/EVAPI.h" - /* fix perl api breakage */ #undef signal #undef sigaction +#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 @@ -25,30 +26,49 @@ # include #endif +/* 5.10.0 */ +#ifndef SvREFCNT_inc_NN +# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv) +#endif + +/* 5.6.x */ +#ifndef SvRV_set +# define SvRV_set(a,b) SvRV ((a)) = (b) +#endif + +#if __GNUC__ >= 3 +# define expect(expr,value) __builtin_expect ((expr),(value)) +#else +# define expect(expr,value) (expr) +#endif + +#define expect_false(expr) expect ((expr) != 0, 0) +#define expect_true(expr) expect ((expr) != 0, 1) + #define e_loop(w) INT2PTR (struct ev_loop *, SvIVX ((w)->loop)) #define WFLAG_KEEPALIVE 1 #define UNREF(w) \ - if (!((w)->flags & WFLAG_KEEPALIVE) \ + if (!((w)->e_flags & WFLAG_KEEPALIVE) \ && !ev_is_active (w)) \ ev_unref (e_loop (w)); #define REF(w) \ - if (!((w)->flags & WFLAG_KEEPALIVE) \ + if (!((w)->e_flags & WFLAG_KEEPALIVE) \ && ev_is_active (w)) \ ev_ref (e_loop (w)); #define START(type,w) \ do { \ UNREF (w); \ - ev_ ## type ## _start (e_loop (w), w); \ + ev_ ## type ## _start (e_loop (w), w); \ } while (0) #define STOP(type,w) \ do { \ REF (w); \ - ev_ ## type ## _stop (e_loop (w), w); \ + ev_ ## type ## _stop (e_loop (w), w); \ } while (0) #define RESET(type,w,seta) \ @@ -78,7 +98,8 @@ *stash_prepare, *stash_check, *stash_embed, - *stash_fork; + *stash_fork, + *stash_async; #ifndef SIG_SIZE /* kudos to Slaven Rezic for the idea */ @@ -127,9 +148,23 @@ return -1; } +static SV * +e_get_cv (SV *cb_sv) +{ + HV *st; + GV *gvp; + CV *cv = sv_2cv (cb_sv, &st, &gvp, 0); + + if (!cv) + croak ("EV watcher callback must be a CODE reference"); + + return (SV *)cv; +} + static void * e_new (int size, SV *cb_sv, SV *loop) { + SV *cv = cb_sv ? e_get_cv (cb_sv) : 0; ev_watcher *w; SV *self = NEWSV (0, size); SvPOK_only (self); @@ -137,14 +172,14 @@ w = (ev_watcher *)SvPVX (self); - ev_init (w, e_cb); + ev_init (w, cv ? e_cb : 0); - w->loop = SvREFCNT_inc (SvRV (loop)); - w->flags = WFLAG_KEEPALIVE; - w->data = 0; - w->fh = 0; - w->cb_sv = SvTEMP (cb_sv) && SvREFCNT (cb_sv) == 1 ? SvREFCNT_inc (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; } @@ -177,7 +212,7 @@ return rv; } -static SV *sv_events_cache; +static SV *sv_self_cache, *sv_events_cache; static void e_cb (EV_P_ ev_watcher *w, int revents) @@ -186,15 +221,27 @@ I32 mark = SP - PL_stack_base; SV *sv_self, *sv_events; - sv_self = newRV_inc (w->self); /* w->self MUST be blessed by now */ + 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 (sv_events_cache) + 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); @@ -204,14 +251,21 @@ PUTBACK; call_sv (w->cb_sv, G_DISCARD | G_VOID | G_EVAL); - SvREFCNT_dec (sv_self); + if (expect_false (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 (sv_events_cache)) SvREFCNT_dec (sv_events); else sv_events_cache = sv_events; - if (SvTRUE (ERRSV)) + if (expect_false (SvTRUE (ERRSV))) { SPAGAIN; PUSHMARK (SP); @@ -376,6 +430,7 @@ 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); @@ -389,12 +444,14 @@ evapi.supported_backends = ev_supported_backends (); evapi.recommended_backends = ev_recommended_backends (); evapi.embeddable_backends = ev_embeddable_backends (); - evapi.time = ev_time; + 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.now = ev_now; + evapi.now_update = ev_now_update; evapi.backend = ev_backend; evapi.unloop = ev_unloop; evapi.ref = ev_ref; @@ -426,6 +483,9 @@ 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; @@ -455,21 +515,44 @@ 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 () NV ev_now () C_ARGS: evapi.default_loop +void ev_now_update () + 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_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 = 1) +void ev_unloop (int how = EVUNLOOP_ONE) C_ARGS: evapi.default_loop, how void ev_feed_fd_event (int fd, int revents = EV_NONE) @@ -584,12 +667,12 @@ OUTPUT: RETVAL -ev_child *child (int pid, SV *cb) +ev_child *child (int pid, int trace, SV *cb) ALIAS: child_ns = 1 CODE: RETVAL = e_new (sizeof (ev_child), cb, default_loop_sv); - ev_child_set (RETVAL, pid); + ev_child_set (RETVAL, pid, trace); if (!ix) START (child, RETVAL); OUTPUT: RETVAL @@ -605,7 +688,7 @@ OUTPUT: RETVAL -ev_embed *embed (struct ev_loop *loop, SV *cb = &PL_sv_undef) +ev_embed *embed (struct ev_loop *loop, SV *cb = 0) ALIAS: embed_ns = 1 CODE: @@ -616,14 +699,21 @@ RETVAL = e_new (sizeof (ev_embed), cb, default_loop_sv); RETVAL->fh = newSVsv (ST (0)); ev_embed_set (RETVAL, loop); - - if (!SvOK (cb)) ev_set_cb (RETVAL, 0); - 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 ( @@ -654,13 +744,13 @@ 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)) { REF (w); - w->flags = (w->flags & ~WFLAG_KEEPALIVE) | new_value; + w->e_flags = (w->e_flags & ~WFLAG_KEEPALIVE) | new_value; UNREF (w); } } @@ -670,10 +760,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 = e_get_cv (new_cb); + RETVAL = newRV_noinc (w->cb_sv); + w->cb_sv = SvREFCNT_inc (new_cb); + } + else + RETVAL = newRV_inc (w->cb_sv); } OUTPUT: RETVAL @@ -856,12 +950,6 @@ 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) @@ -898,7 +986,7 @@ NV at (ev_periodic *w) CODE: - RETVAL = w->at; + RETVAL = ev_periodic_at (w); OUTPUT: RETVAL @@ -977,27 +1065,18 @@ STOP (child, w); e_destroy (w); -void set (ev_child *w, int pid) +void set (ev_child *w, int pid, int trace) CODE: - RESET (child, w, (w, pid)); + RESET (child, w, (w, pid, trace)); -int pid (ev_child *w, int new_pid = 0) - CODE: -{ - RETVAL = w->pid; - - if (items > 1) - RESET (child, w, (w, new_pid)); -} - OUTPUT: - RETVAL - - -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 @@ -1123,6 +1202,33 @@ 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) @@ -1145,8 +1251,16 @@ 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_set_io_collect_interval (struct ev_loop *loop, NV interval) + +void ev_set_timeout_collect_interval (struct ev_loop *loop, NV interval) + unsigned int ev_backend (struct ev_loop *loop) unsigned int ev_loop_count (struct ev_loop *loop) @@ -1274,12 +1388,12 @@ OUTPUT: RETVAL -ev_child *child (struct ev_loop *loop, int pid, SV *cb) +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); + ev_child_set (RETVAL, pid, trace); if (!ix) START (child, RETVAL); OUTPUT: RETVAL @@ -1295,7 +1409,7 @@ OUTPUT: RETVAL -ev_embed *embed (struct ev_loop *loop, struct ev_loop *other, SV *cb = &PL_sv_undef) +ev_embed *embed (struct ev_loop *loop, struct ev_loop *other, SV *cb = 0) ALIAS: embed_ns = 1 CODE: @@ -1306,14 +1420,21 @@ RETVAL = e_new (sizeof (ev_embed), cb, ST (0)); RETVAL->fh = newSVsv (ST (1)); ev_embed_set (RETVAL, other); - - if (!SvOK (cb)) ev_set_cb (RETVAL, 0); - 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 (