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

Comparing EV/EV.xs (file contents):
Revision 1.121 by root, Wed Apr 15 17:49:26 2009 UTC vs.
Revision 1.133 by root, Sun Aug 9 13:30:41 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"
24 31
25#ifndef _WIN32 32#ifndef _WIN32
26# include <pthread.h> 33# include <pthread.h>
27#endif 34#endif
28 35
29/* 5.10.0 */
30#ifndef SvREFCNT_inc_NN
31# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
32#endif
33
34/* 5.6.x */
35#ifndef SvRV_set
36# define SvRV_set(a,b) SvRV ((a)) = (b)
37#endif
38
39#if __GNUC__ >= 3
40# define expect(expr,value) __builtin_expect ((expr),(value))
41#else
42# define expect(expr,value) (expr)
43#endif
44
45#define expect_false(expr) expect ((expr) != 0, 0)
46#define expect_true(expr) expect ((expr) != 0, 1)
47
48#define e_loop(w) INT2PTR (struct ev_loop *, SvIVX ((w)->loop)) 36#define e_loop(w) INT2PTR (struct ev_loop *, SvIVX ((w)->loop))
49 37
50#define WFLAG_KEEPALIVE 1 38#define WFLAG_KEEPALIVE 1
51#define WFLAG_UNREFED 2 /* has been unref'ed */ 39#define WFLAG_UNREFED 2 /* has been unref'ed */
52 40
76 REF (w); \ 64 REF (w); \
77 ev_ ## type ## _stop (e_loop (w), w); \ 65 ev_ ## type ## _stop (e_loop (w), w); \
78 } while (0) 66 } while (0)
79 67
80#define RESET(type,w,seta) \ 68#define RESET(type,w,seta) \
81 do { \ 69 do { \
82 int active = ev_is_active (w); \ 70 int active = ev_is_active (w); \
83 if (active) STOP (type, w); \ 71 if (active) STOP (type, w); \
84 ev_ ## type ## _set seta; \ 72 ev_ ## type ## _set seta; \
85 if (active) START (type, w); \ 73 if (active) START (type, w); \
86 } while (0) 74 } while (0)
87 75
88typedef int Signal; 76typedef int Signal;
77
78/* horrible... */
79#define CHECK_SIGNAL_CAN_START(w) \
80 do { \
81 /* dive into the internals of libev to avoid aborting in libev */ \
82 if (signals [(w)->signum - 1].loop \
83 && signals [(w)->signum - 1].loop != e_loop (w)) \
84 croak ("unable to start signal watcher, signal %d already registered in another loop", w->signum); \
85 } while (0)
86
87#define START_SIGNAL(w) \
88 do { \
89 CHECK_SIGNAL_CAN_START (w); \
90 START (signal, w); \
91 } while (0) \
92
93#define RESET_SIGNAL(w,seta) \
94 do { \
95 int active = ev_is_active (w); \
96 if (active) STOP (signal, w); \
97 ev_ ## signal ## _set seta; \
98 if (active) START_SIGNAL (w); \
99 } while (0)
89 100
90static SV *default_loop_sv; 101static SV *default_loop_sv;
91 102
92static struct EVAPI evapi; 103static struct EVAPI evapi;
93 104
105 *stash_check, 116 *stash_check,
106 *stash_embed, 117 *stash_embed,
107 *stash_fork, 118 *stash_fork,
108 *stash_async; 119 *stash_async;
109 120
110#ifndef SIG_SIZE
111/* kudos to Slaven Rezic for the idea */
112static char sig_size [] = { SIG_NUM };
113# define SIG_SIZE (sizeof (sig_size) + 1)
114#endif
115
116static Signal
117sv_signum (SV *sig)
118{
119 Signal signum;
120
121 SvGETMAGIC (sig);
122
123 for (signum = 1; signum < SIG_SIZE; ++signum)
124 if (strEQ (SvPV_nolen (sig), PL_sig_name [signum]))
125 return signum;
126
127 signum = SvIV (sig);
128
129 if (signum > 0 && signum < SIG_SIZE)
130 return signum;
131
132 return -1;
133}
134
135///////////////////////////////////////////////////////////////////////////// 121/////////////////////////////////////////////////////////////////////////////
136// Event 122// Event
137 123
138static void e_cb (EV_P_ ev_watcher *w, int revents); 124static void e_cb (EV_P_ ev_watcher *w, int revents);
139 125
140static int
141sv_fileno (SV *fh)
142{
143 SvGETMAGIC (fh);
144
145 if (SvROK (fh))
146 fh = SvRV (fh);
147
148 if (SvTYPE (fh) == SVt_PVGV)
149 return PerlIO_fileno (IoIFP (sv_2io (fh)));
150
151 if (SvOK (fh) && (SvIV (fh) >= 0) && (SvIV (fh) < 0x7fffffffL))
152 return SvIV (fh);
153
154 return -1;
155}
156
157static SV *
158e_get_cv (SV *cb_sv)
159{
160 HV *st;
161 GV *gvp;
162 CV *cv = sv_2cv (cb_sv, &st, &gvp, 0);
163
164 if (!cv)
165 croak ("EV watcher callback must be a CODE reference");
166
167 return (SV *)cv;
168}
169
170static void * 126static void *
171e_new (int size, SV *cb_sv, SV *loop) 127e_new (int size, SV *cb_sv, SV *loop)
172{ 128{
173 SV *cv = cb_sv ? e_get_cv (cb_sv) : 0; 129 SV *cv = cb_sv ? s_get_cv_croak (cb_sv) : 0;
174 ev_watcher *w; 130 ev_watcher *w;
175 SV *self = NEWSV (0, size); 131 SV *self = NEWSV (0, size);
176 SvPOK_only (self); 132 SvPOK_only (self);
177 SvCUR_set (self, size); 133 SvCUR_set (self, size);
178 134
399 const_iv (EV_, MINPRI) 355 const_iv (EV_, MINPRI)
400 const_iv (EV_, MAXPRI) 356 const_iv (EV_, MAXPRI)
401 357
402 const_iv (EV_, UNDEF) 358 const_iv (EV_, UNDEF)
403 const_iv (EV_, NONE) 359 const_iv (EV_, NONE)
404 const_iv (EV_, TIMEOUT)
405 const_iv (EV_, READ) 360 const_iv (EV_, READ)
406 const_iv (EV_, WRITE) 361 const_iv (EV_, WRITE)
362 const_iv (EV_, IO)
363 const_iv (EV_, TIMEOUT)
364 const_iv (EV_, TIMER)
365 const_iv (EV_, PERIODIC)
407 const_iv (EV_, SIGNAL) 366 const_iv (EV_, SIGNAL)
367 const_iv (EV_, CHILD)
368 const_iv (EV_, STAT)
408 const_iv (EV_, IDLE) 369 const_iv (EV_, IDLE)
370 const_iv (EV_, PREPARE)
409 const_iv (EV_, CHECK) 371 const_iv (EV_, CHECK)
372 const_iv (EV_, EMBED)
373 const_iv (EV_, FORK)
374 const_iv (EV_, ASYNC)
375 const_iv (EV_, CUSTOM)
410 const_iv (EV_, ERROR) 376 const_iv (EV_, ERROR)
411 377
378 const_iv (EV, LOOP_NONBLOCK)
412 const_iv (EV, LOOP_ONESHOT) 379 const_iv (EV, LOOP_ONESHOT)
380
413 const_iv (EV, LOOP_NONBLOCK) 381 const_iv (EV, UNLOOP_CANCEL)
414 const_iv (EV, UNLOOP_ONE) 382 const_iv (EV, UNLOOP_ONE)
415 const_iv (EV, UNLOOP_ALL) 383 const_iv (EV, UNLOOP_ALL)
416 384
417 const_iv (EV, BACKEND_SELECT) 385 const_iv (EV, BACKEND_SELECT)
418 const_iv (EV, BACKEND_POLL) 386 const_iv (EV, BACKEND_POLL)
421 const_iv (EV, BACKEND_DEVPOLL) 389 const_iv (EV, BACKEND_DEVPOLL)
422 const_iv (EV, BACKEND_PORT) 390 const_iv (EV, BACKEND_PORT)
423 const_iv (EV, FLAG_AUTO) 391 const_iv (EV, FLAG_AUTO)
424 const_iv (EV, FLAG_NOENV) 392 const_iv (EV, FLAG_NOENV)
425 const_iv (EV, FLAG_FORKCHECK) 393 const_iv (EV, FLAG_FORKCHECK)
394
395 const_iv (EV_, VERSION_MAJOR)
396 const_iv (EV_, VERSION_MINOR)
426 }; 397 };
427 398
428 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 399 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
429 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 400 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
430 401
449 420
450 /* the poor man's shared library emulator */ 421 /* the poor man's shared library emulator */
451 evapi.ver = EV_API_VERSION; 422 evapi.ver = EV_API_VERSION;
452 evapi.rev = EV_API_REVISION; 423 evapi.rev = EV_API_REVISION;
453 evapi.sv_fileno = sv_fileno; 424 evapi.sv_fileno = sv_fileno;
454 evapi.sv_signum = sv_signum; 425 evapi.sv_signum = s_signum;
455 evapi.supported_backends = ev_supported_backends (); 426 evapi.supported_backends = ev_supported_backends ();
456 evapi.recommended_backends = ev_recommended_backends (); 427 evapi.recommended_backends = ev_recommended_backends ();
457 evapi.embeddable_backends = ev_embeddable_backends (); 428 evapi.embeddable_backends = ev_embeddable_backends ();
458 evapi.time_ = ev_time; 429 evapi.time_ = ev_time;
459 evapi.sleep_ = ev_sleep; 430 evapi.sleep_ = ev_sleep;
460 evapi.loop_new = ev_loop_new; 431 evapi.loop_new = ev_loop_new;
461 evapi.loop_destroy = ev_loop_destroy; 432 evapi.loop_destroy = ev_loop_destroy;
462 evapi.loop_fork = ev_loop_fork; 433 evapi.loop_fork = ev_loop_fork;
463 evapi.loop_count = ev_loop_count; 434 evapi.loop_count = ev_loop_count;
435 evapi.loop_depth = ev_loop_depth;
436 evapi.set_userdata = ev_set_userdata;
437 evapi.userdata = ev_userdata;
464 evapi.now = ev_now; 438 evapi.now = ev_now;
465 evapi.now_update = ev_now_update; 439 evapi.now_update = ev_now_update;
440 evapi.suspend = ev_suspend;
441 evapi.resume = ev_resume;
466 evapi.backend = ev_backend; 442 evapi.backend = ev_backend;
467 evapi.unloop = ev_unloop; 443 evapi.unloop = ev_unloop;
444 evapi.invoke_pending = ev_invoke_pending;
445 evapi.pending_count = ev_pending_count;
446 evapi.set_loop_release_cb = ev_set_loop_release_cb;
447 evapi.set_invoke_pending_cb= ev_set_invoke_pending_cb;
468 evapi.ref = ev_ref; 448 evapi.ref = ev_ref;
469 evapi.unref = ev_unref; 449 evapi.unref = ev_unref;
470 evapi.loop = ev_loop; 450 evapi.loop = ev_loop;
471 evapi.once = ev_once; 451 evapi.once = ev_once;
472 evapi.io_start = ev_io_start; 452 evapi.io_start = ev_io_start;
473 evapi.io_stop = ev_io_stop; 453 evapi.io_stop = ev_io_stop;
474 evapi.timer_start = ev_timer_start; 454 evapi.timer_start = ev_timer_start;
475 evapi.timer_stop = ev_timer_stop; 455 evapi.timer_stop = ev_timer_stop;
476 evapi.timer_again = ev_timer_again; 456 evapi.timer_again = ev_timer_again;
457 evapi.timer_remaining = ev_timer_remaining;
477 evapi.periodic_start = ev_periodic_start; 458 evapi.periodic_start = ev_periodic_start;
478 evapi.periodic_stop = ev_periodic_stop; 459 evapi.periodic_stop = ev_periodic_stop;
479 evapi.signal_start = ev_signal_start; 460 evapi.signal_start = ev_signal_start;
480 evapi.signal_stop = ev_signal_stop; 461 evapi.signal_stop = ev_signal_stop;
481 evapi.idle_start = ev_idle_start; 462 evapi.idle_start = ev_idle_start;
546 C_ARGS: evapi.default_loop 527 C_ARGS: evapi.default_loop
547 528
548void ev_now_update () 529void ev_now_update ()
549 C_ARGS: evapi.default_loop 530 C_ARGS: evapi.default_loop
550 531
532void ev_suspend ()
533 C_ARGS: evapi.default_loop
534
535void ev_resume ()
536 C_ARGS: evapi.default_loop
537
551unsigned int ev_backend () 538unsigned int ev_backend ()
552 C_ARGS: evapi.default_loop 539 C_ARGS: evapi.default_loop
553 540
541void ev_loop_verify ()
542 C_ARGS: evapi.default_loop
543
554unsigned int ev_loop_count () 544unsigned int ev_loop_count ()
555 C_ARGS: evapi.default_loop 545 C_ARGS: evapi.default_loop
556 546
547unsigned int ev_loop_depth ()
548 C_ARGS: evapi.default_loop
549
557void ev_set_io_collect_interval (NV interval) 550void ev_set_io_collect_interval (NV interval)
558 C_ARGS: evapi.default_loop, interval 551 C_ARGS: evapi.default_loop, interval
559 552
560void ev_set_timeout_collect_interval (NV interval) 553void ev_set_timeout_collect_interval (NV interval)
561 C_ARGS: evapi.default_loop, interval 554 C_ARGS: evapi.default_loop, interval
570 C_ARGS: evapi.default_loop, fd, revents 563 C_ARGS: evapi.default_loop, fd, revents
571 564
572void ev_feed_signal_event (SV *signal) 565void ev_feed_signal_event (SV *signal)
573 CODE: 566 CODE:
574{ 567{
575 Signal signum = sv_signum (signal); 568 Signal signum = s_signum (signal);
576 CHECK_SIG (signal, signum); 569 CHECK_SIG (signal, signum);
577 570
578 ev_feed_signal_event (evapi.default_loop, signum); 571 ev_feed_signal_event (evapi.default_loop, signum);
579} 572}
580 573
574unsigned int ev_pending_count ()
575 C_ARGS: evapi.default_loop
576
577void ev_invoke_pending ()
578 C_ARGS: evapi.default_loop
579
581ev_io *io (SV *fh, int events, SV *cb) 580ev_io *io (SV *fh, int events, SV *cb)
582 ALIAS: 581 ALIAS:
583 io_ns = 1 582 io_ns = 1
583 _ae_io = 2
584 CODE: 584 CODE:
585{ 585{
586 int fd = sv_fileno (fh); 586 int fd = s_fileno (fh, events & EV_WRITE);
587 CHECK_FD (fh, fd); 587 CHECK_FD (fh, fd);
588
589 if (ix == 2)
590 {
591 ix = 0;
592 events = events ? EV_WRITE : EV_READ;
593 }
588 594
589 RETVAL = e_new (sizeof (ev_io), cb, default_loop_sv); 595 RETVAL = e_new (sizeof (ev_io), cb, default_loop_sv);
590 RETVAL->fh = newSVsv (fh); 596 RETVAL->fh = newSVsv (fh);
591 ev_io_set (RETVAL, fd, events); 597 ev_io_set (RETVAL, fd, events);
592 if (!ix) START (io, RETVAL); 598 if (!ix) START (io, RETVAL);
626ev_signal *signal (SV *signal, SV *cb) 632ev_signal *signal (SV *signal, SV *cb)
627 ALIAS: 633 ALIAS:
628 signal_ns = 1 634 signal_ns = 1
629 CODE: 635 CODE:
630{ 636{
631 Signal signum = sv_signum (signal); 637 Signal signum = s_signum (signal);
632 CHECK_SIG (signal, signum); 638 CHECK_SIG (signal, signum);
633 639
634 RETVAL = e_new (sizeof (ev_signal), cb, default_loop_sv); 640 RETVAL = e_new (sizeof (ev_signal), cb, default_loop_sv);
635 ev_signal_set (RETVAL, signum); 641 ev_signal_set (RETVAL, signum);
636 if (!ix) START (signal, RETVAL); 642 if (!ix) START_SIGNAL (RETVAL);
637} 643}
638 OUTPUT: 644 OUTPUT:
639 RETVAL 645 RETVAL
640 646
641ev_idle *idle (SV *cb) 647ev_idle *idle (SV *cb)
727 733
728void once (SV *fh, int events, SV *timeout, SV *cb) 734void once (SV *fh, int events, SV *timeout, SV *cb)
729 CODE: 735 CODE:
730 ev_once ( 736 ev_once (
731 evapi.default_loop, 737 evapi.default_loop,
732 sv_fileno (fh), events, 738 s_fileno (fh, events & EV_WRITE), events,
733 SvOK (timeout) ? SvNV (timeout) : -1., 739 SvOK (timeout) ? SvNV (timeout) : -1.,
734 e_once_cb, 740 e_once_cb,
735 newSVsv (cb) 741 newSVsv (cb)
736 ); 742 );
737 743
771SV *cb (ev_watcher *w, SV *new_cb = 0) 777SV *cb (ev_watcher *w, SV *new_cb = 0)
772 CODE: 778 CODE:
773{ 779{
774 if (items > 1) 780 if (items > 1)
775 { 781 {
776 new_cb = e_get_cv (new_cb); 782 new_cb = s_get_cv_croak (new_cb);
777 RETVAL = newRV_noinc (w->cb_sv); 783 RETVAL = newRV_noinc (w->cb_sv);
778 w->cb_sv = SvREFCNT_inc (new_cb); 784 w->cb_sv = SvREFCNT_inc (new_cb);
779 } 785 }
780 else 786 else
781 RETVAL = newRV_inc (w->cb_sv); 787 RETVAL = newRV_inc (w->cb_sv);
851 e_destroy (w); 857 e_destroy (w);
852 858
853void set (ev_io *w, SV *fh, int events) 859void set (ev_io *w, SV *fh, int events)
854 CODE: 860 CODE:
855{ 861{
856 int fd = sv_fileno (fh); 862 int fd = s_fileno (fh, events & EV_WRITE);
857 CHECK_FD (fh, fd); 863 CHECK_FD (fh, fd);
858 864
859 sv_setsv (w->fh, fh); 865 sv_setsv (w->fh, fh);
860 RESET (io, w, (w, fd, events)); 866 RESET (io, w, (w, fd, events));
861} 867}
863SV *fh (ev_io *w, SV *new_fh = 0) 869SV *fh (ev_io *w, SV *new_fh = 0)
864 CODE: 870 CODE:
865{ 871{
866 if (items > 1) 872 if (items > 1)
867 { 873 {
868 int fd = sv_fileno (new_fh); 874 int fd = s_fileno (new_fh, w->events & EV_WRITE);
869 CHECK_FD (new_fh, fd); 875 CHECK_FD (new_fh, fd);
870 876
871 RETVAL = w->fh; 877 RETVAL = w->fh;
872 w->fh = newSVsv (new_fh); 878 w->fh = newSVsv (new_fh);
873 879
892 898
893MODULE = EV PACKAGE = EV::Signal PREFIX = ev_signal_ 899MODULE = EV PACKAGE = EV::Signal PREFIX = ev_signal_
894 900
895void ev_signal_start (ev_signal *w) 901void ev_signal_start (ev_signal *w)
896 CODE: 902 CODE:
897 START (signal, w); 903 START_SIGNAL (w);
898 904
899void ev_signal_stop (ev_signal *w) 905void ev_signal_stop (ev_signal *w)
900 CODE: 906 CODE:
901 STOP (signal, w); 907 STOP (signal, w);
902 908
906 e_destroy (w); 912 e_destroy (w);
907 913
908void set (ev_signal *w, SV *signal) 914void set (ev_signal *w, SV *signal)
909 CODE: 915 CODE:
910{ 916{
911 Signal signum = sv_signum (signal); 917 Signal signum = s_signum (signal);
912 CHECK_SIG (signal, signum); 918 CHECK_SIG (signal, signum);
913 919
914 RESET (signal, w, (w, signum)); 920 RESET_SIGNAL (w, (w, signum));
915} 921}
916 922
917int signal (ev_signal *w, SV *new_signal = 0) 923int signal (ev_signal *w, SV *new_signal = 0)
918 CODE: 924 CODE:
919{ 925{
920 RETVAL = w->signum; 926 RETVAL = w->signum;
921 927
922 if (items > 1) 928 if (items > 1)
923 { 929 {
924 Signal signum = sv_signum (new_signal); 930 Signal signum = s_signum (new_signal);
925 CHECK_SIG (new_signal, signum); 931 CHECK_SIG (new_signal, signum);
926 932
927 RESET (signal, w, (w, signum)); 933 RESET_SIGNAL (w, (w, signum));
928 } 934 }
929} 935}
930 OUTPUT: 936 OUTPUT:
931 RETVAL 937 RETVAL
932 938
946 INIT: 952 INIT:
947 CHECK_REPEAT (w->repeat); 953 CHECK_REPEAT (w->repeat);
948 CODE: 954 CODE:
949 ev_timer_again (e_loop (w), w); 955 ev_timer_again (e_loop (w), w);
950 UNREF (w); 956 UNREF (w);
957
958NV ev_timer_remaining (ev_timer *w)
959 C_ARGS: e_loop (w), w
951 960
952void DESTROY (ev_timer *w) 961void DESTROY (ev_timer *w)
953 CODE: 962 CODE:
954 STOP (timer, w); 963 STOP (timer, w);
955 e_destroy (w); 964 e_destroy (w);
1264 1273
1265NV ev_now (struct ev_loop *loop) 1274NV ev_now (struct ev_loop *loop)
1266 1275
1267void ev_now_update (struct ev_loop *loop) 1276void ev_now_update (struct ev_loop *loop)
1268 1277
1278void ev_suspend (struct ev_loop *loop)
1279
1280void ev_resume (struct ev_loop *loop)
1281
1269void ev_set_io_collect_interval (struct ev_loop *loop, NV interval) 1282void ev_set_io_collect_interval (struct ev_loop *loop, NV interval)
1270 1283
1271void ev_set_timeout_collect_interval (struct ev_loop *loop, NV interval) 1284void ev_set_timeout_collect_interval (struct ev_loop *loop, NV interval)
1272 1285
1273unsigned int ev_backend (struct ev_loop *loop) 1286unsigned int ev_backend (struct ev_loop *loop)
1274 1287
1275unsigned int ev_loop_count (struct ev_loop *loop) 1288unsigned int ev_loop_count (struct ev_loop *loop)
1276 1289
1290unsigned int ev_loop_depth (struct ev_loop *loop)
1291
1277void ev_loop (struct ev_loop *loop, int flags = 0) 1292void ev_loop (struct ev_loop *loop, int flags = 0)
1278 1293
1279void ev_unloop (struct ev_loop *loop, int how = 1) 1294void ev_unloop (struct ev_loop *loop, int how = 1)
1280 1295
1281void ev_feed_fd_event (struct ev_loop *loop, int fd, int revents = EV_NONE) 1296void ev_feed_fd_event (struct ev_loop *loop, int fd, int revents = EV_NONE)
1282 1297
1298unsigned int ev_pending_count (struct ev_loop *loop)
1299
1300void ev_invoke_pending (struct ev_loop *loop)
1301
1283#if 0 1302#if 0
1284 1303
1285void ev_feed_signal_event (struct ev_loop *loop, SV *signal) 1304void ev_feed_signal_event (struct ev_loop *loop, SV *signal)
1286 CODE: 1305 CODE:
1287{ 1306{
1288 Signal signum = sv_signum (signal); 1307 Signal signum = s_signum (signal);
1289 CHECK_SIG (signal, signum); 1308 CHECK_SIG (signal, signum);
1290 1309
1291 ev_feed_signal_event (loop, signum); 1310 ev_feed_signal_event (loop, signum);
1292} 1311}
1293 1312
1296ev_io *io (struct ev_loop *loop, SV *fh, int events, SV *cb) 1315ev_io *io (struct ev_loop *loop, SV *fh, int events, SV *cb)
1297 ALIAS: 1316 ALIAS:
1298 io_ns = 1 1317 io_ns = 1
1299 CODE: 1318 CODE:
1300{ 1319{
1301 int fd = sv_fileno (fh); 1320 int fd = s_fileno (fh, events & EV_WRITE);
1302 CHECK_FD (fh, fd); 1321 CHECK_FD (fh, fd);
1303 1322
1304 RETVAL = e_new (sizeof (ev_io), cb, ST (0)); 1323 RETVAL = e_new (sizeof (ev_io), cb, ST (0));
1305 RETVAL->fh = newSVsv (fh); 1324 RETVAL->fh = newSVsv (fh);
1306 ev_io_set (RETVAL, fd, events); 1325 ev_io_set (RETVAL, fd, events);
1336 if (!ix) START (periodic, w); 1355 if (!ix) START (periodic, w);
1337} 1356}
1338 OUTPUT: 1357 OUTPUT:
1339 RETVAL 1358 RETVAL
1340 1359
1341#if 0
1342
1343ev_signal *signal (struct ev_loop *loop, SV *signal, SV *cb) 1360ev_signal *signal (struct ev_loop *loop, SV *signal, SV *cb)
1344 ALIAS: 1361 ALIAS:
1345 signal_ns = 1 1362 signal_ns = 1
1346 CODE: 1363 CODE:
1347{ 1364{
1348 Signal signum = sv_signum (signal); 1365 Signal signum = s_signum (signal);
1349 CHECK_SIG (signal, signum); 1366 CHECK_SIG (signal, signum);
1350 1367
1351 RETVAL = e_new (sizeof (ev_signal), cb, ST (0)); 1368 RETVAL = e_new (sizeof (ev_signal), cb, ST (0));
1352 ev_signal_set (RETVAL, signum); 1369 ev_signal_set (RETVAL, signum);
1353 if (!ix) START (signal, RETVAL); 1370 if (!ix) START_SIGNAL (RETVAL);
1354} 1371}
1355 OUTPUT: 1372 OUTPUT:
1356 RETVAL 1373 RETVAL
1357
1358#endif
1359 1374
1360ev_idle *idle (struct ev_loop *loop, SV *cb) 1375ev_idle *idle (struct ev_loop *loop, SV *cb)
1361 ALIAS: 1376 ALIAS:
1362 idle_ns = 1 1377 idle_ns = 1
1363 CODE: 1378 CODE:
1446 1461
1447void once (struct ev_loop *loop, SV *fh, int events, SV *timeout, SV *cb) 1462void once (struct ev_loop *loop, SV *fh, int events, SV *timeout, SV *cb)
1448 CODE: 1463 CODE:
1449 ev_once ( 1464 ev_once (
1450 loop, 1465 loop,
1451 sv_fileno (fh), events, 1466 s_fileno (fh, events & EV_WRITE), events,
1452 SvOK (timeout) ? SvNV (timeout) : -1., 1467 SvOK (timeout) ? SvNV (timeout) : -1.,
1453 e_once_cb, 1468 e_once_cb,
1454 newSVsv (cb) 1469 newSVsv (cb)
1455 ); 1470 );
1456 1471

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines