--- cvsroot/EV/EV.xs 2009/07/14 02:33:55 1.127 +++ cvsroot/EV/EV.xs 2010/04/14 00:17:22 1.138 @@ -15,9 +15,11 @@ return s_fileno (fh, 0); } +#define EV_STANDALONE 1 #define EV_PROTOTYPES 1 #define EV_USE_NANOSLEEP EV_USE_MONOTONIC #define EV_H +#define EV_CONFIG_H error #include "EV/EVAPI.h" #define EV_SELECT_IS_WINSOCKET 0 @@ -33,23 +35,27 @@ # include #endif -#define e_loop(w) INT2PTR (struct ev_loop *, SvIVX ((w)->loop)) +#define e_loop(w) INT2PTR (struct ev_loop *, SvIVX (((ev_watcher *)(w))->loop)) +#define e_flags(w) ((ev_watcher *)(w))->e_flags +#define e_self(w) ((ev_watcher *)(w))->self +#define e_fh(w) ((ev_watcher *)(w))->fh +#define e_data(w) ((ev_watcher *)(w))->data #define WFLAG_KEEPALIVE 1 #define WFLAG_UNREFED 2 /* has been unref'ed */ #define UNREF(w) \ - if (!((w)->e_flags & (WFLAG_KEEPALIVE | WFLAG_UNREFED)) \ + if (!(e_flags (w) & (WFLAG_KEEPALIVE | WFLAG_UNREFED)) \ && ev_is_active (w)) \ { \ ev_unref (e_loop (w)); \ - (w)->e_flags |= WFLAG_UNREFED; \ + e_flags (w) |= WFLAG_UNREFED; \ } #define REF(w) \ - if ((w)->e_flags & WFLAG_UNREFED) \ + if (e_flags (w) & WFLAG_UNREFED) \ { \ - (w)->e_flags &= ~WFLAG_UNREFED; \ + e_flags (w) &= ~WFLAG_UNREFED; \ ev_ref (e_loop (w)); \ } @@ -66,15 +72,38 @@ } while (0) #define RESET(type,w,seta) \ - do { \ - int active = ev_is_active (w); \ - if (active) STOP (type, w); \ - ev_ ## type ## _set seta; \ - if (active) START (type, w); \ - } while (0) + do { \ + int active = ev_is_active (w); \ + if (active) STOP (type, w); \ + ev_ ## type ## _set seta; \ + if (active) START (type, w); \ + } while (0) typedef int Signal; +/* horrible... */ +#define CHECK_SIGNAL_CAN_START(w) \ + do { \ + /* dive into the internals of libev to avoid aborting in libev */ \ + if (signals [(w)->signum - 1].loop \ + && signals [(w)->signum - 1].loop != e_loop (w)) \ + croak ("unable to start signal watcher, signal %d already registered in another loop", w->signum); \ + } while (0) + +#define START_SIGNAL(w) \ + do { \ + CHECK_SIGNAL_CAN_START (w); \ + START (signal, w); \ + } while (0) \ + +#define RESET_SIGNAL(w,seta) \ + do { \ + int active = ev_is_active (w); \ + if (active) STOP (signal, w); \ + ev_ ## signal ## _set seta; \ + if (active) START_SIGNAL (w); \ + } while (0) + static SV *default_loop_sv; static struct EVAPI evapi; @@ -100,7 +129,7 @@ static void e_cb (EV_P_ ev_watcher *w, int revents); -static void * +void * e_new (int size, SV *cb_sv, SV *loop) { SV *cv = cb_sv ? s_get_cv_croak (cb_sv) : 0; @@ -172,7 +201,7 @@ } else { - sv_self = newRV_inc (w->self); /* w->self MUST be blessed by now */ + sv_self = newRV_inc (w->self); /* e_self (w) MUST be blessed by now */ SvREADONLY_on (sv_self); } @@ -273,7 +302,7 @@ PUSHMARK (SP); EXTEND (SP, 2); - PUSHs (newRV_inc (w->self)); /* w->self MUST be blessed by now */ + PUSHs (newRV_inc (e_self (w))); /* e_self (w) MUST be blessed by now */ PUSHs (newSVnv (now)); PUTBACK; @@ -337,7 +366,7 @@ const_iv (EV_, READ) const_iv (EV_, WRITE) const_iv (EV_, IO) - const_iv (EV_, TIMEOUT) + const_iv (EV_, TIMEOUT) /* deprecated */ const_iv (EV_, TIMER) const_iv (EV_, PERIODIC) const_iv (EV_, SIGNAL) @@ -365,9 +394,13 @@ const_iv (EV, BACKEND_KQUEUE) const_iv (EV, BACKEND_DEVPOLL) const_iv (EV, BACKEND_PORT) + const_iv (EV, BACKEND_ALL) const_iv (EV, FLAG_AUTO) - const_iv (EV, FLAG_NOENV) const_iv (EV, FLAG_FORKCHECK) + const_iv (EV, FLAG_SIGNALFD) + const_iv (EV, FLAG_NOENV) + const_iv (EV, FLAG_NOSIGFD) /* compatibility, always 0 */ + const_iv (EV, FLAG_NOINOTIFY) const_iv (EV_, VERSION_MAJOR) const_iv (EV_, VERSION_MINOR) @@ -408,8 +441,8 @@ 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.loop_depth = ev_loop_depth; + evapi.iteration = ev_iteration; + evapi.depth = ev_depth; evapi.set_userdata = ev_set_userdata; evapi.userdata = ev_userdata; evapi.now = ev_now; @@ -419,6 +452,8 @@ evapi.backend = ev_backend; evapi.unloop = ev_unloop; evapi.invoke_pending = ev_invoke_pending; + evapi.pending_count = ev_pending_count; + evapi.verify = ev_verify; evapi.set_loop_release_cb = ev_set_loop_release_cb; evapi.set_invoke_pending_cb= ev_set_invoke_pending_cb; evapi.ref = ev_ref; @@ -430,6 +465,7 @@ evapi.timer_start = ev_timer_start; evapi.timer_stop = ev_timer_stop; evapi.timer_again = ev_timer_again; + evapi.timer_remaining = ev_timer_remaining; evapi.periodic_start = ev_periodic_start; evapi.periodic_stop = ev_periodic_stop; evapi.signal_start = ev_signal_start; @@ -513,13 +549,13 @@ unsigned int ev_backend () C_ARGS: evapi.default_loop -void ev_loop_verify () +void ev_verify () C_ARGS: evapi.default_loop -unsigned int ev_loop_count () +unsigned int ev_iteration () C_ARGS: evapi.default_loop -unsigned int ev_loop_depth () +unsigned int ev_depth () C_ARGS: evapi.default_loop void ev_set_io_collect_interval (NV interval) @@ -546,16 +582,29 @@ ev_feed_signal_event (evapi.default_loop, signum); } +unsigned int ev_pending_count () + C_ARGS: evapi.default_loop + +void ev_invoke_pending () + C_ARGS: evapi.default_loop + ev_io *io (SV *fh, int events, SV *cb) ALIAS: io_ns = 1 + _ae_io = 2 CODE: { int fd = s_fileno (fh, events & EV_WRITE); CHECK_FD (fh, fd); + if (ix == 2) + { + ix = 0; + events = events ? EV_WRITE : EV_READ; + } + RETVAL = e_new (sizeof (ev_io), cb, default_loop_sv); - RETVAL->fh = newSVsv (fh); + e_fh (RETVAL) = newSVsv (fh); ev_io_set (RETVAL, fd, events); if (!ix) START (io, RETVAL); } @@ -583,8 +632,8 @@ { ev_periodic *w; 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); + e_fh (w) = SvTRUE (reschedule_cb) ? newSVsv (reschedule_cb) : 0; + ev_periodic_set (w, at, interval, e_fh (w) ? e_periodic_cb : 0); RETVAL = e_bless ((ev_watcher *)w, stash_periodic); if (!ix) START (periodic, w); } @@ -601,7 +650,7 @@ RETVAL = e_new (sizeof (ev_signal), cb, default_loop_sv); ev_signal_set (RETVAL, signum); - if (!ix) START (signal, RETVAL); + if (!ix) START_SIGNAL (RETVAL); } OUTPUT: RETVAL @@ -661,8 +710,8 @@ stat_ns = 1 CODE: RETVAL = e_new (sizeof (ev_stat), cb, default_loop_sv); - RETVAL->fh = newSVsv (path); - ev_stat_set (RETVAL, SvPVbyte_nolen (RETVAL->fh), interval); + e_fh (RETVAL) = newSVsv (path); + ev_stat_set (RETVAL, SvPVbyte_nolen (e_fh (RETVAL)), interval); if (!ix) START (stat, RETVAL); OUTPUT: RETVAL @@ -676,7 +725,7 @@ croak ("passed loop is not embeddable via EV::embed,"); RETVAL = e_new (sizeof (ev_embed), cb, default_loop_sv); - RETVAL->fh = newSVsv (ST (0)); + e_fh (RETVAL) = newSVsv (ST (0)); ev_embed_set (RETVAL, loop); if (!ix) START (embed, RETVAL); } @@ -824,7 +873,7 @@ int fd = s_fileno (fh, events & EV_WRITE); CHECK_FD (fh, fd); - sv_setsv (w->fh, fh); + sv_setsv (e_fh (w), fh); RESET (io, w, (w, fd, events)); } @@ -836,13 +885,13 @@ int fd = s_fileno (new_fh, w->events & EV_WRITE); CHECK_FD (new_fh, fd); - RETVAL = w->fh; - w->fh = newSVsv (new_fh); + RETVAL = e_fh (w); + e_fh (w) = newSVsv (new_fh); RESET (io, w, (w, fd, w->events)); } else - RETVAL = newSVsv (w->fh); + RETVAL = newSVsv (e_fh (w)); } OUTPUT: RETVAL @@ -862,7 +911,7 @@ void ev_signal_start (ev_signal *w) CODE: - START (signal, w); + START_SIGNAL (w); void ev_signal_stop (ev_signal *w) CODE: @@ -879,7 +928,7 @@ Signal signum = s_signum (signal); CHECK_SIG (signal, signum); - RESET (signal, w, (w, signum)); + RESET_SIGNAL (w, (w, signum)); } int signal (ev_signal *w, SV *new_signal = 0) @@ -892,7 +941,7 @@ Signal signum = s_signum (new_signal); CHECK_SIG (new_signal, signum); - RESET (signal, w, (w, signum)); + RESET_SIGNAL (w, (w, signum)); } } OUTPUT: @@ -917,6 +966,9 @@ ev_timer_again (e_loop (w), w); UNREF (w); +NV ev_timer_remaining (ev_timer *w) + C_ARGS: e_loop (w), w + void DESTROY (ev_timer *w) CODE: STOP (timer, w); @@ -955,10 +1007,10 @@ CHECK_REPEAT (interval); CODE: { - SvREFCNT_dec (w->fh); - w->fh = SvTRUE (reschedule_cb) ? newSVsv (reschedule_cb) : 0; + SvREFCNT_dec (e_fh (w)); + e_fh (w) = SvTRUE (reschedule_cb) ? newSVsv (reschedule_cb) : 0; - RESET (periodic, w, (w, at, interval, w->fh ? e_periodic_cb : 0)); + RESET (periodic, w, (w, at, interval, e_fh (w) ? e_periodic_cb : 0)); } NV at (ev_periodic *w) @@ -1075,20 +1127,20 @@ void set (ev_stat *w, SV *path, NV interval) CODE: { - sv_setsv (w->fh, path); - RESET (stat, w, (w, SvPVbyte_nolen (w->fh), interval)); + sv_setsv (e_fh (w), path); + RESET (stat, w, (w, SvPVbyte_nolen (e_fh (w)), interval)); } SV *path (ev_stat *w, SV *new_path = 0) CODE: { - RETVAL = SvREFCNT_inc (w->fh); + RETVAL = SvREFCNT_inc (e_fh (w)); if (items > 1) { - SvREFCNT_dec (w->fh); - w->fh = newSVsv (new_path); - RESET (stat, w, (w, SvPVbyte_nolen (w->fh), w->interval)); + SvREFCNT_dec (e_fh (w)); + e_fh (w) = newSVsv (new_path); + RESET (stat, w, (w, SvPVbyte_nolen (e_fh (w)), w->interval)); } } OUTPUT: @@ -1100,7 +1152,7 @@ RETVAL = w->interval; if (items > 1) - RESET (stat, w, (w, SvPVbyte_nolen (w->fh), new_interval)); + RESET (stat, w, (w, SvPVbyte_nolen (e_fh (w)), new_interval)); } OUTPUT: RETVAL @@ -1169,13 +1221,13 @@ void set (ev_embed *w, struct ev_loop *loop) CODE: { - sv_setsv (w->fh, ST (1)); + sv_setsv (e_fh (w), ST (1)); RESET (embed, w, (w, loop)); } SV *other (ev_embed *w) CODE: - RETVAL = newSVsv (w->fh); + RETVAL = newSVsv (e_fh (w)); OUTPUT: RETVAL @@ -1228,7 +1280,7 @@ void ev_loop_fork (struct ev_loop *loop) -void ev_loop_verify (struct ev_loop *loop) +void ev_verify (struct ev_loop *loop) NV ev_now (struct ev_loop *loop) @@ -1244,9 +1296,9 @@ unsigned int ev_backend (struct ev_loop *loop) -unsigned int ev_loop_count (struct ev_loop *loop) +unsigned int ev_iteration (struct ev_loop *loop) -unsigned int ev_loop_depth (struct ev_loop *loop) +unsigned int ev_depth (struct ev_loop *loop) void ev_loop (struct ev_loop *loop, int flags = 0) @@ -1254,6 +1306,10 @@ void ev_feed_fd_event (struct ev_loop *loop, int fd, int revents = EV_NONE) +unsigned int ev_pending_count (struct ev_loop *loop) + +void ev_invoke_pending (struct ev_loop *loop) + #if 0 void ev_feed_signal_event (struct ev_loop *loop, SV *signal) @@ -1276,7 +1332,7 @@ CHECK_FD (fh, fd); RETVAL = e_new (sizeof (ev_io), cb, ST (0)); - RETVAL->fh = newSVsv (fh); + e_fh (RETVAL) = newSVsv (fh); ev_io_set (RETVAL, fd, events); if (!ix) START (io, RETVAL); } @@ -1304,16 +1360,14 @@ { 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); + e_fh (w) = SvTRUE (reschedule_cb) ? newSVsv (reschedule_cb) : 0; + ev_periodic_set (w, at, interval, e_fh (w) ? 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 @@ -1324,13 +1378,11 @@ RETVAL = e_new (sizeof (ev_signal), cb, ST (0)); ev_signal_set (RETVAL, signum); - if (!ix) START (signal, RETVAL); + if (!ix) START_SIGNAL (RETVAL); } OUTPUT: RETVAL -#endif - ev_idle *idle (struct ev_loop *loop, SV *cb) ALIAS: idle_ns = 1 @@ -1386,8 +1438,8 @@ 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); + e_fh (RETVAL) = newSVsv (path); + ev_stat_set (RETVAL, SvPVbyte_nolen (e_fh (RETVAL)), interval); if (!ix) START (stat, RETVAL); OUTPUT: RETVAL @@ -1401,7 +1453,7 @@ croak ("passed loop is not embeddable via EV::embed,"); RETVAL = e_new (sizeof (ev_embed), cb, ST (0)); - RETVAL->fh = newSVsv (ST (1)); + e_fh (RETVAL) = newSVsv (ST (1)); ev_embed_set (RETVAL, other); if (!ix) START (embed, RETVAL); }