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.141 by root, Thu Jul 8 00:45:03 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
20# define fd_mask Perl_fd_mask 29# define fd_mask Perl_fd_mask
21#endif 30#endif
22/* due to bugs in OS X we have to use libev/ explicitly here */ 31/* due to bugs in OS X we have to use libev/ explicitly here */
23#include "libev/ev.c" 32#include "libev/ev.c"
24 33
25#ifndef _WIN32 34#if !defined(_WIN32) && !defined(_MINIX)
26# include <pthread.h> 35# include <pthread.h>
27#endif 36#endif
28 37
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)) 38#define e_loop(w) INT2PTR (struct ev_loop *, SvIVX (((ev_watcher *)(w))->loop))
39#define e_flags(w) ((ev_watcher *)(w))->e_flags
40#define e_self(w) ((ev_watcher *)(w))->self
41#define e_fh(w) ((ev_watcher *)(w))->fh
42#define e_data(w) ((ev_watcher *)(w))->data
49 43
50#define WFLAG_KEEPALIVE 1 44#define WFLAG_KEEPALIVE 1
51#define WFLAG_UNREFED 2 /* has been unref'ed */ 45#define WFLAG_UNREFED 2 /* has been unref'ed */
52 46
53#define UNREF(w) \ 47#define UNREF(w) \
54 if (!((w)->e_flags & (WFLAG_KEEPALIVE | WFLAG_UNREFED)) \ 48 if (!(e_flags (w) & (WFLAG_KEEPALIVE | WFLAG_UNREFED)) \
55 && ev_is_active (w)) \ 49 && ev_is_active (w)) \
56 { \ 50 { \
57 ev_unref (e_loop (w)); \ 51 ev_unref (e_loop (w)); \
58 (w)->e_flags |= WFLAG_UNREFED; \ 52 e_flags (w) |= WFLAG_UNREFED; \
59 } 53 }
60 54
61#define REF(w) \ 55#define REF(w) \
62 if ((w)->e_flags & WFLAG_UNREFED) \ 56 if (e_flags (w) & WFLAG_UNREFED) \
63 { \ 57 { \
64 (w)->e_flags &= ~WFLAG_UNREFED; \ 58 e_flags (w) &= ~WFLAG_UNREFED; \
65 ev_ref (e_loop (w)); \ 59 ev_ref (e_loop (w)); \
66 } 60 }
67 61
68#define START(type,w) \ 62#define START(type,w) \
69 do { \ 63 do { \
76 REF (w); \ 70 REF (w); \
77 ev_ ## type ## _stop (e_loop (w), w); \ 71 ev_ ## type ## _stop (e_loop (w), w); \
78 } while (0) 72 } while (0)
79 73
80#define RESET(type,w,seta) \ 74#define RESET(type,w,seta) \
81 do { \ 75 do { \
82 int active = ev_is_active (w); \ 76 int active = ev_is_active (w); \
83 if (active) STOP (type, w); \ 77 if (active) STOP (type, w); \
84 ev_ ## type ## _set seta; \ 78 ev_ ## type ## _set seta; \
85 if (active) START (type, w); \ 79 if (active) START (type, w); \
86 } while (0) 80 } while (0)
87 81
88typedef int Signal; 82typedef int Signal;
83
84/* horrible... */
85#define CHECK_SIGNAL_CAN_START(w) \
86 do { \
87 /* dive into the internals of libev to avoid aborting in libev */ \
88 if (signals [(w)->signum - 1].loop \
89 && signals [(w)->signum - 1].loop != e_loop (w)) \
90 croak ("unable to start signal watcher, signal %d already registered in another loop", w->signum); \
91 } while (0)
92
93#define START_SIGNAL(w) \
94 do { \
95 CHECK_SIGNAL_CAN_START (w); \
96 START (signal, w); \
97 } while (0) \
98
99#define RESET_SIGNAL(w,seta) \
100 do { \
101 int active = ev_is_active (w); \
102 if (active) STOP (signal, w); \
103 ev_ ## signal ## _set seta; \
104 if (active) START_SIGNAL (w); \
105 } while (0)
89 106
90static SV *default_loop_sv; 107static SV *default_loop_sv;
91 108
92static struct EVAPI evapi; 109static struct EVAPI evapi;
93 110
105 *stash_check, 122 *stash_check,
106 *stash_embed, 123 *stash_embed,
107 *stash_fork, 124 *stash_fork,
108 *stash_async; 125 *stash_async;
109 126
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///////////////////////////////////////////////////////////////////////////// 127/////////////////////////////////////////////////////////////////////////////
136// Event 128// Event
137 129
138static void e_cb (EV_P_ ev_watcher *w, int revents); 130static void e_cb (EV_P_ ev_watcher *w, int revents);
139 131
140static int 132void *
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 *
171e_new (int size, SV *cb_sv, SV *loop) 133e_new (int size, SV *cb_sv, SV *loop)
172{ 134{
173 SV *cv = cb_sv ? e_get_cv (cb_sv) : 0; 135 SV *cv = cb_sv ? s_get_cv_croak (cb_sv) : 0;
174 ev_watcher *w; 136 ev_watcher *w;
175 SV *self = NEWSV (0, size); 137 SV *self = NEWSV (0, size);
176 SvPOK_only (self); 138 SvPOK_only (self);
177 SvCUR_set (self, size); 139 SvCUR_set (self, size);
178 140
237 sv_self = sv_self_cache; sv_self_cache = 0; 199 sv_self = sv_self_cache; sv_self_cache = 0;
238 SvRV_set (sv_self, SvREFCNT_inc_NN (w->self)); 200 SvRV_set (sv_self, SvREFCNT_inc_NN (w->self));
239 } 201 }
240 else 202 else
241 { 203 {
242 sv_self = newRV_inc (w->self); /* w->self MUST be blessed by now */ 204 sv_self = newRV_inc (w->self); /* e_self (w) MUST be blessed by now */
243 SvREADONLY_on (sv_self); 205 SvREADONLY_on (sv_self);
244 } 206 }
245 207
246 if (expect_true (sv_events_cache)) 208 if (expect_true (sv_events_cache))
247 { 209 {
338 ENTER; 300 ENTER;
339 SAVETMPS; 301 SAVETMPS;
340 302
341 PUSHMARK (SP); 303 PUSHMARK (SP);
342 EXTEND (SP, 2); 304 EXTEND (SP, 2);
343 PUSHs (newRV_inc (w->self)); /* w->self MUST be blessed by now */ 305 PUSHs (newRV_inc (e_self (w))); /* e_self (w) MUST be blessed by now */
344 PUSHs (newSVnv (now)); 306 PUSHs (newSVnv (now));
345 307
346 PUTBACK; 308 PUTBACK;
347 count = call_sv (w->fh, G_SCALAR | G_EVAL); 309 count = call_sv (w->fh, G_SCALAR | G_EVAL);
348 SPAGAIN; 310 SPAGAIN;
399 const_iv (EV_, MINPRI) 361 const_iv (EV_, MINPRI)
400 const_iv (EV_, MAXPRI) 362 const_iv (EV_, MAXPRI)
401 363
402 const_iv (EV_, UNDEF) 364 const_iv (EV_, UNDEF)
403 const_iv (EV_, NONE) 365 const_iv (EV_, NONE)
404 const_iv (EV_, TIMEOUT)
405 const_iv (EV_, READ) 366 const_iv (EV_, READ)
406 const_iv (EV_, WRITE) 367 const_iv (EV_, WRITE)
368 const_iv (EV_, IO)
369 const_iv (EV_, TIMEOUT) /* deprecated */
370 const_iv (EV_, TIMER)
371 const_iv (EV_, PERIODIC)
407 const_iv (EV_, SIGNAL) 372 const_iv (EV_, SIGNAL)
373 const_iv (EV_, CHILD)
374 const_iv (EV_, STAT)
408 const_iv (EV_, IDLE) 375 const_iv (EV_, IDLE)
376 const_iv (EV_, PREPARE)
409 const_iv (EV_, CHECK) 377 const_iv (EV_, CHECK)
378 const_iv (EV_, EMBED)
379 const_iv (EV_, FORK)
380 const_iv (EV_, ASYNC)
381 const_iv (EV_, CUSTOM)
410 const_iv (EV_, ERROR) 382 const_iv (EV_, ERROR)
411 383
384 const_iv (EV, LOOP_NONBLOCK)
412 const_iv (EV, LOOP_ONESHOT) 385 const_iv (EV, LOOP_ONESHOT)
386
413 const_iv (EV, LOOP_NONBLOCK) 387 const_iv (EV, UNLOOP_CANCEL)
414 const_iv (EV, UNLOOP_ONE) 388 const_iv (EV, UNLOOP_ONE)
415 const_iv (EV, UNLOOP_ALL) 389 const_iv (EV, UNLOOP_ALL)
416 390
417 const_iv (EV, BACKEND_SELECT) 391 const_iv (EV, BACKEND_SELECT)
418 const_iv (EV, BACKEND_POLL) 392 const_iv (EV, BACKEND_POLL)
419 const_iv (EV, BACKEND_EPOLL) 393 const_iv (EV, BACKEND_EPOLL)
420 const_iv (EV, BACKEND_KQUEUE) 394 const_iv (EV, BACKEND_KQUEUE)
421 const_iv (EV, BACKEND_DEVPOLL) 395 const_iv (EV, BACKEND_DEVPOLL)
422 const_iv (EV, BACKEND_PORT) 396 const_iv (EV, BACKEND_PORT)
397 const_iv (EV, BACKEND_ALL)
423 const_iv (EV, FLAG_AUTO) 398 const_iv (EV, FLAG_AUTO)
399 const_iv (EV, FLAG_FORKCHECK)
400 const_iv (EV, FLAG_SIGNALFD)
424 const_iv (EV, FLAG_NOENV) 401 const_iv (EV, FLAG_NOENV)
402 const_iv (EV, FLAG_NOSIGFD) /* compatibility, always 0 */
425 const_iv (EV, FLAG_FORKCHECK) 403 const_iv (EV, FLAG_NOINOTIFY)
404
405 const_iv (EV_, VERSION_MAJOR)
406 const_iv (EV_, VERSION_MINOR)
426 }; 407 };
427 408
428 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 409 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
429 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 410 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
430 411
449 430
450 /* the poor man's shared library emulator */ 431 /* the poor man's shared library emulator */
451 evapi.ver = EV_API_VERSION; 432 evapi.ver = EV_API_VERSION;
452 evapi.rev = EV_API_REVISION; 433 evapi.rev = EV_API_REVISION;
453 evapi.sv_fileno = sv_fileno; 434 evapi.sv_fileno = sv_fileno;
454 evapi.sv_signum = sv_signum; 435 evapi.sv_signum = s_signum;
455 evapi.supported_backends = ev_supported_backends (); 436 evapi.supported_backends = ev_supported_backends ();
456 evapi.recommended_backends = ev_recommended_backends (); 437 evapi.recommended_backends = ev_recommended_backends ();
457 evapi.embeddable_backends = ev_embeddable_backends (); 438 evapi.embeddable_backends = ev_embeddable_backends ();
458 evapi.time_ = ev_time; 439 evapi.time_ = ev_time;
459 evapi.sleep_ = ev_sleep; 440 evapi.sleep_ = ev_sleep;
460 evapi.loop_new = ev_loop_new; 441 evapi.loop_new = ev_loop_new;
461 evapi.loop_destroy = ev_loop_destroy; 442 evapi.loop_destroy = ev_loop_destroy;
462 evapi.loop_fork = ev_loop_fork; 443 evapi.loop_fork = ev_loop_fork;
463 evapi.loop_count = ev_loop_count; 444 evapi.iteration = ev_iteration;
445 evapi.depth = ev_depth;
446 evapi.set_userdata = ev_set_userdata;
447 evapi.userdata = ev_userdata;
464 evapi.now = ev_now; 448 evapi.now = ev_now;
465 evapi.now_update = ev_now_update; 449 evapi.now_update = ev_now_update;
450 evapi.suspend = ev_suspend;
451 evapi.resume = ev_resume;
466 evapi.backend = ev_backend; 452 evapi.backend = ev_backend;
467 evapi.unloop = ev_unloop; 453 evapi.unloop = ev_unloop;
454 evapi.invoke_pending = ev_invoke_pending;
455 evapi.pending_count = ev_pending_count;
456 evapi.verify = ev_verify;
457 evapi.set_loop_release_cb = ev_set_loop_release_cb;
458 evapi.set_invoke_pending_cb= ev_set_invoke_pending_cb;
468 evapi.ref = ev_ref; 459 evapi.ref = ev_ref;
469 evapi.unref = ev_unref; 460 evapi.unref = ev_unref;
470 evapi.loop = ev_loop; 461 evapi.loop = ev_loop;
471 evapi.once = ev_once; 462 evapi.once = ev_once;
472 evapi.io_start = ev_io_start; 463 evapi.io_start = ev_io_start;
473 evapi.io_stop = ev_io_stop; 464 evapi.io_stop = ev_io_stop;
474 evapi.timer_start = ev_timer_start; 465 evapi.timer_start = ev_timer_start;
475 evapi.timer_stop = ev_timer_stop; 466 evapi.timer_stop = ev_timer_stop;
476 evapi.timer_again = ev_timer_again; 467 evapi.timer_again = ev_timer_again;
468 evapi.timer_remaining = ev_timer_remaining;
477 evapi.periodic_start = ev_periodic_start; 469 evapi.periodic_start = ev_periodic_start;
478 evapi.periodic_stop = ev_periodic_stop; 470 evapi.periodic_stop = ev_periodic_stop;
479 evapi.signal_start = ev_signal_start; 471 evapi.signal_start = ev_signal_start;
480 evapi.signal_stop = ev_signal_stop; 472 evapi.signal_stop = ev_signal_stop;
481 evapi.idle_start = ev_idle_start; 473 evapi.idle_start = ev_idle_start;
482 evapi.idle_stop = ev_idle_stop; 474 evapi.idle_stop = ev_idle_stop;
483 evapi.prepare_start = ev_prepare_start; 475 evapi.prepare_start = ev_prepare_start;
484 evapi.prepare_stop = ev_prepare_stop; 476 evapi.prepare_stop = ev_prepare_stop;
485 evapi.check_start = ev_check_start; 477 evapi.check_start = ev_check_start;
486 evapi.check_stop = ev_check_stop; 478 evapi.check_stop = ev_check_stop;
479#if EV_CHILD_ENABLE
487 evapi.child_start = ev_child_start; 480 evapi.child_start = ev_child_start;
488 evapi.child_stop = ev_child_stop; 481 evapi.child_stop = ev_child_stop;
482#endif
489 evapi.stat_start = ev_stat_start; 483 evapi.stat_start = ev_stat_start;
490 evapi.stat_stop = ev_stat_stop; 484 evapi.stat_stop = ev_stat_stop;
491 evapi.stat_stat = ev_stat_stat; 485 evapi.stat_stat = ev_stat_stat;
492 evapi.embed_start = ev_embed_start; 486 evapi.embed_start = ev_embed_start;
493 evapi.embed_stop = ev_embed_stop; 487 evapi.embed_stop = ev_embed_stop;
501 evapi.invoke = ev_invoke; 495 evapi.invoke = ev_invoke;
502 496
503 sv_setiv (sv, (IV)&evapi); 497 sv_setiv (sv, (IV)&evapi);
504 SvREADONLY_on (sv); 498 SvREADONLY_on (sv);
505 } 499 }
506#ifndef _WIN32 500#if !defined(_WIN32) && !defined(_MINIX)
507 pthread_atfork (0, 0, ev_default_fork); 501 pthread_atfork (0, 0, ev_default_fork);
508#endif 502#endif
509} 503}
510 504
511SV *ev_default_loop (unsigned int flags = 0) 505SV *ev_default_loop (unsigned int flags = 0)
546 C_ARGS: evapi.default_loop 540 C_ARGS: evapi.default_loop
547 541
548void ev_now_update () 542void ev_now_update ()
549 C_ARGS: evapi.default_loop 543 C_ARGS: evapi.default_loop
550 544
545void ev_suspend ()
546 C_ARGS: evapi.default_loop
547
548void ev_resume ()
549 C_ARGS: evapi.default_loop
550
551unsigned int ev_backend () 551unsigned int ev_backend ()
552 C_ARGS: evapi.default_loop 552 C_ARGS: evapi.default_loop
553 553
554void ev_verify ()
555 C_ARGS: evapi.default_loop
556
557unsigned int ev_iteration ()
558 C_ARGS: evapi.default_loop
559
554unsigned int ev_loop_count () 560unsigned int ev_depth ()
555 C_ARGS: evapi.default_loop 561 C_ARGS: evapi.default_loop
556 562
557void ev_set_io_collect_interval (NV interval) 563void ev_set_io_collect_interval (NV interval)
558 C_ARGS: evapi.default_loop, interval 564 C_ARGS: evapi.default_loop, interval
559 565
570 C_ARGS: evapi.default_loop, fd, revents 576 C_ARGS: evapi.default_loop, fd, revents
571 577
572void ev_feed_signal_event (SV *signal) 578void ev_feed_signal_event (SV *signal)
573 CODE: 579 CODE:
574{ 580{
575 Signal signum = sv_signum (signal); 581 Signal signum = s_signum (signal);
576 CHECK_SIG (signal, signum); 582 CHECK_SIG (signal, signum);
577 583
578 ev_feed_signal_event (evapi.default_loop, signum); 584 ev_feed_signal_event (evapi.default_loop, signum);
579} 585}
580 586
587unsigned int ev_pending_count ()
588 C_ARGS: evapi.default_loop
589
590void ev_invoke_pending ()
591 C_ARGS: evapi.default_loop
592
581ev_io *io (SV *fh, int events, SV *cb) 593ev_io *io (SV *fh, int events, SV *cb)
582 ALIAS: 594 ALIAS:
583 io_ns = 1 595 io_ns = 1
596 _ae_io = 2
584 CODE: 597 CODE:
585{ 598{
586 int fd = sv_fileno (fh); 599 int fd = s_fileno (fh, events & EV_WRITE);
587 CHECK_FD (fh, fd); 600 CHECK_FD (fh, fd);
588 601
602 if (ix == 2)
603 {
604 ix = 0;
605 events = events ? EV_WRITE : EV_READ;
606 }
607
589 RETVAL = e_new (sizeof (ev_io), cb, default_loop_sv); 608 RETVAL = e_new (sizeof (ev_io), cb, default_loop_sv);
590 RETVAL->fh = newSVsv (fh); 609 e_fh (RETVAL) = newSVsv (fh);
591 ev_io_set (RETVAL, fd, events); 610 ev_io_set (RETVAL, fd, events);
592 if (!ix) START (io, RETVAL); 611 if (!ix) START (io, RETVAL);
593} 612}
594 OUTPUT: 613 OUTPUT:
595 RETVAL 614 RETVAL
613 CHECK_REPEAT (interval); 632 CHECK_REPEAT (interval);
614 CODE: 633 CODE:
615{ 634{
616 ev_periodic *w; 635 ev_periodic *w;
617 w = e_new (sizeof (ev_periodic), cb, default_loop_sv); 636 w = e_new (sizeof (ev_periodic), cb, default_loop_sv);
618 w->fh = SvTRUE (reschedule_cb) ? newSVsv (reschedule_cb) : 0; 637 e_fh (w) = SvTRUE (reschedule_cb) ? newSVsv (reschedule_cb) : 0;
619 ev_periodic_set (w, at, interval, w->fh ? e_periodic_cb : 0); 638 ev_periodic_set (w, at, interval, e_fh (w) ? e_periodic_cb : 0);
620 RETVAL = e_bless ((ev_watcher *)w, stash_periodic); 639 RETVAL = e_bless ((ev_watcher *)w, stash_periodic);
621 if (!ix) START (periodic, w); 640 if (!ix) START (periodic, w);
622} 641}
623 OUTPUT: 642 OUTPUT:
624 RETVAL 643 RETVAL
626ev_signal *signal (SV *signal, SV *cb) 645ev_signal *signal (SV *signal, SV *cb)
627 ALIAS: 646 ALIAS:
628 signal_ns = 1 647 signal_ns = 1
629 CODE: 648 CODE:
630{ 649{
631 Signal signum = sv_signum (signal); 650 Signal signum = s_signum (signal);
632 CHECK_SIG (signal, signum); 651 CHECK_SIG (signal, signum);
633 652
634 RETVAL = e_new (sizeof (ev_signal), cb, default_loop_sv); 653 RETVAL = e_new (sizeof (ev_signal), cb, default_loop_sv);
635 ev_signal_set (RETVAL, signum); 654 ev_signal_set (RETVAL, signum);
636 if (!ix) START (signal, RETVAL); 655 if (!ix) START_SIGNAL (RETVAL);
637} 656}
638 OUTPUT: 657 OUTPUT:
639 RETVAL 658 RETVAL
640 659
641ev_idle *idle (SV *cb) 660ev_idle *idle (SV *cb)
676 ev_fork_set (RETVAL); 695 ev_fork_set (RETVAL);
677 if (!ix) START (fork, RETVAL); 696 if (!ix) START (fork, RETVAL);
678 OUTPUT: 697 OUTPUT:
679 RETVAL 698 RETVAL
680 699
700
681ev_child *child (int pid, int trace, SV *cb) 701ev_child *child (int pid, int trace, SV *cb)
682 ALIAS: 702 ALIAS:
683 child_ns = 1 703 child_ns = 1
684 CODE: 704 CODE:
705#if EV_CHILD_ENABLE
685 RETVAL = e_new (sizeof (ev_child), cb, default_loop_sv); 706 RETVAL = e_new (sizeof (ev_child), cb, default_loop_sv);
686 ev_child_set (RETVAL, pid, trace); 707 ev_child_set (RETVAL, pid, trace);
687 if (!ix) START (child, RETVAL); 708 if (!ix) START (child, RETVAL);
709#else
710 croak ("EV::child watchers not supported on this platform");
711#endif
688 OUTPUT: 712 OUTPUT:
689 RETVAL 713 RETVAL
714
690 715
691ev_stat *stat (SV *path, NV interval, SV *cb) 716ev_stat *stat (SV *path, NV interval, SV *cb)
692 ALIAS: 717 ALIAS:
693 stat_ns = 1 718 stat_ns = 1
694 CODE: 719 CODE:
695 RETVAL = e_new (sizeof (ev_stat), cb, default_loop_sv); 720 RETVAL = e_new (sizeof (ev_stat), cb, default_loop_sv);
696 RETVAL->fh = newSVsv (path); 721 e_fh (RETVAL) = newSVsv (path);
697 ev_stat_set (RETVAL, SvPVbyte_nolen (RETVAL->fh), interval); 722 ev_stat_set (RETVAL, SvPVbyte_nolen (e_fh (RETVAL)), interval);
698 if (!ix) START (stat, RETVAL); 723 if (!ix) START (stat, RETVAL);
699 OUTPUT: 724 OUTPUT:
700 RETVAL 725 RETVAL
701 726
702ev_embed *embed (struct ev_loop *loop, SV *cb = 0) 727ev_embed *embed (struct ev_loop *loop, SV *cb = 0)
706{ 731{
707 if (!(ev_backend (loop) & ev_embeddable_backends ())) 732 if (!(ev_backend (loop) & ev_embeddable_backends ()))
708 croak ("passed loop is not embeddable via EV::embed,"); 733 croak ("passed loop is not embeddable via EV::embed,");
709 734
710 RETVAL = e_new (sizeof (ev_embed), cb, default_loop_sv); 735 RETVAL = e_new (sizeof (ev_embed), cb, default_loop_sv);
711 RETVAL->fh = newSVsv (ST (0)); 736 e_fh (RETVAL) = newSVsv (ST (0));
712 ev_embed_set (RETVAL, loop); 737 ev_embed_set (RETVAL, loop);
713 if (!ix) START (embed, RETVAL); 738 if (!ix) START (embed, RETVAL);
714} 739}
715 OUTPUT: 740 OUTPUT:
716 RETVAL 741 RETVAL
727 752
728void once (SV *fh, int events, SV *timeout, SV *cb) 753void once (SV *fh, int events, SV *timeout, SV *cb)
729 CODE: 754 CODE:
730 ev_once ( 755 ev_once (
731 evapi.default_loop, 756 evapi.default_loop,
732 sv_fileno (fh), events, 757 s_fileno (fh, events & EV_WRITE), events,
733 SvOK (timeout) ? SvNV (timeout) : -1., 758 SvOK (timeout) ? SvNV (timeout) : -1.,
734 e_once_cb, 759 e_once_cb,
735 newSVsv (cb) 760 newSVsv (cb)
736 ); 761 );
737 762
771SV *cb (ev_watcher *w, SV *new_cb = 0) 796SV *cb (ev_watcher *w, SV *new_cb = 0)
772 CODE: 797 CODE:
773{ 798{
774 if (items > 1) 799 if (items > 1)
775 { 800 {
776 new_cb = e_get_cv (new_cb); 801 new_cb = s_get_cv_croak (new_cb);
777 RETVAL = newRV_noinc (w->cb_sv); 802 RETVAL = newRV_noinc (w->cb_sv);
778 w->cb_sv = SvREFCNT_inc (new_cb); 803 w->cb_sv = SvREFCNT_inc (new_cb);
779 } 804 }
780 else 805 else
781 RETVAL = newRV_inc (w->cb_sv); 806 RETVAL = newRV_inc (w->cb_sv);
851 e_destroy (w); 876 e_destroy (w);
852 877
853void set (ev_io *w, SV *fh, int events) 878void set (ev_io *w, SV *fh, int events)
854 CODE: 879 CODE:
855{ 880{
856 int fd = sv_fileno (fh); 881 int fd = s_fileno (fh, events & EV_WRITE);
857 CHECK_FD (fh, fd); 882 CHECK_FD (fh, fd);
858 883
859 sv_setsv (w->fh, fh); 884 sv_setsv (e_fh (w), fh);
860 RESET (io, w, (w, fd, events)); 885 RESET (io, w, (w, fd, events));
861} 886}
862 887
863SV *fh (ev_io *w, SV *new_fh = 0) 888SV *fh (ev_io *w, SV *new_fh = 0)
864 CODE: 889 CODE:
865{ 890{
866 if (items > 1) 891 if (items > 1)
867 { 892 {
868 int fd = sv_fileno (new_fh); 893 int fd = s_fileno (new_fh, w->events & EV_WRITE);
869 CHECK_FD (new_fh, fd); 894 CHECK_FD (new_fh, fd);
870 895
871 RETVAL = w->fh; 896 RETVAL = e_fh (w);
872 w->fh = newSVsv (new_fh); 897 e_fh (w) = newSVsv (new_fh);
873 898
874 RESET (io, w, (w, fd, w->events)); 899 RESET (io, w, (w, fd, w->events));
875 } 900 }
876 else 901 else
877 RETVAL = newSVsv (w->fh); 902 RETVAL = newSVsv (e_fh (w));
878} 903}
879 OUTPUT: 904 OUTPUT:
880 RETVAL 905 RETVAL
881 906
882int events (ev_io *w, int new_events = EV_UNDEF) 907int events (ev_io *w, int new_events = EV_UNDEF)
892 917
893MODULE = EV PACKAGE = EV::Signal PREFIX = ev_signal_ 918MODULE = EV PACKAGE = EV::Signal PREFIX = ev_signal_
894 919
895void ev_signal_start (ev_signal *w) 920void ev_signal_start (ev_signal *w)
896 CODE: 921 CODE:
897 START (signal, w); 922 START_SIGNAL (w);
898 923
899void ev_signal_stop (ev_signal *w) 924void ev_signal_stop (ev_signal *w)
900 CODE: 925 CODE:
901 STOP (signal, w); 926 STOP (signal, w);
902 927
906 e_destroy (w); 931 e_destroy (w);
907 932
908void set (ev_signal *w, SV *signal) 933void set (ev_signal *w, SV *signal)
909 CODE: 934 CODE:
910{ 935{
911 Signal signum = sv_signum (signal); 936 Signal signum = s_signum (signal);
912 CHECK_SIG (signal, signum); 937 CHECK_SIG (signal, signum);
913 938
914 RESET (signal, w, (w, signum)); 939 RESET_SIGNAL (w, (w, signum));
915} 940}
916 941
917int signal (ev_signal *w, SV *new_signal = 0) 942int signal (ev_signal *w, SV *new_signal = 0)
918 CODE: 943 CODE:
919{ 944{
920 RETVAL = w->signum; 945 RETVAL = w->signum;
921 946
922 if (items > 1) 947 if (items > 1)
923 { 948 {
924 Signal signum = sv_signum (new_signal); 949 Signal signum = s_signum (new_signal);
925 CHECK_SIG (new_signal, signum); 950 CHECK_SIG (new_signal, signum);
926 951
927 RESET (signal, w, (w, signum)); 952 RESET_SIGNAL (w, (w, signum));
928 } 953 }
929} 954}
930 OUTPUT: 955 OUTPUT:
931 RETVAL 956 RETVAL
932 957
947 CHECK_REPEAT (w->repeat); 972 CHECK_REPEAT (w->repeat);
948 CODE: 973 CODE:
949 ev_timer_again (e_loop (w), w); 974 ev_timer_again (e_loop (w), w);
950 UNREF (w); 975 UNREF (w);
951 976
977NV ev_timer_remaining (ev_timer *w)
978 C_ARGS: e_loop (w), w
979
952void DESTROY (ev_timer *w) 980void DESTROY (ev_timer *w)
953 CODE: 981 CODE:
954 STOP (timer, w); 982 STOP (timer, w);
955 e_destroy (w); 983 e_destroy (w);
956 984
985void set (ev_periodic *w, NV at, NV interval = 0., SV *reschedule_cb = &PL_sv_undef) 1013void set (ev_periodic *w, NV at, NV interval = 0., SV *reschedule_cb = &PL_sv_undef)
986 INIT: 1014 INIT:
987 CHECK_REPEAT (interval); 1015 CHECK_REPEAT (interval);
988 CODE: 1016 CODE:
989{ 1017{
990 SvREFCNT_dec (w->fh); 1018 SvREFCNT_dec (e_fh (w));
991 w->fh = SvTRUE (reschedule_cb) ? newSVsv (reschedule_cb) : 0; 1019 e_fh (w) = SvTRUE (reschedule_cb) ? newSVsv (reschedule_cb) : 0;
992 1020
993 RESET (periodic, w, (w, at, interval, w->fh ? e_periodic_cb : 0)); 1021 RESET (periodic, w, (w, at, interval, e_fh (w) ? e_periodic_cb : 0));
994} 1022}
995 1023
996NV at (ev_periodic *w) 1024NV at (ev_periodic *w)
997 CODE: 1025 CODE:
998 RETVAL = ev_periodic_at (w); 1026 RETVAL = ev_periodic_at (w);
1058 CODE: 1086 CODE:
1059 STOP (fork, w); 1087 STOP (fork, w);
1060 e_destroy (w); 1088 e_destroy (w);
1061 1089
1062MODULE = EV PACKAGE = EV::Child PREFIX = ev_child_ 1090MODULE = EV PACKAGE = EV::Child PREFIX = ev_child_
1091
1092#if EV_CHILD_ENABLE
1063 1093
1064void ev_child_start (ev_child *w) 1094void ev_child_start (ev_child *w)
1065 CODE: 1095 CODE:
1066 START (child, w); 1096 START (child, w);
1067 1097
1087 : ix == 1 ? w->rpid 1117 : ix == 1 ? w->rpid
1088 : w->rstatus; 1118 : w->rstatus;
1089 OUTPUT: 1119 OUTPUT:
1090 RETVAL 1120 RETVAL
1091 1121
1122#endif
1123
1092MODULE = EV PACKAGE = EV::Stat PREFIX = ev_stat_ 1124MODULE = EV PACKAGE = EV::Stat PREFIX = ev_stat_
1093 1125
1094void ev_stat_start (ev_stat *w) 1126void ev_stat_start (ev_stat *w)
1095 CODE: 1127 CODE:
1096 START (stat, w); 1128 START (stat, w);
1105 e_destroy (w); 1137 e_destroy (w);
1106 1138
1107void set (ev_stat *w, SV *path, NV interval) 1139void set (ev_stat *w, SV *path, NV interval)
1108 CODE: 1140 CODE:
1109{ 1141{
1110 sv_setsv (w->fh, path); 1142 sv_setsv (e_fh (w), path);
1111 RESET (stat, w, (w, SvPVbyte_nolen (w->fh), interval)); 1143 RESET (stat, w, (w, SvPVbyte_nolen (e_fh (w)), interval));
1112} 1144}
1113 1145
1114SV *path (ev_stat *w, SV *new_path = 0) 1146SV *path (ev_stat *w, SV *new_path = 0)
1115 CODE: 1147 CODE:
1116{ 1148{
1117 RETVAL = SvREFCNT_inc (w->fh); 1149 RETVAL = SvREFCNT_inc (e_fh (w));
1118 1150
1119 if (items > 1) 1151 if (items > 1)
1120 { 1152 {
1121 SvREFCNT_dec (w->fh); 1153 SvREFCNT_dec (e_fh (w));
1122 w->fh = newSVsv (new_path); 1154 e_fh (w) = newSVsv (new_path);
1123 RESET (stat, w, (w, SvPVbyte_nolen (w->fh), w->interval)); 1155 RESET (stat, w, (w, SvPVbyte_nolen (e_fh (w)), w->interval));
1124 } 1156 }
1125} 1157}
1126 OUTPUT: 1158 OUTPUT:
1127 RETVAL 1159 RETVAL
1128 1160
1130 CODE: 1162 CODE:
1131{ 1163{
1132 RETVAL = w->interval; 1164 RETVAL = w->interval;
1133 1165
1134 if (items > 1) 1166 if (items > 1)
1135 RESET (stat, w, (w, SvPVbyte_nolen (w->fh), new_interval)); 1167 RESET (stat, w, (w, SvPVbyte_nolen (e_fh (w)), new_interval));
1136} 1168}
1137 OUTPUT: 1169 OUTPUT:
1138 RETVAL 1170 RETVAL
1139 1171
1140void prev (ev_stat *w) 1172void prev (ev_stat *w)
1199 e_destroy (w); 1231 e_destroy (w);
1200 1232
1201void set (ev_embed *w, struct ev_loop *loop) 1233void set (ev_embed *w, struct ev_loop *loop)
1202 CODE: 1234 CODE:
1203{ 1235{
1204 sv_setsv (w->fh, ST (1)); 1236 sv_setsv (e_fh (w), ST (1));
1205 RESET (embed, w, (w, loop)); 1237 RESET (embed, w, (w, loop));
1206} 1238}
1207 1239
1208SV *other (ev_embed *w) 1240SV *other (ev_embed *w)
1209 CODE: 1241 CODE:
1210 RETVAL = newSVsv (w->fh); 1242 RETVAL = newSVsv (e_fh (w));
1211 OUTPUT: 1243 OUTPUT:
1212 RETVAL 1244 RETVAL
1213 1245
1214void ev_embed_sweep (ev_embed *w) 1246void ev_embed_sweep (ev_embed *w)
1215 C_ARGS: e_loop (w), w 1247 C_ARGS: e_loop (w), w
1258 if (loop != evapi.default_loop) /* global destruction sucks */ 1290 if (loop != evapi.default_loop) /* global destruction sucks */
1259 ev_loop_destroy (loop); 1291 ev_loop_destroy (loop);
1260 1292
1261void ev_loop_fork (struct ev_loop *loop) 1293void ev_loop_fork (struct ev_loop *loop)
1262 1294
1263void ev_loop_verify (struct ev_loop *loop) 1295void ev_verify (struct ev_loop *loop)
1264 1296
1265NV ev_now (struct ev_loop *loop) 1297NV ev_now (struct ev_loop *loop)
1266 1298
1267void ev_now_update (struct ev_loop *loop) 1299void ev_now_update (struct ev_loop *loop)
1268 1300
1301void ev_suspend (struct ev_loop *loop)
1302
1303void ev_resume (struct ev_loop *loop)
1304
1269void ev_set_io_collect_interval (struct ev_loop *loop, NV interval) 1305void ev_set_io_collect_interval (struct ev_loop *loop, NV interval)
1270 1306
1271void ev_set_timeout_collect_interval (struct ev_loop *loop, NV interval) 1307void ev_set_timeout_collect_interval (struct ev_loop *loop, NV interval)
1272 1308
1273unsigned int ev_backend (struct ev_loop *loop) 1309unsigned int ev_backend (struct ev_loop *loop)
1274 1310
1275unsigned int ev_loop_count (struct ev_loop *loop) 1311unsigned int ev_iteration (struct ev_loop *loop)
1312
1313unsigned int ev_depth (struct ev_loop *loop)
1276 1314
1277void ev_loop (struct ev_loop *loop, int flags = 0) 1315void ev_loop (struct ev_loop *loop, int flags = 0)
1278 1316
1279void ev_unloop (struct ev_loop *loop, int how = 1) 1317void ev_unloop (struct ev_loop *loop, int how = 1)
1280 1318
1281void ev_feed_fd_event (struct ev_loop *loop, int fd, int revents = EV_NONE) 1319void ev_feed_fd_event (struct ev_loop *loop, int fd, int revents = EV_NONE)
1282 1320
1321unsigned int ev_pending_count (struct ev_loop *loop)
1322
1323void ev_invoke_pending (struct ev_loop *loop)
1324
1283#if 0 1325#if 0
1284 1326
1285void ev_feed_signal_event (struct ev_loop *loop, SV *signal) 1327void ev_feed_signal_event (struct ev_loop *loop, SV *signal)
1286 CODE: 1328 CODE:
1287{ 1329{
1288 Signal signum = sv_signum (signal); 1330 Signal signum = s_signum (signal);
1289 CHECK_SIG (signal, signum); 1331 CHECK_SIG (signal, signum);
1290 1332
1291 ev_feed_signal_event (loop, signum); 1333 ev_feed_signal_event (loop, signum);
1292} 1334}
1293 1335
1296ev_io *io (struct ev_loop *loop, SV *fh, int events, SV *cb) 1338ev_io *io (struct ev_loop *loop, SV *fh, int events, SV *cb)
1297 ALIAS: 1339 ALIAS:
1298 io_ns = 1 1340 io_ns = 1
1299 CODE: 1341 CODE:
1300{ 1342{
1301 int fd = sv_fileno (fh); 1343 int fd = s_fileno (fh, events & EV_WRITE);
1302 CHECK_FD (fh, fd); 1344 CHECK_FD (fh, fd);
1303 1345
1304 RETVAL = e_new (sizeof (ev_io), cb, ST (0)); 1346 RETVAL = e_new (sizeof (ev_io), cb, ST (0));
1305 RETVAL->fh = newSVsv (fh); 1347 e_fh (RETVAL) = newSVsv (fh);
1306 ev_io_set (RETVAL, fd, events); 1348 ev_io_set (RETVAL, fd, events);
1307 if (!ix) START (io, RETVAL); 1349 if (!ix) START (io, RETVAL);
1308} 1350}
1309 OUTPUT: 1351 OUTPUT:
1310 RETVAL 1352 RETVAL
1328 CHECK_REPEAT (interval); 1370 CHECK_REPEAT (interval);
1329 CODE: 1371 CODE:
1330{ 1372{
1331 ev_periodic *w; 1373 ev_periodic *w;
1332 w = e_new (sizeof (ev_periodic), cb, ST (0)); 1374 w = e_new (sizeof (ev_periodic), cb, ST (0));
1333 w->fh = SvTRUE (reschedule_cb) ? newSVsv (reschedule_cb) : 0; 1375 e_fh (w) = SvTRUE (reschedule_cb) ? newSVsv (reschedule_cb) : 0;
1334 ev_periodic_set (w, at, interval, w->fh ? e_periodic_cb : 0); 1376 ev_periodic_set (w, at, interval, e_fh (w) ? e_periodic_cb : 0);
1335 RETVAL = e_bless ((ev_watcher *)w, stash_periodic); 1377 RETVAL = e_bless ((ev_watcher *)w, stash_periodic);
1336 if (!ix) START (periodic, w); 1378 if (!ix) START (periodic, w);
1337} 1379}
1338 OUTPUT: 1380 OUTPUT:
1339 RETVAL 1381 RETVAL
1340 1382
1341#if 0
1342
1343ev_signal *signal (struct ev_loop *loop, SV *signal, SV *cb) 1383ev_signal *signal (struct ev_loop *loop, SV *signal, SV *cb)
1344 ALIAS: 1384 ALIAS:
1345 signal_ns = 1 1385 signal_ns = 1
1346 CODE: 1386 CODE:
1347{ 1387{
1348 Signal signum = sv_signum (signal); 1388 Signal signum = s_signum (signal);
1349 CHECK_SIG (signal, signum); 1389 CHECK_SIG (signal, signum);
1350 1390
1351 RETVAL = e_new (sizeof (ev_signal), cb, ST (0)); 1391 RETVAL = e_new (sizeof (ev_signal), cb, ST (0));
1352 ev_signal_set (RETVAL, signum); 1392 ev_signal_set (RETVAL, signum);
1353 if (!ix) START (signal, RETVAL); 1393 if (!ix) START_SIGNAL (RETVAL);
1354} 1394}
1355 OUTPUT: 1395 OUTPUT:
1356 RETVAL 1396 RETVAL
1357
1358#endif
1359 1397
1360ev_idle *idle (struct ev_loop *loop, SV *cb) 1398ev_idle *idle (struct ev_loop *loop, SV *cb)
1361 ALIAS: 1399 ALIAS:
1362 idle_ns = 1 1400 idle_ns = 1
1363 CODE: 1401 CODE:
1395 ev_fork_set (RETVAL); 1433 ev_fork_set (RETVAL);
1396 if (!ix) START (fork, RETVAL); 1434 if (!ix) START (fork, RETVAL);
1397 OUTPUT: 1435 OUTPUT:
1398 RETVAL 1436 RETVAL
1399 1437
1438
1400ev_child *child (struct ev_loop *loop, int pid, int trace, SV *cb) 1439ev_child *child (struct ev_loop *loop, int pid, int trace, SV *cb)
1401 ALIAS: 1440 ALIAS:
1402 child_ns = 1 1441 child_ns = 1
1403 CODE: 1442 CODE:
1443#if EV_CHILD_ENABLE
1404 RETVAL = e_new (sizeof (ev_child), cb, ST (0)); 1444 RETVAL = e_new (sizeof (ev_child), cb, ST (0));
1405 ev_child_set (RETVAL, pid, trace); 1445 ev_child_set (RETVAL, pid, trace);
1406 if (!ix) START (child, RETVAL); 1446 if (!ix) START (child, RETVAL);
1447#else
1448 croak ("EV::child watchers not supported on this platform");
1449#endif
1407 OUTPUT: 1450 OUTPUT:
1408 RETVAL 1451 RETVAL
1409 1452
1410ev_stat *stat (struct ev_loop *loop, SV *path, NV interval, SV *cb) 1453ev_stat *stat (struct ev_loop *loop, SV *path, NV interval, SV *cb)
1411 ALIAS: 1454 ALIAS:
1412 stat_ns = 1 1455 stat_ns = 1
1413 CODE: 1456 CODE:
1414 RETVAL = e_new (sizeof (ev_stat), cb, ST (0)); 1457 RETVAL = e_new (sizeof (ev_stat), cb, ST (0));
1415 RETVAL->fh = newSVsv (path); 1458 e_fh (RETVAL) = newSVsv (path);
1416 ev_stat_set (RETVAL, SvPVbyte_nolen (RETVAL->fh), interval); 1459 ev_stat_set (RETVAL, SvPVbyte_nolen (e_fh (RETVAL)), interval);
1417 if (!ix) START (stat, RETVAL); 1460 if (!ix) START (stat, RETVAL);
1418 OUTPUT: 1461 OUTPUT:
1419 RETVAL 1462 RETVAL
1420 1463
1421ev_embed *embed (struct ev_loop *loop, struct ev_loop *other, SV *cb = 0) 1464ev_embed *embed (struct ev_loop *loop, struct ev_loop *other, SV *cb = 0)
1425{ 1468{
1426 if (!(ev_backend (other) & ev_embeddable_backends ())) 1469 if (!(ev_backend (other) & ev_embeddable_backends ()))
1427 croak ("passed loop is not embeddable via EV::embed,"); 1470 croak ("passed loop is not embeddable via EV::embed,");
1428 1471
1429 RETVAL = e_new (sizeof (ev_embed), cb, ST (0)); 1472 RETVAL = e_new (sizeof (ev_embed), cb, ST (0));
1430 RETVAL->fh = newSVsv (ST (1)); 1473 e_fh (RETVAL) = newSVsv (ST (1));
1431 ev_embed_set (RETVAL, other); 1474 ev_embed_set (RETVAL, other);
1432 if (!ix) START (embed, RETVAL); 1475 if (!ix) START (embed, RETVAL);
1433} 1476}
1434 OUTPUT: 1477 OUTPUT:
1435 RETVAL 1478 RETVAL
1446 1489
1447void once (struct ev_loop *loop, SV *fh, int events, SV *timeout, SV *cb) 1490void once (struct ev_loop *loop, SV *fh, int events, SV *timeout, SV *cb)
1448 CODE: 1491 CODE:
1449 ev_once ( 1492 ev_once (
1450 loop, 1493 loop,
1451 sv_fileno (fh), events, 1494 s_fileno (fh, events & EV_WRITE), events,
1452 SvOK (timeout) ? SvNV (timeout) : -1., 1495 SvOK (timeout) ? SvNV (timeout) : -1.,
1453 e_once_cb, 1496 e_once_cb,
1454 newSVsv (cb) 1497 newSVsv (cb)
1455 ); 1498 );
1456 1499

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines