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

Comparing EV/EV.xs (file contents):
Revision 1.113 by root, Thu May 22 02:44:57 2008 UTC vs.
Revision 1.127 by root, Tue Jul 14 02:33:55 2009 UTC

1#include "EXTERN.h" 1#include "EXTERN.h"
2#include "perl.h" 2#include "perl.h"
3#include "XSUB.h" 3#include "XSUB.h"
4 4
5/*#include <netinet/in.h>*/
6
7/* fix perl api breakage */ 5/* fix perl api breakage */
8#undef signal 6#undef signal
9#undef sigaction 7#undef sigaction
8
9#include "schmorp.h"
10
11/* old API compatibility */
12static int
13sv_fileno (SV *fh)
14{
15 return s_fileno (fh, 0);
16}
10 17
11#define EV_PROTOTYPES 1 18#define EV_PROTOTYPES 1
12#define EV_USE_NANOSLEEP EV_USE_MONOTONIC 19#define EV_USE_NANOSLEEP EV_USE_MONOTONIC
13#define EV_H <ev.h> 20#define EV_H <ev.h>
14#include "EV/EVAPI.h" 21#include "EV/EVAPI.h"
… …
27#endif 34#endif
28 35
29#define e_loop(w) INT2PTR (struct ev_loop *, SvIVX ((w)->loop)) 36#define e_loop(w) INT2PTR (struct ev_loop *, SvIVX ((w)->loop))
30 37
31#define WFLAG_KEEPALIVE 1 38#define WFLAG_KEEPALIVE 1
39#define WFLAG_UNREFED 2 /* has been unref'ed */
32 40
33#define UNREF(w) \ 41#define UNREF(w) \
34 if (!((w)->e_flags & WFLAG_KEEPALIVE) \ 42 if (!((w)->e_flags & (WFLAG_KEEPALIVE | WFLAG_UNREFED)) \
35 && !ev_is_active (w)) \ 43 && ev_is_active (w)) \
44 { \
36 ev_unref (e_loop (w)); 45 ev_unref (e_loop (w)); \
46 (w)->e_flags |= WFLAG_UNREFED; \
47 }
37 48
38#define REF(w) \ 49#define REF(w) \
39 if (!((w)->e_flags & WFLAG_KEEPALIVE) \ 50 if ((w)->e_flags & WFLAG_UNREFED) \
40 && ev_is_active (w)) \ 51 { \
52 (w)->e_flags &= ~WFLAG_UNREFED; \
41 ev_ref (e_loop (w)); 53 ev_ref (e_loop (w)); \
54 }
42 55
43#define START(type,w) \ 56#define START(type,w) \
44 do { \ 57 do { \
58 ev_ ## type ## _start (e_loop (w), w); \
45 UNREF (w); \ 59 UNREF (w); \
46 ev_ ## type ## _start (e_loop (w), w); \
47 } while (0) 60 } while (0)
48 61
49#define STOP(type,w) \ 62#define STOP(type,w) \
50 do { \ 63 do { \
51 REF (w); \ 64 REF (w); \
… …
80 *stash_check, 93 *stash_check,
81 *stash_embed, 94 *stash_embed,
82 *stash_fork, 95 *stash_fork,
83 *stash_async; 96 *stash_async;
84 97
85#ifndef SIG_SIZE
86/* kudos to Slaven Rezic for the idea */
87static char sig_size [] = { SIG_NUM };
88# define SIG_SIZE (sizeof (sig_size) + 1)
89#endif
90
91static Signal
92sv_signum (SV *sig)
93{
94 Signal signum;
95
96 SvGETMAGIC (sig);
97
98 for (signum = 1; signum < SIG_SIZE; ++signum)
99 if (strEQ (SvPV_nolen (sig), PL_sig_name [signum]))
100 return signum;
101
102 signum = SvIV (sig);
103
104 if (signum > 0 && signum < SIG_SIZE)
105 return signum;
106
107 return -1;
108}
109
110///////////////////////////////////////////////////////////////////////////// 98/////////////////////////////////////////////////////////////////////////////
111// Event 99// Event
112 100
113static void e_cb (EV_P_ ev_watcher *w, int revents); 101static void e_cb (EV_P_ ev_watcher *w, int revents);
114 102
115static int
116sv_fileno (SV *fh)
117{
118 SvGETMAGIC (fh);
119
120 if (SvROK (fh))
121 fh = SvRV (fh);
122
123 if (SvTYPE (fh) == SVt_PVGV)
124 return PerlIO_fileno (IoIFP (sv_2io (fh)));
125
126 if (SvOK (fh) && (SvIV (fh) >= 0) && (SvIV (fh) < 0x7fffffffL))
127 return SvIV (fh);
128
129 return -1;
130}
131
132static SV *
133e_get_cv (SV *cb_sv)
134{
135 HV *st;
136 GV *gvp;
137 CV *cv = sv_2cv (cb_sv, &st, &gvp, 0);
138
139 if (!cv)
140 croak ("EV watcher callback must be a CODE reference");
141
142 return (SV *)cv;
143}
144
145static void * 103static void *
146e_new (int size, SV *cb_sv, SV *loop) 104e_new (int size, SV *cb_sv, SV *loop)
147{ 105{
148 SV *cv = e_get_cv (cb_sv); 106 SV *cv = cb_sv ? s_get_cv_croak (cb_sv) : 0;
149 ev_watcher *w; 107 ev_watcher *w;
150 SV *self = NEWSV (0, size); 108 SV *self = NEWSV (0, size);
151 SvPOK_only (self); 109 SvPOK_only (self);
152 SvCUR_set (self, size); 110 SvCUR_set (self, size);
153 111
154 w = (ev_watcher *)SvPVX (self); 112 w = (ev_watcher *)SvPVX (self);
155 113
156 ev_init (w, e_cb); 114 ev_init (w, cv ? e_cb : 0);
157 115
158 w->loop = SvREFCNT_inc (SvRV (loop)); 116 w->loop = SvREFCNT_inc (SvRV (loop));
159 w->e_flags = WFLAG_KEEPALIVE; 117 w->e_flags = WFLAG_KEEPALIVE;
160 w->data = 0; 118 w->data = 0;
161 w->fh = 0; 119 w->fh = 0;
… …
191 } 149 }
192 150
193 return rv; 151 return rv;
194} 152}
195 153
196static SV *sv_events_cache; 154static SV *sv_self_cache, *sv_events_cache;
197 155
198static void 156static void
199e_cb (EV_P_ ev_watcher *w, int revents) 157e_cb (EV_P_ ev_watcher *w, int revents)
200{ 158{
201 dSP; 159 dSP;
202 I32 mark = SP - PL_stack_base; 160 I32 mark = SP - PL_stack_base;
203 SV *sv_self, *sv_events; 161 SV *sv_self, *sv_events;
204 162
163 /* libev might have stopped the watcher */
164 if (expect_false (w->e_flags & WFLAG_UNREFED)
165 && !ev_is_active (w))
166 REF (w);
167
168 if (expect_true (sv_self_cache))
169 {
170 sv_self = sv_self_cache; sv_self_cache = 0;
171 SvRV_set (sv_self, SvREFCNT_inc_NN (w->self));
172 }
173 else
174 {
205 sv_self = newRV_inc (w->self); /* w->self MUST be blessed by now */ 175 sv_self = newRV_inc (w->self); /* w->self MUST be blessed by now */
176 SvREADONLY_on (sv_self);
177 }
178
179 if (expect_true (sv_events_cache))
180 {
181 sv_events = sv_events_cache; sv_events_cache = 0;
182 SvIV_set (sv_events, revents);
183 }
184 else
185 {
186 sv_events = newSViv (revents);
187 SvREADONLY_on (sv_events);
188 }
189
190 PUSHMARK (SP);
191 EXTEND (SP, 2);
192 PUSHs (sv_self);
193 PUSHs (sv_events);
194
195 PUTBACK;
196 call_sv (w->cb_sv, G_DISCARD | G_VOID | G_EVAL);
197
198 if (expect_false (SvREFCNT (sv_self) != 1 || sv_self_cache))
199 SvREFCNT_dec (sv_self);
200 else
201 {
202 SvREFCNT_dec (SvRV (sv_self));
203 SvRV_set (sv_self, &PL_sv_undef);
204 sv_self_cache = sv_self;
205 }
206
207 if (expect_false (SvREFCNT (sv_events) != 1 || sv_events_cache))
208 SvREFCNT_dec (sv_events);
209 else
210 sv_events_cache = sv_events;
211
212 if (expect_false (SvTRUE (ERRSV)))
213 {
214 SPAGAIN;
215 PUSHMARK (SP);
216 PUTBACK;
217 call_sv (get_sv ("EV::DIED", 1), G_DISCARD | G_VOID | G_EVAL | G_KEEPERR);
218 }
219
220 SP = PL_stack_base + mark;
221 PUTBACK;
222}
223
224static void
225e_once_cb (int revents, void *arg)
226{
227 dSP;
228 I32 mark = SP - PL_stack_base;
229 SV *sv_events;
206 230
207 if (sv_events_cache) 231 if (sv_events_cache)
208 { 232 {
209 sv_events = sv_events_cache; sv_events_cache = 0; 233 sv_events = sv_events_cache; sv_events_cache = 0;
210 SvIV_set (sv_events, revents); 234 SvIV_set (sv_events, revents);
211 } 235 }
212 else 236 else
213 sv_events = newSViv (revents); 237 sv_events = newSViv (revents);
214 238
215 PUSHMARK (SP); 239 PUSHMARK (SP);
216 EXTEND (SP, 2);
217 PUSHs (sv_self);
218 PUSHs (sv_events); 240 XPUSHs (sv_events);
219 241
220 PUTBACK; 242 PUTBACK;
221 call_sv (w->cb_sv, G_DISCARD | G_VOID | G_EVAL); 243 call_sv ((SV *)arg, G_DISCARD | G_VOID | G_EVAL);
222 244
223 SvREFCNT_dec (sv_self); 245 SvREFCNT_dec ((SV *)arg);
224 246
225 if (sv_events_cache) 247 if (sv_events_cache)
226 SvREFCNT_dec (sv_events); 248 SvREFCNT_dec (sv_events);
227 else 249 else
228 sv_events_cache = sv_events; 250 sv_events_cache = sv_events;
… …
237 259
238 SP = PL_stack_base + mark; 260 SP = PL_stack_base + mark;
239 PUTBACK; 261 PUTBACK;
240} 262}
241 263
242static void
243e_once_cb (int revents, void *arg)
244{
245 dSP;
246 I32 mark = SP - PL_stack_base;
247 SV *sv_events;
248
249 if (sv_events_cache)
250 {
251 sv_events = sv_events_cache; sv_events_cache = 0;
252 SvIV_set (sv_events, revents);
253 }
254 else
255 sv_events = newSViv (revents);
256
257 PUSHMARK (SP);
258 XPUSHs (sv_events);
259
260 PUTBACK;
261 call_sv ((SV *)arg, G_DISCARD | G_VOID | G_EVAL);
262
263 SvREFCNT_dec ((SV *)arg);
264
265 if (sv_events_cache)
266 SvREFCNT_dec (sv_events);
267 else
268 sv_events_cache = sv_events;
269
270 if (SvTRUE (ERRSV))
271 {
272 SPAGAIN;
273 PUSHMARK (SP);
274 PUTBACK;
275 call_sv (get_sv ("EV::DIED", 1), G_DISCARD | G_VOID | G_EVAL | G_KEEPERR);
276 }
277
278 SP = PL_stack_base + mark;
279 PUTBACK;
280}
281
282static ev_tstamp 264static ev_tstamp
283e_periodic_cb (ev_periodic *w, ev_tstamp now) 265e_periodic_cb (ev_periodic *w, ev_tstamp now)
284{ 266{
285 ev_tstamp retval; 267 ev_tstamp retval;
286 int count; 268 int count;
… …
350 const_iv (EV_, MINPRI) 332 const_iv (EV_, MINPRI)
351 const_iv (EV_, MAXPRI) 333 const_iv (EV_, MAXPRI)
352 334
353 const_iv (EV_, UNDEF) 335 const_iv (EV_, UNDEF)
354 const_iv (EV_, NONE) 336 const_iv (EV_, NONE)
355 const_iv (EV_, TIMEOUT)
356 const_iv (EV_, READ) 337 const_iv (EV_, READ)
357 const_iv (EV_, WRITE) 338 const_iv (EV_, WRITE)
339 const_iv (EV_, IO)
340 const_iv (EV_, TIMEOUT)
341 const_iv (EV_, TIMER)
342 const_iv (EV_, PERIODIC)
358 const_iv (EV_, SIGNAL) 343 const_iv (EV_, SIGNAL)
344 const_iv (EV_, CHILD)
345 const_iv (EV_, STAT)
359 const_iv (EV_, IDLE) 346 const_iv (EV_, IDLE)
347 const_iv (EV_, PREPARE)
360 const_iv (EV_, CHECK) 348 const_iv (EV_, CHECK)
349 const_iv (EV_, EMBED)
350 const_iv (EV_, FORK)
351 const_iv (EV_, ASYNC)
352 const_iv (EV_, CUSTOM)
361 const_iv (EV_, ERROR) 353 const_iv (EV_, ERROR)
362 354
355 const_iv (EV, LOOP_NONBLOCK)
363 const_iv (EV, LOOP_ONESHOT) 356 const_iv (EV, LOOP_ONESHOT)
357
364 const_iv (EV, LOOP_NONBLOCK) 358 const_iv (EV, UNLOOP_CANCEL)
365 const_iv (EV, UNLOOP_ONE) 359 const_iv (EV, UNLOOP_ONE)
366 const_iv (EV, UNLOOP_ALL) 360 const_iv (EV, UNLOOP_ALL)
367 361
368 const_iv (EV, BACKEND_SELECT) 362 const_iv (EV, BACKEND_SELECT)
369 const_iv (EV, BACKEND_POLL) 363 const_iv (EV, BACKEND_POLL)
… …
372 const_iv (EV, BACKEND_DEVPOLL) 366 const_iv (EV, BACKEND_DEVPOLL)
373 const_iv (EV, BACKEND_PORT) 367 const_iv (EV, BACKEND_PORT)
374 const_iv (EV, FLAG_AUTO) 368 const_iv (EV, FLAG_AUTO)
375 const_iv (EV, FLAG_NOENV) 369 const_iv (EV, FLAG_NOENV)
376 const_iv (EV, FLAG_FORKCHECK) 370 const_iv (EV, FLAG_FORKCHECK)
371
372 const_iv (EV_, VERSION_MAJOR)
373 const_iv (EV_, VERSION_MINOR)
377 }; 374 };
378 375
379 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 376 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
380 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 377 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
381 378
… …
400 397
401 /* the poor man's shared library emulator */ 398 /* the poor man's shared library emulator */
402 evapi.ver = EV_API_VERSION; 399 evapi.ver = EV_API_VERSION;
403 evapi.rev = EV_API_REVISION; 400 evapi.rev = EV_API_REVISION;
404 evapi.sv_fileno = sv_fileno; 401 evapi.sv_fileno = sv_fileno;
405 evapi.sv_signum = sv_signum; 402 evapi.sv_signum = s_signum;
406 evapi.supported_backends = ev_supported_backends (); 403 evapi.supported_backends = ev_supported_backends ();
407 evapi.recommended_backends = ev_recommended_backends (); 404 evapi.recommended_backends = ev_recommended_backends ();
408 evapi.embeddable_backends = ev_embeddable_backends (); 405 evapi.embeddable_backends = ev_embeddable_backends ();
409 evapi.time_ = ev_time; 406 evapi.time_ = ev_time;
410 evapi.sleep_ = ev_sleep; 407 evapi.sleep_ = ev_sleep;
411 evapi.loop_new = ev_loop_new; 408 evapi.loop_new = ev_loop_new;
412 evapi.loop_destroy = ev_loop_destroy; 409 evapi.loop_destroy = ev_loop_destroy;
413 evapi.loop_fork = ev_loop_fork; 410 evapi.loop_fork = ev_loop_fork;
414 evapi.loop_count = ev_loop_count; 411 evapi.loop_count = ev_loop_count;
412 evapi.loop_depth = ev_loop_depth;
413 evapi.set_userdata = ev_set_userdata;
414 evapi.userdata = ev_userdata;
415 evapi.now = ev_now; 415 evapi.now = ev_now;
416 evapi.now_update = ev_now_update;
417 evapi.suspend = ev_suspend;
418 evapi.resume = ev_resume;
416 evapi.backend = ev_backend; 419 evapi.backend = ev_backend;
417 evapi.unloop = ev_unloop; 420 evapi.unloop = ev_unloop;
421 evapi.invoke_pending = ev_invoke_pending;
422 evapi.set_loop_release_cb = ev_set_loop_release_cb;
423 evapi.set_invoke_pending_cb= ev_set_invoke_pending_cb;
418 evapi.ref = ev_ref; 424 evapi.ref = ev_ref;
419 evapi.unref = ev_unref; 425 evapi.unref = ev_unref;
420 evapi.loop = ev_loop; 426 evapi.loop = ev_loop;
421 evapi.once = ev_once; 427 evapi.once = ev_once;
422 evapi.io_start = ev_io_start; 428 evapi.io_start = ev_io_start;
… …
486 492
487unsigned int ev_recommended_backends () 493unsigned int ev_recommended_backends ()
488 494
489unsigned int ev_embeddable_backends () 495unsigned int ev_embeddable_backends ()
490 496
497void ev_sleep (NV interval)
498
491NV ev_time () 499NV ev_time ()
492 500
493NV ev_now () 501NV ev_now ()
494 C_ARGS: evapi.default_loop 502 C_ARGS: evapi.default_loop
495 503
504void ev_now_update ()
505 C_ARGS: evapi.default_loop
506
507void ev_suspend ()
508 C_ARGS: evapi.default_loop
509
510void ev_resume ()
511 C_ARGS: evapi.default_loop
512
496unsigned int ev_backend () 513unsigned int ev_backend ()
497 C_ARGS: evapi.default_loop 514 C_ARGS: evapi.default_loop
498 515
516void ev_loop_verify ()
517 C_ARGS: evapi.default_loop
518
499unsigned int ev_loop_count () 519unsigned int ev_loop_count ()
500 C_ARGS: evapi.default_loop 520 C_ARGS: evapi.default_loop
501 521
522unsigned int ev_loop_depth ()
523 C_ARGS: evapi.default_loop
524
502void ev_set_io_collect_interval (NV interval) 525void ev_set_io_collect_interval (NV interval)
503 C_ARGS: evapi.default_loop, interval 526 C_ARGS: evapi.default_loop, interval
504 527
505void ev_set_timeout_collect_interval (NV interval) 528void ev_set_timeout_collect_interval (NV interval)
506 C_ARGS: evapi.default_loop, interval 529 C_ARGS: evapi.default_loop, interval
… …
515 C_ARGS: evapi.default_loop, fd, revents 538 C_ARGS: evapi.default_loop, fd, revents
516 539
517void ev_feed_signal_event (SV *signal) 540void ev_feed_signal_event (SV *signal)
518 CODE: 541 CODE:
519{ 542{
520 Signal signum = sv_signum (signal); 543 Signal signum = s_signum (signal);
521 CHECK_SIG (signal, signum); 544 CHECK_SIG (signal, signum);
522 545
523 ev_feed_signal_event (evapi.default_loop, signum); 546 ev_feed_signal_event (evapi.default_loop, signum);
524} 547}
525 548
526ev_io *io (SV *fh, int events, SV *cb) 549ev_io *io (SV *fh, int events, SV *cb)
527 ALIAS: 550 ALIAS:
528 io_ns = 1 551 io_ns = 1
529 CODE: 552 CODE:
530{ 553{
531 int fd = sv_fileno (fh); 554 int fd = s_fileno (fh, events & EV_WRITE);
532 CHECK_FD (fh, fd); 555 CHECK_FD (fh, fd);
533 556
534 RETVAL = e_new (sizeof (ev_io), cb, default_loop_sv); 557 RETVAL = e_new (sizeof (ev_io), cb, default_loop_sv);
535 RETVAL->fh = newSVsv (fh); 558 RETVAL->fh = newSVsv (fh);
536 ev_io_set (RETVAL, fd, events); 559 ev_io_set (RETVAL, fd, events);
… …
571ev_signal *signal (SV *signal, SV *cb) 594ev_signal *signal (SV *signal, SV *cb)
572 ALIAS: 595 ALIAS:
573 signal_ns = 1 596 signal_ns = 1
574 CODE: 597 CODE:
575{ 598{
576 Signal signum = sv_signum (signal); 599 Signal signum = s_signum (signal);
577 CHECK_SIG (signal, signum); 600 CHECK_SIG (signal, signum);
578 601
579 RETVAL = e_new (sizeof (ev_signal), cb, default_loop_sv); 602 RETVAL = e_new (sizeof (ev_signal), cb, default_loop_sv);
580 ev_signal_set (RETVAL, signum); 603 ev_signal_set (RETVAL, signum);
581 if (!ix) START (signal, RETVAL); 604 if (!ix) START (signal, RETVAL);
… …
642 ev_stat_set (RETVAL, SvPVbyte_nolen (RETVAL->fh), interval); 665 ev_stat_set (RETVAL, SvPVbyte_nolen (RETVAL->fh), interval);
643 if (!ix) START (stat, RETVAL); 666 if (!ix) START (stat, RETVAL);
644 OUTPUT: 667 OUTPUT:
645 RETVAL 668 RETVAL
646 669
647ev_embed *embed (struct ev_loop *loop, SV *cb = &PL_sv_undef) 670ev_embed *embed (struct ev_loop *loop, SV *cb = 0)
648 ALIAS: 671 ALIAS:
649 embed_ns = 1 672 embed_ns = 1
650 CODE: 673 CODE:
651{ 674{
652 if (!(ev_backend (loop) & ev_embeddable_backends ())) 675 if (!(ev_backend (loop) & ev_embeddable_backends ()))
653 croak ("passed loop is not embeddable via EV::embed,"); 676 croak ("passed loop is not embeddable via EV::embed,");
654 677
655 RETVAL = e_new (sizeof (ev_embed), cb, default_loop_sv); 678 RETVAL = e_new (sizeof (ev_embed), cb, default_loop_sv);
656 RETVAL->fh = newSVsv (ST (0)); 679 RETVAL->fh = newSVsv (ST (0));
657 ev_embed_set (RETVAL, loop); 680 ev_embed_set (RETVAL, loop);
658
659 if (!SvOK (cb)) ev_set_cb (RETVAL, 0);
660
661 if (!ix) START (embed, RETVAL); 681 if (!ix) START (embed, RETVAL);
662} 682}
663 OUTPUT: 683 OUTPUT:
664 RETVAL 684 RETVAL
665 685
… …
675 695
676void once (SV *fh, int events, SV *timeout, SV *cb) 696void once (SV *fh, int events, SV *timeout, SV *cb)
677 CODE: 697 CODE:
678 ev_once ( 698 ev_once (
679 evapi.default_loop, 699 evapi.default_loop,
680 sv_fileno (fh), events, 700 s_fileno (fh, events & EV_WRITE), events,
681 SvOK (timeout) ? SvNV (timeout) : -1., 701 SvOK (timeout) ? SvNV (timeout) : -1.,
682 e_once_cb, 702 e_once_cb,
683 newSVsv (cb) 703 newSVsv (cb)
684 ); 704 );
685 705
… …
706 RETVAL = w->e_flags & WFLAG_KEEPALIVE; 726 RETVAL = w->e_flags & WFLAG_KEEPALIVE;
707 new_value = new_value ? WFLAG_KEEPALIVE : 0; 727 new_value = new_value ? WFLAG_KEEPALIVE : 0;
708 728
709 if (items > 1 && ((new_value ^ w->e_flags) & WFLAG_KEEPALIVE)) 729 if (items > 1 && ((new_value ^ w->e_flags) & WFLAG_KEEPALIVE))
710 { 730 {
731 w->e_flags = (w->e_flags & ~WFLAG_KEEPALIVE) | new_value;
711 REF (w); 732 REF (w);
712 w->e_flags = (w->e_flags & ~WFLAG_KEEPALIVE) | new_value;
713 UNREF (w); 733 UNREF (w);
714 } 734 }
715} 735}
716 OUTPUT: 736 OUTPUT:
717 RETVAL 737 RETVAL
… …
719SV *cb (ev_watcher *w, SV *new_cb = 0) 739SV *cb (ev_watcher *w, SV *new_cb = 0)
720 CODE: 740 CODE:
721{ 741{
722 if (items > 1) 742 if (items > 1)
723 { 743 {
724 new_cb = e_get_cv (new_cb); 744 new_cb = s_get_cv_croak (new_cb);
725 RETVAL = newRV_noinc (w->cb_sv); 745 RETVAL = newRV_noinc (w->cb_sv);
726 w->cb_sv = SvREFCNT_inc (new_cb); 746 w->cb_sv = SvREFCNT_inc (new_cb);
727 } 747 }
728 else 748 else
729 RETVAL = newRV_inc (w->cb_sv); 749 RETVAL = newRV_inc (w->cb_sv);
… …
799 e_destroy (w); 819 e_destroy (w);
800 820
801void set (ev_io *w, SV *fh, int events) 821void set (ev_io *w, SV *fh, int events)
802 CODE: 822 CODE:
803{ 823{
804 int fd = sv_fileno (fh); 824 int fd = s_fileno (fh, events & EV_WRITE);
805 CHECK_FD (fh, fd); 825 CHECK_FD (fh, fd);
806 826
807 sv_setsv (w->fh, fh); 827 sv_setsv (w->fh, fh);
808 RESET (io, w, (w, fd, events)); 828 RESET (io, w, (w, fd, events));
809} 829}
… …
811SV *fh (ev_io *w, SV *new_fh = 0) 831SV *fh (ev_io *w, SV *new_fh = 0)
812 CODE: 832 CODE:
813{ 833{
814 if (items > 1) 834 if (items > 1)
815 { 835 {
816 int fd = sv_fileno (new_fh); 836 int fd = s_fileno (new_fh, w->events & EV_WRITE);
817 CHECK_FD (new_fh, fd); 837 CHECK_FD (new_fh, fd);
818 838
819 RETVAL = w->fh; 839 RETVAL = w->fh;
820 w->fh = newSVsv (new_fh); 840 w->fh = newSVsv (new_fh);
821 841
… …
854 e_destroy (w); 874 e_destroy (w);
855 875
856void set (ev_signal *w, SV *signal) 876void set (ev_signal *w, SV *signal)
857 CODE: 877 CODE:
858{ 878{
859 Signal signum = sv_signum (signal); 879 Signal signum = s_signum (signal);
860 CHECK_SIG (signal, signum); 880 CHECK_SIG (signal, signum);
861 881
862 RESET (signal, w, (w, signum)); 882 RESET (signal, w, (w, signum));
863} 883}
864 884
… …
867{ 887{
868 RETVAL = w->signum; 888 RETVAL = w->signum;
869 889
870 if (items > 1) 890 if (items > 1)
871 { 891 {
872 Signal signum = sv_signum (new_signal); 892 Signal signum = s_signum (new_signal);
873 CHECK_SIG (new_signal, signum); 893 CHECK_SIG (new_signal, signum);
874 894
875 RESET (signal, w, (w, signum)); 895 RESET (signal, w, (w, signum));
876 } 896 }
877} 897}
… …
892 912
893void ev_timer_again (ev_timer *w) 913void ev_timer_again (ev_timer *w)
894 INIT: 914 INIT:
895 CHECK_REPEAT (w->repeat); 915 CHECK_REPEAT (w->repeat);
896 CODE: 916 CODE:
897 REF (w);
898 ev_timer_again (e_loop (w), w); 917 ev_timer_again (e_loop (w), w);
899 UNREF (w); 918 UNREF (w);
900 919
901void DESTROY (ev_timer *w) 920void DESTROY (ev_timer *w)
902 CODE: 921 CODE:
… …
921 CODE: 940 CODE:
922 STOP (periodic, w); 941 STOP (periodic, w);
923 942
924void ev_periodic_again (ev_periodic *w) 943void ev_periodic_again (ev_periodic *w)
925 CODE: 944 CODE:
926 REF (w);
927 ev_periodic_again (e_loop (w), w); 945 ev_periodic_again (e_loop (w), w);
928 UNREF (w); 946 UNREF (w);
929 947
930void DESTROY (ev_periodic *w) 948void DESTROY (ev_periodic *w)
931 CODE: 949 CODE:
… …
1212 1230
1213void ev_loop_verify (struct ev_loop *loop) 1231void ev_loop_verify (struct ev_loop *loop)
1214 1232
1215NV ev_now (struct ev_loop *loop) 1233NV ev_now (struct ev_loop *loop)
1216 1234
1235void ev_now_update (struct ev_loop *loop)
1236
1237void ev_suspend (struct ev_loop *loop)
1238
1239void ev_resume (struct ev_loop *loop)
1240
1217void ev_set_io_collect_interval (struct ev_loop *loop, NV interval) 1241void ev_set_io_collect_interval (struct ev_loop *loop, NV interval)
1218 1242
1219void ev_set_timeout_collect_interval (struct ev_loop *loop, NV interval) 1243void ev_set_timeout_collect_interval (struct ev_loop *loop, NV interval)
1220 1244
1221unsigned int ev_backend (struct ev_loop *loop) 1245unsigned int ev_backend (struct ev_loop *loop)
1222 1246
1223unsigned int ev_loop_count (struct ev_loop *loop) 1247unsigned int ev_loop_count (struct ev_loop *loop)
1224 1248
1249unsigned int ev_loop_depth (struct ev_loop *loop)
1250
1225void ev_loop (struct ev_loop *loop, int flags = 0) 1251void ev_loop (struct ev_loop *loop, int flags = 0)
1226 1252
1227void ev_unloop (struct ev_loop *loop, int how = 1) 1253void ev_unloop (struct ev_loop *loop, int how = 1)
1228 1254
1229void ev_feed_fd_event (struct ev_loop *loop, int fd, int revents = EV_NONE) 1255void ev_feed_fd_event (struct ev_loop *loop, int fd, int revents = EV_NONE)
… …
1231#if 0 1257#if 0
1232 1258
1233void ev_feed_signal_event (struct ev_loop *loop, SV *signal) 1259void ev_feed_signal_event (struct ev_loop *loop, SV *signal)
1234 CODE: 1260 CODE:
1235{ 1261{
1236 Signal signum = sv_signum (signal); 1262 Signal signum = s_signum (signal);
1237 CHECK_SIG (signal, signum); 1263 CHECK_SIG (signal, signum);
1238 1264
1239 ev_feed_signal_event (loop, signum); 1265 ev_feed_signal_event (loop, signum);
1240} 1266}
1241 1267
… …
1244ev_io *io (struct ev_loop *loop, SV *fh, int events, SV *cb) 1270ev_io *io (struct ev_loop *loop, SV *fh, int events, SV *cb)
1245 ALIAS: 1271 ALIAS:
1246 io_ns = 1 1272 io_ns = 1
1247 CODE: 1273 CODE:
1248{ 1274{
1249 int fd = sv_fileno (fh); 1275 int fd = s_fileno (fh, events & EV_WRITE);
1250 CHECK_FD (fh, fd); 1276 CHECK_FD (fh, fd);
1251 1277
1252 RETVAL = e_new (sizeof (ev_io), cb, ST (0)); 1278 RETVAL = e_new (sizeof (ev_io), cb, ST (0));
1253 RETVAL->fh = newSVsv (fh); 1279 RETVAL->fh = newSVsv (fh);
1254 ev_io_set (RETVAL, fd, events); 1280 ev_io_set (RETVAL, fd, events);
… …
1291ev_signal *signal (struct ev_loop *loop, SV *signal, SV *cb) 1317ev_signal *signal (struct ev_loop *loop, SV *signal, SV *cb)
1292 ALIAS: 1318 ALIAS:
1293 signal_ns = 1 1319 signal_ns = 1
1294 CODE: 1320 CODE:
1295{ 1321{
1296 Signal signum = sv_signum (signal); 1322 Signal signum = s_signum (signal);
1297 CHECK_SIG (signal, signum); 1323 CHECK_SIG (signal, signum);
1298 1324
1299 RETVAL = e_new (sizeof (ev_signal), cb, ST (0)); 1325 RETVAL = e_new (sizeof (ev_signal), cb, ST (0));
1300 ev_signal_set (RETVAL, signum); 1326 ev_signal_set (RETVAL, signum);
1301 if (!ix) START (signal, RETVAL); 1327 if (!ix) START (signal, RETVAL);
… …
1364 ev_stat_set (RETVAL, SvPVbyte_nolen (RETVAL->fh), interval); 1390 ev_stat_set (RETVAL, SvPVbyte_nolen (RETVAL->fh), interval);
1365 if (!ix) START (stat, RETVAL); 1391 if (!ix) START (stat, RETVAL);
1366 OUTPUT: 1392 OUTPUT:
1367 RETVAL 1393 RETVAL
1368 1394
1369ev_embed *embed (struct ev_loop *loop, struct ev_loop *other, SV *cb = &PL_sv_undef) 1395ev_embed *embed (struct ev_loop *loop, struct ev_loop *other, SV *cb = 0)
1370 ALIAS: 1396 ALIAS:
1371 embed_ns = 1 1397 embed_ns = 1
1372 CODE: 1398 CODE:
1373{ 1399{
1374 if (!(ev_backend (other) & ev_embeddable_backends ())) 1400 if (!(ev_backend (other) & ev_embeddable_backends ()))
1375 croak ("passed loop is not embeddable via EV::embed,"); 1401 croak ("passed loop is not embeddable via EV::embed,");
1376 1402
1377 RETVAL = e_new (sizeof (ev_embed), cb, ST (0)); 1403 RETVAL = e_new (sizeof (ev_embed), cb, ST (0));
1378 RETVAL->fh = newSVsv (ST (1)); 1404 RETVAL->fh = newSVsv (ST (1));
1379 ev_embed_set (RETVAL, other); 1405 ev_embed_set (RETVAL, other);
1380
1381 if (!SvOK (cb)) ev_set_cb (RETVAL, 0);
1382
1383 if (!ix) START (embed, RETVAL); 1406 if (!ix) START (embed, RETVAL);
1384} 1407}
1385 OUTPUT: 1408 OUTPUT:
1386 RETVAL 1409 RETVAL
1387 1410
… …
1397 1420
1398void once (struct ev_loop *loop, SV *fh, int events, SV *timeout, SV *cb) 1421void once (struct ev_loop *loop, SV *fh, int events, SV *timeout, SV *cb)
1399 CODE: 1422 CODE:
1400 ev_once ( 1423 ev_once (
1401 loop, 1424 loop,
1402 sv_fileno (fh), events, 1425 s_fileno (fh, events & EV_WRITE), events,
1403 SvOK (timeout) ? SvNV (timeout) : -1., 1426 SvOK (timeout) ? SvNV (timeout) : -1.,
1404 e_once_cb, 1427 e_once_cb,
1405 newSVsv (cb) 1428 newSVsv (cb)
1406 ); 1429 );
1407 1430

Diff Legend

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