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

Comparing EV/EV.xs (file contents):
Revision 1.117 by root, Wed Oct 29 14:12:34 2008 UTC vs.
Revision 1.126 by root, Tue Jul 14 00:09:59 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 10
11#define EV_PROTOTYPES 1 11#define EV_PROTOTYPES 1
12#define EV_USE_NANOSLEEP EV_USE_MONOTONIC 12#define EV_USE_NANOSLEEP EV_USE_MONOTONIC
13#define EV_H <ev.h> 13#define EV_H <ev.h>
14#include "EV/EVAPI.h" 14#include "EV/EVAPI.h"
… …
24 24
25#ifndef _WIN32 25#ifndef _WIN32
26# include <pthread.h> 26# include <pthread.h>
27#endif 27#endif
28 28
29/* 5.10.0 */
30#ifndef SvREFCNT_inc_NN
31# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
32#endif
33
34#if __GNUC__ >= 3
35# define expect(expr,value) __builtin_expect ((expr),(value))
36#else
37# define expect(expr,value) (expr)
38#endif
39
40#define expect_false(expr) expect ((expr) != 0, 0)
41#define expect_true(expr) expect ((expr) != 0, 1)
42
43#define e_loop(w) INT2PTR (struct ev_loop *, SvIVX ((w)->loop)) 29#define e_loop(w) INT2PTR (struct ev_loop *, SvIVX ((w)->loop))
44 30
45#define WFLAG_KEEPALIVE 1 31#define WFLAG_KEEPALIVE 1
32#define WFLAG_UNREFED 2 /* has been unref'ed */
46 33
47#define UNREF(w) \ 34#define UNREF(w) \
48 if (!((w)->e_flags & WFLAG_KEEPALIVE) \ 35 if (!((w)->e_flags & (WFLAG_KEEPALIVE | WFLAG_UNREFED)) \
49 && !ev_is_active (w)) \ 36 && ev_is_active (w)) \
37 { \
50 ev_unref (e_loop (w)); 38 ev_unref (e_loop (w)); \
39 (w)->e_flags |= WFLAG_UNREFED; \
40 }
51 41
52#define REF(w) \ 42#define REF(w) \
53 if (!((w)->e_flags & WFLAG_KEEPALIVE) \ 43 if ((w)->e_flags & WFLAG_UNREFED) \
54 && ev_is_active (w)) \ 44 { \
45 (w)->e_flags &= ~WFLAG_UNREFED; \
55 ev_ref (e_loop (w)); 46 ev_ref (e_loop (w)); \
47 }
56 48
57#define START(type,w) \ 49#define START(type,w) \
58 do { \ 50 do { \
51 ev_ ## type ## _start (e_loop (w), w); \
59 UNREF (w); \ 52 UNREF (w); \
60 ev_ ## type ## _start (e_loop (w), w); \
61 } while (0) 53 } while (0)
62 54
63#define STOP(type,w) \ 55#define STOP(type,w) \
64 do { \ 56 do { \
65 REF (w); \ 57 REF (w); \
… …
94 *stash_check, 86 *stash_check,
95 *stash_embed, 87 *stash_embed,
96 *stash_fork, 88 *stash_fork,
97 *stash_async; 89 *stash_async;
98 90
99#ifndef SIG_SIZE
100/* kudos to Slaven Rezic for the idea */
101static char sig_size [] = { SIG_NUM };
102# define SIG_SIZE (sizeof (sig_size) + 1)
103#endif
104
105static Signal
106sv_signum (SV *sig)
107{
108 Signal signum;
109
110 SvGETMAGIC (sig);
111
112 for (signum = 1; signum < SIG_SIZE; ++signum)
113 if (strEQ (SvPV_nolen (sig), PL_sig_name [signum]))
114 return signum;
115
116 signum = SvIV (sig);
117
118 if (signum > 0 && signum < SIG_SIZE)
119 return signum;
120
121 return -1;
122}
123
124///////////////////////////////////////////////////////////////////////////// 91/////////////////////////////////////////////////////////////////////////////
125// Event 92// Event
126 93
127static void e_cb (EV_P_ ev_watcher *w, int revents); 94static void e_cb (EV_P_ ev_watcher *w, int revents);
128 95
129static int
130sv_fileno (SV *fh)
131{
132 SvGETMAGIC (fh);
133
134 if (SvROK (fh))
135 fh = SvRV (fh);
136
137 if (SvTYPE (fh) == SVt_PVGV)
138 return PerlIO_fileno (IoIFP (sv_2io (fh)));
139
140 if (SvOK (fh) && (SvIV (fh) >= 0) && (SvIV (fh) < 0x7fffffffL))
141 return SvIV (fh);
142
143 return -1;
144}
145
146static SV *
147e_get_cv (SV *cb_sv)
148{
149 HV *st;
150 GV *gvp;
151 CV *cv = sv_2cv (cb_sv, &st, &gvp, 0);
152
153 if (!cv)
154 croak ("EV watcher callback must be a CODE reference");
155
156 return (SV *)cv;
157}
158
159static void * 96static void *
160e_new (int size, SV *cb_sv, SV *loop) 97e_new (int size, SV *cb_sv, SV *loop)
161{ 98{
162 SV *cv = cb_sv ? e_get_cv (cb_sv) : 0; 99 SV *cv = cb_sv ? s_get_cv_croak (cb_sv) : 0;
163 ev_watcher *w; 100 ev_watcher *w;
164 SV *self = NEWSV (0, size); 101 SV *self = NEWSV (0, size);
165 SvPOK_only (self); 102 SvPOK_only (self);
166 SvCUR_set (self, size); 103 SvCUR_set (self, size);
167 104
… …
213e_cb (EV_P_ ev_watcher *w, int revents) 150e_cb (EV_P_ ev_watcher *w, int revents)
214{ 151{
215 dSP; 152 dSP;
216 I32 mark = SP - PL_stack_base; 153 I32 mark = SP - PL_stack_base;
217 SV *sv_self, *sv_events; 154 SV *sv_self, *sv_events;
155
156 /* libev might have stopped the watcher */
157 if (expect_false (w->e_flags & WFLAG_UNREFED)
158 && !ev_is_active (w))
159 REF (w);
218 160
219 if (expect_true (sv_self_cache)) 161 if (expect_true (sv_self_cache))
220 { 162 {
221 sv_self = sv_self_cache; sv_self_cache = 0; 163 sv_self = sv_self_cache; sv_self_cache = 0;
222 SvRV_set (sv_self, SvREFCNT_inc_NN (w->self)); 164 SvRV_set (sv_self, SvREFCNT_inc_NN (w->self));
… …
244 PUSHs (sv_events); 186 PUSHs (sv_events);
245 187
246 PUTBACK; 188 PUTBACK;
247 call_sv (w->cb_sv, G_DISCARD | G_VOID | G_EVAL); 189 call_sv (w->cb_sv, G_DISCARD | G_VOID | G_EVAL);
248 190
249 if (expect_false (sv_self_cache)) 191 if (expect_false (SvREFCNT (sv_self) != 1 || sv_self_cache))
250 SvREFCNT_dec (sv_self); 192 SvREFCNT_dec (sv_self);
251 else 193 else
252 { 194 {
253 SvREFCNT_dec (SvRV (sv_self)); 195 SvREFCNT_dec (SvRV (sv_self));
254 SvRV_set (sv_self, &PL_sv_undef); 196 SvRV_set (sv_self, &PL_sv_undef);
255 sv_self_cache = sv_self; 197 sv_self_cache = sv_self;
256 } 198 }
257 199
258 if (expect_false (sv_events_cache)) 200 if (expect_false (SvREFCNT (sv_events) != 1 || sv_events_cache))
201 SvREFCNT_dec (sv_events);
202 else
203 sv_events_cache = sv_events;
204
205 if (expect_false (SvTRUE (ERRSV)))
206 {
207 SPAGAIN;
208 PUSHMARK (SP);
209 PUTBACK;
210 call_sv (get_sv ("EV::DIED", 1), G_DISCARD | G_VOID | G_EVAL | G_KEEPERR);
211 }
212
213 SP = PL_stack_base + mark;
214 PUTBACK;
215}
216
217static void
218e_once_cb (int revents, void *arg)
219{
220 dSP;
221 I32 mark = SP - PL_stack_base;
222 SV *sv_events;
223
224 if (sv_events_cache)
225 {
226 sv_events = sv_events_cache; sv_events_cache = 0;
227 SvIV_set (sv_events, revents);
228 }
229 else
230 sv_events = newSViv (revents);
231
232 PUSHMARK (SP);
233 XPUSHs (sv_events);
234
235 PUTBACK;
236 call_sv ((SV *)arg, G_DISCARD | G_VOID | G_EVAL);
237
238 SvREFCNT_dec ((SV *)arg);
239
240 if (sv_events_cache)
259 SvREFCNT_dec (sv_events); 241 SvREFCNT_dec (sv_events);
260 else 242 else
261 sv_events_cache = sv_events; 243 sv_events_cache = sv_events;
262 244
263 if (SvTRUE (ERRSV)) 245 if (SvTRUE (ERRSV))
… …
270 252
271 SP = PL_stack_base + mark; 253 SP = PL_stack_base + mark;
272 PUTBACK; 254 PUTBACK;
273} 255}
274 256
275static void
276e_once_cb (int revents, void *arg)
277{
278 dSP;
279 I32 mark = SP - PL_stack_base;
280 SV *sv_events;
281
282 if (sv_events_cache)
283 {
284 sv_events = sv_events_cache; sv_events_cache = 0;
285 SvIV_set (sv_events, revents);
286 }
287 else
288 sv_events = newSViv (revents);
289
290 PUSHMARK (SP);
291 XPUSHs (sv_events);
292
293 PUTBACK;
294 call_sv ((SV *)arg, G_DISCARD | G_VOID | G_EVAL);
295
296 SvREFCNT_dec ((SV *)arg);
297
298 if (sv_events_cache)
299 SvREFCNT_dec (sv_events);
300 else
301 sv_events_cache = sv_events;
302
303 if (SvTRUE (ERRSV))
304 {
305 SPAGAIN;
306 PUSHMARK (SP);
307 PUTBACK;
308 call_sv (get_sv ("EV::DIED", 1), G_DISCARD | G_VOID | G_EVAL | G_KEEPERR);
309 }
310
311 SP = PL_stack_base + mark;
312 PUTBACK;
313}
314
315static ev_tstamp 257static ev_tstamp
316e_periodic_cb (ev_periodic *w, ev_tstamp now) 258e_periodic_cb (ev_periodic *w, ev_tstamp now)
317{ 259{
318 ev_tstamp retval; 260 ev_tstamp retval;
319 int count; 261 int count;
… …
383 const_iv (EV_, MINPRI) 325 const_iv (EV_, MINPRI)
384 const_iv (EV_, MAXPRI) 326 const_iv (EV_, MAXPRI)
385 327
386 const_iv (EV_, UNDEF) 328 const_iv (EV_, UNDEF)
387 const_iv (EV_, NONE) 329 const_iv (EV_, NONE)
388 const_iv (EV_, TIMEOUT)
389 const_iv (EV_, READ) 330 const_iv (EV_, READ)
390 const_iv (EV_, WRITE) 331 const_iv (EV_, WRITE)
332 const_iv (EV_, IO)
333 const_iv (EV_, TIMEOUT)
334 const_iv (EV_, TIMER)
335 const_iv (EV_, PERIODIC)
391 const_iv (EV_, SIGNAL) 336 const_iv (EV_, SIGNAL)
337 const_iv (EV_, CHILD)
338 const_iv (EV_, STAT)
392 const_iv (EV_, IDLE) 339 const_iv (EV_, IDLE)
340 const_iv (EV_, PREPARE)
393 const_iv (EV_, CHECK) 341 const_iv (EV_, CHECK)
342 const_iv (EV_, EMBED)
343 const_iv (EV_, FORK)
344 const_iv (EV_, ASYNC)
345 const_iv (EV_, CUSTOM)
394 const_iv (EV_, ERROR) 346 const_iv (EV_, ERROR)
395 347
348 const_iv (EV, LOOP_NONBLOCK)
396 const_iv (EV, LOOP_ONESHOT) 349 const_iv (EV, LOOP_ONESHOT)
350
397 const_iv (EV, LOOP_NONBLOCK) 351 const_iv (EV, UNLOOP_CANCEL)
398 const_iv (EV, UNLOOP_ONE) 352 const_iv (EV, UNLOOP_ONE)
399 const_iv (EV, UNLOOP_ALL) 353 const_iv (EV, UNLOOP_ALL)
400 354
401 const_iv (EV, BACKEND_SELECT) 355 const_iv (EV, BACKEND_SELECT)
402 const_iv (EV, BACKEND_POLL) 356 const_iv (EV, BACKEND_POLL)
… …
405 const_iv (EV, BACKEND_DEVPOLL) 359 const_iv (EV, BACKEND_DEVPOLL)
406 const_iv (EV, BACKEND_PORT) 360 const_iv (EV, BACKEND_PORT)
407 const_iv (EV, FLAG_AUTO) 361 const_iv (EV, FLAG_AUTO)
408 const_iv (EV, FLAG_NOENV) 362 const_iv (EV, FLAG_NOENV)
409 const_iv (EV, FLAG_FORKCHECK) 363 const_iv (EV, FLAG_FORKCHECK)
364
365 const_iv (EV_, VERSION_MAJOR)
366 const_iv (EV_, VERSION_MINOR)
410 }; 367 };
411 368
412 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 369 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
413 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 370 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
414 371
… …
432 perl_get_sv ("EV::API", TRUE); /* silence 5.10 warning */ 389 perl_get_sv ("EV::API", TRUE); /* silence 5.10 warning */
433 390
434 /* the poor man's shared library emulator */ 391 /* the poor man's shared library emulator */
435 evapi.ver = EV_API_VERSION; 392 evapi.ver = EV_API_VERSION;
436 evapi.rev = EV_API_REVISION; 393 evapi.rev = EV_API_REVISION;
437 evapi.sv_fileno = sv_fileno; 394 evapi.sv_fileno = s_fileno;
438 evapi.sv_signum = sv_signum; 395 evapi.sv_signum = s_signum;
439 evapi.supported_backends = ev_supported_backends (); 396 evapi.supported_backends = ev_supported_backends ();
440 evapi.recommended_backends = ev_recommended_backends (); 397 evapi.recommended_backends = ev_recommended_backends ();
441 evapi.embeddable_backends = ev_embeddable_backends (); 398 evapi.embeddable_backends = ev_embeddable_backends ();
442 evapi.time_ = ev_time; 399 evapi.time_ = ev_time;
443 evapi.sleep_ = ev_sleep; 400 evapi.sleep_ = ev_sleep;
444 evapi.loop_new = ev_loop_new; 401 evapi.loop_new = ev_loop_new;
445 evapi.loop_destroy = ev_loop_destroy; 402 evapi.loop_destroy = ev_loop_destroy;
446 evapi.loop_fork = ev_loop_fork; 403 evapi.loop_fork = ev_loop_fork;
447 evapi.loop_count = ev_loop_count; 404 evapi.loop_count = ev_loop_count;
405 evapi.loop_depth = ev_loop_depth;
406 evapi.set_userdata = ev_set_userdata;
407 evapi.userdata = ev_userdata;
448 evapi.now = ev_now; 408 evapi.now = ev_now;
449 evapi.now_update = ev_now_update; 409 evapi.now_update = ev_now_update;
410 evapi.suspend = ev_suspend;
411 evapi.resume = ev_resume;
450 evapi.backend = ev_backend; 412 evapi.backend = ev_backend;
451 evapi.unloop = ev_unloop; 413 evapi.unloop = ev_unloop;
414 evapi.invoke_pending = ev_invoke_pending;
415 evapi.set_loop_release_cb = ev_set_loop_release_cb;
416 evapi.set_invoke_pending_cb= ev_set_invoke_pending_cb;
452 evapi.ref = ev_ref; 417 evapi.ref = ev_ref;
453 evapi.unref = ev_unref; 418 evapi.unref = ev_unref;
454 evapi.loop = ev_loop; 419 evapi.loop = ev_loop;
455 evapi.once = ev_once; 420 evapi.once = ev_once;
456 evapi.io_start = ev_io_start; 421 evapi.io_start = ev_io_start;
… …
530 C_ARGS: evapi.default_loop 495 C_ARGS: evapi.default_loop
531 496
532void ev_now_update () 497void ev_now_update ()
533 C_ARGS: evapi.default_loop 498 C_ARGS: evapi.default_loop
534 499
500void ev_suspend ()
501 C_ARGS: evapi.default_loop
502
503void ev_resume ()
504 C_ARGS: evapi.default_loop
505
535unsigned int ev_backend () 506unsigned int ev_backend ()
536 C_ARGS: evapi.default_loop 507 C_ARGS: evapi.default_loop
537 508
509void ev_loop_verify ()
510 C_ARGS: evapi.default_loop
511
538unsigned int ev_loop_count () 512unsigned int ev_loop_count ()
539 C_ARGS: evapi.default_loop 513 C_ARGS: evapi.default_loop
540 514
515unsigned int ev_loop_depth ()
516 C_ARGS: evapi.default_loop
517
541void ev_set_io_collect_interval (NV interval) 518void ev_set_io_collect_interval (NV interval)
542 C_ARGS: evapi.default_loop, interval 519 C_ARGS: evapi.default_loop, interval
543 520
544void ev_set_timeout_collect_interval (NV interval) 521void ev_set_timeout_collect_interval (NV interval)
545 C_ARGS: evapi.default_loop, interval 522 C_ARGS: evapi.default_loop, interval
… …
554 C_ARGS: evapi.default_loop, fd, revents 531 C_ARGS: evapi.default_loop, fd, revents
555 532
556void ev_feed_signal_event (SV *signal) 533void ev_feed_signal_event (SV *signal)
557 CODE: 534 CODE:
558{ 535{
559 Signal signum = sv_signum (signal); 536 Signal signum = s_signum (signal);
560 CHECK_SIG (signal, signum); 537 CHECK_SIG (signal, signum);
561 538
562 ev_feed_signal_event (evapi.default_loop, signum); 539 ev_feed_signal_event (evapi.default_loop, signum);
563} 540}
564 541
565ev_io *io (SV *fh, int events, SV *cb) 542ev_io *io (SV *fh, int events, SV *cb)
566 ALIAS: 543 ALIAS:
567 io_ns = 1 544 io_ns = 1
568 CODE: 545 CODE:
569{ 546{
570 int fd = sv_fileno (fh); 547 int fd = s_fileno (fh, events & EV_WRITE);
571 CHECK_FD (fh, fd); 548 CHECK_FD (fh, fd);
572 549
573 RETVAL = e_new (sizeof (ev_io), cb, default_loop_sv); 550 RETVAL = e_new (sizeof (ev_io), cb, default_loop_sv);
574 RETVAL->fh = newSVsv (fh); 551 RETVAL->fh = newSVsv (fh);
575 ev_io_set (RETVAL, fd, events); 552 ev_io_set (RETVAL, fd, events);
… …
610ev_signal *signal (SV *signal, SV *cb) 587ev_signal *signal (SV *signal, SV *cb)
611 ALIAS: 588 ALIAS:
612 signal_ns = 1 589 signal_ns = 1
613 CODE: 590 CODE:
614{ 591{
615 Signal signum = sv_signum (signal); 592 Signal signum = s_signum (signal);
616 CHECK_SIG (signal, signum); 593 CHECK_SIG (signal, signum);
617 594
618 RETVAL = e_new (sizeof (ev_signal), cb, default_loop_sv); 595 RETVAL = e_new (sizeof (ev_signal), cb, default_loop_sv);
619 ev_signal_set (RETVAL, signum); 596 ev_signal_set (RETVAL, signum);
620 if (!ix) START (signal, RETVAL); 597 if (!ix) START (signal, RETVAL);
… …
711 688
712void once (SV *fh, int events, SV *timeout, SV *cb) 689void once (SV *fh, int events, SV *timeout, SV *cb)
713 CODE: 690 CODE:
714 ev_once ( 691 ev_once (
715 evapi.default_loop, 692 evapi.default_loop,
716 sv_fileno (fh), events, 693 s_fileno (fh, events & EV_WRITE), events,
717 SvOK (timeout) ? SvNV (timeout) : -1., 694 SvOK (timeout) ? SvNV (timeout) : -1.,
718 e_once_cb, 695 e_once_cb,
719 newSVsv (cb) 696 newSVsv (cb)
720 ); 697 );
721 698
… …
742 RETVAL = w->e_flags & WFLAG_KEEPALIVE; 719 RETVAL = w->e_flags & WFLAG_KEEPALIVE;
743 new_value = new_value ? WFLAG_KEEPALIVE : 0; 720 new_value = new_value ? WFLAG_KEEPALIVE : 0;
744 721
745 if (items > 1 && ((new_value ^ w->e_flags) & WFLAG_KEEPALIVE)) 722 if (items > 1 && ((new_value ^ w->e_flags) & WFLAG_KEEPALIVE))
746 { 723 {
724 w->e_flags = (w->e_flags & ~WFLAG_KEEPALIVE) | new_value;
747 REF (w); 725 REF (w);
748 w->e_flags = (w->e_flags & ~WFLAG_KEEPALIVE) | new_value;
749 UNREF (w); 726 UNREF (w);
750 } 727 }
751} 728}
752 OUTPUT: 729 OUTPUT:
753 RETVAL 730 RETVAL
… …
755SV *cb (ev_watcher *w, SV *new_cb = 0) 732SV *cb (ev_watcher *w, SV *new_cb = 0)
756 CODE: 733 CODE:
757{ 734{
758 if (items > 1) 735 if (items > 1)
759 { 736 {
760 new_cb = e_get_cv (new_cb); 737 new_cb = s_get_cv_croak (new_cb);
761 RETVAL = newRV_noinc (w->cb_sv); 738 RETVAL = newRV_noinc (w->cb_sv);
762 w->cb_sv = SvREFCNT_inc (new_cb); 739 w->cb_sv = SvREFCNT_inc (new_cb);
763 } 740 }
764 else 741 else
765 RETVAL = newRV_inc (w->cb_sv); 742 RETVAL = newRV_inc (w->cb_sv);
… …
835 e_destroy (w); 812 e_destroy (w);
836 813
837void set (ev_io *w, SV *fh, int events) 814void set (ev_io *w, SV *fh, int events)
838 CODE: 815 CODE:
839{ 816{
840 int fd = sv_fileno (fh); 817 int fd = s_fileno (fh, events & EV_WRITE);
841 CHECK_FD (fh, fd); 818 CHECK_FD (fh, fd);
842 819
843 sv_setsv (w->fh, fh); 820 sv_setsv (w->fh, fh);
844 RESET (io, w, (w, fd, events)); 821 RESET (io, w, (w, fd, events));
845} 822}
… …
847SV *fh (ev_io *w, SV *new_fh = 0) 824SV *fh (ev_io *w, SV *new_fh = 0)
848 CODE: 825 CODE:
849{ 826{
850 if (items > 1) 827 if (items > 1)
851 { 828 {
852 int fd = sv_fileno (new_fh); 829 int fd = s_fileno (new_fh, w->events & EV_WRITE);
853 CHECK_FD (new_fh, fd); 830 CHECK_FD (new_fh, fd);
854 831
855 RETVAL = w->fh; 832 RETVAL = w->fh;
856 w->fh = newSVsv (new_fh); 833 w->fh = newSVsv (new_fh);
857 834
… …
890 e_destroy (w); 867 e_destroy (w);
891 868
892void set (ev_signal *w, SV *signal) 869void set (ev_signal *w, SV *signal)
893 CODE: 870 CODE:
894{ 871{
895 Signal signum = sv_signum (signal); 872 Signal signum = s_signum (signal);
896 CHECK_SIG (signal, signum); 873 CHECK_SIG (signal, signum);
897 874
898 RESET (signal, w, (w, signum)); 875 RESET (signal, w, (w, signum));
899} 876}
900 877
… …
903{ 880{
904 RETVAL = w->signum; 881 RETVAL = w->signum;
905 882
906 if (items > 1) 883 if (items > 1)
907 { 884 {
908 Signal signum = sv_signum (new_signal); 885 Signal signum = s_signum (new_signal);
909 CHECK_SIG (new_signal, signum); 886 CHECK_SIG (new_signal, signum);
910 887
911 RESET (signal, w, (w, signum)); 888 RESET (signal, w, (w, signum));
912 } 889 }
913} 890}
… …
928 905
929void ev_timer_again (ev_timer *w) 906void ev_timer_again (ev_timer *w)
930 INIT: 907 INIT:
931 CHECK_REPEAT (w->repeat); 908 CHECK_REPEAT (w->repeat);
932 CODE: 909 CODE:
933 REF (w);
934 ev_timer_again (e_loop (w), w); 910 ev_timer_again (e_loop (w), w);
935 UNREF (w); 911 UNREF (w);
936 912
937void DESTROY (ev_timer *w) 913void DESTROY (ev_timer *w)
938 CODE: 914 CODE:
… …
957 CODE: 933 CODE:
958 STOP (periodic, w); 934 STOP (periodic, w);
959 935
960void ev_periodic_again (ev_periodic *w) 936void ev_periodic_again (ev_periodic *w)
961 CODE: 937 CODE:
962 REF (w);
963 ev_periodic_again (e_loop (w), w); 938 ev_periodic_again (e_loop (w), w);
964 UNREF (w); 939 UNREF (w);
965 940
966void DESTROY (ev_periodic *w) 941void DESTROY (ev_periodic *w)
967 CODE: 942 CODE:
… …
1250 1225
1251NV ev_now (struct ev_loop *loop) 1226NV ev_now (struct ev_loop *loop)
1252 1227
1253void ev_now_update (struct ev_loop *loop) 1228void ev_now_update (struct ev_loop *loop)
1254 1229
1230void ev_suspend (struct ev_loop *loop)
1231
1232void ev_resume (struct ev_loop *loop)
1233
1255void ev_set_io_collect_interval (struct ev_loop *loop, NV interval) 1234void ev_set_io_collect_interval (struct ev_loop *loop, NV interval)
1256 1235
1257void ev_set_timeout_collect_interval (struct ev_loop *loop, NV interval) 1236void ev_set_timeout_collect_interval (struct ev_loop *loop, NV interval)
1258 1237
1259unsigned int ev_backend (struct ev_loop *loop) 1238unsigned int ev_backend (struct ev_loop *loop)
1260 1239
1261unsigned int ev_loop_count (struct ev_loop *loop) 1240unsigned int ev_loop_count (struct ev_loop *loop)
1262 1241
1242unsigned int ev_loop_depth (struct ev_loop *loop)
1243
1263void ev_loop (struct ev_loop *loop, int flags = 0) 1244void ev_loop (struct ev_loop *loop, int flags = 0)
1264 1245
1265void ev_unloop (struct ev_loop *loop, int how = 1) 1246void ev_unloop (struct ev_loop *loop, int how = 1)
1266 1247
1267void ev_feed_fd_event (struct ev_loop *loop, int fd, int revents = EV_NONE) 1248void ev_feed_fd_event (struct ev_loop *loop, int fd, int revents = EV_NONE)
… …
1269#if 0 1250#if 0
1270 1251
1271void ev_feed_signal_event (struct ev_loop *loop, SV *signal) 1252void ev_feed_signal_event (struct ev_loop *loop, SV *signal)
1272 CODE: 1253 CODE:
1273{ 1254{
1274 Signal signum = sv_signum (signal); 1255 Signal signum = s_signum (signal);
1275 CHECK_SIG (signal, signum); 1256 CHECK_SIG (signal, signum);
1276 1257
1277 ev_feed_signal_event (loop, signum); 1258 ev_feed_signal_event (loop, signum);
1278} 1259}
1279 1260
… …
1282ev_io *io (struct ev_loop *loop, SV *fh, int events, SV *cb) 1263ev_io *io (struct ev_loop *loop, SV *fh, int events, SV *cb)
1283 ALIAS: 1264 ALIAS:
1284 io_ns = 1 1265 io_ns = 1
1285 CODE: 1266 CODE:
1286{ 1267{
1287 int fd = sv_fileno (fh); 1268 int fd = s_fileno (fh, events & EV_WRITE);
1288 CHECK_FD (fh, fd); 1269 CHECK_FD (fh, fd);
1289 1270
1290 RETVAL = e_new (sizeof (ev_io), cb, ST (0)); 1271 RETVAL = e_new (sizeof (ev_io), cb, ST (0));
1291 RETVAL->fh = newSVsv (fh); 1272 RETVAL->fh = newSVsv (fh);
1292 ev_io_set (RETVAL, fd, events); 1273 ev_io_set (RETVAL, fd, events);
… …
1329ev_signal *signal (struct ev_loop *loop, SV *signal, SV *cb) 1310ev_signal *signal (struct ev_loop *loop, SV *signal, SV *cb)
1330 ALIAS: 1311 ALIAS:
1331 signal_ns = 1 1312 signal_ns = 1
1332 CODE: 1313 CODE:
1333{ 1314{
1334 Signal signum = sv_signum (signal); 1315 Signal signum = s_signum (signal);
1335 CHECK_SIG (signal, signum); 1316 CHECK_SIG (signal, signum);
1336 1317
1337 RETVAL = e_new (sizeof (ev_signal), cb, ST (0)); 1318 RETVAL = e_new (sizeof (ev_signal), cb, ST (0));
1338 ev_signal_set (RETVAL, signum); 1319 ev_signal_set (RETVAL, signum);
1339 if (!ix) START (signal, RETVAL); 1320 if (!ix) START (signal, RETVAL);
… …
1432 1413
1433void once (struct ev_loop *loop, SV *fh, int events, SV *timeout, SV *cb) 1414void once (struct ev_loop *loop, SV *fh, int events, SV *timeout, SV *cb)
1434 CODE: 1415 CODE:
1435 ev_once ( 1416 ev_once (
1436 loop, 1417 loop,
1437 sv_fileno (fh), events, 1418 s_fileno (fh, events & EV_WRITE), events,
1438 SvOK (timeout) ? SvNV (timeout) : -1., 1419 SvOK (timeout) ? SvNV (timeout) : -1.,
1439 e_once_cb, 1420 e_once_cb,
1440 newSVsv (cb) 1421 newSVsv (cb)
1441 ); 1422 );
1442 1423

Diff Legend

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