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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.188 by root, Fri Oct 5 20:36:31 2007 UTC vs.
Revision 1.194 by root, Sat Oct 6 00:08:04 2007 UTC

… …
75/* 5.8.7 */ 75/* 5.8.7 */
76#ifndef SvRV_set 76#ifndef SvRV_set
77# define SvRV_set(s,v) SvRV(s) = (v) 77# define SvRV_set(s,v) SvRV(s) = (v)
78#endif 78#endif
79 79
80/* 5.8.8 */
81#ifndef GV_NOTQUAL
82# define GV_NOTQUAL 0
83#endif
84#ifndef newSV
85# define newSV(l) NEWSV(0,l)
86#endif
87
80#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 88#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
81# undef CORO_STACKGUARD 89# undef CORO_STACKGUARD
82#endif 90#endif
83 91
84#ifndef CORO_STACKGUARD 92#ifndef CORO_STACKGUARD
… …
98#define IN_DESTRUCT (PL_main_cv == Nullcv) 106#define IN_DESTRUCT (PL_main_cv == Nullcv)
99 107
100#if __GNUC__ >= 3 108#if __GNUC__ >= 3
101# define attribute(x) __attribute__(x) 109# define attribute(x) __attribute__(x)
102# define BARRIER __asm__ __volatile__ ("" : : : "memory") 110# define BARRIER __asm__ __volatile__ ("" : : : "memory")
111# define expect(expr,value) __builtin_expect ((expr),(value))
103#else 112#else
104# define attribute(x) 113# define attribute(x)
105# define BARRIER 114# define BARRIER
115# define expect(expr,value) (expr)
106#endif 116#endif
117
118#define expect_false(expr) expect ((expr) != 0, 0)
119#define expect_true(expr) expect ((expr) != 0, 1)
107 120
108#define NOINLINE attribute ((noinline)) 121#define NOINLINE attribute ((noinline))
109 122
110#include "CoroAPI.h" 123#include "CoroAPI.h"
111 124
… …
132static AV *main_mainstack; /* used to differentiate between $main and others */ 145static AV *main_mainstack; /* used to differentiate between $main and others */
133static JMPENV *main_top_env; 146static JMPENV *main_top_env;
134static HV *coro_state_stash, *coro_stash; 147static HV *coro_state_stash, *coro_stash;
135static SV *coro_mortal; /* will be freed after next transfer */ 148static SV *coro_mortal; /* will be freed after next transfer */
136 149
137static GV *irsgv; /* $/ */ 150static GV *irsgv; /* $/ */
138static GV *stdoutgv; /* STDOUT */ 151static GV *stdoutgv; /* *STDOUT */
139 152
140/* async_pool helper stuff */ 153/* async_pool helper stuff */
141static SV *sv_pool_rss; 154static SV *sv_pool_rss;
142static SV *sv_pool_size; 155static SV *sv_pool_size;
143static AV *av_async_pool; 156static AV *av_async_pool;
… …
317 MAGIC *mg; 330 MAGIC *mg;
318 331
319 if (SvROK (coro)) 332 if (SvROK (coro))
320 coro = SvRV (coro); 333 coro = SvRV (coro);
321 334
322 if (SvTYPE (coro) != SVt_PVHV) 335 if (expect_false (SvTYPE (coro) != SVt_PVHV))
323 croak ("Coro::State object required"); 336 croak ("Coro::State object required");
324 337
325 stash = SvSTASH (coro); 338 stash = SvSTASH (coro);
326 if (stash != coro_stash && stash != coro_state_stash) 339 if (expect_false (stash != coro_stash && stash != coro_state_stash))
327 { 340 {
328 /* very slow, but rare, check */ 341 /* very slow, but rare, check */
329 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 342 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
330 croak ("Coro::State object required"); 343 croak ("Coro::State object required");
331 } 344 }
… …
341get_padlist (pTHX_ CV *cv) 354get_padlist (pTHX_ CV *cv)
342{ 355{
343 MAGIC *mg = CORO_MAGIC (cv); 356 MAGIC *mg = CORO_MAGIC (cv);
344 AV *av; 357 AV *av;
345 358
346 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 359 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
347 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 360 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
348 else 361 else
349 { 362 {
350#if CORO_PREFER_PERL_FUNCTIONS 363#if CORO_PREFER_PERL_FUNCTIONS
351 /* this is probably cleaner, but also slower? */ 364 /* this is probably cleaner, but also slower? */
… …
363put_padlist (pTHX_ CV *cv) 376put_padlist (pTHX_ CV *cv)
364{ 377{
365 MAGIC *mg = CORO_MAGIC (cv); 378 MAGIC *mg = CORO_MAGIC (cv);
366 AV *av; 379 AV *av;
367 380
368 if (!mg) 381 if (expect_false (!mg))
369 { 382 {
370 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 383 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
371 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 384 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
372 mg->mg_virtual = &vtbl_coro; 385 mg->mg_virtual = &vtbl_coro;
373 mg->mg_obj = (SV *)newAV (); 386 mg->mg_obj = (SV *)newAV ();
374 } 387 }
375 388
376 av = (AV *)mg->mg_obj; 389 av = (AV *)mg->mg_obj;
377 390
378 if (AvFILLp (av) >= AvMAX (av)) 391 if (expect_false (AvFILLp (av) >= AvMAX (av)))
379 av_extend (av, AvMAX (av) + 1); 392 av_extend (av, AvMAX (av) + 1);
380 393
381 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 394 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
382} 395}
383 396
… …
398 { 411 {
399 dSP; 412 dSP;
400 CV *cv; 413 CV *cv;
401 414
402 /* now do the ugly restore mess */ 415 /* now do the ugly restore mess */
403 while ((cv = (CV *)POPs)) 416 while (expect_true (cv = (CV *)POPs))
404 { 417 {
405 put_padlist (aTHX_ cv); /* mark this padlist as available */ 418 put_padlist (aTHX_ cv); /* mark this padlist as available */
406 CvDEPTH (cv) = PTR2IV (POPs); 419 CvDEPTH (cv) = PTR2IV (POPs);
407 CvPADLIST (cv) = (AV *)POPs; 420 CvPADLIST (cv) = (AV *)POPs;
408 } 421 }
… …
427 440
428 XPUSHs (Nullsv); 441 XPUSHs (Nullsv);
429 /* this loop was inspired by pp_caller */ 442 /* this loop was inspired by pp_caller */
430 for (;;) 443 for (;;)
431 { 444 {
432 while (cxix >= 0) 445 while (expect_true (cxix >= 0))
433 { 446 {
434 PERL_CONTEXT *cx = &ccstk[cxix--]; 447 PERL_CONTEXT *cx = &ccstk[cxix--];
435 448
436 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 449 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
437 { 450 {
438 CV *cv = cx->blk_sub.cv; 451 CV *cv = cx->blk_sub.cv;
439 452
440 if (CvDEPTH (cv)) 453 if (expect_true (CvDEPTH (cv)))
441 { 454 {
442 EXTEND (SP, 3); 455 EXTEND (SP, 3);
443 PUSHs ((SV *)CvPADLIST (cv)); 456 PUSHs ((SV *)CvPADLIST (cv));
444 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 457 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
445 PUSHs ((SV *)cv); 458 PUSHs ((SV *)cv);
… …
448 get_padlist (aTHX_ cv); 461 get_padlist (aTHX_ cv);
449 } 462 }
450 } 463 }
451 } 464 }
452 465
453 if (top_si->si_type == PERLSI_MAIN) 466 if (expect_true (top_si->si_type == PERLSI_MAIN))
454 break; 467 break;
455 468
456 top_si = top_si->si_prev; 469 top_si = top_si->si_prev;
457 ccstk = top_si->si_cxstack; 470 ccstk = top_si->si_cxstack;
458 cxix = top_si->si_cxix; 471 cxix = top_si->si_cxix;
… …
599 PL_curpm = 0; 612 PL_curpm = 0;
600 PL_localizing = 0; 613 PL_localizing = 0;
601 PL_dirty = 0; 614 PL_dirty = 0;
602 PL_restartop = 0; 615 PL_restartop = 0;
603 616
604 GvSV (PL_defgv) = NEWSV (0, 0); 617 GvSV (PL_defgv) = newSV (0);
605 GvAV (PL_defgv) = coro->args; coro->args = 0; 618 GvAV (PL_defgv) = coro->args; coro->args = 0;
606 GvSV (PL_errgv) = NEWSV (0, 0); 619 GvSV (PL_errgv) = newSV (0);
607 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 620 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
608 PL_rs = newSVsv (GvSV (irsgv)); 621 PL_rs = newSVsv (GvSV (irsgv));
609 PL_defoutgv = SvREFCNT_inc (stdoutgv); 622 PL_defoutgv = SvREFCNT_inc (stdoutgv);
610 623
624 ENTER; /* necessary e.g. for dounwind */
625
611 { 626 {
612 dSP; 627 dSP;
613 LOGOP myop; 628 LOGOP myop;
614 629
615 Zero (&myop, 1, LOGOP); 630 Zero (&myop, 1, LOGOP);
616 myop.op_next = Nullop; 631 myop.op_next = Nullop;
617 myop.op_flags = OPf_WANT_VOID; 632 myop.op_flags = OPf_WANT_VOID;
618 633
619 PUSHMARK (SP); 634 PUSHMARK (SP);
620 XPUSHs (av_shift (GvAV (PL_defgv))); 635 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
621 PUTBACK; 636 PUTBACK;
622 PL_op = (OP *)&myop; 637 PL_op = (OP *)&myop;
623 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 638 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
624 SPAGAIN; 639 SPAGAIN;
625 } 640 }
626
627 ENTER; /* necessary e.g. for dounwind */
628} 641}
629 642
630static void 643static void
631coro_destroy (pTHX_ struct coro *coro) 644coro_destroy (pTHX_ struct coro *coro)
632{ 645{
… …
661} 674}
662 675
663static void 676static void
664free_coro_mortal (pTHX) 677free_coro_mortal (pTHX)
665{ 678{
666 if (coro_mortal) 679 if (expect_true (coro_mortal))
667 { 680 {
668 SvREFCNT_dec (coro_mortal); 681 SvREFCNT_dec (coro_mortal);
669 coro_mortal = 0; 682 coro_mortal = 0;
670 } 683 }
671} 684}
… …
700 bot = PL_stack_base + cx->blk_oldsp + 1; 713 bot = PL_stack_base + cx->blk_oldsp + 1;
701 top = cx->blk_gimme == G_ARRAY ? SP + 1 714 top = cx->blk_gimme == G_ARRAY ? SP + 1
702 : cx->blk_gimme == G_SCALAR ? bot + 1 715 : cx->blk_gimme == G_SCALAR ? bot + 1
703 : bot; 716 : bot;
704 717
718 av_extend (av, top - bot);
705 while (bot < top) 719 while (bot < top)
706 av_push (av, SvREFCNT_inc (*bot++)); 720 av_push (av, SvREFCNT_inc (*bot++));
707 721
708 PL_runops = RUNOPS_DEFAULT; 722 PL_runops = RUNOPS_DEFAULT;
709 ENTER; 723 ENTER;
… …
921 Safefree (cctx->sptr); 935 Safefree (cctx->sptr);
922 936
923 Safefree (cctx); 937 Safefree (cctx);
924} 938}
925 939
940/* wether this cctx should be destructed */
941#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
942
926static coro_cctx * 943static coro_cctx *
927cctx_get (pTHX) 944cctx_get (pTHX)
928{ 945{
929 while (cctx_first) 946 while (expect_true (cctx_first))
930 { 947 {
931 coro_cctx *cctx = cctx_first; 948 coro_cctx *cctx = cctx_first;
932 cctx_first = cctx->next; 949 cctx_first = cctx->next;
933 --cctx_idle; 950 --cctx_idle;
934 951
935 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 952 if (expect_true (!CCTX_EXPIRED (cctx)))
936 return cctx; 953 return cctx;
937 954
938 cctx_destroy (cctx); 955 cctx_destroy (cctx);
939 } 956 }
940 957
… …
943 960
944static void 961static void
945cctx_put (coro_cctx *cctx) 962cctx_put (coro_cctx *cctx)
946{ 963{
947 /* free another cctx if overlimit */ 964 /* free another cctx if overlimit */
948 if (cctx_idle >= MAX_IDLE_CCTX) 965 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
949 { 966 {
950 coro_cctx *first = cctx_first; 967 coro_cctx *first = cctx_first;
951 cctx_first = first->next; 968 cctx_first = first->next;
952 --cctx_idle; 969 --cctx_idle;
953 970
… …
959 cctx_first = cctx; 976 cctx_first = cctx;
960} 977}
961 978
962/** coroutine switching *****************************************************/ 979/** coroutine switching *****************************************************/
963 980
964static void NOINLINE 981static void
965transfer_check (pTHX_ struct coro *prev, struct coro *next) 982transfer_check (pTHX_ struct coro *prev, struct coro *next)
966{ 983{
967 if (prev != next) 984 if (expect_true (prev != next))
968 { 985 {
969 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 986 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
970 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states"); 987 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
971 988
972 if (next->flags & CF_RUNNING) 989 if (expect_false (next->flags & CF_RUNNING))
973 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 990 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
974 991
975 if (next->flags & CF_DESTROYED) 992 if (expect_false (next->flags & CF_DESTROYED))
976 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 993 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
977 994
978 if (PL_lex_state != LEX_NOTPARSING) 995 if (expect_false (PL_lex_state != LEX_NOTPARSING))
979 croak ("Coro::State::transfer called while parsing, but this is not supported"); 996 croak ("Coro::State::transfer called while parsing, but this is not supported");
980 } 997 }
981} 998}
982 999
983/* always use the TRANSFER macro */ 1000/* always use the TRANSFER macro */
… …
985transfer (pTHX_ struct coro *prev, struct coro *next) 1002transfer (pTHX_ struct coro *prev, struct coro *next)
986{ 1003{
987 dSTACKLEVEL; 1004 dSTACKLEVEL;
988 1005
989 /* sometimes transfer is only called to set idle_sp */ 1006 /* sometimes transfer is only called to set idle_sp */
990 if (!next) 1007 if (expect_false (!next))
991 { 1008 {
992 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1009 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
993 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1010 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
994 } 1011 }
995 else if (prev != next) 1012 else if (expect_true (prev != next))
996 { 1013 {
997 coro_cctx *prev__cctx; 1014 coro_cctx *prev__cctx;
998 1015
999 if (prev->flags & CF_NEW) 1016 if (expect_false (prev->flags & CF_NEW))
1000 { 1017 {
1001 /* create a new empty context */ 1018 /* create a new empty context */
1002 Newz (0, prev->cctx, 1, coro_cctx); 1019 Newz (0, prev->cctx, 1, coro_cctx);
1003 prev->flags &= ~CF_NEW; 1020 prev->flags &= ~CF_NEW;
1004 prev->flags |= CF_RUNNING; 1021 prev->flags |= CF_RUNNING;
… …
1007 prev->flags &= ~CF_RUNNING; 1024 prev->flags &= ~CF_RUNNING;
1008 next->flags |= CF_RUNNING; 1025 next->flags |= CF_RUNNING;
1009 1026
1010 LOCK; 1027 LOCK;
1011 1028
1012 if (next->flags & CF_NEW) 1029 if (expect_false (next->flags & CF_NEW))
1013 { 1030 {
1014 /* need to start coroutine */ 1031 /* need to start coroutine */
1015 next->flags &= ~CF_NEW; 1032 next->flags &= ~CF_NEW;
1016 /* first get rid of the old state */ 1033 /* first get rid of the old state */
1017 save_perl (aTHX_ prev); 1034 save_perl (aTHX_ prev);
… …
1026 } 1043 }
1027 1044
1028 prev__cctx = prev->cctx; 1045 prev__cctx = prev->cctx;
1029 1046
1030 /* possibly "free" the cctx */ 1047 /* possibly "free" the cctx */
1031 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)) 1048 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
1032 { 1049 {
1033 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1050 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1034 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1051 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1035 1052
1036 prev->cctx = 0; 1053 prev->cctx = 0;
1037 1054
1055 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1056 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1057 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1058 next->cctx = cctx_get (aTHX);
1059
1038 cctx_put (prev__cctx); 1060 cctx_put (prev__cctx);
1039 } 1061 }
1040 1062
1041 ++next->usecount; 1063 ++next->usecount;
1042 1064
1043 if (!next->cctx) 1065 if (expect_true (!next->cctx))
1044 next->cctx = cctx_get (aTHX); 1066 next->cctx = cctx_get (aTHX);
1045 1067
1046 if (prev__cctx != next->cctx) 1068 if (expect_false (prev__cctx != next->cctx))
1047 { 1069 {
1048 prev__cctx->top_env = PL_top_env; 1070 prev__cctx->top_env = PL_top_env;
1049 PL_top_env = next->cctx->top_env; 1071 PL_top_env = next->cctx->top_env;
1050 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1072 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1051 } 1073 }
… …
1231 { 1253 {
1232 LOCK; 1254 LOCK;
1233 next_sv = coro_deq (aTHX_ PRIO_MIN); 1255 next_sv = coro_deq (aTHX_ PRIO_MIN);
1234 1256
1235 /* nothing to schedule: call the idle handler */ 1257 /* nothing to schedule: call the idle handler */
1236 if (!next_sv) 1258 if (expect_false (!next_sv))
1237 { 1259 {
1238 dSP; 1260 dSP;
1239 UNLOCK; 1261 UNLOCK;
1240 1262
1241 ENTER; 1263 ENTER;
… …
1251 } 1273 }
1252 1274
1253 ta->next = SvSTATE (next_sv); 1275 ta->next = SvSTATE (next_sv);
1254 1276
1255 /* cannot transfer to destroyed coros, skip and look for next */ 1277 /* cannot transfer to destroyed coros, skip and look for next */
1256 if (ta->next->flags & CF_DESTROYED) 1278 if (expect_false (ta->next->flags & CF_DESTROYED))
1257 { 1279 {
1258 UNLOCK; 1280 UNLOCK;
1259 SvREFCNT_dec (next_sv); 1281 SvREFCNT_dec (next_sv);
1260 /* coro_nready is already taken care of by destroy */ 1282 /* coro_nready is already taken care of by destroy */
1261 continue; 1283 continue;
… …
1317 dTHX; 1339 dTHX;
1318 struct transfer_args ta; 1340 struct transfer_args ta;
1319 1341
1320 prepare_cede (aTHX_ &ta); 1342 prepare_cede (aTHX_ &ta);
1321 1343
1322 if (ta.prev != ta.next) 1344 if (expect_true (ta.prev != ta.next))
1323 { 1345 {
1324 TRANSFER (ta); 1346 TRANSFER (ta);
1325 return 1; 1347 return 1;
1326 } 1348 }
1327 else 1349 else
… …
1420 1442
1421 coro->hv = hv = newHV (); 1443 coro->hv = hv = newHV ();
1422 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1444 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1423 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1445 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1424 1446
1447 av_extend (coro->args, items - 1);
1425 for (i = 1; i < items; i++) 1448 for (i = 1; i < items; i++)
1426 av_push (coro->args, newSVsv (ST (i))); 1449 av_push (coro->args, newSVsv (ST (i)));
1427} 1450}
1428 OUTPUT: 1451 OUTPUT:
1429 RETVAL 1452 RETVAL
… …
1472 } 1495 }
1473 1496
1474 BARRIER; 1497 BARRIER;
1475 TRANSFER (ta); 1498 TRANSFER (ta);
1476 1499
1477 if (GIMME_V != G_VOID && ta.next != ta.prev) 1500 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev))
1478 XSRETURN_YES; 1501 XSRETURN_YES;
1479} 1502}
1480 1503
1481bool 1504bool
1482_destroy (SV *coro_sv) 1505_destroy (SV *coro_sv)

Diff Legend

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