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

Comparing EV/EV.xs (file contents):
Revision 1.115 by root, Mon Sep 8 17:27:42 2008 UTC vs.
Revision 1.128 by root, Tue Jul 14 20:31:21 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 = cb_sv ? e_get_cv (cb_sv) : 0; 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
… …
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; 416 evapi.now_update = ev_now_update;
417 evapi.suspend = ev_suspend;
418 evapi.resume = ev_resume;
417 evapi.backend = ev_backend; 419 evapi.backend = ev_backend;
418 evapi.unloop = ev_unloop; 420 evapi.unloop = ev_unloop;
421 evapi.invoke_pending = ev_invoke_pending;
422 evapi.pending_count = ev_pending_count;
423 evapi.set_loop_release_cb = ev_set_loop_release_cb;
424 evapi.set_invoke_pending_cb= ev_set_invoke_pending_cb;
419 evapi.ref = ev_ref; 425 evapi.ref = ev_ref;
420 evapi.unref = ev_unref; 426 evapi.unref = ev_unref;
421 evapi.loop = ev_loop; 427 evapi.loop = ev_loop;
422 evapi.once = ev_once; 428 evapi.once = ev_once;
423 evapi.io_start = ev_io_start; 429 evapi.io_start = ev_io_start;
… …
487 493
488unsigned int ev_recommended_backends () 494unsigned int ev_recommended_backends ()
489 495
490unsigned int ev_embeddable_backends () 496unsigned int ev_embeddable_backends ()
491 497
498void ev_sleep (NV interval)
499
492NV ev_time () 500NV ev_time ()
493 501
494NV ev_now () 502NV ev_now ()
495 C_ARGS: evapi.default_loop 503 C_ARGS: evapi.default_loop
496 504
497void ev_now_update () 505void ev_now_update ()
498 C_ARGS: evapi.default_loop 506 C_ARGS: evapi.default_loop
499 507
508void ev_suspend ()
509 C_ARGS: evapi.default_loop
510
511void ev_resume ()
512 C_ARGS: evapi.default_loop
513
500unsigned int ev_backend () 514unsigned int ev_backend ()
501 C_ARGS: evapi.default_loop 515 C_ARGS: evapi.default_loop
502 516
517void ev_loop_verify ()
518 C_ARGS: evapi.default_loop
519
503unsigned int ev_loop_count () 520unsigned int ev_loop_count ()
504 C_ARGS: evapi.default_loop 521 C_ARGS: evapi.default_loop
505 522
523unsigned int ev_loop_depth ()
524 C_ARGS: evapi.default_loop
525
506void ev_set_io_collect_interval (NV interval) 526void ev_set_io_collect_interval (NV interval)
507 C_ARGS: evapi.default_loop, interval 527 C_ARGS: evapi.default_loop, interval
508 528
509void ev_set_timeout_collect_interval (NV interval) 529void ev_set_timeout_collect_interval (NV interval)
510 C_ARGS: evapi.default_loop, interval 530 C_ARGS: evapi.default_loop, interval
… …
519 C_ARGS: evapi.default_loop, fd, revents 539 C_ARGS: evapi.default_loop, fd, revents
520 540
521void ev_feed_signal_event (SV *signal) 541void ev_feed_signal_event (SV *signal)
522 CODE: 542 CODE:
523{ 543{
524 Signal signum = sv_signum (signal); 544 Signal signum = s_signum (signal);
525 CHECK_SIG (signal, signum); 545 CHECK_SIG (signal, signum);
526 546
527 ev_feed_signal_event (evapi.default_loop, signum); 547 ev_feed_signal_event (evapi.default_loop, signum);
528} 548}
529 549
530ev_io *io (SV *fh, int events, SV *cb) 550ev_io *io (SV *fh, int events, SV *cb)
531 ALIAS: 551 ALIAS:
532 io_ns = 1 552 io_ns = 1
533 CODE: 553 CODE:
534{ 554{
535 int fd = sv_fileno (fh); 555 int fd = s_fileno (fh, events & EV_WRITE);
536 CHECK_FD (fh, fd); 556 CHECK_FD (fh, fd);
537 557
538 RETVAL = e_new (sizeof (ev_io), cb, default_loop_sv); 558 RETVAL = e_new (sizeof (ev_io), cb, default_loop_sv);
539 RETVAL->fh = newSVsv (fh); 559 RETVAL->fh = newSVsv (fh);
540 ev_io_set (RETVAL, fd, events); 560 ev_io_set (RETVAL, fd, events);
… …
575ev_signal *signal (SV *signal, SV *cb) 595ev_signal *signal (SV *signal, SV *cb)
576 ALIAS: 596 ALIAS:
577 signal_ns = 1 597 signal_ns = 1
578 CODE: 598 CODE:
579{ 599{
580 Signal signum = sv_signum (signal); 600 Signal signum = s_signum (signal);
581 CHECK_SIG (signal, signum); 601 CHECK_SIG (signal, signum);
582 602
583 RETVAL = e_new (sizeof (ev_signal), cb, default_loop_sv); 603 RETVAL = e_new (sizeof (ev_signal), cb, default_loop_sv);
584 ev_signal_set (RETVAL, signum); 604 ev_signal_set (RETVAL, signum);
585 if (!ix) START (signal, RETVAL); 605 if (!ix) START (signal, RETVAL);
… …
676 696
677void once (SV *fh, int events, SV *timeout, SV *cb) 697void once (SV *fh, int events, SV *timeout, SV *cb)
678 CODE: 698 CODE:
679 ev_once ( 699 ev_once (
680 evapi.default_loop, 700 evapi.default_loop,
681 sv_fileno (fh), events, 701 s_fileno (fh, events & EV_WRITE), events,
682 SvOK (timeout) ? SvNV (timeout) : -1., 702 SvOK (timeout) ? SvNV (timeout) : -1.,
683 e_once_cb, 703 e_once_cb,
684 newSVsv (cb) 704 newSVsv (cb)
685 ); 705 );
686 706
… …
707 RETVAL = w->e_flags & WFLAG_KEEPALIVE; 727 RETVAL = w->e_flags & WFLAG_KEEPALIVE;
708 new_value = new_value ? WFLAG_KEEPALIVE : 0; 728 new_value = new_value ? WFLAG_KEEPALIVE : 0;
709 729
710 if (items > 1 && ((new_value ^ w->e_flags) & WFLAG_KEEPALIVE)) 730 if (items > 1 && ((new_value ^ w->e_flags) & WFLAG_KEEPALIVE))
711 { 731 {
732 w->e_flags = (w->e_flags & ~WFLAG_KEEPALIVE) | new_value;
712 REF (w); 733 REF (w);
713 w->e_flags = (w->e_flags & ~WFLAG_KEEPALIVE) | new_value;
714 UNREF (w); 734 UNREF (w);
715 } 735 }
716} 736}
717 OUTPUT: 737 OUTPUT:
718 RETVAL 738 RETVAL
… …
720SV *cb (ev_watcher *w, SV *new_cb = 0) 740SV *cb (ev_watcher *w, SV *new_cb = 0)
721 CODE: 741 CODE:
722{ 742{
723 if (items > 1) 743 if (items > 1)
724 { 744 {
725 new_cb = e_get_cv (new_cb); 745 new_cb = s_get_cv_croak (new_cb);
726 RETVAL = newRV_noinc (w->cb_sv); 746 RETVAL = newRV_noinc (w->cb_sv);
727 w->cb_sv = SvREFCNT_inc (new_cb); 747 w->cb_sv = SvREFCNT_inc (new_cb);
728 } 748 }
729 else 749 else
730 RETVAL = newRV_inc (w->cb_sv); 750 RETVAL = newRV_inc (w->cb_sv);
… …
800 e_destroy (w); 820 e_destroy (w);
801 821
802void set (ev_io *w, SV *fh, int events) 822void set (ev_io *w, SV *fh, int events)
803 CODE: 823 CODE:
804{ 824{
805 int fd = sv_fileno (fh); 825 int fd = s_fileno (fh, events & EV_WRITE);
806 CHECK_FD (fh, fd); 826 CHECK_FD (fh, fd);
807 827
808 sv_setsv (w->fh, fh); 828 sv_setsv (w->fh, fh);
809 RESET (io, w, (w, fd, events)); 829 RESET (io, w, (w, fd, events));
810} 830}
… …
812SV *fh (ev_io *w, SV *new_fh = 0) 832SV *fh (ev_io *w, SV *new_fh = 0)
813 CODE: 833 CODE:
814{ 834{
815 if (items > 1) 835 if (items > 1)
816 { 836 {
817 int fd = sv_fileno (new_fh); 837 int fd = s_fileno (new_fh, w->events & EV_WRITE);
818 CHECK_FD (new_fh, fd); 838 CHECK_FD (new_fh, fd);
819 839
820 RETVAL = w->fh; 840 RETVAL = w->fh;
821 w->fh = newSVsv (new_fh); 841 w->fh = newSVsv (new_fh);
822 842
… …
855 e_destroy (w); 875 e_destroy (w);
856 876
857void set (ev_signal *w, SV *signal) 877void set (ev_signal *w, SV *signal)
858 CODE: 878 CODE:
859{ 879{
860 Signal signum = sv_signum (signal); 880 Signal signum = s_signum (signal);
861 CHECK_SIG (signal, signum); 881 CHECK_SIG (signal, signum);
862 882
863 RESET (signal, w, (w, signum)); 883 RESET (signal, w, (w, signum));
864} 884}
865 885
… …
868{ 888{
869 RETVAL = w->signum; 889 RETVAL = w->signum;
870 890
871 if (items > 1) 891 if (items > 1)
872 { 892 {
873 Signal signum = sv_signum (new_signal); 893 Signal signum = s_signum (new_signal);
874 CHECK_SIG (new_signal, signum); 894 CHECK_SIG (new_signal, signum);
875 895
876 RESET (signal, w, (w, signum)); 896 RESET (signal, w, (w, signum));
877 } 897 }
878} 898}
… …
893 913
894void ev_timer_again (ev_timer *w) 914void ev_timer_again (ev_timer *w)
895 INIT: 915 INIT:
896 CHECK_REPEAT (w->repeat); 916 CHECK_REPEAT (w->repeat);
897 CODE: 917 CODE:
898 REF (w);
899 ev_timer_again (e_loop (w), w); 918 ev_timer_again (e_loop (w), w);
900 UNREF (w); 919 UNREF (w);
901 920
902void DESTROY (ev_timer *w) 921void DESTROY (ev_timer *w)
903 CODE: 922 CODE:
… …
922 CODE: 941 CODE:
923 STOP (periodic, w); 942 STOP (periodic, w);
924 943
925void ev_periodic_again (ev_periodic *w) 944void ev_periodic_again (ev_periodic *w)
926 CODE: 945 CODE:
927 REF (w);
928 ev_periodic_again (e_loop (w), w); 946 ev_periodic_again (e_loop (w), w);
929 UNREF (w); 947 UNREF (w);
930 948
931void DESTROY (ev_periodic *w) 949void DESTROY (ev_periodic *w)
932 CODE: 950 CODE:
… …
1215 1233
1216NV ev_now (struct ev_loop *loop) 1234NV ev_now (struct ev_loop *loop)
1217 1235
1218void ev_now_update (struct ev_loop *loop) 1236void ev_now_update (struct ev_loop *loop)
1219 1237
1238void ev_suspend (struct ev_loop *loop)
1239
1240void ev_resume (struct ev_loop *loop)
1241
1220void ev_set_io_collect_interval (struct ev_loop *loop, NV interval) 1242void ev_set_io_collect_interval (struct ev_loop *loop, NV interval)
1221 1243
1222void ev_set_timeout_collect_interval (struct ev_loop *loop, NV interval) 1244void ev_set_timeout_collect_interval (struct ev_loop *loop, NV interval)
1223 1245
1224unsigned int ev_backend (struct ev_loop *loop) 1246unsigned int ev_backend (struct ev_loop *loop)
1225 1247
1226unsigned int ev_loop_count (struct ev_loop *loop) 1248unsigned int ev_loop_count (struct ev_loop *loop)
1227 1249
1250unsigned int ev_loop_depth (struct ev_loop *loop)
1251
1228void ev_loop (struct ev_loop *loop, int flags = 0) 1252void ev_loop (struct ev_loop *loop, int flags = 0)
1229 1253
1230void ev_unloop (struct ev_loop *loop, int how = 1) 1254void ev_unloop (struct ev_loop *loop, int how = 1)
1231 1255
1232void ev_feed_fd_event (struct ev_loop *loop, int fd, int revents = EV_NONE) 1256void ev_feed_fd_event (struct ev_loop *loop, int fd, int revents = EV_NONE)
… …
1234#if 0 1258#if 0
1235 1259
1236void ev_feed_signal_event (struct ev_loop *loop, SV *signal) 1260void ev_feed_signal_event (struct ev_loop *loop, SV *signal)
1237 CODE: 1261 CODE:
1238{ 1262{
1239 Signal signum = sv_signum (signal); 1263 Signal signum = s_signum (signal);
1240 CHECK_SIG (signal, signum); 1264 CHECK_SIG (signal, signum);
1241 1265
1242 ev_feed_signal_event (loop, signum); 1266 ev_feed_signal_event (loop, signum);
1243} 1267}
1244 1268
… …
1247ev_io *io (struct ev_loop *loop, SV *fh, int events, SV *cb) 1271ev_io *io (struct ev_loop *loop, SV *fh, int events, SV *cb)
1248 ALIAS: 1272 ALIAS:
1249 io_ns = 1 1273 io_ns = 1
1250 CODE: 1274 CODE:
1251{ 1275{
1252 int fd = sv_fileno (fh); 1276 int fd = s_fileno (fh, events & EV_WRITE);
1253 CHECK_FD (fh, fd); 1277 CHECK_FD (fh, fd);
1254 1278
1255 RETVAL = e_new (sizeof (ev_io), cb, ST (0)); 1279 RETVAL = e_new (sizeof (ev_io), cb, ST (0));
1256 RETVAL->fh = newSVsv (fh); 1280 RETVAL->fh = newSVsv (fh);
1257 ev_io_set (RETVAL, fd, events); 1281 ev_io_set (RETVAL, fd, events);
… …
1294ev_signal *signal (struct ev_loop *loop, SV *signal, SV *cb) 1318ev_signal *signal (struct ev_loop *loop, SV *signal, SV *cb)
1295 ALIAS: 1319 ALIAS:
1296 signal_ns = 1 1320 signal_ns = 1
1297 CODE: 1321 CODE:
1298{ 1322{
1299 Signal signum = sv_signum (signal); 1323 Signal signum = s_signum (signal);
1300 CHECK_SIG (signal, signum); 1324 CHECK_SIG (signal, signum);
1301 1325
1302 RETVAL = e_new (sizeof (ev_signal), cb, ST (0)); 1326 RETVAL = e_new (sizeof (ev_signal), cb, ST (0));
1303 ev_signal_set (RETVAL, signum); 1327 ev_signal_set (RETVAL, signum);
1304 if (!ix) START (signal, RETVAL); 1328 if (!ix) START (signal, RETVAL);
… …
1397 1421
1398void once (struct ev_loop *loop, SV *fh, int events, SV *timeout, SV *cb) 1422void once (struct ev_loop *loop, SV *fh, int events, SV *timeout, SV *cb)
1399 CODE: 1423 CODE:
1400 ev_once ( 1424 ev_once (
1401 loop, 1425 loop,
1402 sv_fileno (fh), events, 1426 s_fileno (fh, events & EV_WRITE), events,
1403 SvOK (timeout) ? SvNV (timeout) : -1., 1427 SvOK (timeout) ? SvNV (timeout) : -1.,
1404 e_once_cb, 1428 e_once_cb,
1405 newSVsv (cb) 1429 newSVsv (cb)
1406 ); 1430 );
1407 1431

Diff Legend

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