--- cvsroot/EV/EV.xs 2007/12/01 15:32:53 1.84 +++ cvsroot/EV/EV.xs 2007/12/20 08:18:54 1.92 @@ -5,6 +5,7 @@ /*#include */ #define EV_PROTOTYPES 1 +#define EV_H #include "EV/EVAPI.h" /* fix perl api breakage */ @@ -19,19 +20,6 @@ #endif /* due to bugs in OS X we have to use libev/ explicitly here */ #include "libev/ev.c" -#include "event.c" - -#ifndef _WIN32 -#define DNS_USE_GETTIMEOFDAY_FOR_ID 1 -#if !defined (WIN32) && !defined(__CYGWIN__) -# define HAVE_STRUCT_IN6_ADDR 1 -#endif -#undef HAVE_STRTOK_R -#undef strtok_r -#define strtok_r fake_strtok_r -#include "evdns.h" -#include "evdns.c" -#endif #ifndef _WIN32 # include @@ -42,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) \ @@ -115,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) @@ -146,6 +134,7 @@ ev_init (w, e_cb); + w->loop = EV_DEFAULT; w->flags = WFLAG_KEEPALIVE; w->data = 0; w->fh = 0; @@ -185,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; @@ -258,6 +247,7 @@ if (SvTRUE (ERRSV)) { + SPAGAIN; PUSHMARK (SP); PUTBACK; call_sv (get_sv ("EV::DIED", 1), G_DISCARD | G_VOID | G_EVAL | G_KEEPERR); @@ -310,60 +300,6 @@ return retval; } -///////////////////////////////////////////////////////////////////////////// -// DNS - -#ifndef _WIN32 -static void -dns_cb (int result, char type, int count, int ttl, void *addresses, void *arg) -{ - dSP; - SV *cb = (SV *)arg; - - ENTER; - SAVETMPS; - PUSHMARK (SP); - EXTEND (SP, count + 3); - PUSHs (sv_2mortal (newSViv (result))); - - if (result == DNS_ERR_NONE && ttl >= 0) - { - int i; - - PUSHs (sv_2mortal (newSViv (type))); - PUSHs (sv_2mortal (newSViv (ttl))); - - for (i = 0; i < count; ++i) - switch (type) - { - case DNS_IPv6_AAAA: - PUSHs (sv_2mortal (newSVpvn (i * 16 + (char *)addresses, 16))); - break; - case DNS_IPv4_A: - PUSHs (sv_2mortal (newSVpvn (i * 4 + (char *)addresses, 4))); - break; - case DNS_PTR: - PUSHs (sv_2mortal (newSVpv (*(char **)addresses, 0))); - break; - } - } - - PUTBACK; - call_sv (sv_2mortal (cb), G_DISCARD | G_VOID | G_EVAL); - - FREETMPS; - - if (SvTRUE (ERRSV)) - { - PUSHMARK (SP); - PUTBACK; - call_sv (get_sv ("EV::DIED", 1), G_DISCARD | G_VOID | G_EVAL | G_KEEPERR); - } - - LEAVE; -} -#endif - #define CHECK_REPEAT(repeat) if (repeat < 0.) \ croak (# repeat " value must be >= 0"); @@ -432,44 +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.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); @@ -479,17 +430,47 @@ #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: +{ + Signal signum = sv_signum (signal); + CHECK_SIG (signal, signum); + + ev_feed_signal_event (evapi.default_loop, signum); +} ev_io *io (SV *fh, int events, SV *cb) ALIAS: @@ -581,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 @@ -605,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, @@ -619,6 +611,15 @@ 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: { @@ -660,10 +661,6 @@ OUTPUT: RETVAL -void trigger (ev_watcher *w, int revents = EV_NONE) - CODE: - w->cb (w, revents); - int priority (ev_watcher *w, int new_priority = 0) CODE: { @@ -673,14 +670,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); } @@ -690,6 +685,7 @@ { PUSHMARK (SP); XPUSHs (ST (0)); + PUTBACK; call_method ("start", G_DISCARD | G_VOID); } } @@ -809,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) @@ -823,6 +819,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) @@ -838,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) @@ -857,6 +859,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) @@ -902,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) @@ -998,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; @@ -1035,99 +1058,6 @@ } } -#ifndef _WIN32 - -MODULE = EV PACKAGE = EV::DNS PREFIX = evdns_ - -BOOT: -{ - HV *stash = gv_stashpv ("EV::DNS", 1); - - static const struct { - const char *name; - IV iv; - } *civ, const_iv[] = { -# define const_iv(pfx, name) { # name, (IV) pfx ## name }, - const_iv (DNS_, ERR_NONE) - const_iv (DNS_, ERR_FORMAT) - const_iv (DNS_, ERR_SERVERFAILED) - const_iv (DNS_, ERR_NOTEXIST) - const_iv (DNS_, ERR_NOTIMPL) - const_iv (DNS_, ERR_REFUSED) - const_iv (DNS_, ERR_TRUNCATED) - const_iv (DNS_, ERR_UNKNOWN) - const_iv (DNS_, ERR_TIMEOUT) - const_iv (DNS_, ERR_SHUTDOWN) - const_iv (DNS_, IPv4_A) - const_iv (DNS_, PTR) - const_iv (DNS_, IPv6_AAAA) - const_iv (DNS_, QUERY_NO_SEARCH) - const_iv (DNS_, OPTION_SEARCH) - const_iv (DNS_, OPTION_NAMESERVERS) - const_iv (DNS_, OPTION_MISC) - const_iv (DNS_, OPTIONS_ALL) - const_iv (DNS_, NO_SEARCH) - }; - - for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) - newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); -} - -int evdns_init () - -void evdns_shutdown (int fail_requests = 1) - -const char *evdns_err_to_string (int err) - -int evdns_nameserver_add (U32 address) - -int evdns_count_nameservers () - -int evdns_clear_nameservers_and_suspend () - -int evdns_resume () - -int evdns_nameserver_ip_add (char *ip_as_string) - -int evdns_resolve_ipv4 (const char *name, int flags, SV *cb) - C_ARGS: name, flags, dns_cb, (void *)SvREFCNT_inc (cb) - -int evdns_resolve_ipv6 (const char *name, int flags, SV *cb) - C_ARGS: name, flags, dns_cb, (void *)SvREFCNT_inc (cb) - -int evdns_resolve_reverse (SV *addr, int flags, SV *cb) - ALIAS: - evdns_resolve_reverse_ipv6 = 1 - CODE: -{ - STRLEN len; - char *data = SvPVbyte (addr, len); - if (len != (ix ? 16 : 4)) - croak ("ipv4/ipv6 address to be resolved must be given as 4/16 byte octet string"); - - RETVAL = ix - ? evdns_resolve_reverse_ipv6 ((struct in6_addr *)data, flags, dns_cb, (void *)SvREFCNT_inc (cb)) - : evdns_resolve_reverse ((struct in_addr *)data, flags, dns_cb, (void *)SvREFCNT_inc (cb)); -} - OUTPUT: - RETVAL - -int evdns_set_option (char *option, char *val, int flags) - -int evdns_resolv_conf_parse (int flags, const char *filename) - -#ifdef _WIN32 - -int evdns_config_windows_nameservers () - -#endif - -void evdns_search_clear () - -void evdns_search_add (char *domain) - -void evdns_search_ndots_set (int ndots) - #if 0 MODULE = EV PACKAGE = EV::HTTP PREFIX = evhttp_ @@ -1170,7 +1100,6 @@ #endif -#endif