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

Comparing EV/EV.xs (file contents):
Revision 1.84 by root, Sat Dec 1 15:32:53 2007 UTC vs.
Revision 1.101 by root, Sat Dec 22 05:47:51 2007 UTC

3#include "XSUB.h" 3#include "XSUB.h"
4 4
5/*#include <netinet/in.h>*/ 5/*#include <netinet/in.h>*/
6 6
7#define EV_PROTOTYPES 1 7#define EV_PROTOTYPES 1
8#define EV_USE_NANOSLEEP EV_USE_MONOTONIC
9#define EV_H <ev.h>
8#include "EV/EVAPI.h" 10#include "EV/EVAPI.h"
9 11
10/* fix perl api breakage */ 12/* fix perl api breakage */
11#undef signal 13#undef signal
12#undef sigaction 14#undef sigaction
17# define NFDBITS PERL_NFDBITS 19# define NFDBITS PERL_NFDBITS
18# define fd_mask Perl_fd_mask 20# define fd_mask Perl_fd_mask
19#endif 21#endif
20/* due to bugs in OS X we have to use libev/ explicitly here */ 22/* due to bugs in OS X we have to use libev/ explicitly here */
21#include "libev/ev.c" 23#include "libev/ev.c"
22#include "event.c"
23
24#ifndef _WIN32
25#define DNS_USE_GETTIMEOFDAY_FOR_ID 1
26#if !defined (WIN32) && !defined(__CYGWIN__)
27# define HAVE_STRUCT_IN6_ADDR 1
28#endif
29#undef HAVE_STRTOK_R
30#undef strtok_r
31#define strtok_r fake_strtok_r
32#include "evdns.h"
33#include "evdns.c"
34#endif
35 24
36#ifndef _WIN32 25#ifndef _WIN32
37# include <pthread.h> 26# include <pthread.h>
38#endif 27#endif
39 28
29#define e_loop(w) INT2PTR (struct ev_loop *, SvIVX ((w)->loop))
30
40#define WFLAG_KEEPALIVE 1 31#define WFLAG_KEEPALIVE 1
41 32
42#define UNREF(w) \ 33#define UNREF(w) \
43 if (!((w)->flags & WFLAG_KEEPALIVE) \ 34 if (!((w)->flags & WFLAG_KEEPALIVE) \
44 && !ev_is_active (w)) \ 35 && !ev_is_active (w)) \
45 ev_unref (); 36 ev_unref (e_loop (w));
46 37
47#define REF(w) \ 38#define REF(w) \
48 if (!((w)->flags & WFLAG_KEEPALIVE) \ 39 if (!((w)->flags & WFLAG_KEEPALIVE) \
49 && ev_is_active (w)) \ 40 && ev_is_active (w)) \
50 ev_ref (); 41 ev_ref (e_loop (w));
51 42
52#define START(type,w) \ 43#define START(type,w) \
53 do { \ 44 do { \
54 UNREF (w); \ 45 UNREF (w); \
55 ev_ ## type ## _start (w); \ 46 ev_ ## type ## _start (e_loop (w), w); \
56 } while (0) 47 } while (0)
57 48
58#define STOP(type,w) \ 49#define STOP(type,w) \
59 do { \ 50 do { \
60 REF (w); \ 51 REF (w); \
61 ev_ ## type ## _stop (w); \ 52 ev_ ## type ## _stop (e_loop (w), w); \
62 } while (0) 53 } while (0)
63 54
64#define RESET(type,w,seta) \ 55#define RESET(type,w,seta) \
65 do { \ 56 do { \
66 int active = ev_is_active (w); \ 57 int active = ev_is_active (w); \
69 if (active) START (type, w); \ 60 if (active) START (type, w); \
70 } while (0) 61 } while (0)
71 62
72typedef int Signal; 63typedef int Signal;
73 64
65static SV *default_loop_sv;
66
74static struct EVAPI evapi; 67static struct EVAPI evapi;
75 68
76static HV 69static HV
70 *stash_loop,
77 *stash_watcher, 71 *stash_watcher,
78 *stash_io, 72 *stash_io,
79 *stash_timer, 73 *stash_timer,
80 *stash_periodic, 74 *stash_periodic,
81 *stash_signal, 75 *stash_signal,
113} 107}
114 108
115///////////////////////////////////////////////////////////////////////////// 109/////////////////////////////////////////////////////////////////////////////
116// Event 110// Event
117 111
118static void e_cb (ev_watcher *w, int revents); 112static void e_cb (EV_P_ ev_watcher *w, int revents);
119 113
120static int 114static int
121sv_fileno (SV *fh) 115sv_fileno (SV *fh)
122{ 116{
123 SvGETMAGIC (fh); 117 SvGETMAGIC (fh);
133 127
134 return -1; 128 return -1;
135} 129}
136 130
137static void * 131static void *
138e_new (int size, SV *cb_sv) 132e_new (int size, SV *cb_sv, SV *loop)
139{ 133{
140 ev_watcher *w; 134 ev_watcher *w;
141 SV *self = NEWSV (0, size); 135 SV *self = NEWSV (0, size);
142 SvPOK_only (self); 136 SvPOK_only (self);
143 SvCUR_set (self, size); 137 SvCUR_set (self, size);
144 138
145 w = (ev_watcher *)SvPVX (self); 139 w = (ev_watcher *)SvPVX (self);
146 140
147 ev_init (w, e_cb); 141 ev_init (w, e_cb);
148 142
143 w->loop = SvREFCNT_inc (SvRV (loop));
149 w->flags = WFLAG_KEEPALIVE; 144 w->flags = WFLAG_KEEPALIVE;
150 w->data = 0; 145 w->data = 0;
151 w->fh = 0; 146 w->fh = 0;
152 w->cb_sv = newSVsv (cb_sv); 147 w->cb_sv = SvTEMP (cb_sv) && SvREFCNT (cb_sv) == 1 ? SvREFCNT_inc (cb_sv) : newSVsv (cb_sv);
153 w->self = self; 148 w->self = self;
154 149
155 return (void *)w; 150 return (void *)w;
156} 151}
157 152
158static void 153static void
159e_destroy (void *w_) 154e_destroy (void *w_)
160{ 155{
161 ev_watcher *w = (ev_watcher *)w_; 156 ev_watcher *w = (ev_watcher *)w_;
162 157
158 SvREFCNT_dec (w->loop ); w->loop = 0;
163 SvREFCNT_dec (w->fh ); w->fh = 0; 159 SvREFCNT_dec (w->fh ); w->fh = 0;
164 SvREFCNT_dec (w->cb_sv); w->cb_sv = 0; 160 SvREFCNT_dec (w->cb_sv); w->cb_sv = 0;
165 SvREFCNT_dec (w->data ); w->data = 0; 161 SvREFCNT_dec (w->data ); w->data = 0;
166} 162}
167 163
183} 179}
184 180
185static SV *sv_events_cache; 181static SV *sv_events_cache;
186 182
187static void 183static void
188e_cb (ev_watcher *w, int revents) 184e_cb (EV_P_ ev_watcher *w, int revents)
189{ 185{
190 dSP; 186 dSP;
191 I32 mark = SP - PL_stack_base; 187 I32 mark = SP - PL_stack_base;
192 SV *sv_self, *sv_events; 188 SV *sv_self, *sv_events;
193 189
256 else 252 else
257 sv_events_cache = sv_events; 253 sv_events_cache = sv_events;
258 254
259 if (SvTRUE (ERRSV)) 255 if (SvTRUE (ERRSV))
260 { 256 {
257 SPAGAIN;
261 PUSHMARK (SP); 258 PUSHMARK (SP);
262 PUTBACK; 259 PUTBACK;
263 call_sv (get_sv ("EV::DIED", 1), G_DISCARD | G_VOID | G_EVAL | G_KEEPERR); 260 call_sv (get_sv ("EV::DIED", 1), G_DISCARD | G_VOID | G_EVAL | G_KEEPERR);
264 } 261 }
265 262
307 FREETMPS; 304 FREETMPS;
308 LEAVE; 305 LEAVE;
309 306
310 return retval; 307 return retval;
311} 308}
312
313/////////////////////////////////////////////////////////////////////////////
314// DNS
315
316#ifndef _WIN32
317static void
318dns_cb (int result, char type, int count, int ttl, void *addresses, void *arg)
319{
320 dSP;
321 SV *cb = (SV *)arg;
322
323 ENTER;
324 SAVETMPS;
325 PUSHMARK (SP);
326 EXTEND (SP, count + 3);
327 PUSHs (sv_2mortal (newSViv (result)));
328
329 if (result == DNS_ERR_NONE && ttl >= 0)
330 {
331 int i;
332
333 PUSHs (sv_2mortal (newSViv (type)));
334 PUSHs (sv_2mortal (newSViv (ttl)));
335
336 for (i = 0; i < count; ++i)
337 switch (type)
338 {
339 case DNS_IPv6_AAAA:
340 PUSHs (sv_2mortal (newSVpvn (i * 16 + (char *)addresses, 16)));
341 break;
342 case DNS_IPv4_A:
343 PUSHs (sv_2mortal (newSVpvn (i * 4 + (char *)addresses, 4)));
344 break;
345 case DNS_PTR:
346 PUSHs (sv_2mortal (newSVpv (*(char **)addresses, 0)));
347 break;
348 }
349 }
350
351 PUTBACK;
352 call_sv (sv_2mortal (cb), G_DISCARD | G_VOID | G_EVAL);
353
354 FREETMPS;
355
356 if (SvTRUE (ERRSV))
357 {
358 PUSHMARK (SP);
359 PUTBACK;
360 call_sv (get_sv ("EV::DIED", 1), G_DISCARD | G_VOID | G_EVAL | G_KEEPERR);
361 }
362
363 LEAVE;
364}
365#endif
366 309
367#define CHECK_REPEAT(repeat) if (repeat < 0.) \ 310#define CHECK_REPEAT(repeat) if (repeat < 0.) \
368 croak (# repeat " value must be >= 0"); 311 croak (# repeat " value must be >= 0");
369 312
370#define CHECK_FD(fh,fd) if ((fd) < 0) \ 313#define CHECK_FD(fh,fd) if ((fd) < 0) \
419 }; 362 };
420 363
421 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 364 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
422 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 365 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
423 366
367 stash_loop = gv_stashpv ("EV::Loop" , 1);
424 stash_watcher = gv_stashpv ("EV::Watcher" , 1); 368 stash_watcher = gv_stashpv ("EV::Watcher" , 1);
425 stash_io = gv_stashpv ("EV::IO" , 1); 369 stash_io = gv_stashpv ("EV::IO" , 1);
426 stash_timer = gv_stashpv ("EV::Timer" , 1); 370 stash_timer = gv_stashpv ("EV::Timer" , 1);
427 stash_periodic = gv_stashpv ("EV::Periodic", 1); 371 stash_periodic = gv_stashpv ("EV::Periodic", 1);
428 stash_signal = gv_stashpv ("EV::Signal" , 1); 372 stash_signal = gv_stashpv ("EV::Signal" , 1);
430 stash_prepare = gv_stashpv ("EV::Prepare" , 1); 374 stash_prepare = gv_stashpv ("EV::Prepare" , 1);
431 stash_check = gv_stashpv ("EV::Check" , 1); 375 stash_check = gv_stashpv ("EV::Check" , 1);
432 stash_child = gv_stashpv ("EV::Child" , 1); 376 stash_child = gv_stashpv ("EV::Child" , 1);
433 stash_embed = gv_stashpv ("EV::Embed" , 1); 377 stash_embed = gv_stashpv ("EV::Embed" , 1);
434 stash_stat = gv_stashpv ("EV::Stat" , 1); 378 stash_stat = gv_stashpv ("EV::Stat" , 1);
379 stash_fork = gv_stashpv ("EV::Fork" , 1);
435 380
436 { 381 {
437 SV *sv = perl_get_sv ("EV::API", TRUE); 382 SV *sv = perl_get_sv ("EV::API", TRUE);
438 perl_get_sv ("EV::API", TRUE); /* silence 5.10 warning */ 383 perl_get_sv ("EV::API", TRUE); /* silence 5.10 warning */
439 384
440 /* the poor man's shared library emulator */ 385 /* the poor man's shared library emulator */
441 evapi.ver = EV_API_VERSION; 386 evapi.ver = EV_API_VERSION;
442 evapi.rev = EV_API_REVISION; 387 evapi.rev = EV_API_REVISION;
443 evapi.sv_fileno = sv_fileno; 388 evapi.sv_fileno = sv_fileno;
444 evapi.sv_signum = sv_signum; 389 evapi.sv_signum = sv_signum;
390 evapi.supported_backends = ev_supported_backends ();
391 evapi.recommended_backends = ev_recommended_backends ();
392 evapi.embeddable_backends = ev_embeddable_backends ();
393 evapi.time = ev_time;
394 evapi.sleep = ev_sleep;
395 evapi.loop_new = ev_loop_new;
396 evapi.loop_destroy = ev_loop_destroy;
397 evapi.loop_fork = ev_loop_fork;
398 evapi.loop_count = ev_loop_count;
445 evapi.now = ev_now; 399 evapi.now = ev_now;
446 evapi.backend = ev_backend; 400 evapi.backend = ev_backend;
447 evapi.unloop = ev_unloop; 401 evapi.unloop = ev_unloop;
448 evapi.ref = ev_ref; 402 evapi.ref = ev_ref;
449 evapi.unref = ev_unref; 403 evapi.unref = ev_unref;
450 evapi.time = ev_time;
451 evapi.loop = ev_loop; 404 evapi.loop = ev_loop;
452 evapi.once = ev_once; 405 evapi.once = ev_once;
453 evapi.io_start = ev_io_start; 406 evapi.io_start = ev_io_start;
454 evapi.io_stop = ev_io_stop; 407 evapi.io_stop = ev_io_stop;
455 evapi.timer_start = ev_timer_start; 408 evapi.timer_start = ev_timer_start;
456 evapi.timer_stop = ev_timer_stop; 409 evapi.timer_stop = ev_timer_stop;
457 evapi.timer_again = ev_timer_again; 410 evapi.timer_again = ev_timer_again;
458 evapi.periodic_start = ev_periodic_start; 411 evapi.periodic_start = ev_periodic_start;
459 evapi.periodic_stop = ev_periodic_stop; 412 evapi.periodic_stop = ev_periodic_stop;
460 evapi.signal_start = ev_signal_start; 413 evapi.signal_start = ev_signal_start;
461 evapi.signal_stop = ev_signal_stop; 414 evapi.signal_stop = ev_signal_stop;
462 evapi.idle_start = ev_idle_start; 415 evapi.idle_start = ev_idle_start;
463 evapi.idle_stop = ev_idle_stop; 416 evapi.idle_stop = ev_idle_stop;
464 evapi.prepare_start = ev_prepare_start; 417 evapi.prepare_start = ev_prepare_start;
465 evapi.prepare_stop = ev_prepare_stop; 418 evapi.prepare_stop = ev_prepare_stop;
466 evapi.check_start = ev_check_start; 419 evapi.check_start = ev_check_start;
467 evapi.check_stop = ev_check_stop; 420 evapi.check_stop = ev_check_stop;
468 evapi.child_start = ev_child_start; 421 evapi.child_start = ev_child_start;
469 evapi.child_stop = ev_child_stop; 422 evapi.child_stop = ev_child_stop;
470 evapi.stat_start = ev_stat_start; 423 evapi.stat_start = ev_stat_start;
471 evapi.stat_stop = ev_stat_stop; 424 evapi.stat_stop = ev_stat_stop;
472 evapi.stat_stat = ev_stat_stat; 425 evapi.stat_stat = ev_stat_stat;
426 evapi.embed_start = ev_embed_start;
427 evapi.embed_stop = ev_embed_stop;
428 evapi.embed_sweep = ev_embed_sweep;
429 evapi.fork_start = ev_fork_start;
430 evapi.fork_stop = ev_fork_stop;
431 evapi.clear_pending = ev_clear_pending;
432 evapi.invoke = ev_invoke;
473 433
474 sv_setiv (sv, (IV)&evapi); 434 sv_setiv (sv, (IV)&evapi);
475 SvREADONLY_on (sv); 435 SvREADONLY_on (sv);
476 } 436 }
477#ifndef _WIN32 437#ifndef _WIN32
478 pthread_atfork (0, 0, ev_default_fork); 438 pthread_atfork (0, 0, ev_default_fork);
479#endif 439#endif
480} 440}
481 441
442SV *ev_default_loop (unsigned int flags = 0)
443 CODE:
444{
445 if (!default_loop_sv)
446 {
447 evapi.default_loop = ev_default_loop (flags);
448
449 if (!evapi.default_loop)
450 XSRETURN_UNDEF;
451
452 default_loop_sv = sv_bless (newRV_noinc (newSViv (PTR2IV (evapi.default_loop))), stash_loop);
453 }
454
455 RETVAL = newSVsv (default_loop_sv);
456}
457 OUTPUT:
458 RETVAL
459
460NV ev_time ()
461
482NV ev_now () 462NV ev_now ()
463 C_ARGS: evapi.default_loop
483 464
484unsigned int ev_backend () 465unsigned int ev_backend ()
466 C_ARGS: evapi.default_loop
485 467
486NV ev_time () 468unsigned int ev_loop_count ()
469 C_ARGS: evapi.default_loop
487 470
488unsigned int ev_default_loop (unsigned int flags = ev_supported_backends ()) 471void ev_set_io_collect_interval (NV interval)
472 C_ARGS: evapi.default_loop, interval
473
474void ev_set_timeout_collect_interval (NV interval)
475 C_ARGS: evapi.default_loop, interval
489 476
490void ev_loop (int flags = 0) 477void ev_loop (int flags = 0)
478 C_ARGS: evapi.default_loop, flags
491 479
492void ev_unloop (int how = 1) 480void ev_unloop (int how = 1)
481 C_ARGS: evapi.default_loop, how
482
483void ev_feed_fd_event (int fd, int revents = EV_NONE)
484 C_ARGS: evapi.default_loop, fd, revents
485
486void ev_feed_signal_event (SV *signal)
487 CODE:
488{
489 Signal signum = sv_signum (signal);
490 CHECK_SIG (signal, signum);
491
492 ev_feed_signal_event (evapi.default_loop, signum);
493}
493 494
494ev_io *io (SV *fh, int events, SV *cb) 495ev_io *io (SV *fh, int events, SV *cb)
495 ALIAS: 496 ALIAS:
496 io_ns = 1 497 io_ns = 1
497 CODE: 498 CODE:
498{ 499{
499 int fd = sv_fileno (fh); 500 int fd = sv_fileno (fh);
500 CHECK_FD (fh, fd); 501 CHECK_FD (fh, fd);
501 502
502 RETVAL = e_new (sizeof (ev_io), cb); 503 RETVAL = e_new (sizeof (ev_io), cb, default_loop_sv);
503 RETVAL->fh = newSVsv (fh); 504 RETVAL->fh = newSVsv (fh);
504 ev_io_set (RETVAL, fd, events); 505 ev_io_set (RETVAL, fd, events);
505 if (!ix) START (io, RETVAL); 506 if (!ix) START (io, RETVAL);
506} 507}
507 OUTPUT: 508 OUTPUT:
511 ALIAS: 512 ALIAS:
512 timer_ns = 1 513 timer_ns = 1
513 INIT: 514 INIT:
514 CHECK_REPEAT (repeat); 515 CHECK_REPEAT (repeat);
515 CODE: 516 CODE:
516 RETVAL = e_new (sizeof (ev_timer), cb); 517 RETVAL = e_new (sizeof (ev_timer), cb, default_loop_sv);
517 ev_timer_set (RETVAL, after, repeat); 518 ev_timer_set (RETVAL, after, repeat);
518 if (!ix) START (timer, RETVAL); 519 if (!ix) START (timer, RETVAL);
519 OUTPUT: 520 OUTPUT:
520 RETVAL 521 RETVAL
521 522
525 INIT: 526 INIT:
526 CHECK_REPEAT (interval); 527 CHECK_REPEAT (interval);
527 CODE: 528 CODE:
528{ 529{
529 ev_periodic *w; 530 ev_periodic *w;
530 w = e_new (sizeof (ev_periodic), cb); 531 w = e_new (sizeof (ev_periodic), cb, default_loop_sv);
531 w->fh = SvTRUE (reschedule_cb) ? newSVsv (reschedule_cb) : 0; 532 w->fh = SvTRUE (reschedule_cb) ? newSVsv (reschedule_cb) : 0;
532 ev_periodic_set (w, at, interval, w->fh ? e_periodic_cb : 0); 533 ev_periodic_set (w, at, interval, w->fh ? e_periodic_cb : 0);
533 RETVAL = e_bless ((ev_watcher *)w, stash_periodic); 534 RETVAL = e_bless ((ev_watcher *)w, stash_periodic);
534 if (!ix) START (periodic, w); 535 if (!ix) START (periodic, w);
535} 536}
542 CODE: 543 CODE:
543{ 544{
544 Signal signum = sv_signum (signal); 545 Signal signum = sv_signum (signal);
545 CHECK_SIG (signal, signum); 546 CHECK_SIG (signal, signum);
546 547
547 RETVAL = e_new (sizeof (ev_signal), cb); 548 RETVAL = e_new (sizeof (ev_signal), cb, default_loop_sv);
548 ev_signal_set (RETVAL, signum); 549 ev_signal_set (RETVAL, signum);
549 if (!ix) START (signal, RETVAL); 550 if (!ix) START (signal, RETVAL);
550} 551}
551 OUTPUT: 552 OUTPUT:
552 RETVAL 553 RETVAL
553 554
554ev_idle *idle (SV *cb) 555ev_idle *idle (SV *cb)
555 ALIAS: 556 ALIAS:
556 idle_ns = 1 557 idle_ns = 1
557 CODE: 558 CODE:
558 RETVAL = e_new (sizeof (ev_idle), cb); 559 RETVAL = e_new (sizeof (ev_idle), cb, default_loop_sv);
559 ev_idle_set (RETVAL); 560 ev_idle_set (RETVAL);
560 if (!ix) START (idle, RETVAL); 561 if (!ix) START (idle, RETVAL);
561 OUTPUT: 562 OUTPUT:
562 RETVAL 563 RETVAL
563 564
564ev_prepare *prepare (SV *cb) 565ev_prepare *prepare (SV *cb)
565 ALIAS: 566 ALIAS:
566 prepare_ns = 1 567 prepare_ns = 1
567 CODE: 568 CODE:
568 RETVAL = e_new (sizeof (ev_prepare), cb); 569 RETVAL = e_new (sizeof (ev_prepare), cb, default_loop_sv);
569 ev_prepare_set (RETVAL); 570 ev_prepare_set (RETVAL);
570 if (!ix) START (prepare, RETVAL); 571 if (!ix) START (prepare, RETVAL);
571 OUTPUT: 572 OUTPUT:
572 RETVAL 573 RETVAL
573 574
574ev_check *check (SV *cb) 575ev_check *check (SV *cb)
575 ALIAS: 576 ALIAS:
576 check_ns = 1 577 check_ns = 1
577 CODE: 578 CODE:
578 RETVAL = e_new (sizeof (ev_check), cb); 579 RETVAL = e_new (sizeof (ev_check), cb, default_loop_sv);
579 ev_check_set (RETVAL); 580 ev_check_set (RETVAL);
580 if (!ix) START (check, RETVAL); 581 if (!ix) START (check, RETVAL);
581 OUTPUT: 582 OUTPUT:
582 RETVAL 583 RETVAL
583 584
585ev_fork *fork (SV *cb)
586 ALIAS:
587 fork_ns = 1
588 CODE:
589 RETVAL = e_new (sizeof (ev_fork), cb, default_loop_sv);
590 ev_fork_set (RETVAL);
591 if (!ix) START (fork, RETVAL);
592 OUTPUT:
593 RETVAL
594
584ev_child *child (int pid, SV *cb) 595ev_child *child (int pid, SV *cb)
585 ALIAS: 596 ALIAS:
586 child_ns = 1 597 child_ns = 1
587 CODE: 598 CODE:
588 RETVAL = e_new (sizeof (ev_child), cb); 599 RETVAL = e_new (sizeof (ev_child), cb, default_loop_sv);
589 ev_child_set (RETVAL, pid); 600 ev_child_set (RETVAL, pid);
590 if (!ix) START (child, RETVAL); 601 if (!ix) START (child, RETVAL);
591 OUTPUT: 602 OUTPUT:
592 RETVAL 603 RETVAL
593 604
594ev_stat *stat (SV *path, NV interval, SV *cb) 605ev_stat *stat (SV *path, NV interval, SV *cb)
595 ALIAS: 606 ALIAS:
596 stat_ns = 1 607 stat_ns = 1
597 CODE: 608 CODE:
598 RETVAL = e_new (sizeof (ev_stat), cb); 609 RETVAL = e_new (sizeof (ev_stat), cb, default_loop_sv);
599 RETVAL->fh = newSVsv (path); 610 RETVAL->fh = newSVsv (path);
600 ev_stat_set (RETVAL, SvPVbyte_nolen (RETVAL->fh), interval); 611 ev_stat_set (RETVAL, SvPVbyte_nolen (RETVAL->fh), interval);
601 if (!ix) START (stat, RETVAL); 612 if (!ix) START (stat, RETVAL);
602 OUTPUT: 613 OUTPUT:
603 RETVAL 614 RETVAL
604 615
616ev_embed *embed (struct ev_loop *loop, SV *cb = &PL_sv_undef)
617 ALIAS:
618 embed_ns = 1
619 CODE:
620{
621 if (!(ev_backend (loop) & ev_embeddable_backends ()))
622 croak ("passed loop is not embeddable via EV::embed,");
623
624 RETVAL = e_new (sizeof (ev_embed), cb, default_loop_sv);
625 RETVAL->fh = newSVsv (ST (0));
626 ev_embed_set (RETVAL, loop);
627
628 if (!SvOK (cb)) ev_set_cb (RETVAL, 0);
629
630 if (!ix) START (embed, RETVAL);
631}
632 OUTPUT:
633 RETVAL
634
605void once (SV *fh, int events, SV *timeout, SV *cb) 635void once (SV *fh, int events, SV *timeout, SV *cb)
606 CODE: 636 CODE:
607 ev_once ( 637 ev_once (
638 evapi.default_loop,
608 sv_fileno (fh), events, 639 sv_fileno (fh), events,
609 SvOK (timeout) ? SvNV (timeout) : -1., 640 SvOK (timeout) ? SvNV (timeout) : -1.,
610 e_once_cb, 641 e_once_cb,
611 newSVsv (cb) 642 newSVsv (cb)
612 ); 643 );
616MODULE = EV PACKAGE = EV::Watcher PREFIX = ev_ 647MODULE = EV PACKAGE = EV::Watcher PREFIX = ev_
617 648
618int ev_is_active (ev_watcher *w) 649int ev_is_active (ev_watcher *w)
619 650
620int ev_is_pending (ev_watcher *w) 651int ev_is_pending (ev_watcher *w)
652
653void ev_invoke (ev_watcher *w, int revents = EV_NONE)
654 C_ARGS: e_loop (w), w, revents
655
656int ev_clear_pending (ev_watcher *w)
657 C_ARGS: e_loop (w), w
658
659void ev_feed_event (ev_watcher *w, int revents = EV_NONE)
660 C_ARGS: e_loop (w), w, revents
621 661
622int keepalive (ev_watcher *w, int new_value = 0) 662int keepalive (ev_watcher *w, int new_value = 0)
623 CODE: 663 CODE:
624{ 664{
625 RETVAL = w->flags & WFLAG_KEEPALIVE; 665 RETVAL = w->flags & WFLAG_KEEPALIVE;
658 } 698 }
659} 699}
660 OUTPUT: 700 OUTPUT:
661 RETVAL 701 RETVAL
662 702
663void trigger (ev_watcher *w, int revents = EV_NONE) 703SV *loop (ev_watcher *w)
664 CODE: 704 CODE:
665 w->cb (w, revents); 705 RETVAL = newRV_inc (w->loop);
706 OUTPUT:
707 RETVAL
666 708
667int priority (ev_watcher *w, int new_priority = 0) 709int priority (ev_watcher *w, int new_priority = 0)
668 CODE: 710 CODE:
669{ 711{
670 RETVAL = w->priority; 712 RETVAL = w->priority;
671 713
672 if (items > 1) 714 if (items > 1)
673 { 715 {
674 int active = ev_is_active (w); 716 int active = ev_is_active (w);
675
676 if (new_priority < EV_MINPRI || new_priority > EV_MAXPRI)
677 croak ("watcher priority out of range, value must be between %d and %d, inclusive", EV_MINPRI, EV_MAXPRI);
678 717
679 if (active) 718 if (active)
680 { 719 {
681 /* grrr. */ 720 /* grrr. */
682 PUSHMARK (SP); 721 PUSHMARK (SP);
683 XPUSHs (ST (0)); 722 XPUSHs (ST (0));
723 PUTBACK;
684 call_method ("stop", G_DISCARD | G_VOID); 724 call_method ("stop", G_DISCARD | G_VOID);
685 } 725 }
686 726
687 ev_set_priority (w, new_priority); 727 ev_set_priority (w, new_priority);
688 728
689 if (active) 729 if (active)
690 { 730 {
691 PUSHMARK (SP); 731 PUSHMARK (SP);
692 XPUSHs (ST (0)); 732 XPUSHs (ST (0));
733 PUTBACK;
693 call_method ("start", G_DISCARD | G_VOID); 734 call_method ("start", G_DISCARD | G_VOID);
694 } 735 }
695 } 736 }
696} 737}
697 OUTPUT: 738 OUTPUT:
807void ev_timer_again (ev_timer *w) 848void ev_timer_again (ev_timer *w)
808 INIT: 849 INIT:
809 CHECK_REPEAT (w->repeat); 850 CHECK_REPEAT (w->repeat);
810 CODE: 851 CODE:
811 REF (w); 852 REF (w);
812 ev_timer_again (w); 853 ev_timer_again (e_loop (w), w);
813 UNREF (w); 854 UNREF (w);
814 855
815void DESTROY (ev_timer *w) 856void DESTROY (ev_timer *w)
816 CODE: 857 CODE:
817 STOP (timer, w); 858 STOP (timer, w);
821 INIT: 862 INIT:
822 CHECK_REPEAT (repeat); 863 CHECK_REPEAT (repeat);
823 CODE: 864 CODE:
824 RESET (timer, w, (w, after, repeat)); 865 RESET (timer, w, (w, after, repeat));
825 866
867NV at (ev_timer *w)
868 CODE:
869 RETVAL = w->at;
870 OUTPUT:
871 RETVAL
872
826MODULE = EV PACKAGE = EV::Periodic PREFIX = ev_periodic_ 873MODULE = EV PACKAGE = EV::Periodic PREFIX = ev_periodic_
827 874
828void ev_periodic_start (ev_periodic *w) 875void ev_periodic_start (ev_periodic *w)
829 INIT: 876 INIT:
830 CHECK_REPEAT (w->interval); 877 CHECK_REPEAT (w->interval);
836 STOP (periodic, w); 883 STOP (periodic, w);
837 884
838void ev_periodic_again (ev_periodic *w) 885void ev_periodic_again (ev_periodic *w)
839 CODE: 886 CODE:
840 REF (w); 887 REF (w);
841 ev_periodic_again (w); 888 ev_periodic_again (e_loop (w), w);
842 UNREF (w); 889 UNREF (w);
843 890
844void DESTROY (ev_periodic *w) 891void DESTROY (ev_periodic *w)
845 CODE: 892 CODE:
846 STOP (periodic, w); 893 STOP (periodic, w);
855 w->fh = SvTRUE (reschedule_cb) ? newSVsv (reschedule_cb) : 0; 902 w->fh = SvTRUE (reschedule_cb) ? newSVsv (reschedule_cb) : 0;
856 903
857 RESET (periodic, w, (w, at, interval, w->fh ? e_periodic_cb : 0)); 904 RESET (periodic, w, (w, at, interval, w->fh ? e_periodic_cb : 0));
858} 905}
859 906
907NV at (ev_periodic *w)
908 CODE:
909 RETVAL = w->at;
910 OUTPUT:
911 RETVAL
912
860MODULE = EV PACKAGE = EV::Idle PREFIX = ev_idle_ 913MODULE = EV PACKAGE = EV::Idle PREFIX = ev_idle_
861 914
862void ev_idle_start (ev_idle *w) 915void ev_idle_start (ev_idle *w)
863 CODE: 916 CODE:
864 START (idle, w); 917 START (idle, w);
870void DESTROY (ev_idle *w) 923void DESTROY (ev_idle *w)
871 CODE: 924 CODE:
872 STOP (idle, w); 925 STOP (idle, w);
873 e_destroy (w); 926 e_destroy (w);
874 927
875MODULE = EV PACKAGE = EV::Prepare PREFIX = ev_check_ 928MODULE = EV PACKAGE = EV::Prepare PREFIX = ev_prepare_
876 929
877void ev_prepare_start (ev_prepare *w) 930void ev_prepare_start (ev_prepare *w)
878 CODE: 931 CODE:
879 START (prepare, w); 932 START (prepare, w);
880 933
898 STOP (check, w); 951 STOP (check, w);
899 952
900void DESTROY (ev_check *w) 953void DESTROY (ev_check *w)
901 CODE: 954 CODE:
902 STOP (check, w); 955 STOP (check, w);
956 e_destroy (w);
957
958MODULE = EV PACKAGE = EV::Fork PREFIX = ev_fork_
959
960void ev_fork_start (ev_fork *w)
961 CODE:
962 START (fork, w);
963
964void ev_fork_stop (ev_fork *w)
965 CODE:
966 STOP (fork, w);
967
968void DESTROY (ev_fork *w)
969 CODE:
970 STOP (fork, w);
903 e_destroy (w); 971 e_destroy (w);
904 972
905MODULE = EV PACKAGE = EV::Child PREFIX = ev_child_ 973MODULE = EV PACKAGE = EV::Child PREFIX = ev_child_
906 974
907void ev_child_start (ev_child *w) 975void ev_child_start (ev_child *w)
996 PPCODE: 1064 PPCODE:
997{ 1065{
998 ev_statdata *s = ix ? &w->attr : &w->prev; 1066 ev_statdata *s = ix ? &w->attr : &w->prev;
999 1067
1000 if (ix == 1) 1068 if (ix == 1)
1001 ev_stat_stat (w); 1069 ev_stat_stat (e_loop (w), w);
1002 else if (!s->st_nlink) 1070 else if (!s->st_nlink)
1003 errno = ENOENT; 1071 errno = ENOENT;
1004 1072
1005 PL_statcache.st_dev = s->st_nlink; 1073 PL_statcache.st_dev = s->st_nlink;
1006 PL_statcache.st_ino = s->st_ino; 1074 PL_statcache.st_ino = s->st_ino;
1033 PUSHs (sv_2mortal (newSVuv (4096))); 1101 PUSHs (sv_2mortal (newSVuv (4096)));
1034 PUSHs (sv_2mortal (newSVnv ((NV)((s->st_size + 4095) / 4096)))); 1102 PUSHs (sv_2mortal (newSVnv ((NV)((s->st_size + 4095) / 4096))));
1035 } 1103 }
1036} 1104}
1037 1105
1038#ifndef _WIN32 1106MODULE = EV PACKAGE = EV::Embed PREFIX = ev_embed_
1039 1107
1108void ev_embed_start (ev_embed *w)
1109 CODE:
1110 START (embed, w);
1111
1112void ev_embed_stop (ev_embed *w)
1113 CODE:
1114 STOP (embed, w);
1115
1116void DESTROY (ev_embed *w)
1117 CODE:
1118 STOP (embed, w);
1119 e_destroy (w);
1120
1121void set (ev_embed *w, struct ev_loop *loop)
1122 CODE:
1123{
1124 sv_setsv (w->fh, ST (1));
1125 RESET (embed, w, (w, loop));
1126}
1127
1128SV *other (ev_embed *w)
1129 CODE:
1130 RETVAL = newSVsv (w->fh);
1131 OUTPUT:
1132 RETVAL
1133
1040MODULE = EV PACKAGE = EV::DNS PREFIX = evdns_ 1134MODULE = EV PACKAGE = EV::Loop PREFIX = ev_
1041 1135
1042BOOT: 1136SV *new (SV *klass, unsigned int flags = 0)
1137 CODE:
1043{ 1138{
1044 HV *stash = gv_stashpv ("EV::DNS", 1); 1139 struct ev_loop *loop = ev_loop_new (flags);
1045 1140
1046 static const struct { 1141 if (!loop)
1047 const char *name; 1142 XSRETURN_UNDEF;
1048 IV iv;
1049 } *civ, const_iv[] = {
1050# define const_iv(pfx, name) { # name, (IV) pfx ## name },
1051 const_iv (DNS_, ERR_NONE)
1052 const_iv (DNS_, ERR_FORMAT)
1053 const_iv (DNS_, ERR_SERVERFAILED)
1054 const_iv (DNS_, ERR_NOTEXIST)
1055 const_iv (DNS_, ERR_NOTIMPL)
1056 const_iv (DNS_, ERR_REFUSED)
1057 const_iv (DNS_, ERR_TRUNCATED)
1058 const_iv (DNS_, ERR_UNKNOWN)
1059 const_iv (DNS_, ERR_TIMEOUT)
1060 const_iv (DNS_, ERR_SHUTDOWN)
1061 const_iv (DNS_, IPv4_A)
1062 const_iv (DNS_, PTR)
1063 const_iv (DNS_, IPv6_AAAA)
1064 const_iv (DNS_, QUERY_NO_SEARCH)
1065 const_iv (DNS_, OPTION_SEARCH)
1066 const_iv (DNS_, OPTION_NAMESERVERS)
1067 const_iv (DNS_, OPTION_MISC)
1068 const_iv (DNS_, OPTIONS_ALL)
1069 const_iv (DNS_, NO_SEARCH)
1070 };
1071 1143
1072 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1144 RETVAL = sv_bless (newRV_noinc (newSViv (PTR2IV (loop))), stash_loop);
1073 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1074} 1145}
1075 1146 OUTPUT:
1076int evdns_init ()
1077
1078void evdns_shutdown (int fail_requests = 1)
1079
1080const char *evdns_err_to_string (int err)
1081
1082int evdns_nameserver_add (U32 address)
1083
1084int evdns_count_nameservers ()
1085
1086int evdns_clear_nameservers_and_suspend ()
1087
1088int evdns_resume ()
1089
1090int evdns_nameserver_ip_add (char *ip_as_string)
1091
1092int evdns_resolve_ipv4 (const char *name, int flags, SV *cb)
1093 C_ARGS: name, flags, dns_cb, (void *)SvREFCNT_inc (cb)
1094
1095int evdns_resolve_ipv6 (const char *name, int flags, SV *cb)
1096 C_ARGS: name, flags, dns_cb, (void *)SvREFCNT_inc (cb)
1097
1098int evdns_resolve_reverse (SV *addr, int flags, SV *cb)
1099 ALIAS:
1100 evdns_resolve_reverse_ipv6 = 1
1101 CODE:
1102{
1103 STRLEN len;
1104 char *data = SvPVbyte (addr, len);
1105 if (len != (ix ? 16 : 4))
1106 croak ("ipv4/ipv6 address to be resolved must be given as 4/16 byte octet string");
1107
1108 RETVAL = ix 1147 RETVAL
1109 ? evdns_resolve_reverse_ipv6 ((struct in6_addr *)data, flags, dns_cb, (void *)SvREFCNT_inc (cb))
1110 : evdns_resolve_reverse ((struct in_addr *)data, flags, dns_cb, (void *)SvREFCNT_inc (cb));
1111}
1112 OUTPUT:
1113 RETVAL
1114 1148
1115int evdns_set_option (char *option, char *val, int flags) 1149void DESTROY (struct ev_loop *loop)
1150 CODE:
1151 if (loop != evapi.default_loop) /* global destruction sucks */
1152 ev_loop_destroy (loop);
1116 1153
1117int evdns_resolv_conf_parse (int flags, const char *filename) 1154void ev_loop_fork (struct ev_loop *loop)
1118 1155
1119#ifdef _WIN32 1156NV ev_now (struct ev_loop *loop)
1120 1157
1121int evdns_config_windows_nameservers () 1158void ev_set_io_collect_interval (struct ev_loop *loop, NV interval)
1159
1160void ev_set_timeout_collect_interval (struct ev_loop *loop, NV interval)
1161
1162unsigned int ev_backend (struct ev_loop *loop)
1163
1164unsigned int ev_loop_count (struct ev_loop *loop)
1165
1166void ev_loop (struct ev_loop *loop, int flags = 0)
1167
1168void ev_unloop (struct ev_loop *loop, int how = 1)
1169
1170void ev_feed_fd_event (struct ev_loop *loop, int fd, int revents = EV_NONE)
1171
1172#if 0
1173
1174void ev_feed_signal_event (struct ev_loop *loop, SV *signal)
1175 CODE:
1176{
1177 Signal signum = sv_signum (signal);
1178 CHECK_SIG (signal, signum);
1179
1180 ev_feed_signal_event (loop, signum);
1181}
1122 1182
1123#endif 1183#endif
1124 1184
1125void evdns_search_clear () 1185ev_io *io (struct ev_loop *loop, SV *fh, int events, SV *cb)
1186 ALIAS:
1187 io_ns = 1
1188 CODE:
1189{
1190 int fd = sv_fileno (fh);
1191 CHECK_FD (fh, fd);
1126 1192
1127void evdns_search_add (char *domain) 1193 RETVAL = e_new (sizeof (ev_io), cb, ST (0));
1194 RETVAL->fh = newSVsv (fh);
1195 ev_io_set (RETVAL, fd, events);
1196 if (!ix) START (io, RETVAL);
1197}
1198 OUTPUT:
1199 RETVAL
1128 1200
1129void evdns_search_ndots_set (int ndots) 1201ev_timer *timer (struct ev_loop *loop, NV after, NV repeat, SV *cb)
1202 ALIAS:
1203 timer_ns = 1
1204 INIT:
1205 CHECK_REPEAT (repeat);
1206 CODE:
1207 RETVAL = e_new (sizeof (ev_timer), cb, ST (0));
1208 ev_timer_set (RETVAL, after, repeat);
1209 if (!ix) START (timer, RETVAL);
1210 OUTPUT:
1211 RETVAL
1212
1213SV *periodic (struct ev_loop *loop, NV at, NV interval, SV *reschedule_cb, SV *cb)
1214 ALIAS:
1215 periodic_ns = 1
1216 INIT:
1217 CHECK_REPEAT (interval);
1218 CODE:
1219{
1220 ev_periodic *w;
1221 w = e_new (sizeof (ev_periodic), cb, ST (0));
1222 w->fh = SvTRUE (reschedule_cb) ? newSVsv (reschedule_cb) : 0;
1223 ev_periodic_set (w, at, interval, w->fh ? e_periodic_cb : 0);
1224 RETVAL = e_bless ((ev_watcher *)w, stash_periodic);
1225 if (!ix) START (periodic, w);
1226}
1227 OUTPUT:
1228 RETVAL
1130 1229
1131#if 0 1230#if 0
1132 1231
1133MODULE = EV PACKAGE = EV::HTTP PREFIX = evhttp_ 1232ev_signal *signal (struct ev_loop *loop, SV *signal, SV *cb)
1134 1233 ALIAS:
1135BOOT: 1234 signal_ns = 1
1235 CODE:
1136{ 1236{
1137 HV *stash = gv_stashpv ("EV::HTTP", 1); 1237 Signal signum = sv_signum (signal);
1238 CHECK_SIG (signal, signum);
1138 1239
1139 static const struct { 1240 RETVAL = e_new (sizeof (ev_signal), cb, ST (0));
1140 const char *name; 1241 ev_signal_set (RETVAL, signum);
1141 IV iv; 1242 if (!ix) START (signal, RETVAL);
1142 } *civ, const_iv[] = {
1143# define const_iv(pfx, name) { # name, (IV) pfx ## name },
1144 const_iv (HTTP_, OK)
1145 const_iv (HTTP_, NOCONTENT)
1146 const_iv (HTTP_, MOVEPERM)
1147 const_iv (HTTP_, MOVETEMP)
1148 const_iv (HTTP_, NOTMODIFIED)
1149 const_iv (HTTP_, BADREQUEST)
1150 const_iv (HTTP_, NOTFOUND)
1151 const_iv (HTTP_, SERVUNAVAIL)
1152 const_iv (EVHTTP_, REQ_OWN_CONNECTION)
1153 const_iv (EVHTTP_, PROXY_REQUEST)
1154 const_iv (EVHTTP_, REQ_GET)
1155 const_iv (EVHTTP_, REQ_POST)
1156 const_iv (EVHTTP_, REQ_HEAD)
1157 const_iv (EVHTTP_, REQUEST)
1158 const_iv (EVHTTP_, RESPONSE)
1159 };
1160
1161 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1162 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1163} 1243}
1164 1244 OUTPUT:
1165MODULE = EV PACKAGE = EV::HTTP::Request PREFIX = evhttp_request_ 1245 RETVAL
1166
1167#HttpRequest new (SV *klass, SV *cb)
1168
1169#void DESTROY (struct evhttp_request *req);
1170 1246
1171#endif 1247#endif
1172 1248
1173#endif 1249ev_idle *idle (struct ev_loop *loop, SV *cb)
1250 ALIAS:
1251 idle_ns = 1
1252 CODE:
1253 RETVAL = e_new (sizeof (ev_idle), cb, ST (0));
1254 ev_idle_set (RETVAL);
1255 if (!ix) START (idle, RETVAL);
1256 OUTPUT:
1257 RETVAL
1174 1258
1259ev_prepare *prepare (struct ev_loop *loop, SV *cb)
1260 ALIAS:
1261 prepare_ns = 1
1262 CODE:
1263 RETVAL = e_new (sizeof (ev_prepare), cb, ST (0));
1264 ev_prepare_set (RETVAL);
1265 if (!ix) START (prepare, RETVAL);
1266 OUTPUT:
1267 RETVAL
1175 1268
1269ev_check *check (struct ev_loop *loop, SV *cb)
1270 ALIAS:
1271 check_ns = 1
1272 CODE:
1273 RETVAL = e_new (sizeof (ev_check), cb, ST (0));
1274 ev_check_set (RETVAL);
1275 if (!ix) START (check, RETVAL);
1276 OUTPUT:
1277 RETVAL
1176 1278
1279ev_fork *fork (struct ev_loop *loop, SV *cb)
1280 ALIAS:
1281 fork_ns = 1
1282 CODE:
1283 RETVAL = e_new (sizeof (ev_fork), cb, ST (0));
1284 ev_fork_set (RETVAL);
1285 if (!ix) START (fork, RETVAL);
1286 OUTPUT:
1287 RETVAL
1177 1288
1289ev_child *child (struct ev_loop *loop, int pid, SV *cb)
1290 ALIAS:
1291 child_ns = 1
1292 CODE:
1293 RETVAL = e_new (sizeof (ev_child), cb, ST (0));
1294 ev_child_set (RETVAL, pid);
1295 if (!ix) START (child, RETVAL);
1296 OUTPUT:
1297 RETVAL
1178 1298
1299ev_stat *stat (struct ev_loop *loop, SV *path, NV interval, SV *cb)
1300 ALIAS:
1301 stat_ns = 1
1302 CODE:
1303 RETVAL = e_new (sizeof (ev_stat), cb, ST (0));
1304 RETVAL->fh = newSVsv (path);
1305 ev_stat_set (RETVAL, SvPVbyte_nolen (RETVAL->fh), interval);
1306 if (!ix) START (stat, RETVAL);
1307 OUTPUT:
1308 RETVAL
1179 1309
1310ev_embed *embed (struct ev_loop *loop, struct ev_loop *other, SV *cb = &PL_sv_undef)
1311 ALIAS:
1312 embed_ns = 1
1313 CODE:
1314{
1315 if (!(ev_backend (other) & ev_embeddable_backends ()))
1316 croak ("passed loop is not embeddable via EV::embed,");
1180 1317
1318 RETVAL = e_new (sizeof (ev_embed), cb, ST (0));
1319 RETVAL->fh = newSVsv (ST (1));
1320 ev_embed_set (RETVAL, other);
1321
1322 if (!SvOK (cb)) ev_set_cb (RETVAL, 0);
1323
1324 if (!ix) START (embed, RETVAL);
1325}
1326 OUTPUT:
1327 RETVAL
1328
1329void once (struct ev_loop *loop, SV *fh, int events, SV *timeout, SV *cb)
1330 CODE:
1331 ev_once (
1332 loop,
1333 sv_fileno (fh), events,
1334 SvOK (timeout) ? SvNV (timeout) : -1.,
1335 e_once_cb,
1336 newSVsv (cb)
1337 );
1338

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines