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.137 by root, Tue Mar 16 20:43:05 2010 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
10 8
9#include "schmorp.h"
10
11/* old API compatibility */
12static int
13sv_fileno (SV *fh)
14{
15 return s_fileno (fh, 0);
16}
17
18#define EV_STANDALONE 1
11#define EV_PROTOTYPES 1 19#define EV_PROTOTYPES 1
12#define EV_USE_NANOSLEEP EV_USE_MONOTONIC 20#define EV_USE_NANOSLEEP EV_USE_MONOTONIC
13#define EV_H <ev.h> 21#define EV_H <ev.h>
22#define EV_CONFIG_H error
14#include "EV/EVAPI.h" 23#include "EV/EVAPI.h"
15 24
16#define EV_SELECT_IS_WINSOCKET 0 25#define EV_SELECT_IS_WINSOCKET 0
17#ifdef _WIN32 26#ifdef _WIN32
18# define EV_SELECT_USE_FD_SET 0 27# define EV_SELECT_USE_FD_SET 0
… …
27#endif 36#endif
28 37
29#define e_loop(w) INT2PTR (struct ev_loop *, SvIVX ((w)->loop)) 38#define e_loop(w) INT2PTR (struct ev_loop *, SvIVX ((w)->loop))
30 39
31#define WFLAG_KEEPALIVE 1 40#define WFLAG_KEEPALIVE 1
41#define WFLAG_UNREFED 2 /* has been unref'ed */
32 42
33#define UNREF(w) \ 43#define UNREF(w) \
34 if (!((w)->e_flags & WFLAG_KEEPALIVE) \ 44 if (!((w)->e_flags & (WFLAG_KEEPALIVE | WFLAG_UNREFED)) \
35 && !ev_is_active (w)) \ 45 && ev_is_active (w)) \
46 { \
36 ev_unref (e_loop (w)); 47 ev_unref (e_loop (w)); \
48 (w)->e_flags |= WFLAG_UNREFED; \
49 }
37 50
38#define REF(w) \ 51#define REF(w) \
39 if (!((w)->e_flags & WFLAG_KEEPALIVE) \ 52 if ((w)->e_flags & WFLAG_UNREFED) \
40 && ev_is_active (w)) \ 53 { \
54 (w)->e_flags &= ~WFLAG_UNREFED; \
41 ev_ref (e_loop (w)); 55 ev_ref (e_loop (w)); \
56 }
42 57
43#define START(type,w) \ 58#define START(type,w) \
44 do { \ 59 do { \
60 ev_ ## type ## _start (e_loop (w), w); \
45 UNREF (w); \ 61 UNREF (w); \
46 ev_ ## type ## _start (e_loop (w), w); \
47 } while (0) 62 } while (0)
48 63
49#define STOP(type,w) \ 64#define STOP(type,w) \
50 do { \ 65 do { \
51 REF (w); \ 66 REF (w); \
52 ev_ ## type ## _stop (e_loop (w), w); \ 67 ev_ ## type ## _stop (e_loop (w), w); \
53 } while (0) 68 } while (0)
54 69
55#define RESET(type,w,seta) \ 70#define RESET(type,w,seta) \
56 do { \ 71 do { \
57 int active = ev_is_active (w); \ 72 int active = ev_is_active (w); \
58 if (active) STOP (type, w); \ 73 if (active) STOP (type, w); \
59 ev_ ## type ## _set seta; \ 74 ev_ ## type ## _set seta; \
60 if (active) START (type, w); \ 75 if (active) START (type, w); \
61 } while (0) 76 } while (0)
62 77
63typedef int Signal; 78typedef int Signal;
79
80/* horrible... */
81#define CHECK_SIGNAL_CAN_START(w) \
82 do { \
83 /* dive into the internals of libev to avoid aborting in libev */ \
84 if (signals [(w)->signum - 1].loop \
85 && signals [(w)->signum - 1].loop != e_loop (w)) \
86 croak ("unable to start signal watcher, signal %d already registered in another loop", w->signum); \
87 } while (0)
88
89#define START_SIGNAL(w) \
90 do { \
91 CHECK_SIGNAL_CAN_START (w); \
92 START (signal, w); \
93 } while (0) \
94
95#define RESET_SIGNAL(w,seta) \
96 do { \
97 int active = ev_is_active (w); \
98 if (active) STOP (signal, w); \
99 ev_ ## signal ## _set seta; \
100 if (active) START_SIGNAL (w); \
101 } while (0)
64 102
65static SV *default_loop_sv; 103static SV *default_loop_sv;
66 104
67static struct EVAPI evapi; 105static struct EVAPI evapi;
68 106
… …
80 *stash_check, 118 *stash_check,
81 *stash_embed, 119 *stash_embed,
82 *stash_fork, 120 *stash_fork,
83 *stash_async; 121 *stash_async;
84 122
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///////////////////////////////////////////////////////////////////////////// 123/////////////////////////////////////////////////////////////////////////////
111// Event 124// Event
112 125
113static void e_cb (EV_P_ ev_watcher *w, int revents); 126static void e_cb (EV_P_ ev_watcher *w, int revents);
114 127
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 * 128static void *
146e_new (int size, SV *cb_sv, SV *loop) 129e_new (int size, SV *cb_sv, SV *loop)
147{ 130{
148 SV *cv = e_get_cv (cb_sv); 131 SV *cv = cb_sv ? s_get_cv_croak (cb_sv) : 0;
149 ev_watcher *w; 132 ev_watcher *w;
150 SV *self = NEWSV (0, size); 133 SV *self = NEWSV (0, size);
151 SvPOK_only (self); 134 SvPOK_only (self);
152 SvCUR_set (self, size); 135 SvCUR_set (self, size);
153 136
154 w = (ev_watcher *)SvPVX (self); 137 w = (ev_watcher *)SvPVX (self);
155 138
156 ev_init (w, e_cb); 139 ev_init (w, cv ? e_cb : 0);
157 140
158 w->loop = SvREFCNT_inc (SvRV (loop)); 141 w->loop = SvREFCNT_inc (SvRV (loop));
159 w->e_flags = WFLAG_KEEPALIVE; 142 w->e_flags = WFLAG_KEEPALIVE;
160 w->data = 0; 143 w->data = 0;
161 w->fh = 0; 144 w->fh = 0;
… …
191 } 174 }
192 175
193 return rv; 176 return rv;
194} 177}
195 178
196static SV *sv_events_cache; 179static SV *sv_self_cache, *sv_events_cache;
197 180
198static void 181static void
199e_cb (EV_P_ ev_watcher *w, int revents) 182e_cb (EV_P_ ev_watcher *w, int revents)
200{ 183{
201 dSP; 184 dSP;
202 I32 mark = SP - PL_stack_base; 185 I32 mark = SP - PL_stack_base;
203 SV *sv_self, *sv_events; 186 SV *sv_self, *sv_events;
204 187
188 /* libev might have stopped the watcher */
189 if (expect_false (w->e_flags & WFLAG_UNREFED)
190 && !ev_is_active (w))
191 REF (w);
192
193 if (expect_true (sv_self_cache))
194 {
195 sv_self = sv_self_cache; sv_self_cache = 0;
196 SvRV_set (sv_self, SvREFCNT_inc_NN (w->self));
197 }
198 else
199 {
205 sv_self = newRV_inc (w->self); /* w->self MUST be blessed by now */ 200 sv_self = newRV_inc (w->self); /* w->self MUST be blessed by now */
201 SvREADONLY_on (sv_self);
202 }
203
204 if (expect_true (sv_events_cache))
205 {
206 sv_events = sv_events_cache; sv_events_cache = 0;
207 SvIV_set (sv_events, revents);
208 }
209 else
210 {
211 sv_events = newSViv (revents);
212 SvREADONLY_on (sv_events);
213 }
214
215 PUSHMARK (SP);
216 EXTEND (SP, 2);
217 PUSHs (sv_self);
218 PUSHs (sv_events);
219
220 PUTBACK;
221 call_sv (w->cb_sv, G_DISCARD | G_VOID | G_EVAL);
222
223 if (expect_false (SvREFCNT (sv_self) != 1 || sv_self_cache))
224 SvREFCNT_dec (sv_self);
225 else
226 {
227 SvREFCNT_dec (SvRV (sv_self));
228 SvRV_set (sv_self, &PL_sv_undef);
229 sv_self_cache = sv_self;
230 }
231
232 if (expect_false (SvREFCNT (sv_events) != 1 || sv_events_cache))
233 SvREFCNT_dec (sv_events);
234 else
235 sv_events_cache = sv_events;
236
237 if (expect_false (SvTRUE (ERRSV)))
238 {
239 SPAGAIN;
240 PUSHMARK (SP);
241 PUTBACK;
242 call_sv (get_sv ("EV::DIED", 1), G_DISCARD | G_VOID | G_EVAL | G_KEEPERR);
243 }
244
245 SP = PL_stack_base + mark;
246 PUTBACK;
247}
248
249static void
250e_once_cb (int revents, void *arg)
251{
252 dSP;
253 I32 mark = SP - PL_stack_base;
254 SV *sv_events;
206 255
207 if (sv_events_cache) 256 if (sv_events_cache)
208 { 257 {
209 sv_events = sv_events_cache; sv_events_cache = 0; 258 sv_events = sv_events_cache; sv_events_cache = 0;
210 SvIV_set (sv_events, revents); 259 SvIV_set (sv_events, revents);
211 } 260 }
212 else 261 else
213 sv_events = newSViv (revents); 262 sv_events = newSViv (revents);
214 263
215 PUSHMARK (SP); 264 PUSHMARK (SP);
216 EXTEND (SP, 2);
217 PUSHs (sv_self);
218 PUSHs (sv_events); 265 XPUSHs (sv_events);
219 266
220 PUTBACK; 267 PUTBACK;
221 call_sv (w->cb_sv, G_DISCARD | G_VOID | G_EVAL); 268 call_sv ((SV *)arg, G_DISCARD | G_VOID | G_EVAL);
222 269
223 SvREFCNT_dec (sv_self); 270 SvREFCNT_dec ((SV *)arg);
224 271
225 if (sv_events_cache) 272 if (sv_events_cache)
226 SvREFCNT_dec (sv_events); 273 SvREFCNT_dec (sv_events);
227 else 274 else
228 sv_events_cache = sv_events; 275 sv_events_cache = sv_events;
… …
237 284
238 SP = PL_stack_base + mark; 285 SP = PL_stack_base + mark;
239 PUTBACK; 286 PUTBACK;
240} 287}
241 288
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 289static ev_tstamp
283e_periodic_cb (ev_periodic *w, ev_tstamp now) 290e_periodic_cb (ev_periodic *w, ev_tstamp now)
284{ 291{
285 ev_tstamp retval; 292 ev_tstamp retval;
286 int count; 293 int count;
… …
350 const_iv (EV_, MINPRI) 357 const_iv (EV_, MINPRI)
351 const_iv (EV_, MAXPRI) 358 const_iv (EV_, MAXPRI)
352 359
353 const_iv (EV_, UNDEF) 360 const_iv (EV_, UNDEF)
354 const_iv (EV_, NONE) 361 const_iv (EV_, NONE)
355 const_iv (EV_, TIMEOUT)
356 const_iv (EV_, READ) 362 const_iv (EV_, READ)
357 const_iv (EV_, WRITE) 363 const_iv (EV_, WRITE)
364 const_iv (EV_, IO)
365 const_iv (EV_, TIMEOUT) /* deprecated */
366 const_iv (EV_, TIMER)
367 const_iv (EV_, PERIODIC)
358 const_iv (EV_, SIGNAL) 368 const_iv (EV_, SIGNAL)
369 const_iv (EV_, CHILD)
370 const_iv (EV_, STAT)
359 const_iv (EV_, IDLE) 371 const_iv (EV_, IDLE)
372 const_iv (EV_, PREPARE)
360 const_iv (EV_, CHECK) 373 const_iv (EV_, CHECK)
374 const_iv (EV_, EMBED)
375 const_iv (EV_, FORK)
376 const_iv (EV_, ASYNC)
377 const_iv (EV_, CUSTOM)
361 const_iv (EV_, ERROR) 378 const_iv (EV_, ERROR)
362 379
380 const_iv (EV, LOOP_NONBLOCK)
363 const_iv (EV, LOOP_ONESHOT) 381 const_iv (EV, LOOP_ONESHOT)
382
364 const_iv (EV, LOOP_NONBLOCK) 383 const_iv (EV, UNLOOP_CANCEL)
365 const_iv (EV, UNLOOP_ONE) 384 const_iv (EV, UNLOOP_ONE)
366 const_iv (EV, UNLOOP_ALL) 385 const_iv (EV, UNLOOP_ALL)
367 386
368 const_iv (EV, BACKEND_SELECT) 387 const_iv (EV, BACKEND_SELECT)
369 const_iv (EV, BACKEND_POLL) 388 const_iv (EV, BACKEND_POLL)
370 const_iv (EV, BACKEND_EPOLL) 389 const_iv (EV, BACKEND_EPOLL)
371 const_iv (EV, BACKEND_KQUEUE) 390 const_iv (EV, BACKEND_KQUEUE)
372 const_iv (EV, BACKEND_DEVPOLL) 391 const_iv (EV, BACKEND_DEVPOLL)
373 const_iv (EV, BACKEND_PORT) 392 const_iv (EV, BACKEND_PORT)
393 const_iv (EV, BACKEND_ALL)
374 const_iv (EV, FLAG_AUTO) 394 const_iv (EV, FLAG_AUTO)
395 const_iv (EV, FLAG_FORKCHECK)
396 const_iv (EV, FLAG_SIGNALFD)
375 const_iv (EV, FLAG_NOENV) 397 const_iv (EV, FLAG_NOENV)
398 const_iv (EV, FLAG_NOSIGFD) /* compatibility, always 0 */
376 const_iv (EV, FLAG_FORKCHECK) 399 const_iv (EV, FLAG_NOINOTIFY)
400
401 const_iv (EV_, VERSION_MAJOR)
402 const_iv (EV_, VERSION_MINOR)
377 }; 403 };
378 404
379 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 405 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
380 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 406 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
381 407
… …
400 426
401 /* the poor man's shared library emulator */ 427 /* the poor man's shared library emulator */
402 evapi.ver = EV_API_VERSION; 428 evapi.ver = EV_API_VERSION;
403 evapi.rev = EV_API_REVISION; 429 evapi.rev = EV_API_REVISION;
404 evapi.sv_fileno = sv_fileno; 430 evapi.sv_fileno = sv_fileno;
405 evapi.sv_signum = sv_signum; 431 evapi.sv_signum = s_signum;
406 evapi.supported_backends = ev_supported_backends (); 432 evapi.supported_backends = ev_supported_backends ();
407 evapi.recommended_backends = ev_recommended_backends (); 433 evapi.recommended_backends = ev_recommended_backends ();
408 evapi.embeddable_backends = ev_embeddable_backends (); 434 evapi.embeddable_backends = ev_embeddable_backends ();
409 evapi.time_ = ev_time; 435 evapi.time_ = ev_time;
410 evapi.sleep_ = ev_sleep; 436 evapi.sleep_ = ev_sleep;
411 evapi.loop_new = ev_loop_new; 437 evapi.loop_new = ev_loop_new;
412 evapi.loop_destroy = ev_loop_destroy; 438 evapi.loop_destroy = ev_loop_destroy;
413 evapi.loop_fork = ev_loop_fork; 439 evapi.loop_fork = ev_loop_fork;
414 evapi.loop_count = ev_loop_count; 440 evapi.iteration = ev_iteration;
441 evapi.depth = ev_depth;
442 evapi.set_userdata = ev_set_userdata;
443 evapi.userdata = ev_userdata;
415 evapi.now = ev_now; 444 evapi.now = ev_now;
445 evapi.now_update = ev_now_update;
446 evapi.suspend = ev_suspend;
447 evapi.resume = ev_resume;
416 evapi.backend = ev_backend; 448 evapi.backend = ev_backend;
417 evapi.unloop = ev_unloop; 449 evapi.unloop = ev_unloop;
450 evapi.invoke_pending = ev_invoke_pending;
451 evapi.pending_count = ev_pending_count;
452 evapi.verify = ev_verify;
453 evapi.set_loop_release_cb = ev_set_loop_release_cb;
454 evapi.set_invoke_pending_cb= ev_set_invoke_pending_cb;
418 evapi.ref = ev_ref; 455 evapi.ref = ev_ref;
419 evapi.unref = ev_unref; 456 evapi.unref = ev_unref;
420 evapi.loop = ev_loop; 457 evapi.loop = ev_loop;
421 evapi.once = ev_once; 458 evapi.once = ev_once;
422 evapi.io_start = ev_io_start; 459 evapi.io_start = ev_io_start;
423 evapi.io_stop = ev_io_stop; 460 evapi.io_stop = ev_io_stop;
424 evapi.timer_start = ev_timer_start; 461 evapi.timer_start = ev_timer_start;
425 evapi.timer_stop = ev_timer_stop; 462 evapi.timer_stop = ev_timer_stop;
426 evapi.timer_again = ev_timer_again; 463 evapi.timer_again = ev_timer_again;
464 evapi.timer_remaining = ev_timer_remaining;
427 evapi.periodic_start = ev_periodic_start; 465 evapi.periodic_start = ev_periodic_start;
428 evapi.periodic_stop = ev_periodic_stop; 466 evapi.periodic_stop = ev_periodic_stop;
429 evapi.signal_start = ev_signal_start; 467 evapi.signal_start = ev_signal_start;
430 evapi.signal_stop = ev_signal_stop; 468 evapi.signal_stop = ev_signal_stop;
431 evapi.idle_start = ev_idle_start; 469 evapi.idle_start = ev_idle_start;
… …
486 524
487unsigned int ev_recommended_backends () 525unsigned int ev_recommended_backends ()
488 526
489unsigned int ev_embeddable_backends () 527unsigned int ev_embeddable_backends ()
490 528
529void ev_sleep (NV interval)
530
491NV ev_time () 531NV ev_time ()
492 532
493NV ev_now () 533NV ev_now ()
494 C_ARGS: evapi.default_loop 534 C_ARGS: evapi.default_loop
495 535
536void ev_now_update ()
537 C_ARGS: evapi.default_loop
538
539void ev_suspend ()
540 C_ARGS: evapi.default_loop
541
542void ev_resume ()
543 C_ARGS: evapi.default_loop
544
496unsigned int ev_backend () 545unsigned int ev_backend ()
497 C_ARGS: evapi.default_loop 546 C_ARGS: evapi.default_loop
498 547
548void ev_verify ()
549 C_ARGS: evapi.default_loop
550
551unsigned int ev_iteration ()
552 C_ARGS: evapi.default_loop
553
499unsigned int ev_loop_count () 554unsigned int ev_depth ()
500 C_ARGS: evapi.default_loop 555 C_ARGS: evapi.default_loop
501 556
502void ev_set_io_collect_interval (NV interval) 557void ev_set_io_collect_interval (NV interval)
503 C_ARGS: evapi.default_loop, interval 558 C_ARGS: evapi.default_loop, interval
504 559
… …
515 C_ARGS: evapi.default_loop, fd, revents 570 C_ARGS: evapi.default_loop, fd, revents
516 571
517void ev_feed_signal_event (SV *signal) 572void ev_feed_signal_event (SV *signal)
518 CODE: 573 CODE:
519{ 574{
520 Signal signum = sv_signum (signal); 575 Signal signum = s_signum (signal);
521 CHECK_SIG (signal, signum); 576 CHECK_SIG (signal, signum);
522 577
523 ev_feed_signal_event (evapi.default_loop, signum); 578 ev_feed_signal_event (evapi.default_loop, signum);
524} 579}
525 580
581unsigned int ev_pending_count ()
582 C_ARGS: evapi.default_loop
583
584void ev_invoke_pending ()
585 C_ARGS: evapi.default_loop
586
526ev_io *io (SV *fh, int events, SV *cb) 587ev_io *io (SV *fh, int events, SV *cb)
527 ALIAS: 588 ALIAS:
528 io_ns = 1 589 io_ns = 1
590 _ae_io = 2
529 CODE: 591 CODE:
530{ 592{
531 int fd = sv_fileno (fh); 593 int fd = s_fileno (fh, events & EV_WRITE);
532 CHECK_FD (fh, fd); 594 CHECK_FD (fh, fd);
595
596 if (ix == 2)
597 {
598 ix = 0;
599 events = events ? EV_WRITE : EV_READ;
600 }
533 601
534 RETVAL = e_new (sizeof (ev_io), cb, default_loop_sv); 602 RETVAL = e_new (sizeof (ev_io), cb, default_loop_sv);
535 RETVAL->fh = newSVsv (fh); 603 RETVAL->fh = newSVsv (fh);
536 ev_io_set (RETVAL, fd, events); 604 ev_io_set (RETVAL, fd, events);
537 if (!ix) START (io, RETVAL); 605 if (!ix) START (io, RETVAL);
… …
571ev_signal *signal (SV *signal, SV *cb) 639ev_signal *signal (SV *signal, SV *cb)
572 ALIAS: 640 ALIAS:
573 signal_ns = 1 641 signal_ns = 1
574 CODE: 642 CODE:
575{ 643{
576 Signal signum = sv_signum (signal); 644 Signal signum = s_signum (signal);
577 CHECK_SIG (signal, signum); 645 CHECK_SIG (signal, signum);
578 646
579 RETVAL = e_new (sizeof (ev_signal), cb, default_loop_sv); 647 RETVAL = e_new (sizeof (ev_signal), cb, default_loop_sv);
580 ev_signal_set (RETVAL, signum); 648 ev_signal_set (RETVAL, signum);
581 if (!ix) START (signal, RETVAL); 649 if (!ix) START_SIGNAL (RETVAL);
582} 650}
583 OUTPUT: 651 OUTPUT:
584 RETVAL 652 RETVAL
585 653
586ev_idle *idle (SV *cb) 654ev_idle *idle (SV *cb)
… …
642 ev_stat_set (RETVAL, SvPVbyte_nolen (RETVAL->fh), interval); 710 ev_stat_set (RETVAL, SvPVbyte_nolen (RETVAL->fh), interval);
643 if (!ix) START (stat, RETVAL); 711 if (!ix) START (stat, RETVAL);
644 OUTPUT: 712 OUTPUT:
645 RETVAL 713 RETVAL
646 714
647ev_embed *embed (struct ev_loop *loop, SV *cb = &PL_sv_undef) 715ev_embed *embed (struct ev_loop *loop, SV *cb = 0)
648 ALIAS: 716 ALIAS:
649 embed_ns = 1 717 embed_ns = 1
650 CODE: 718 CODE:
651{ 719{
652 if (!(ev_backend (loop) & ev_embeddable_backends ())) 720 if (!(ev_backend (loop) & ev_embeddable_backends ()))
653 croak ("passed loop is not embeddable via EV::embed,"); 721 croak ("passed loop is not embeddable via EV::embed,");
654 722
655 RETVAL = e_new (sizeof (ev_embed), cb, default_loop_sv); 723 RETVAL = e_new (sizeof (ev_embed), cb, default_loop_sv);
656 RETVAL->fh = newSVsv (ST (0)); 724 RETVAL->fh = newSVsv (ST (0));
657 ev_embed_set (RETVAL, loop); 725 ev_embed_set (RETVAL, loop);
658
659 if (!SvOK (cb)) ev_set_cb (RETVAL, 0);
660
661 if (!ix) START (embed, RETVAL); 726 if (!ix) START (embed, RETVAL);
662} 727}
663 OUTPUT: 728 OUTPUT:
664 RETVAL 729 RETVAL
665 730
… …
675 740
676void once (SV *fh, int events, SV *timeout, SV *cb) 741void once (SV *fh, int events, SV *timeout, SV *cb)
677 CODE: 742 CODE:
678 ev_once ( 743 ev_once (
679 evapi.default_loop, 744 evapi.default_loop,
680 sv_fileno (fh), events, 745 s_fileno (fh, events & EV_WRITE), events,
681 SvOK (timeout) ? SvNV (timeout) : -1., 746 SvOK (timeout) ? SvNV (timeout) : -1.,
682 e_once_cb, 747 e_once_cb,
683 newSVsv (cb) 748 newSVsv (cb)
684 ); 749 );
685 750
… …
706 RETVAL = w->e_flags & WFLAG_KEEPALIVE; 771 RETVAL = w->e_flags & WFLAG_KEEPALIVE;
707 new_value = new_value ? WFLAG_KEEPALIVE : 0; 772 new_value = new_value ? WFLAG_KEEPALIVE : 0;
708 773
709 if (items > 1 && ((new_value ^ w->e_flags) & WFLAG_KEEPALIVE)) 774 if (items > 1 && ((new_value ^ w->e_flags) & WFLAG_KEEPALIVE))
710 { 775 {
776 w->e_flags = (w->e_flags & ~WFLAG_KEEPALIVE) | new_value;
711 REF (w); 777 REF (w);
712 w->e_flags = (w->e_flags & ~WFLAG_KEEPALIVE) | new_value;
713 UNREF (w); 778 UNREF (w);
714 } 779 }
715} 780}
716 OUTPUT: 781 OUTPUT:
717 RETVAL 782 RETVAL
… …
719SV *cb (ev_watcher *w, SV *new_cb = 0) 784SV *cb (ev_watcher *w, SV *new_cb = 0)
720 CODE: 785 CODE:
721{ 786{
722 if (items > 1) 787 if (items > 1)
723 { 788 {
724 new_cb = e_get_cv (new_cb); 789 new_cb = s_get_cv_croak (new_cb);
725 RETVAL = newRV_noinc (w->cb_sv); 790 RETVAL = newRV_noinc (w->cb_sv);
726 w->cb_sv = SvREFCNT_inc (new_cb); 791 w->cb_sv = SvREFCNT_inc (new_cb);
727 } 792 }
728 else 793 else
729 RETVAL = newRV_inc (w->cb_sv); 794 RETVAL = newRV_inc (w->cb_sv);
… …
799 e_destroy (w); 864 e_destroy (w);
800 865
801void set (ev_io *w, SV *fh, int events) 866void set (ev_io *w, SV *fh, int events)
802 CODE: 867 CODE:
803{ 868{
804 int fd = sv_fileno (fh); 869 int fd = s_fileno (fh, events & EV_WRITE);
805 CHECK_FD (fh, fd); 870 CHECK_FD (fh, fd);
806 871
807 sv_setsv (w->fh, fh); 872 sv_setsv (w->fh, fh);
808 RESET (io, w, (w, fd, events)); 873 RESET (io, w, (w, fd, events));
809} 874}
… …
811SV *fh (ev_io *w, SV *new_fh = 0) 876SV *fh (ev_io *w, SV *new_fh = 0)
812 CODE: 877 CODE:
813{ 878{
814 if (items > 1) 879 if (items > 1)
815 { 880 {
816 int fd = sv_fileno (new_fh); 881 int fd = s_fileno (new_fh, w->events & EV_WRITE);
817 CHECK_FD (new_fh, fd); 882 CHECK_FD (new_fh, fd);
818 883
819 RETVAL = w->fh; 884 RETVAL = w->fh;
820 w->fh = newSVsv (new_fh); 885 w->fh = newSVsv (new_fh);
821 886
… …
840 905
841MODULE = EV PACKAGE = EV::Signal PREFIX = ev_signal_ 906MODULE = EV PACKAGE = EV::Signal PREFIX = ev_signal_
842 907
843void ev_signal_start (ev_signal *w) 908void ev_signal_start (ev_signal *w)
844 CODE: 909 CODE:
845 START (signal, w); 910 START_SIGNAL (w);
846 911
847void ev_signal_stop (ev_signal *w) 912void ev_signal_stop (ev_signal *w)
848 CODE: 913 CODE:
849 STOP (signal, w); 914 STOP (signal, w);
850 915
… …
854 e_destroy (w); 919 e_destroy (w);
855 920
856void set (ev_signal *w, SV *signal) 921void set (ev_signal *w, SV *signal)
857 CODE: 922 CODE:
858{ 923{
859 Signal signum = sv_signum (signal); 924 Signal signum = s_signum (signal);
860 CHECK_SIG (signal, signum); 925 CHECK_SIG (signal, signum);
861 926
862 RESET (signal, w, (w, signum)); 927 RESET_SIGNAL (w, (w, signum));
863} 928}
864 929
865int signal (ev_signal *w, SV *new_signal = 0) 930int signal (ev_signal *w, SV *new_signal = 0)
866 CODE: 931 CODE:
867{ 932{
868 RETVAL = w->signum; 933 RETVAL = w->signum;
869 934
870 if (items > 1) 935 if (items > 1)
871 { 936 {
872 Signal signum = sv_signum (new_signal); 937 Signal signum = s_signum (new_signal);
873 CHECK_SIG (new_signal, signum); 938 CHECK_SIG (new_signal, signum);
874 939
875 RESET (signal, w, (w, signum)); 940 RESET_SIGNAL (w, (w, signum));
876 } 941 }
877} 942}
878 OUTPUT: 943 OUTPUT:
879 RETVAL 944 RETVAL
880 945
… …
892 957
893void ev_timer_again (ev_timer *w) 958void ev_timer_again (ev_timer *w)
894 INIT: 959 INIT:
895 CHECK_REPEAT (w->repeat); 960 CHECK_REPEAT (w->repeat);
896 CODE: 961 CODE:
897 REF (w);
898 ev_timer_again (e_loop (w), w); 962 ev_timer_again (e_loop (w), w);
899 UNREF (w); 963 UNREF (w);
964
965NV ev_timer_remaining (ev_timer *w)
966 C_ARGS: e_loop (w), w
900 967
901void DESTROY (ev_timer *w) 968void DESTROY (ev_timer *w)
902 CODE: 969 CODE:
903 STOP (timer, w); 970 STOP (timer, w);
904 e_destroy (w); 971 e_destroy (w);
… …
921 CODE: 988 CODE:
922 STOP (periodic, w); 989 STOP (periodic, w);
923 990
924void ev_periodic_again (ev_periodic *w) 991void ev_periodic_again (ev_periodic *w)
925 CODE: 992 CODE:
926 REF (w);
927 ev_periodic_again (e_loop (w), w); 993 ev_periodic_again (e_loop (w), w);
928 UNREF (w); 994 UNREF (w);
929 995
930void DESTROY (ev_periodic *w) 996void DESTROY (ev_periodic *w)
931 CODE: 997 CODE:
… …
1208 if (loop != evapi.default_loop) /* global destruction sucks */ 1274 if (loop != evapi.default_loop) /* global destruction sucks */
1209 ev_loop_destroy (loop); 1275 ev_loop_destroy (loop);
1210 1276
1211void ev_loop_fork (struct ev_loop *loop) 1277void ev_loop_fork (struct ev_loop *loop)
1212 1278
1213void ev_loop_verify (struct ev_loop *loop) 1279void ev_verify (struct ev_loop *loop)
1214 1280
1215NV ev_now (struct ev_loop *loop) 1281NV ev_now (struct ev_loop *loop)
1216 1282
1283void ev_now_update (struct ev_loop *loop)
1284
1285void ev_suspend (struct ev_loop *loop)
1286
1287void ev_resume (struct ev_loop *loop)
1288
1217void ev_set_io_collect_interval (struct ev_loop *loop, NV interval) 1289void ev_set_io_collect_interval (struct ev_loop *loop, NV interval)
1218 1290
1219void ev_set_timeout_collect_interval (struct ev_loop *loop, NV interval) 1291void ev_set_timeout_collect_interval (struct ev_loop *loop, NV interval)
1220 1292
1221unsigned int ev_backend (struct ev_loop *loop) 1293unsigned int ev_backend (struct ev_loop *loop)
1222 1294
1223unsigned int ev_loop_count (struct ev_loop *loop) 1295unsigned int ev_iteration (struct ev_loop *loop)
1296
1297unsigned int ev_depth (struct ev_loop *loop)
1224 1298
1225void ev_loop (struct ev_loop *loop, int flags = 0) 1299void ev_loop (struct ev_loop *loop, int flags = 0)
1226 1300
1227void ev_unloop (struct ev_loop *loop, int how = 1) 1301void ev_unloop (struct ev_loop *loop, int how = 1)
1228 1302
1229void ev_feed_fd_event (struct ev_loop *loop, int fd, int revents = EV_NONE) 1303void ev_feed_fd_event (struct ev_loop *loop, int fd, int revents = EV_NONE)
1230 1304
1305unsigned int ev_pending_count (struct ev_loop *loop)
1306
1307void ev_invoke_pending (struct ev_loop *loop)
1308
1231#if 0 1309#if 0
1232 1310
1233void ev_feed_signal_event (struct ev_loop *loop, SV *signal) 1311void ev_feed_signal_event (struct ev_loop *loop, SV *signal)
1234 CODE: 1312 CODE:
1235{ 1313{
1236 Signal signum = sv_signum (signal); 1314 Signal signum = s_signum (signal);
1237 CHECK_SIG (signal, signum); 1315 CHECK_SIG (signal, signum);
1238 1316
1239 ev_feed_signal_event (loop, signum); 1317 ev_feed_signal_event (loop, signum);
1240} 1318}
1241 1319
… …
1244ev_io *io (struct ev_loop *loop, SV *fh, int events, SV *cb) 1322ev_io *io (struct ev_loop *loop, SV *fh, int events, SV *cb)
1245 ALIAS: 1323 ALIAS:
1246 io_ns = 1 1324 io_ns = 1
1247 CODE: 1325 CODE:
1248{ 1326{
1249 int fd = sv_fileno (fh); 1327 int fd = s_fileno (fh, events & EV_WRITE);
1250 CHECK_FD (fh, fd); 1328 CHECK_FD (fh, fd);
1251 1329
1252 RETVAL = e_new (sizeof (ev_io), cb, ST (0)); 1330 RETVAL = e_new (sizeof (ev_io), cb, ST (0));
1253 RETVAL->fh = newSVsv (fh); 1331 RETVAL->fh = newSVsv (fh);
1254 ev_io_set (RETVAL, fd, events); 1332 ev_io_set (RETVAL, fd, events);
… …
1284 if (!ix) START (periodic, w); 1362 if (!ix) START (periodic, w);
1285} 1363}
1286 OUTPUT: 1364 OUTPUT:
1287 RETVAL 1365 RETVAL
1288 1366
1289#if 0
1290
1291ev_signal *signal (struct ev_loop *loop, SV *signal, SV *cb) 1367ev_signal *signal (struct ev_loop *loop, SV *signal, SV *cb)
1292 ALIAS: 1368 ALIAS:
1293 signal_ns = 1 1369 signal_ns = 1
1294 CODE: 1370 CODE:
1295{ 1371{
1296 Signal signum = sv_signum (signal); 1372 Signal signum = s_signum (signal);
1297 CHECK_SIG (signal, signum); 1373 CHECK_SIG (signal, signum);
1298 1374
1299 RETVAL = e_new (sizeof (ev_signal), cb, ST (0)); 1375 RETVAL = e_new (sizeof (ev_signal), cb, ST (0));
1300 ev_signal_set (RETVAL, signum); 1376 ev_signal_set (RETVAL, signum);
1301 if (!ix) START (signal, RETVAL); 1377 if (!ix) START_SIGNAL (RETVAL);
1302} 1378}
1303 OUTPUT: 1379 OUTPUT:
1304 RETVAL 1380 RETVAL
1305
1306#endif
1307 1381
1308ev_idle *idle (struct ev_loop *loop, SV *cb) 1382ev_idle *idle (struct ev_loop *loop, SV *cb)
1309 ALIAS: 1383 ALIAS:
1310 idle_ns = 1 1384 idle_ns = 1
1311 CODE: 1385 CODE:
… …
1364 ev_stat_set (RETVAL, SvPVbyte_nolen (RETVAL->fh), interval); 1438 ev_stat_set (RETVAL, SvPVbyte_nolen (RETVAL->fh), interval);
1365 if (!ix) START (stat, RETVAL); 1439 if (!ix) START (stat, RETVAL);
1366 OUTPUT: 1440 OUTPUT:
1367 RETVAL 1441 RETVAL
1368 1442
1369ev_embed *embed (struct ev_loop *loop, struct ev_loop *other, SV *cb = &PL_sv_undef) 1443ev_embed *embed (struct ev_loop *loop, struct ev_loop *other, SV *cb = 0)
1370 ALIAS: 1444 ALIAS:
1371 embed_ns = 1 1445 embed_ns = 1
1372 CODE: 1446 CODE:
1373{ 1447{
1374 if (!(ev_backend (other) & ev_embeddable_backends ())) 1448 if (!(ev_backend (other) & ev_embeddable_backends ()))
1375 croak ("passed loop is not embeddable via EV::embed,"); 1449 croak ("passed loop is not embeddable via EV::embed,");
1376 1450
1377 RETVAL = e_new (sizeof (ev_embed), cb, ST (0)); 1451 RETVAL = e_new (sizeof (ev_embed), cb, ST (0));
1378 RETVAL->fh = newSVsv (ST (1)); 1452 RETVAL->fh = newSVsv (ST (1));
1379 ev_embed_set (RETVAL, other); 1453 ev_embed_set (RETVAL, other);
1380
1381 if (!SvOK (cb)) ev_set_cb (RETVAL, 0);
1382
1383 if (!ix) START (embed, RETVAL); 1454 if (!ix) START (embed, RETVAL);
1384} 1455}
1385 OUTPUT: 1456 OUTPUT:
1386 RETVAL 1457 RETVAL
1387 1458
… …
1397 1468
1398void once (struct ev_loop *loop, SV *fh, int events, SV *timeout, SV *cb) 1469void once (struct ev_loop *loop, SV *fh, int events, SV *timeout, SV *cb)
1399 CODE: 1470 CODE:
1400 ev_once ( 1471 ev_once (
1401 loop, 1472 loop,
1402 sv_fileno (fh), events, 1473 s_fileno (fh, events & EV_WRITE), events,
1403 SvOK (timeout) ? SvNV (timeout) : -1., 1474 SvOK (timeout) ? SvNV (timeout) : -1.,
1404 e_once_cb, 1475 e_once_cb,
1405 newSVsv (cb) 1476 newSVsv (cb)
1406 ); 1477 );
1407 1478

Diff Legend

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