ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/EV/EV.xs
(Generate patch)

Comparing EV/EV.xs (file contents):
Revision 1.163 by root, Wed Apr 3 23:46:45 2013 UTC vs.
Revision 1.164 by root, Fri Apr 5 21:04:18 2013 UTC

… …
47#define e_fh(w) ((ev_watcher *)(w))->fh 47#define e_fh(w) ((ev_watcher *)(w))->fh
48#define e_data(w) ((ev_watcher *)(w))->data 48#define e_data(w) ((ev_watcher *)(w))->data
49 49
50#define WFLAG_KEEPALIVE 1 50#define WFLAG_KEEPALIVE 1
51#define WFLAG_UNREFED 2 /* has been unref'ed */ 51#define WFLAG_UNREFED 2 /* has been unref'ed */
52#define WFLAG_NOARGS 4 /* do not pass anything to the callback */
52 53
53#define UNREF(w) \ 54#define UNREF(w) \
54 if (!(e_flags (w) & (WFLAG_KEEPALIVE | WFLAG_UNREFED)) \ 55 if (!(e_flags (w) & (WFLAG_KEEPALIVE | WFLAG_UNREFED)) \
55 && ev_is_active (w)) \ 56 && ev_is_active (w)) \
56 { \ 57 { \
… …
199 /* libev might have stopped the watcher */ 200 /* libev might have stopped the watcher */
200 if (expect_false (w->e_flags & WFLAG_UNREFED) 201 if (expect_false (w->e_flags & WFLAG_UNREFED)
201 && !ev_is_active (w)) 202 && !ev_is_active (w))
202 REF (w); 203 REF (w);
203 204
204 if (expect_true (sv_self_cache)) 205 PUSHMARK (SP);
206
207 if (!expect_true (e_flags (w) & WFLAG_NOARGS))
205 { 208 {
209 if (expect_true (sv_self_cache))
210 {
206 sv_self = sv_self_cache; sv_self_cache = 0; 211 sv_self = sv_self_cache; sv_self_cache = 0;
207 SvRV_set (sv_self, SvREFCNT_inc_NN (w->self)); 212 SvRV_set (sv_self, SvREFCNT_inc_NN (w->self));
213 }
214 else
215 {
216 sv_self = newRV_inc (w->self); /* e_self (w) MUST be blessed by now */
217 SvREADONLY_on (sv_self);
218 }
219
220 if (expect_true (sv_events_cache))
221 {
222 sv_events = sv_events_cache; sv_events_cache = 0;
223 SvIV_set (sv_events, revents);
224 SvIOK_only (sv_events);
225 }
226 else
227 {
228 sv_events = newSViv (revents);
229 SvREADONLY_on (sv_events);
230 }
231
232 EXTEND (SP, 2);
233 PUSHs (sv_self);
234 PUSHs (sv_events);
235
236 PUTBACK;
237 call_sv (w->cb_sv, G_DISCARD | G_VOID | G_EVAL);
238
239 if (expect_false (SvREFCNT (sv_self) != 1 || sv_self_cache))
240 SvREFCNT_dec (sv_self);
241 else
242 {
243 SvREFCNT_dec (SvRV (sv_self));
244 SvRV_set (sv_self, &PL_sv_undef);
245 sv_self_cache = sv_self;
246 }
247
248 if (expect_false (SvREFCNT (sv_events) != 1 || sv_events_cache))
249 SvREFCNT_dec (sv_events);
250 else
251 sv_events_cache = sv_events;
208 } 252 }
209 else 253 else
210 { 254 {
211 sv_self = newRV_inc (w->self); /* e_self (w) MUST be blessed by now */ 255 EXTEND (SP, 2);
212 SvREADONLY_on (sv_self); 256 PUSHs (sv_self);
257 PUSHs (sv_events);
258
259 PUTBACK;
260 call_sv (w->cb_sv, G_DISCARD | G_VOID | G_EVAL);
213 } 261 }
214
215 if (expect_true (sv_events_cache))
216 {
217 sv_events = sv_events_cache; sv_events_cache = 0;
218 SvIV_set (sv_events, revents);
219 SvIOK_only (sv_events);
220 }
221 else
222 {
223 sv_events = newSViv (revents);
224 SvREADONLY_on (sv_events);
225 }
226
227 PUSHMARK (SP);
228 EXTEND (SP, 2);
229 PUSHs (sv_self);
230 PUSHs (sv_events);
231
232 PUTBACK;
233 call_sv (w->cb_sv, G_DISCARD | G_VOID | G_EVAL);
234
235 if (expect_false (SvREFCNT (sv_self) != 1 || sv_self_cache))
236 SvREFCNT_dec (sv_self);
237 else
238 {
239 SvREFCNT_dec (SvRV (sv_self));
240 SvRV_set (sv_self, &PL_sv_undef);
241 sv_self_cache = sv_self;
242 }
243
244 if (expect_false (SvREFCNT (sv_events) != 1 || sv_events_cache))
245 SvREFCNT_dec (sv_events);
246 else
247 sv_events_cache = sv_events;
248 262
249 if (expect_false (SvTRUE (ERRSV))) 263 if (expect_false (SvTRUE (ERRSV)))
250 { 264 {
251 SPAGAIN; 265 SPAGAIN;
252 PUSHMARK (SP); 266 PUSHMARK (SP);
… …
656 _ae_io = 2 670 _ae_io = 2
657 CODE: 671 CODE:
658{ 672{
659 int fd = s_fileno (fh, events & EV_WRITE); 673 int fd = s_fileno (fh, events & EV_WRITE);
660 CHECK_FD (fh, fd); 674 CHECK_FD (fh, fd);
675 RETVAL = e_new (sizeof (ev_io), cb, default_loop_sv);
676 e_fh (RETVAL) = newSVsv (fh);
661 677
662 if (ix == 2) 678 if (ix == 2)
663 { 679 {
664 ix = 0;
665 events = events ? EV_WRITE : EV_READ; 680 events = events ? EV_WRITE : EV_READ;
681 e_flags (RETVAL) |= WFLAG_NOARGS;
666 } 682 }
667 683
668 RETVAL = e_new (sizeof (ev_io), cb, default_loop_sv);
669 e_fh (RETVAL) = newSVsv (fh);
670 ev_io_set (RETVAL, fd, events); 684 ev_io_set (RETVAL, fd, events);
671 if (!ix) START (io, RETVAL); 685 if (ix != 1) START (io, RETVAL);
672} 686}
673 OUTPUT: 687 OUTPUT:
674 RETVAL 688 RETVAL
675 689
676ev_timer *timer (NV after, NV repeat, SV *cb) 690ev_timer *timer (NV after, NV repeat, SV *cb)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines