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

Comparing EV/EV.xs (file contents):
Revision 1.114 by root, Sat Jul 12 22:19:22 2008 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"
… …
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); \
52 ev_ ## type ## _stop (e_loop (w), w); \ 65 ev_ ## type ## _stop (e_loop (w), w); \
53 } while (0) 66 } while (0)
54 67
55#define RESET(type,w,seta) \ 68#define RESET(type,w,seta) \
56 do { \ 69 do { \
57 int active = ev_is_active (w); \ 70 int active = ev_is_active (w); \
58 if (active) STOP (type, w); \ 71 if (active) STOP (type, w); \
59 ev_ ## type ## _set seta; \ 72 ev_ ## type ## _set seta; \
60 if (active) START (type, w); \ 73 if (active) START (type, w); \
61 } while (0) 74 } while (0)
62 75
63typedef 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)
64 100
65static SV *default_loop_sv; 101static SV *default_loop_sv;
66 102
67static struct EVAPI evapi; 103static struct EVAPI evapi;
68 104
… …
80 *stash_check, 116 *stash_check,
81 *stash_embed, 117 *stash_embed,
82 *stash_fork, 118 *stash_fork,
83 *stash_async; 119 *stash_async;
84 120
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///////////////////////////////////////////////////////////////////////////// 121/////////////////////////////////////////////////////////////////////////////
111// Event 122// Event
112 123
113static void e_cb (EV_P_ ev_watcher *w, int revents); 124static void e_cb (EV_P_ ev_watcher *w, int revents);
114 125
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 * 126static void *
146e_new (int size, SV *cb_sv, SV *loop) 127e_new (int size, SV *cb_sv, SV *loop)
147{ 128{
148 SV *cv = cb_sv ? e_get_cv (cb_sv) : 0; 129 SV *cv = cb_sv ? s_get_cv_croak (cb_sv) : 0;
149 ev_watcher *w; 130 ev_watcher *w;
150 SV *self = NEWSV (0, size); 131 SV *self = NEWSV (0, size);
151 SvPOK_only (self); 132 SvPOK_only (self);
152 SvCUR_set (self, size); 133 SvCUR_set (self, size);
153 134
… …
191 } 172 }
192 173
193 return rv; 174 return rv;
194} 175}
195 176
196static SV *sv_events_cache; 177static SV *sv_self_cache, *sv_events_cache;
197 178
198static void 179static void
199e_cb (EV_P_ ev_watcher *w, int revents) 180e_cb (EV_P_ ev_watcher *w, int revents)
200{ 181{
201 dSP; 182 dSP;
202 I32 mark = SP - PL_stack_base; 183 I32 mark = SP - PL_stack_base;
203 SV *sv_self, *sv_events; 184 SV *sv_self, *sv_events;
204 185
186 /* libev might have stopped the watcher */
187 if (expect_false (w->e_flags & WFLAG_UNREFED)
188 && !ev_is_active (w))
189 REF (w);
190
191 if (expect_true (sv_self_cache))
192 {
193 sv_self = sv_self_cache; sv_self_cache = 0;
194 SvRV_set (sv_self, SvREFCNT_inc_NN (w->self));
195 }
196 else
197 {
205 sv_self = newRV_inc (w->self); /* w->self MUST be blessed by now */ 198 sv_self = newRV_inc (w->self); /* w->self MUST be blessed by now */
199 SvREADONLY_on (sv_self);
200 }
201
202 if (expect_true (sv_events_cache))
203 {
204 sv_events = sv_events_cache; sv_events_cache = 0;
205 SvIV_set (sv_events, revents);
206 }
207 else
208 {
209 sv_events = newSViv (revents);
210 SvREADONLY_on (sv_events);
211 }
212
213 PUSHMARK (SP);
214 EXTEND (SP, 2);
215 PUSHs (sv_self);
216 PUSHs (sv_events);
217
218 PUTBACK;
219 call_sv (w->cb_sv, G_DISCARD | G_VOID | G_EVAL);
220
221 if (expect_false (SvREFCNT (sv_self) != 1 || sv_self_cache))
222 SvREFCNT_dec (sv_self);
223 else
224 {
225 SvREFCNT_dec (SvRV (sv_self));
226 SvRV_set (sv_self, &PL_sv_undef);
227 sv_self_cache = sv_self;
228 }
229
230 if (expect_false (SvREFCNT (sv_events) != 1 || sv_events_cache))
231 SvREFCNT_dec (sv_events);
232 else
233 sv_events_cache = sv_events;
234
235 if (expect_false (SvTRUE (ERRSV)))
236 {
237 SPAGAIN;
238 PUSHMARK (SP);
239 PUTBACK;
240 call_sv (get_sv ("EV::DIED", 1), G_DISCARD | G_VOID | G_EVAL | G_KEEPERR);
241 }
242
243 SP = PL_stack_base + mark;
244 PUTBACK;
245}
246
247static void
248e_once_cb (int revents, void *arg)
249{
250 dSP;
251 I32 mark = SP - PL_stack_base;
252 SV *sv_events;
206 253
207 if (sv_events_cache) 254 if (sv_events_cache)
208 { 255 {
209 sv_events = sv_events_cache; sv_events_cache = 0; 256 sv_events = sv_events_cache; sv_events_cache = 0;
210 SvIV_set (sv_events, revents); 257 SvIV_set (sv_events, revents);
211 } 258 }
212 else 259 else
213 sv_events = newSViv (revents); 260 sv_events = newSViv (revents);
214 261
215 PUSHMARK (SP); 262 PUSHMARK (SP);
216 EXTEND (SP, 2);
217 PUSHs (sv_self);
218 PUSHs (sv_events); 263 XPUSHs (sv_events);
219 264
220 PUTBACK; 265 PUTBACK;
221 call_sv (w->cb_sv, G_DISCARD | G_VOID | G_EVAL); 266 call_sv ((SV *)arg, G_DISCARD | G_VOID | G_EVAL);
222 267
223 SvREFCNT_dec (sv_self); 268 SvREFCNT_dec ((SV *)arg);
224 269
225 if (sv_events_cache) 270 if (sv_events_cache)
226 SvREFCNT_dec (sv_events); 271 SvREFCNT_dec (sv_events);
227 else 272 else
228 sv_events_cache = sv_events; 273 sv_events_cache = sv_events;
… …
237 282
238 SP = PL_stack_base + mark; 283 SP = PL_stack_base + mark;
239 PUTBACK; 284 PUTBACK;
240} 285}
241 286
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 287static ev_tstamp
283e_periodic_cb (ev_periodic *w, ev_tstamp now) 288e_periodic_cb (ev_periodic *w, ev_tstamp now)
284{ 289{
285 ev_tstamp retval; 290 ev_tstamp retval;
286 int count; 291 int count;
… …
350 const_iv (EV_, MINPRI) 355 const_iv (EV_, MINPRI)
351 const_iv (EV_, MAXPRI) 356 const_iv (EV_, MAXPRI)
352 357
353 const_iv (EV_, UNDEF) 358 const_iv (EV_, UNDEF)
354 const_iv (EV_, NONE) 359 const_iv (EV_, NONE)
355 const_iv (EV_, TIMEOUT)
356 const_iv (EV_, READ) 360 const_iv (EV_, READ)
357 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)
358 const_iv (EV_, SIGNAL) 366 const_iv (EV_, SIGNAL)
367 const_iv (EV_, CHILD)
368 const_iv (EV_, STAT)
359 const_iv (EV_, IDLE) 369 const_iv (EV_, IDLE)
370 const_iv (EV_, PREPARE)
360 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)
361 const_iv (EV_, ERROR) 376 const_iv (EV_, ERROR)
362 377
378 const_iv (EV, LOOP_NONBLOCK)
363 const_iv (EV, LOOP_ONESHOT) 379 const_iv (EV, LOOP_ONESHOT)
380
364 const_iv (EV, LOOP_NONBLOCK) 381 const_iv (EV, UNLOOP_CANCEL)
365 const_iv (EV, UNLOOP_ONE) 382 const_iv (EV, UNLOOP_ONE)
366 const_iv (EV, UNLOOP_ALL) 383 const_iv (EV, UNLOOP_ALL)
367 384
368 const_iv (EV, BACKEND_SELECT) 385 const_iv (EV, BACKEND_SELECT)
369 const_iv (EV, BACKEND_POLL) 386 const_iv (EV, BACKEND_POLL)
… …
372 const_iv (EV, BACKEND_DEVPOLL) 389 const_iv (EV, BACKEND_DEVPOLL)
373 const_iv (EV, BACKEND_PORT) 390 const_iv (EV, BACKEND_PORT)
374 const_iv (EV, FLAG_AUTO) 391 const_iv (EV, FLAG_AUTO)
375 const_iv (EV, FLAG_NOENV) 392 const_iv (EV, FLAG_NOENV)
376 const_iv (EV, FLAG_FORKCHECK) 393 const_iv (EV, FLAG_FORKCHECK)
394
395 const_iv (EV_, VERSION_MAJOR)
396 const_iv (EV_, VERSION_MINOR)
377 }; 397 };
378 398
379 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; )
380 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 400 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
381 401
… …
400 420
401 /* the poor man's shared library emulator */ 421 /* the poor man's shared library emulator */
402 evapi.ver = EV_API_VERSION; 422 evapi.ver = EV_API_VERSION;
403 evapi.rev = EV_API_REVISION; 423 evapi.rev = EV_API_REVISION;
404 evapi.sv_fileno = sv_fileno; 424 evapi.sv_fileno = sv_fileno;
405 evapi.sv_signum = sv_signum; 425 evapi.sv_signum = s_signum;
406 evapi.supported_backends = ev_supported_backends (); 426 evapi.supported_backends = ev_supported_backends ();
407 evapi.recommended_backends = ev_recommended_backends (); 427 evapi.recommended_backends = ev_recommended_backends ();
408 evapi.embeddable_backends = ev_embeddable_backends (); 428 evapi.embeddable_backends = ev_embeddable_backends ();
409 evapi.time_ = ev_time; 429 evapi.time_ = ev_time;
410 evapi.sleep_ = ev_sleep; 430 evapi.sleep_ = ev_sleep;
411 evapi.loop_new = ev_loop_new; 431 evapi.loop_new = ev_loop_new;
412 evapi.loop_destroy = ev_loop_destroy; 432 evapi.loop_destroy = ev_loop_destroy;
413 evapi.loop_fork = ev_loop_fork; 433 evapi.loop_fork = ev_loop_fork;
414 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;
415 evapi.now = ev_now; 438 evapi.now = ev_now;
439 evapi.now_update = ev_now_update;
440 evapi.suspend = ev_suspend;
441 evapi.resume = ev_resume;
416 evapi.backend = ev_backend; 442 evapi.backend = ev_backend;
417 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;
418 evapi.ref = ev_ref; 448 evapi.ref = ev_ref;
419 evapi.unref = ev_unref; 449 evapi.unref = ev_unref;
420 evapi.loop = ev_loop; 450 evapi.loop = ev_loop;
421 evapi.once = ev_once; 451 evapi.once = ev_once;
422 evapi.io_start = ev_io_start; 452 evapi.io_start = ev_io_start;
423 evapi.io_stop = ev_io_stop; 453 evapi.io_stop = ev_io_stop;
424 evapi.timer_start = ev_timer_start; 454 evapi.timer_start = ev_timer_start;
425 evapi.timer_stop = ev_timer_stop; 455 evapi.timer_stop = ev_timer_stop;
426 evapi.timer_again = ev_timer_again; 456 evapi.timer_again = ev_timer_again;
457 evapi.timer_remaining = ev_timer_remaining;
427 evapi.periodic_start = ev_periodic_start; 458 evapi.periodic_start = ev_periodic_start;
428 evapi.periodic_stop = ev_periodic_stop; 459 evapi.periodic_stop = ev_periodic_stop;
429 evapi.signal_start = ev_signal_start; 460 evapi.signal_start = ev_signal_start;
430 evapi.signal_stop = ev_signal_stop; 461 evapi.signal_stop = ev_signal_stop;
431 evapi.idle_start = ev_idle_start; 462 evapi.idle_start = ev_idle_start;
… …
486 517
487unsigned int ev_recommended_backends () 518unsigned int ev_recommended_backends ()
488 519
489unsigned int ev_embeddable_backends () 520unsigned int ev_embeddable_backends ()
490 521
522void ev_sleep (NV interval)
523
491NV ev_time () 524NV ev_time ()
492 525
493NV ev_now () 526NV ev_now ()
494 C_ARGS: evapi.default_loop 527 C_ARGS: evapi.default_loop
495 528
529void ev_now_update ()
530 C_ARGS: evapi.default_loop
531
532void ev_suspend ()
533 C_ARGS: evapi.default_loop
534
535void ev_resume ()
536 C_ARGS: evapi.default_loop
537
496unsigned int ev_backend () 538unsigned int ev_backend ()
497 C_ARGS: evapi.default_loop 539 C_ARGS: evapi.default_loop
498 540
541void ev_loop_verify ()
542 C_ARGS: evapi.default_loop
543
499unsigned int ev_loop_count () 544unsigned int ev_loop_count ()
500 C_ARGS: evapi.default_loop 545 C_ARGS: evapi.default_loop
501 546
547unsigned int ev_loop_depth ()
548 C_ARGS: evapi.default_loop
549
502void ev_set_io_collect_interval (NV interval) 550void ev_set_io_collect_interval (NV interval)
503 C_ARGS: evapi.default_loop, interval 551 C_ARGS: evapi.default_loop, interval
504 552
505void ev_set_timeout_collect_interval (NV interval) 553void ev_set_timeout_collect_interval (NV interval)
506 C_ARGS: evapi.default_loop, interval 554 C_ARGS: evapi.default_loop, interval
… …
515 C_ARGS: evapi.default_loop, fd, revents 563 C_ARGS: evapi.default_loop, fd, revents
516 564
517void ev_feed_signal_event (SV *signal) 565void ev_feed_signal_event (SV *signal)
518 CODE: 566 CODE:
519{ 567{
520 Signal signum = sv_signum (signal); 568 Signal signum = s_signum (signal);
521 CHECK_SIG (signal, signum); 569 CHECK_SIG (signal, signum);
522 570
523 ev_feed_signal_event (evapi.default_loop, signum); 571 ev_feed_signal_event (evapi.default_loop, signum);
524} 572}
525 573
574unsigned int ev_pending_count ()
575 C_ARGS: evapi.default_loop
576
577void ev_invoke_pending ()
578 C_ARGS: evapi.default_loop
579
526ev_io *io (SV *fh, int events, SV *cb) 580ev_io *io (SV *fh, int events, SV *cb)
527 ALIAS: 581 ALIAS:
528 io_ns = 1 582 io_ns = 1
583 _ae_io = 2
529 CODE: 584 CODE:
530{ 585{
531 int fd = sv_fileno (fh); 586 int fd = s_fileno (fh, events & EV_WRITE);
532 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 }
533 594
534 RETVAL = e_new (sizeof (ev_io), cb, default_loop_sv); 595 RETVAL = e_new (sizeof (ev_io), cb, default_loop_sv);
535 RETVAL->fh = newSVsv (fh); 596 RETVAL->fh = newSVsv (fh);
536 ev_io_set (RETVAL, fd, events); 597 ev_io_set (RETVAL, fd, events);
537 if (!ix) START (io, RETVAL); 598 if (!ix) START (io, RETVAL);
… …
571ev_signal *signal (SV *signal, SV *cb) 632ev_signal *signal (SV *signal, SV *cb)
572 ALIAS: 633 ALIAS:
573 signal_ns = 1 634 signal_ns = 1
574 CODE: 635 CODE:
575{ 636{
576 Signal signum = sv_signum (signal); 637 Signal signum = s_signum (signal);
577 CHECK_SIG (signal, signum); 638 CHECK_SIG (signal, signum);
578 639
579 RETVAL = e_new (sizeof (ev_signal), cb, default_loop_sv); 640 RETVAL = e_new (sizeof (ev_signal), cb, default_loop_sv);
580 ev_signal_set (RETVAL, signum); 641 ev_signal_set (RETVAL, signum);
581 if (!ix) START (signal, RETVAL); 642 if (!ix) START_SIGNAL (RETVAL);
582} 643}
583 OUTPUT: 644 OUTPUT:
584 RETVAL 645 RETVAL
585 646
586ev_idle *idle (SV *cb) 647ev_idle *idle (SV *cb)
… …
672 733
673void once (SV *fh, int events, SV *timeout, SV *cb) 734void once (SV *fh, int events, SV *timeout, SV *cb)
674 CODE: 735 CODE:
675 ev_once ( 736 ev_once (
676 evapi.default_loop, 737 evapi.default_loop,
677 sv_fileno (fh), events, 738 s_fileno (fh, events & EV_WRITE), events,
678 SvOK (timeout) ? SvNV (timeout) : -1., 739 SvOK (timeout) ? SvNV (timeout) : -1.,
679 e_once_cb, 740 e_once_cb,
680 newSVsv (cb) 741 newSVsv (cb)
681 ); 742 );
682 743
… …
703 RETVAL = w->e_flags & WFLAG_KEEPALIVE; 764 RETVAL = w->e_flags & WFLAG_KEEPALIVE;
704 new_value = new_value ? WFLAG_KEEPALIVE : 0; 765 new_value = new_value ? WFLAG_KEEPALIVE : 0;
705 766
706 if (items > 1 && ((new_value ^ w->e_flags) & WFLAG_KEEPALIVE)) 767 if (items > 1 && ((new_value ^ w->e_flags) & WFLAG_KEEPALIVE))
707 { 768 {
769 w->e_flags = (w->e_flags & ~WFLAG_KEEPALIVE) | new_value;
708 REF (w); 770 REF (w);
709 w->e_flags = (w->e_flags & ~WFLAG_KEEPALIVE) | new_value;
710 UNREF (w); 771 UNREF (w);
711 } 772 }
712} 773}
713 OUTPUT: 774 OUTPUT:
714 RETVAL 775 RETVAL
… …
716SV *cb (ev_watcher *w, SV *new_cb = 0) 777SV *cb (ev_watcher *w, SV *new_cb = 0)
717 CODE: 778 CODE:
718{ 779{
719 if (items > 1) 780 if (items > 1)
720 { 781 {
721 new_cb = e_get_cv (new_cb); 782 new_cb = s_get_cv_croak (new_cb);
722 RETVAL = newRV_noinc (w->cb_sv); 783 RETVAL = newRV_noinc (w->cb_sv);
723 w->cb_sv = SvREFCNT_inc (new_cb); 784 w->cb_sv = SvREFCNT_inc (new_cb);
724 } 785 }
725 else 786 else
726 RETVAL = newRV_inc (w->cb_sv); 787 RETVAL = newRV_inc (w->cb_sv);
… …
796 e_destroy (w); 857 e_destroy (w);
797 858
798void set (ev_io *w, SV *fh, int events) 859void set (ev_io *w, SV *fh, int events)
799 CODE: 860 CODE:
800{ 861{
801 int fd = sv_fileno (fh); 862 int fd = s_fileno (fh, events & EV_WRITE);
802 CHECK_FD (fh, fd); 863 CHECK_FD (fh, fd);
803 864
804 sv_setsv (w->fh, fh); 865 sv_setsv (w->fh, fh);
805 RESET (io, w, (w, fd, events)); 866 RESET (io, w, (w, fd, events));
806} 867}
… …
808SV *fh (ev_io *w, SV *new_fh = 0) 869SV *fh (ev_io *w, SV *new_fh = 0)
809 CODE: 870 CODE:
810{ 871{
811 if (items > 1) 872 if (items > 1)
812 { 873 {
813 int fd = sv_fileno (new_fh); 874 int fd = s_fileno (new_fh, w->events & EV_WRITE);
814 CHECK_FD (new_fh, fd); 875 CHECK_FD (new_fh, fd);
815 876
816 RETVAL = w->fh; 877 RETVAL = w->fh;
817 w->fh = newSVsv (new_fh); 878 w->fh = newSVsv (new_fh);
818 879
… …
837 898
838MODULE = EV PACKAGE = EV::Signal PREFIX = ev_signal_ 899MODULE = EV PACKAGE = EV::Signal PREFIX = ev_signal_
839 900
840void ev_signal_start (ev_signal *w) 901void ev_signal_start (ev_signal *w)
841 CODE: 902 CODE:
842 START (signal, w); 903 START_SIGNAL (w);
843 904
844void ev_signal_stop (ev_signal *w) 905void ev_signal_stop (ev_signal *w)
845 CODE: 906 CODE:
846 STOP (signal, w); 907 STOP (signal, w);
847 908
… …
851 e_destroy (w); 912 e_destroy (w);
852 913
853void set (ev_signal *w, SV *signal) 914void set (ev_signal *w, SV *signal)
854 CODE: 915 CODE:
855{ 916{
856 Signal signum = sv_signum (signal); 917 Signal signum = s_signum (signal);
857 CHECK_SIG (signal, signum); 918 CHECK_SIG (signal, signum);
858 919
859 RESET (signal, w, (w, signum)); 920 RESET_SIGNAL (w, (w, signum));
860} 921}
861 922
862int signal (ev_signal *w, SV *new_signal = 0) 923int signal (ev_signal *w, SV *new_signal = 0)
863 CODE: 924 CODE:
864{ 925{
865 RETVAL = w->signum; 926 RETVAL = w->signum;
866 927
867 if (items > 1) 928 if (items > 1)
868 { 929 {
869 Signal signum = sv_signum (new_signal); 930 Signal signum = s_signum (new_signal);
870 CHECK_SIG (new_signal, signum); 931 CHECK_SIG (new_signal, signum);
871 932
872 RESET (signal, w, (w, signum)); 933 RESET_SIGNAL (w, (w, signum));
873 } 934 }
874} 935}
875 OUTPUT: 936 OUTPUT:
876 RETVAL 937 RETVAL
877 938
… …
889 950
890void ev_timer_again (ev_timer *w) 951void ev_timer_again (ev_timer *w)
891 INIT: 952 INIT:
892 CHECK_REPEAT (w->repeat); 953 CHECK_REPEAT (w->repeat);
893 CODE: 954 CODE:
894 REF (w);
895 ev_timer_again (e_loop (w), w); 955 ev_timer_again (e_loop (w), w);
896 UNREF (w); 956 UNREF (w);
957
958NV ev_timer_remaining (ev_timer *w)
959 C_ARGS: e_loop (w), w
897 960
898void DESTROY (ev_timer *w) 961void DESTROY (ev_timer *w)
899 CODE: 962 CODE:
900 STOP (timer, w); 963 STOP (timer, w);
901 e_destroy (w); 964 e_destroy (w);
… …
918 CODE: 981 CODE:
919 STOP (periodic, w); 982 STOP (periodic, w);
920 983
921void ev_periodic_again (ev_periodic *w) 984void ev_periodic_again (ev_periodic *w)
922 CODE: 985 CODE:
923 REF (w);
924 ev_periodic_again (e_loop (w), w); 986 ev_periodic_again (e_loop (w), w);
925 UNREF (w); 987 UNREF (w);
926 988
927void DESTROY (ev_periodic *w) 989void DESTROY (ev_periodic *w)
928 CODE: 990 CODE:
… …
1209 1271
1210void ev_loop_verify (struct ev_loop *loop) 1272void ev_loop_verify (struct ev_loop *loop)
1211 1273
1212NV ev_now (struct ev_loop *loop) 1274NV ev_now (struct ev_loop *loop)
1213 1275
1276void ev_now_update (struct ev_loop *loop)
1277
1278void ev_suspend (struct ev_loop *loop)
1279
1280void ev_resume (struct ev_loop *loop)
1281
1214void ev_set_io_collect_interval (struct ev_loop *loop, NV interval) 1282void ev_set_io_collect_interval (struct ev_loop *loop, NV interval)
1215 1283
1216void ev_set_timeout_collect_interval (struct ev_loop *loop, NV interval) 1284void ev_set_timeout_collect_interval (struct ev_loop *loop, NV interval)
1217 1285
1218unsigned int ev_backend (struct ev_loop *loop) 1286unsigned int ev_backend (struct ev_loop *loop)
1219 1287
1220unsigned int ev_loop_count (struct ev_loop *loop) 1288unsigned int ev_loop_count (struct ev_loop *loop)
1221 1289
1290unsigned int ev_loop_depth (struct ev_loop *loop)
1291
1222void ev_loop (struct ev_loop *loop, int flags = 0) 1292void ev_loop (struct ev_loop *loop, int flags = 0)
1223 1293
1224void ev_unloop (struct ev_loop *loop, int how = 1) 1294void ev_unloop (struct ev_loop *loop, int how = 1)
1225 1295
1226void 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)
1227 1297
1298unsigned int ev_pending_count (struct ev_loop *loop)
1299
1300void ev_invoke_pending (struct ev_loop *loop)
1301
1228#if 0 1302#if 0
1229 1303
1230void ev_feed_signal_event (struct ev_loop *loop, SV *signal) 1304void ev_feed_signal_event (struct ev_loop *loop, SV *signal)
1231 CODE: 1305 CODE:
1232{ 1306{
1233 Signal signum = sv_signum (signal); 1307 Signal signum = s_signum (signal);
1234 CHECK_SIG (signal, signum); 1308 CHECK_SIG (signal, signum);
1235 1309
1236 ev_feed_signal_event (loop, signum); 1310 ev_feed_signal_event (loop, signum);
1237} 1311}
1238 1312
… …
1241ev_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)
1242 ALIAS: 1316 ALIAS:
1243 io_ns = 1 1317 io_ns = 1
1244 CODE: 1318 CODE:
1245{ 1319{
1246 int fd = sv_fileno (fh); 1320 int fd = s_fileno (fh, events & EV_WRITE);
1247 CHECK_FD (fh, fd); 1321 CHECK_FD (fh, fd);
1248 1322
1249 RETVAL = e_new (sizeof (ev_io), cb, ST (0)); 1323 RETVAL = e_new (sizeof (ev_io), cb, ST (0));
1250 RETVAL->fh = newSVsv (fh); 1324 RETVAL->fh = newSVsv (fh);
1251 ev_io_set (RETVAL, fd, events); 1325 ev_io_set (RETVAL, fd, events);
… …
1281 if (!ix) START (periodic, w); 1355 if (!ix) START (periodic, w);
1282} 1356}
1283 OUTPUT: 1357 OUTPUT:
1284 RETVAL 1358 RETVAL
1285 1359
1286#if 0
1287
1288ev_signal *signal (struct ev_loop *loop, SV *signal, SV *cb) 1360ev_signal *signal (struct ev_loop *loop, SV *signal, SV *cb)
1289 ALIAS: 1361 ALIAS:
1290 signal_ns = 1 1362 signal_ns = 1
1291 CODE: 1363 CODE:
1292{ 1364{
1293 Signal signum = sv_signum (signal); 1365 Signal signum = s_signum (signal);
1294 CHECK_SIG (signal, signum); 1366 CHECK_SIG (signal, signum);
1295 1367
1296 RETVAL = e_new (sizeof (ev_signal), cb, ST (0)); 1368 RETVAL = e_new (sizeof (ev_signal), cb, ST (0));
1297 ev_signal_set (RETVAL, signum); 1369 ev_signal_set (RETVAL, signum);
1298 if (!ix) START (signal, RETVAL); 1370 if (!ix) START_SIGNAL (RETVAL);
1299} 1371}
1300 OUTPUT: 1372 OUTPUT:
1301 RETVAL 1373 RETVAL
1302
1303#endif
1304 1374
1305ev_idle *idle (struct ev_loop *loop, SV *cb) 1375ev_idle *idle (struct ev_loop *loop, SV *cb)
1306 ALIAS: 1376 ALIAS:
1307 idle_ns = 1 1377 idle_ns = 1
1308 CODE: 1378 CODE:
… …
1391 1461
1392void 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)
1393 CODE: 1463 CODE:
1394 ev_once ( 1464 ev_once (
1395 loop, 1465 loop,
1396 sv_fileno (fh), events, 1466 s_fileno (fh, events & EV_WRITE), events,
1397 SvOK (timeout) ? SvNV (timeout) : -1., 1467 SvOK (timeout) ? SvNV (timeout) : -1.,
1398 e_once_cb, 1468 e_once_cb,
1399 newSVsv (cb) 1469 newSVsv (cb)
1400 ); 1470 );
1401 1471

Diff Legend

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