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

Comparing EV/EV.xs (file contents):
Revision 1.116 by root, Tue Oct 28 08:08:28 2008 UTC vs.
Revision 1.121 by root, Wed Apr 15 17:49:26 2009 UTC

… …
29/* 5.10.0 */ 29/* 5.10.0 */
30#ifndef SvREFCNT_inc_NN 30#ifndef SvREFCNT_inc_NN
31# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv) 31# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
32#endif 32#endif
33 33
34/* 5.6.x */
35#ifndef SvRV_set
36# define SvRV_set(a,b) SvRV ((a)) = (b)
37#endif
38
34#if __GNUC__ >= 3 39#if __GNUC__ >= 3
35# define expect(expr,value) __builtin_expect ((expr),(value)) 40# define expect(expr,value) __builtin_expect ((expr),(value))
36#else 41#else
37# define expect(expr,value) (expr) 42# define expect(expr,value) (expr)
38#endif 43#endif
… …
41#define expect_true(expr) expect ((expr) != 0, 1) 46#define expect_true(expr) expect ((expr) != 0, 1)
42 47
43#define e_loop(w) INT2PTR (struct ev_loop *, SvIVX ((w)->loop)) 48#define e_loop(w) INT2PTR (struct ev_loop *, SvIVX ((w)->loop))
44 49
45#define WFLAG_KEEPALIVE 1 50#define WFLAG_KEEPALIVE 1
51#define WFLAG_UNREFED 2 /* has been unref'ed */
46 52
47#define UNREF(w) \ 53#define UNREF(w) \
48 if (!((w)->e_flags & WFLAG_KEEPALIVE) \ 54 if (!((w)->e_flags & (WFLAG_KEEPALIVE | WFLAG_UNREFED)) \
49 && !ev_is_active (w)) \ 55 && ev_is_active (w)) \
56 { \
50 ev_unref (e_loop (w)); 57 ev_unref (e_loop (w)); \
58 (w)->e_flags |= WFLAG_UNREFED; \
59 }
51 60
52#define REF(w) \ 61#define REF(w) \
53 if (!((w)->e_flags & WFLAG_KEEPALIVE) \ 62 if ((w)->e_flags & WFLAG_UNREFED) \
54 && ev_is_active (w)) \ 63 { \
64 (w)->e_flags &= ~WFLAG_UNREFED; \
55 ev_ref (e_loop (w)); 65 ev_ref (e_loop (w)); \
66 }
56 67
57#define START(type,w) \ 68#define START(type,w) \
58 do { \ 69 do { \
70 ev_ ## type ## _start (e_loop (w), w); \
59 UNREF (w); \ 71 UNREF (w); \
60 ev_ ## type ## _start (e_loop (w), w); \
61 } while (0) 72 } while (0)
62 73
63#define STOP(type,w) \ 74#define STOP(type,w) \
64 do { \ 75 do { \
65 REF (w); \ 76 REF (w); \
… …
214{ 225{
215 dSP; 226 dSP;
216 I32 mark = SP - PL_stack_base; 227 I32 mark = SP - PL_stack_base;
217 SV *sv_self, *sv_events; 228 SV *sv_self, *sv_events;
218 229
230 /* libev might have stopped the watcher */
231 if (expect_false (w->e_flags & WFLAG_UNREFED)
232 && !ev_is_active (w))
233 REF (w);
234
219 if (expect_true (sv_self_cache)) 235 if (expect_true (sv_self_cache))
220 { 236 {
221 sv_self = sv_self_cache; sv_self_cache = 0; 237 sv_self = sv_self_cache; sv_self_cache = 0;
222 SvRV_set (sv_self, SvREFCNT_inc_NN (w->self)); 238 SvRV_set (sv_self, SvREFCNT_inc_NN (w->self));
223 } 239 }
… …
244 PUSHs (sv_events); 260 PUSHs (sv_events);
245 261
246 PUTBACK; 262 PUTBACK;
247 call_sv (w->cb_sv, G_DISCARD | G_VOID | G_EVAL); 263 call_sv (w->cb_sv, G_DISCARD | G_VOID | G_EVAL);
248 264
249 if (expect_false (sv_self_cache)) 265 if (expect_false (SvREFCNT (sv_self) != 1 || sv_self_cache))
250 SvREFCNT_dec (sv_self); 266 SvREFCNT_dec (sv_self);
251 else 267 else
252 { 268 {
253 SvREFCNT_dec (SvRV (sv_self)); 269 SvREFCNT_dec (SvRV (sv_self));
254 SvRV_set (sv_self, &PL_sv_undef); 270 SvRV_set (sv_self, &PL_sv_undef);
255 sv_self_cache = sv_self; 271 sv_self_cache = sv_self;
256 } 272 }
257 273
258 if (expect_false (sv_events_cache)) 274 if (expect_false (SvREFCNT (sv_events) != 1 || sv_events_cache))
259 SvREFCNT_dec (sv_events); 275 SvREFCNT_dec (sv_events);
260 else 276 else
261 sv_events_cache = sv_events; 277 sv_events_cache = sv_events;
262 278
263 if (SvTRUE (ERRSV)) 279 if (expect_false (SvTRUE (ERRSV)))
264 { 280 {
265 SPAGAIN; 281 SPAGAIN;
266 PUSHMARK (SP); 282 PUSHMARK (SP);
267 PUTBACK; 283 PUTBACK;
268 call_sv (get_sv ("EV::DIED", 1), G_DISCARD | G_VOID | G_EVAL | G_KEEPERR); 284 call_sv (get_sv ("EV::DIED", 1), G_DISCARD | G_VOID | G_EVAL | G_KEEPERR);
… …
520 536
521unsigned int ev_recommended_backends () 537unsigned int ev_recommended_backends ()
522 538
523unsigned int ev_embeddable_backends () 539unsigned int ev_embeddable_backends ()
524 540
541void ev_sleep (NV interval)
542
525NV ev_time () 543NV ev_time ()
526 544
527NV ev_now () 545NV ev_now ()
528 C_ARGS: evapi.default_loop 546 C_ARGS: evapi.default_loop
529 547
… …
740 RETVAL = w->e_flags & WFLAG_KEEPALIVE; 758 RETVAL = w->e_flags & WFLAG_KEEPALIVE;
741 new_value = new_value ? WFLAG_KEEPALIVE : 0; 759 new_value = new_value ? WFLAG_KEEPALIVE : 0;
742 760
743 if (items > 1 && ((new_value ^ w->e_flags) & WFLAG_KEEPALIVE)) 761 if (items > 1 && ((new_value ^ w->e_flags) & WFLAG_KEEPALIVE))
744 { 762 {
763 w->e_flags = (w->e_flags & ~WFLAG_KEEPALIVE) | new_value;
745 REF (w); 764 REF (w);
746 w->e_flags = (w->e_flags & ~WFLAG_KEEPALIVE) | new_value;
747 UNREF (w); 765 UNREF (w);
748 } 766 }
749} 767}
750 OUTPUT: 768 OUTPUT:
751 RETVAL 769 RETVAL
… …
926 944
927void ev_timer_again (ev_timer *w) 945void ev_timer_again (ev_timer *w)
928 INIT: 946 INIT:
929 CHECK_REPEAT (w->repeat); 947 CHECK_REPEAT (w->repeat);
930 CODE: 948 CODE:
931 REF (w);
932 ev_timer_again (e_loop (w), w); 949 ev_timer_again (e_loop (w), w);
933 UNREF (w); 950 UNREF (w);
934 951
935void DESTROY (ev_timer *w) 952void DESTROY (ev_timer *w)
936 CODE: 953 CODE:
… …
955 CODE: 972 CODE:
956 STOP (periodic, w); 973 STOP (periodic, w);
957 974
958void ev_periodic_again (ev_periodic *w) 975void ev_periodic_again (ev_periodic *w)
959 CODE: 976 CODE:
960 REF (w);
961 ev_periodic_again (e_loop (w), w); 977 ev_periodic_again (e_loop (w), w);
962 UNREF (w); 978 UNREF (w);
963 979
964void DESTROY (ev_periodic *w) 980void DESTROY (ev_periodic *w)
965 CODE: 981 CODE:

Diff Legend

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