--- cvsroot/EV/EV.xs 2007/12/20 10:12:22 1.96 +++ cvsroot/EV/EV.xs 2008/02/01 13:08:54 1.106 @@ -5,6 +5,7 @@ /*#include */ #define EV_PROTOTYPES 1 +#define EV_USE_NANOSLEEP EV_USE_MONOTONIC #define EV_H #include "EV/EVAPI.h" @@ -30,25 +31,25 @@ #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 +79,8 @@ *stash_prepare, *stash_check, *stash_embed, - *stash_fork; + *stash_fork, + *stash_async; #ifndef SIG_SIZE /* kudos to Slaven Rezic for the idea */ @@ -139,12 +141,12 @@ ev_init (w, e_cb); - 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 = SvTEMP (cb_sv) && SvREFCNT (cb_sv) == 1 ? SvREFCNT_inc (cb_sv) : newSVsv (cb_sv); + w->self = self; return (void *)w; } @@ -376,6 +378,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); @@ -390,6 +393,7 @@ 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; @@ -426,6 +430,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; @@ -437,7 +444,7 @@ #endif } -SV *ev_default_loop (unsigned int flags = ev_supported_backends ()) +SV *ev_default_loop (unsigned int flags = 0) CODE: { if (!default_loop_sv) @@ -455,6 +462,18 @@ 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 () + NV ev_time () NV ev_now () @@ -466,10 +485,16 @@ 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 +609,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 @@ -624,6 +649,16 @@ 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 +689,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); } } @@ -692,6 +727,12 @@ OUTPUT: RETVAL +SV *loop (ev_watcher *w) + CODE: + RETVAL = newRV_inc (w->loop); + OUTPUT: + RETVAL + int priority (ev_watcher *w, int new_priority = 0) CODE: { @@ -911,7 +952,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: @@ -971,27 +1012,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)); - -int pid (ev_child *w, int new_pid = 0) - 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 @@ -1117,9 +1149,24 @@ OUTPUT: RETVAL -MODULE = EV PACKAGE = EV::Loop PREFIX = ev_loop_ +MODULE = EV PACKAGE = EV::Async PREFIX = ev_async_ + +void ev_async_start (ev_async *w) + CODE: + START (async, w); -SV *new (SV *klass, unsigned int flags = ev_supported_backends ()) +void ev_async_stop (ev_async *w) + CODE: + STOP (async, w); + +void DESTROY (ev_async *w) + CODE: + STOP (async, w); + e_destroy (w); + +MODULE = EV PACKAGE = EV::Loop PREFIX = ev_ + +SV *new (SV *klass, unsigned int flags = 0) CODE: { struct ev_loop *loop = ev_loop_new (flags); @@ -1137,6 +1184,37 @@ if (loop != evapi.default_loop) /* global destruction sucks */ ev_loop_destroy (loop); +void ev_loop_fork (struct ev_loop *loop) + +NV ev_now (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) + +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) + +#if 0 + +void ev_feed_signal_event (struct ev_loop *loop, SV *signal) + CODE: +{ + Signal signum = sv_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 @@ -1153,3 +1231,151 @@ 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 + +#if 0 + +ev_signal *signal (struct ev_loop *loop, SV *signal, SV *cb) + ALIAS: + signal_ns = 1 + CODE: +{ + Signal signum = sv_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 + +#endif + +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 = &PL_sv_undef) + 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 (!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 ( + loop, + sv_fileno (fh), events, + SvOK (timeout) ? SvNV (timeout) : -1., + e_once_cb, + newSVsv (cb) + ); +