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

Comparing EV/EV.xs (file contents):
Revision 1.40 by root, Fri Nov 2 11:09:50 2007 UTC vs.
Revision 1.67 by root, Mon Nov 12 21:51:14 2007 UTC

5/*#include <netinet/in.h>*/ 5/*#include <netinet/in.h>*/
6 6
7#define EV_PROTOTYPES 1 7#define EV_PROTOTYPES 1
8#include "EV/EVAPI.h" 8#include "EV/EVAPI.h"
9 9
10/* fix perl api breakage */
11#undef signal
12#undef sigaction
13
14#define EV_SELECT_IS_WINSOCKET 0
15#ifdef _WIN32
16# define EV_SELECT_USE_FD_SET 0
17# define NFDBITS PERL_NFDBITS
18# define fd_mask Perl_fd_mask
19#endif
20/* due to bugs in OS X we have to use libev/ explicitly here */
10#include "libev/ev.c" 21#include "libev/ev.c"
11#include "libev/event.h"
12#include "libev/event.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"
13#include "libev/evdns.c" 33#include "evdns.c"
34#endif
35
36#ifndef _WIN32
37# include <pthread.h>
38#endif
14 39
15typedef int Signal; 40typedef int Signal;
16 41
17static struct EVAPI evapi; 42static struct EVAPI evapi;
18 43
25 *stash_idle, 50 *stash_idle,
26 *stash_prepare, 51 *stash_prepare,
27 *stash_check, 52 *stash_check,
28 *stash_child; 53 *stash_child;
29 54
55#ifndef SIG_SIZE
56/* kudos to Slaven Rezic for the idea */
57static char sig_size [] = { SIG_NUM };
58# define SIG_SIZE (sizeof (sig_size) + 1)
59#endif
60
30static int 61static int
31sv_signum (SV *sig) 62sv_signum (SV *sig)
32{ 63{
33 int signum; 64 int signum;
34 65
74 SvPOK_only (self); 105 SvPOK_only (self);
75 SvCUR_set (self, size); 106 SvCUR_set (self, size);
76 107
77 w = (struct ev_watcher *)SvPVX (self); 108 w = (struct ev_watcher *)SvPVX (self);
78 109
79 ev_watcher_init (w, e_cb); 110 ev_init (w, e_cb);
80 111
112 w->data = 0;
81 w->fh = 0; 113 w->fh = 0;
82 w->cb_sv = newSVsv (cb_sv); 114 w->cb_sv = newSVsv (cb_sv);
83 w->self = self; 115 w->self = self;
84 116
85 return (void *)w; 117 return (void *)w;
86} 118}
87 119
88static void * 120static void
89e_destroy (void *w_) 121e_destroy (void *w_)
90{ 122{
91 struct ev_watcher *w = w_; 123 struct ev_watcher *w = (struct ev_watcher *)w_;
92 124
93 SvREFCNT_dec (w->fh ); w->fh = 0; 125 SvREFCNT_dec (w->fh ); w->fh = 0;
94 SvREFCNT_dec (w->cb_sv); w->cb_sv = 0; 126 SvREFCNT_dec (w->cb_sv); w->cb_sv = 0;
127 SvREFCNT_dec (w->data ); w->data = 0;
95} 128}
96 129
97static SV * 130static SV *
98e_bless (struct ev_watcher *w, HV *stash) 131e_bless (struct ev_watcher *w, HV *stash)
99{ 132{
132 PUSHMARK (SP); 165 PUSHMARK (SP);
133 EXTEND (SP, 2); 166 EXTEND (SP, 2);
134 PUSHs (sv_self); 167 PUSHs (sv_self);
135 PUSHs (sv_events); 168 PUSHs (sv_events);
136 169
137 if (revents & EV_CHILD)
138 XPUSHs (sv_status = newSViv (((struct ev_child *)w)->status));
139
140 PUTBACK; 170 PUTBACK;
141 call_sv (w->cb_sv, G_DISCARD | G_VOID | G_EVAL); 171 call_sv (w->cb_sv, G_DISCARD | G_VOID | G_EVAL);
142 SP = PL_stack_base + mark; PUTBACK; 172 SP = PL_stack_base + mark; PUTBACK;
143 173
144 SvREFCNT_dec (sv_self); 174 SvREFCNT_dec (sv_self);
156 call_sv (get_sv ("EV::DIED", 1), G_DISCARD | G_VOID | G_EVAL | G_KEEPERR); 186 call_sv (get_sv ("EV::DIED", 1), G_DISCARD | G_VOID | G_EVAL | G_KEEPERR);
157 SP = PL_stack_base + mark; PUTBACK; 187 SP = PL_stack_base + mark; PUTBACK;
158 } 188 }
159} 189}
160 190
191static ev_tstamp
192e_periodic_cb (struct ev_periodic *w, ev_tstamp now)
193{
194 ev_tstamp retval;
195 int count;
196 dSP;
197
198 ENTER;
199 SAVETMPS;
200
201 PUSHMARK (SP);
202 EXTEND (SP, 2);
203 PUSHs (newRV_inc (w->self)); /* w->self MUST be blessed by now */
204 PUSHs (newSVnv (now));
205
206 PUTBACK;
207 count = call_sv (w->fh, G_SCALAR | G_EVAL);
208 SPAGAIN;
209
210 if (SvTRUE (ERRSV))
211 {
212 PUSHMARK (SP);
213 PUTBACK;
214 call_sv (get_sv ("EV::DIED", 1), G_DISCARD | G_VOID | G_EVAL | G_KEEPERR);
215 SPAGAIN;
216 }
217
218 if (count > 0)
219 {
220 retval = SvNV (TOPs);
221
222 if (retval < now)
223 retval = now;
224 }
225 else
226 retval = now;
227
228 FREETMPS;
229 LEAVE;
230
231 return retval;
232}
233
161///////////////////////////////////////////////////////////////////////////// 234/////////////////////////////////////////////////////////////////////////////
162// DNS 235// DNS
163 236
237#ifndef _WIN32
164static void 238static void
165dns_cb (int result, char type, int count, int ttl, void *addresses, void *arg) 239dns_cb (int result, char type, int count, int ttl, void *addresses, void *arg)
166{ 240{
167 dSP; 241 dSP;
168 SV *cb = (SV *)arg; 242 SV *cb = (SV *)arg;
207 call_sv (get_sv ("EV::DIED", 1), G_DISCARD | G_VOID | G_EVAL | G_KEEPERR); 281 call_sv (get_sv ("EV::DIED", 1), G_DISCARD | G_VOID | G_EVAL | G_KEEPERR);
208 } 282 }
209 283
210 LEAVE; 284 LEAVE;
211} 285}
286#endif
212 287
213#define CHECK_REPEAT(repeat) if (repeat < 0.) \ 288#define CHECK_REPEAT(repeat) if (repeat < 0.) \
214 croak (# repeat " value must be >= 0"); 289 croak (# repeat " value must be >= 0");
215 290
216#define CHECK_FD(fh,fd) if ((fd) < 0) \ 291#define CHECK_FD(fh,fd) if ((fd) < 0) \
223 298
224PROTOTYPES: ENABLE 299PROTOTYPES: ENABLE
225 300
226BOOT: 301BOOT:
227{ 302{
228 int i;
229 HV *stash = gv_stashpv ("EV", 1); 303 HV *stash = gv_stashpv ("EV", 1);
230 304
231 static const struct { 305 static const struct {
232 const char *name; 306 const char *name;
233 IV iv; 307 IV iv;
234 } *civ, const_iv[] = { 308 } *civ, const_iv[] = {
235# define const_iv(pfx, name) { # name, (IV) pfx ## name }, 309# define const_iv(pfx, name) { # name, (IV) pfx ## name },
310 const_iv (EV_, MINPRI)
311 const_iv (EV_, MAXPRI)
312
236 const_iv (EV_, UNDEF) 313 const_iv (EV_, UNDEF)
237 const_iv (EV_, NONE) 314 const_iv (EV_, NONE)
238 const_iv (EV_, TIMEOUT) 315 const_iv (EV_, TIMEOUT)
239 const_iv (EV_, READ) 316 const_iv (EV_, READ)
240 const_iv (EV_, WRITE) 317 const_iv (EV_, WRITE)
243 const_iv (EV_, CHECK) 320 const_iv (EV_, CHECK)
244 const_iv (EV_, ERROR) 321 const_iv (EV_, ERROR)
245 322
246 const_iv (EV, LOOP_ONESHOT) 323 const_iv (EV, LOOP_ONESHOT)
247 const_iv (EV, LOOP_NONBLOCK) 324 const_iv (EV, LOOP_NONBLOCK)
248
249 const_iv (EV, METHOD_NONE) 325 const_iv (EV, UNLOOP_ONE)
326 const_iv (EV, UNLOOP_ALL)
327
250 const_iv (EV, METHOD_SELECT) 328 const_iv (EV, METHOD_SELECT)
329 const_iv (EV, METHOD_POLL)
251 const_iv (EV, METHOD_EPOLL) 330 const_iv (EV, METHOD_EPOLL)
331 const_iv (EV, METHOD_KQUEUE)
332 const_iv (EV, METHOD_DEVPOLL)
333 const_iv (EV, METHOD_PORT)
334 const_iv (EV, FLAG_AUTO)
335 const_iv (EV, FLAG_NOENV)
252 }; 336 };
253 337
254 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 338 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
255 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 339 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
256 340
271 /* the poor man's shared library emulator */ 355 /* the poor man's shared library emulator */
272 evapi.ver = EV_API_VERSION; 356 evapi.ver = EV_API_VERSION;
273 evapi.rev = EV_API_REVISION; 357 evapi.rev = EV_API_REVISION;
274 evapi.sv_fileno = sv_fileno; 358 evapi.sv_fileno = sv_fileno;
275 evapi.sv_signum = sv_signum; 359 evapi.sv_signum = sv_signum;
276 evapi.now = &ev_now; 360 evapi.now = ev_now;
277 evapi.method = &ev_method; 361 evapi.method = ev_method;
278 evapi.loop_done = &ev_loop_done; 362 evapi.unloop = ev_unloop;
279 evapi.time = ev_time; 363 evapi.time = ev_time;
280 evapi.loop = ev_loop; 364 evapi.loop = ev_loop;
281 evapi.once = ev_once; 365 evapi.once = ev_once;
282 evapi.io_start = ev_io_start; 366 evapi.io_start = ev_io_start;
283 evapi.io_stop = ev_io_stop; 367 evapi.io_stop = ev_io_stop;
298 evapi.child_stop = ev_child_stop; 382 evapi.child_stop = ev_child_stop;
299 383
300 sv_setiv (sv, (IV)&evapi); 384 sv_setiv (sv, (IV)&evapi);
301 SvREADONLY_on (sv); 385 SvREADONLY_on (sv);
302 } 386 }
303 387#ifndef _WIN32
304 pthread_atfork (ev_fork_prepare, ev_fork_parent, ev_fork_child); 388 pthread_atfork (0, 0, ev_default_fork);
389#endif
305} 390}
306 391
307NV ev_now () 392NV ev_now ()
308 CODE:
309 RETVAL = ev_now;
310 OUTPUT:
311 RETVAL
312 393
313int ev_method () 394int ev_method ()
314 CODE:
315 RETVAL = ev_method;
316 OUTPUT:
317 RETVAL
318 395
319NV ev_time () 396NV ev_time ()
320 397
321void ev_init (int flags = 0) 398int ev_default_loop (int methods = EVFLAG_AUTO)
322 399
323void ev_loop (int flags = 0) 400void ev_loop (int flags = 0)
324 401
325void ev_loop_done (int value = 1) 402void ev_unloop (int how = 1)
326 CODE:
327 ev_loop_done = value;
328 403
329struct ev_io *io (SV *fh, int events, SV *cb) 404struct ev_io *io (SV *fh, int events, SV *cb)
330 ALIAS: 405 ALIAS:
331 io_ns = 1 406 io_ns = 1
332 CODE: 407 CODE:
352 ev_timer_set (RETVAL, after, repeat); 427 ev_timer_set (RETVAL, after, repeat);
353 if (!ix) ev_timer_start (RETVAL); 428 if (!ix) ev_timer_start (RETVAL);
354 OUTPUT: 429 OUTPUT:
355 RETVAL 430 RETVAL
356 431
357struct ev_periodic *periodic (NV at, NV interval, SV *cb) 432SV *periodic (NV at, NV interval, SV *reschedule_cb, SV *cb)
358 ALIAS: 433 ALIAS:
359 periodic_ns = 1 434 periodic_ns = 1
360 INIT: 435 INIT:
361 CHECK_REPEAT (interval); 436 CHECK_REPEAT (interval);
362 CODE: 437 CODE:
438{
439 struct ev_periodic *w;
363 RETVAL = e_new (sizeof (struct ev_periodic), cb); 440 w = e_new (sizeof (struct ev_periodic), cb);
364 ev_periodic_set (RETVAL, at, interval); 441 w->fh = SvTRUE (reschedule_cb) ? newSVsv (reschedule_cb) : 0;
442 ev_periodic_set (w, at, interval, w->fh ? e_periodic_cb : 0);
443 RETVAL = e_bless ((struct ev_watcher *)w, stash_periodic);
365 if (!ix) ev_periodic_start (RETVAL); 444 if (!ix) ev_periodic_start (w);
445}
366 OUTPUT: 446 OUTPUT:
367 RETVAL 447 RETVAL
368 448
369struct ev_signal *signal (Signal signum, SV *cb) 449struct ev_signal *signal (Signal signum, SV *cb)
370 ALIAS: 450 ALIAS:
408 488
409struct ev_child *child (int pid, SV *cb) 489struct ev_child *child (int pid, SV *cb)
410 ALIAS: 490 ALIAS:
411 check_ns = 1 491 check_ns = 1
412 CODE: 492 CODE:
413 RETVAL = e_new (sizeof (struct ev_check), cb); 493 RETVAL = e_new (sizeof (struct ev_child), cb);
414 ev_child_set (RETVAL, pid); 494 ev_child_set (RETVAL, pid);
415 if (!ix) ev_child_start (RETVAL); 495 if (!ix) ev_child_start (RETVAL);
416 OUTPUT: 496 OUTPUT:
417 RETVAL 497 RETVAL
418 498
432 sv_setsv (w->cb_sv, new_cb); 512 sv_setsv (w->cb_sv, new_cb);
433} 513}
434 OUTPUT: 514 OUTPUT:
435 RETVAL 515 RETVAL
436 516
517SV *data (struct ev_watcher *w, SV *new_data = 0)
518 CODE:
519{
520 RETVAL = w->data ? newSVsv (w->data) : &PL_sv_undef;
521}
522 OUTPUT:
523 RETVAL
524
437void trigger (struct ev_watcher *w, int revents = EV_NONE) 525void trigger (struct ev_watcher *w, int revents = EV_NONE)
438 CODE: 526 CODE:
439 w->cb (w, revents); 527 w->cb (w, revents);
528
529int priority (struct ev_watcher *w, int new_priority = 0)
530 CODE:
531{
532 RETVAL = w->priority;
533
534 if (items > 1)
535 {
536 int active = ev_is_active (w);
537
538 if (new_priority < EV_MINPRI || new_priority > EV_MAXPRI)
539 croak ("watcher priority out of range, value must be between %d and %d, inclusive", EV_MINPRI, EV_MAXPRI);
540
541 if (active)
542 {
543 /* grrr. */
544 PUSHMARK (SP);
545 XPUSHs (ST (0));
546 call_method ("stop", G_DISCARD | G_VOID);
547 }
548
549 ev_set_priority (w, new_priority);
550
551 if (active)
552 {
553 PUSHMARK (SP);
554 XPUSHs (ST (0));
555 call_method ("start", G_DISCARD | G_VOID);
556 }
557 }
558}
559 OUTPUT:
560 RETVAL
440 561
441MODULE = EV PACKAGE = EV::Io PREFIX = ev_io_ 562MODULE = EV PACKAGE = EV::Io PREFIX = ev_io_
442 563
443void ev_io_start (struct ev_io *w) 564void ev_io_start (struct ev_io *w)
444 565
450 e_destroy (w); 571 e_destroy (w);
451 572
452void set (struct ev_io *w, SV *fh, int events) 573void set (struct ev_io *w, SV *fh, int events)
453 CODE: 574 CODE:
454{ 575{
455 int active = w->active; 576 int active = ev_is_active (w);
456 int fd = sv_fileno (fh); 577 int fd = sv_fileno (fh);
457 CHECK_FD (fh, fd); 578 CHECK_FD (fh, fd);
458 579
459 if (active) ev_io_stop (w); 580 if (active) ev_io_stop (w);
460 581
469{ 590{
470 RETVAL = newSVsv (w->fh); 591 RETVAL = newSVsv (w->fh);
471 592
472 if (items > 1) 593 if (items > 1)
473 { 594 {
474 int active = w->active; 595 int active = ev_is_active (w);
475 if (active) ev_io_stop (w); 596 if (active) ev_io_stop (w);
476 597
477 sv_setsv (w->fh, new_fh); 598 sv_setsv (w->fh, new_fh);
478 ev_io_set (w, sv_fileno (w->fh), w->events); 599 ev_io_set (w, sv_fileno (w->fh), w->events);
479 600
488{ 609{
489 RETVAL = w->events; 610 RETVAL = w->events;
490 611
491 if (items > 1) 612 if (items > 1)
492 { 613 {
493 int active = w->active; 614 int active = ev_is_active (w);
494 if (active) ev_io_stop (w); 615 if (active) ev_io_stop (w);
495 616
496 ev_io_set (w, w->fd, new_events); 617 ev_io_set (w, w->fd, new_events);
497 618
498 if (active) ev_io_start (w); 619 if (active) ev_io_start (w);
514 635
515void set (struct ev_signal *w, SV *signal) 636void set (struct ev_signal *w, SV *signal)
516 CODE: 637 CODE:
517{ 638{
518 Signal signum = sv_signum (signal); /* may croak here */ 639 Signal signum = sv_signum (signal); /* may croak here */
519 int active = w->active; 640 int active = ev_is_active (w);
520 641
521 if (active) ev_signal_stop (w); 642 if (active) ev_signal_stop (w);
522 643
523 ev_signal_set (w, signum); 644 ev_signal_set (w, signum);
524 645
531 RETVAL = w->signum; 652 RETVAL = w->signum;
532 653
533 if (items > 1) 654 if (items > 1)
534 { 655 {
535 Signal signum = sv_signum (new_signal); /* may croak here */ 656 Signal signum = sv_signum (new_signal); /* may croak here */
536 int active = w->active; 657 int active = ev_is_active (w);
537 if (active) ev_signal_stop (w); 658 if (active) ev_signal_stop (w);
538 659
539 ev_signal_set (w, signum); 660 ev_signal_set (w, signum);
540 661
541 if (active) ev_signal_start (w); 662 if (active) ev_signal_start (w);
542 } 663 }
543} 664}
544 OUTPUT: 665 OUTPUT:
545 RETVAL 666 RETVAL
546
547MODULE = EV PACKAGE = EV::Time
548 667
549MODULE = EV PACKAGE = EV::Timer PREFIX = ev_timer_ 668MODULE = EV PACKAGE = EV::Timer PREFIX = ev_timer_
550 669
551void ev_timer_start (struct ev_timer *w) 670void ev_timer_start (struct ev_timer *w)
552 INIT: 671 INIT:
566void set (struct ev_timer *w, NV after, NV repeat = 0.) 685void set (struct ev_timer *w, NV after, NV repeat = 0.)
567 INIT: 686 INIT:
568 CHECK_REPEAT (repeat); 687 CHECK_REPEAT (repeat);
569 CODE: 688 CODE:
570{ 689{
571 int active = w->active; 690 int active = ev_is_active (w);
572 if (active) ev_timer_stop (w); 691 if (active) ev_timer_stop (w);
573 ev_timer_set (w, after, repeat); 692 ev_timer_set (w, after, repeat);
574 if (active) ev_timer_start (w); 693 if (active) ev_timer_start (w);
575} 694}
576 695
580 INIT: 699 INIT:
581 CHECK_REPEAT (w->interval); 700 CHECK_REPEAT (w->interval);
582 701
583void ev_periodic_stop (struct ev_periodic *w) 702void ev_periodic_stop (struct ev_periodic *w)
584 703
704void ev_periodic_again (struct ev_periodic *w)
705
585void DESTROY (struct ev_periodic *w) 706void DESTROY (struct ev_periodic *w)
586 CODE: 707 CODE:
587 ev_periodic_stop (w); 708 ev_periodic_stop (w);
588 e_destroy (w); 709 e_destroy (w);
589 710
590void set (struct ev_periodic *w, NV at, NV interval = 0.) 711void set (struct ev_periodic *w, NV at, NV interval = 0., SV *reschedule_cb = &PL_sv_undef)
591 INIT: 712 INIT:
592 CHECK_REPEAT (interval); 713 CHECK_REPEAT (interval);
593 CODE: 714 CODE:
594{ 715{
595 int active = w->active; 716 int active = ev_is_active (w);
596 if (active) ev_periodic_stop (w); 717 if (active) ev_periodic_stop (w);
597 718
719 SvREFCNT_dec (w->fh);
720 w->fh = SvTRUE (reschedule_cb) ? newSVsv (reschedule_cb) : 0;
598 ev_periodic_set (w, at, interval); 721 ev_periodic_set (w, at, interval, w->fh ? e_periodic_cb : 0);
599 722
600 if (active) ev_periodic_start (w); 723 if (active) ev_periodic_start (w);
601} 724}
602 725
603MODULE = EV PACKAGE = EV::Idle PREFIX = ev_idle_ 726MODULE = EV PACKAGE = EV::Idle PREFIX = ev_idle_
645 e_destroy (w); 768 e_destroy (w);
646 769
647void set (struct ev_child *w, int pid) 770void set (struct ev_child *w, int pid)
648 CODE: 771 CODE:
649{ 772{
650 int active = w->active; 773 int active = ev_is_active (w);
651 if (active) ev_child_stop (w); 774 if (active) ev_child_stop (w);
652 775
653 ev_child_set (w, pid); 776 ev_child_set (w, pid);
654 777
655 if (active) ev_child_start (w); 778 if (active) ev_child_start (w);
660{ 783{
661 RETVAL = w->pid; 784 RETVAL = w->pid;
662 785
663 if (items > 1) 786 if (items > 1)
664 { 787 {
665 int active = w->active; 788 int active = ev_is_active (w);
666 if (active) ev_child_stop (w); 789 if (active) ev_child_stop (w);
667 790
668 ev_child_set (w, new_pid); 791 ev_child_set (w, new_pid);
669 792
670 if (active) ev_child_start (w); 793 if (active) ev_child_start (w);
672} 795}
673 OUTPUT: 796 OUTPUT:
674 RETVAL 797 RETVAL
675 798
676 799
677int status (struct ev_child *w) 800int rstatus (struct ev_child *w)
801 ALIAS:
802 rpid = 1
678 CODE: 803 CODE:
679 RETVAL = w->status; 804 RETVAL = ix ? w->rpid : w->rstatus;
680 OUTPUT: 805 OUTPUT:
681 RETVAL 806 RETVAL
807
808#ifndef _WIN32
682 809
683MODULE = EV PACKAGE = EV::DNS PREFIX = evdns_ 810MODULE = EV PACKAGE = EV::DNS PREFIX = evdns_
684 811
685BOOT: 812BOOT:
686{ 813{
757 884
758int evdns_set_option (char *option, char *val, int flags) 885int evdns_set_option (char *option, char *val, int flags)
759 886
760int evdns_resolv_conf_parse (int flags, const char *filename) 887int evdns_resolv_conf_parse (int flags, const char *filename)
761 888
762#ifdef MS_WINDOWS 889#ifdef _WIN32
763 890
764int evdns_config_windows_nameservers () 891int evdns_config_windows_nameservers ()
765 892
766#endif 893#endif
767 894
811 938
812#void DESTROY (struct evhttp_request *req); 939#void DESTROY (struct evhttp_request *req);
813 940
814#endif 941#endif
815 942
943#endif
816 944
817 945
818 946
819 947
820 948

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines