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.368 by root, Thu Aug 13 02:35:41 2009 UTC vs.
Revision 1.382 by root, Thu Feb 10 08:06:27 2011 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
… …
11#include "schmorp.h" 16#include "schmorp.h"
12 17
13#include <stdio.h> 18#include <stdio.h>
14#include <errno.h> 19#include <errno.h>
15#include <assert.h> 20#include <assert.h>
21
22#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0
24#endif
16 25
17#ifdef WIN32 26#ifdef WIN32
18# undef setjmp 27# undef setjmp
19# undef longjmp 28# undef longjmp
20# undef _exit 29# undef _exit
… …
142static SV *sv_pool_size; 151static SV *sv_pool_size;
143static SV *sv_async_pool_idle; /* description string */ 152static SV *sv_async_pool_idle; /* description string */
144static AV *av_async_pool; /* idle pool */ 153static AV *av_async_pool; /* idle pool */
145static SV *sv_Coro; /* class string */ 154static SV *sv_Coro; /* class string */
146static CV *cv_pool_handler; 155static CV *cv_pool_handler;
147static CV *cv_coro_state_new;
148 156
149/* Coro::AnyEvent */ 157/* Coro::AnyEvent */
150static SV *sv_activity; 158static SV *sv_activity;
151 159
152/* enable processtime/realtime profiling */ 160/* enable processtime/realtime profiling */
… …
251 259
252 /* on_enter/on_leave */ 260 /* on_enter/on_leave */
253 AV *on_enter; 261 AV *on_enter;
254 AV *on_leave; 262 AV *on_leave;
255 263
264 /* swap_sv */
265 AV *swap_sv;
266
256 /* times */ 267 /* times */
257 coro_ts t_cpu, t_real; 268 coro_ts t_cpu, t_real;
258 269
259 /* linked list */ 270 /* linked list */
260 struct coro *next, *prev; 271 struct coro *next, *prev;
… …
290static OP *(*coro_old_pp_sselect) (pTHX); 301static OP *(*coro_old_pp_sselect) (pTHX);
291static SV *coro_select_select; 302static SV *coro_select_select;
292 303
293/* horrible hack, but if it works... */ 304/* horrible hack, but if it works... */
294static OP * 305static OP *
295coro_pp_sselect (aTHX) 306coro_pp_sselect (pTHX)
296{ 307{
297 dSP; 308 dSP;
298 PUSHMARK (SP - 4); /* fake argument list */ 309 PUSHMARK (SP - 4); /* fake argument list */
299 XPUSHs (coro_select_select); 310 XPUSHs (coro_select_select);
300 PUTBACK; 311 PUTBACK;
… …
551 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 562 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
552} 563}
553 564
554/** load & save, init *******************************************************/ 565/** load & save, init *******************************************************/
555 566
567/* swap sv heads, at least logically */
568static void
569swap_svs (pTHX_ Coro__State c)
570{
571 int i;
572
573 for (i = 0; i <= AvFILLp (c->swap_sv); )
574 {
575 SV *a = AvARRAY (c->swap_sv)[i++];
576 SV *b = AvARRAY (c->swap_sv)[i++];
577
578 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
579 SV tmp;
580
581 /* swap sv_any */
582 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
583
584 /* swap sv_flags */
585 SvFLAGS (&tmp) = SvFLAGS (a);
586 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
587 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
588
589#if PERL_VERSION_ATLEAST (5,10,0)
590 /* perl 5.10 complicates this _quite_ a bit, but it also is
591 * is much faster, so no quarrels here. alternatively, we could
592 * sv_upgrade to avoid this.
593 */
594 {
595 /* swap sv_u */
596 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
597
598 /* if SvANY points to the head, we need to adjust the pointers,
599 * as the pointer for a still points to b, and maybe vice versa.
600 */
601 #define svany_in_head(type) \
602 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
603
604 if (svany_in_head (SvTYPE (a)))
605 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
606
607 if (svany_in_head (SvTYPE (b)))
608 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
609 }
610#endif
611 }
612}
613
614#define SWAP_SVS(coro) \
615 if (expect_false ((coro)->swap_sv)) \
616 swap_svs (aTHX_ (coro))
617
556static void 618static void
557on_enterleave_call (pTHX_ SV *cb); 619on_enterleave_call (pTHX_ SV *cb);
558 620
559static void 621static void
560load_perl (pTHX_ Coro__State c) 622load_perl (pTHX_ Coro__State c)
… …
606 int i; 668 int i;
607 669
608 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 670 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
609 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 671 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
610 } 672 }
673
674 SWAP_SVS (c);
611} 675}
612 676
613static void 677static void
614save_perl (pTHX_ Coro__State c) 678save_perl (pTHX_ Coro__State c)
615{ 679{
680 SWAP_SVS (c);
681
616 if (expect_false (c->on_leave)) 682 if (expect_false (c->on_leave))
617 { 683 {
618 int i; 684 int i;
619 685
620 for (i = AvFILLp (c->on_leave); i >= 0; --i) 686 for (i = AvFILLp (c->on_leave); i >= 0; --i)
… …
927slf_check_repeat (pTHX_ struct CoroSLF *frame) 993slf_check_repeat (pTHX_ struct CoroSLF *frame)
928{ 994{
929 return 1; 995 return 1;
930} 996}
931 997
932static UNOP coro_setup_op; 998static UNOP init_perl_op;
933 999
934static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1000static void NOINLINE /* noinline to keep it out of the transfer fast path */
935coro_setup (pTHX_ struct coro *coro) 1001init_perl (pTHX_ struct coro *coro)
936{ 1002{
937 /* 1003 /*
938 * emulate part of the perl startup here. 1004 * emulate part of the perl startup here.
939 */ 1005 */
940 coro_init_stacks (aTHX); 1006 coro_init_stacks (aTHX);
… …
989 */ 1055 */
990 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1056 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
991 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1057 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
992 1058
993 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1059 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
994 coro_setup_op.op_next = PL_op; 1060 init_perl_op.op_next = PL_op;
995 coro_setup_op.op_type = OP_ENTERSUB; 1061 init_perl_op.op_type = OP_ENTERSUB;
996 coro_setup_op.op_ppaddr = pp_slf; 1062 init_perl_op.op_ppaddr = pp_slf;
997 /* no flags etc. required, as an init function won't be called */ 1063 /* no flags etc. required, as an init function won't be called */
998 1064
999 PL_op = (OP *)&coro_setup_op; 1065 PL_op = (OP *)&init_perl_op;
1000 1066
1001 /* copy throw, in case it was set before coro_setup */ 1067 /* copy throw, in case it was set before init_perl */
1002 CORO_THROW = coro->except; 1068 CORO_THROW = coro->except;
1069
1070 SWAP_SVS (coro);
1003 1071
1004 if (expect_false (enable_times)) 1072 if (expect_false (enable_times))
1005 { 1073 {
1006 coro_times_update (); 1074 coro_times_update ();
1007 coro_times_sub (coro); 1075 coro_times_sub (coro);
… …
1028 dounwind (-1); 1096 dounwind (-1);
1029 } 1097 }
1030} 1098}
1031 1099
1032static void 1100static void
1033coro_destruct_perl (pTHX_ struct coro *coro) 1101destroy_perl (pTHX_ struct coro *coro)
1034{ 1102{
1035 SV *svf [9]; 1103 SV *svf [9];
1036 1104
1037 { 1105 {
1038 struct coro *current = SvSTATE_current; 1106 struct coro *current = SvSTATE_current;
… …
1042 save_perl (aTHX_ current); 1110 save_perl (aTHX_ current);
1043 load_perl (aTHX_ coro); 1111 load_perl (aTHX_ coro);
1044 1112
1045 coro_unwind_stacks (aTHX); 1113 coro_unwind_stacks (aTHX);
1046 coro_destruct_stacks (aTHX); 1114 coro_destruct_stacks (aTHX);
1115
1116 /* restore swapped sv's */
1117 SWAP_SVS (coro);
1047 1118
1048 // now save some sv's to be free'd later 1119 // now save some sv's to be free'd later
1049 svf [0] = GvSV (PL_defgv); 1120 svf [0] = GvSV (PL_defgv);
1050 svf [1] = (SV *)GvAV (PL_defgv); 1121 svf [1] = (SV *)GvAV (PL_defgv);
1051 svf [2] = GvSV (PL_errgv); 1122 svf [2] = GvSV (PL_errgv);
… …
1493 if (expect_false (next->flags & CF_NEW)) 1564 if (expect_false (next->flags & CF_NEW))
1494 { 1565 {
1495 /* need to start coroutine */ 1566 /* need to start coroutine */
1496 next->flags &= ~CF_NEW; 1567 next->flags &= ~CF_NEW;
1497 /* setup coroutine call */ 1568 /* setup coroutine call */
1498 coro_setup (aTHX_ next); 1569 init_perl (aTHX_ next);
1499 } 1570 }
1500 else 1571 else
1501 load_perl (aTHX_ next); 1572 load_perl (aTHX_ next);
1502 1573
1503 /* possibly untie and reuse the cctx */ 1574 /* possibly untie and reuse the cctx */
… …
1566 1637
1567 if (coro->mainstack 1638 if (coro->mainstack
1568 && coro->mainstack != main_mainstack 1639 && coro->mainstack != main_mainstack
1569 && coro->slot 1640 && coro->slot
1570 && !PL_dirty) 1641 && !PL_dirty)
1571 coro_destruct_perl (aTHX_ coro); 1642 destroy_perl (aTHX_ coro);
1643
1644 if (coro->next) coro->next->prev = coro->prev;
1645 if (coro->prev) coro->prev->next = coro->next;
1646 if (coro == coro_first) coro_first = coro->next;
1572 1647
1573 cctx_destroy (coro->cctx); 1648 cctx_destroy (coro->cctx);
1574 SvREFCNT_dec (coro->startcv); 1649 SvREFCNT_dec (coro->startcv);
1575 SvREFCNT_dec (coro->args); 1650 SvREFCNT_dec (coro->args);
1651 SvREFCNT_dec (coro->swap_sv);
1576 SvREFCNT_dec (CORO_THROW); 1652 SvREFCNT_dec (CORO_THROW);
1577
1578 if (coro->next) coro->next->prev = coro->prev;
1579 if (coro->prev) coro->prev->next = coro->next;
1580 if (coro == coro_first) coro_first = coro->next;
1581 1653
1582 return 1; 1654 return 1;
1583} 1655}
1584 1656
1585static int 1657static int
… …
1755 { 1827 {
1756 /* nothing to schedule: call the idle handler */ 1828 /* nothing to schedule: call the idle handler */
1757 if (SvROK (sv_idle) 1829 if (SvROK (sv_idle)
1758 && SvOBJECT (SvRV (sv_idle))) 1830 && SvOBJECT (SvRV (sv_idle)))
1759 { 1831 {
1832 if (SvRV (sv_idle) == SvRV (coro_current))
1833 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1834
1760 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1835 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1761 api_ready (aTHX_ SvRV (sv_idle)); 1836 api_ready (aTHX_ SvRV (sv_idle));
1762 --coro_nready; 1837 --coro_nready;
1763 } 1838 }
1764 else 1839 else
1765 { 1840 {
1841 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1766 dSP; 1842 dSP;
1767 1843
1768 ENTER; 1844 ENTER;
1769 SAVETMPS; 1845 SAVETMPS;
1770 1846
… …
2349 if (PL_op->op_flags & OPf_STACKED) 2425 if (PL_op->op_flags & OPf_STACKED)
2350 { 2426 {
2351 if (items > slf_arga) 2427 if (items > slf_arga)
2352 { 2428 {
2353 slf_arga = items; 2429 slf_arga = items;
2354 free (slf_argv); 2430 Safefree (slf_argv);
2355 slf_argv = malloc (slf_arga * sizeof (SV *)); 2431 New (0, slf_argv, slf_arga, SV *);
2356 } 2432 }
2357 2433
2358 slf_argc = items; 2434 slf_argc = items;
2359 2435
2360 for (i = 0; i < items; ++i) 2436 for (i = 0; i < items; ++i)
… …
2721 { 2797 {
2722 SV *cb_cv = s_get_cv_croak (arg [1]); 2798 SV *cb_cv = s_get_cv_croak (arg [1]);
2723 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2799 av_push (av, SvREFCNT_inc_NN (cb_cv));
2724 2800
2725 if (SvIVX (AvARRAY (av)[0])) 2801 if (SvIVX (AvARRAY (av)[0]))
2726 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 2802 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2727 2803
2728 frame->prepare = prepare_nop; 2804 frame->prepare = prepare_nop;
2729 frame->check = slf_check_nop; 2805 frame->check = slf_check_nop;
2730 } 2806 }
2731 else if (SvIVX (AvARRAY (av)[0])) 2807 else if (SvIVX (AvARRAY (av)[0]))
… …
2893 /* now call the AIO function - we assume our request is uncancelable */ 2969 /* now call the AIO function - we assume our request is uncancelable */
2894 PUTBACK; 2970 PUTBACK;
2895 call_sv ((SV *)req, G_VOID | G_DISCARD); 2971 call_sv ((SV *)req, G_VOID | G_DISCARD);
2896 } 2972 }
2897 2973
2898 /* now that the requets is going, we loop toll we have a result */ 2974 /* now that the request is going, we loop till we have a result */
2899 frame->data = (void *)state; 2975 frame->data = (void *)state;
2900 frame->prepare = prepare_schedule; 2976 frame->prepare = prepare_schedule;
2901 frame->check = slf_check_aio_req; 2977 frame->check = slf_check_aio_req;
2902} 2978}
2903 2979
… …
2918#endif 2994#endif
2919 2995
2920/*****************************************************************************/ 2996/*****************************************************************************/
2921 2997
2922static SV * 2998static SV *
2923coro_new (HV *stash, SV **argv, int argc, int is_coro) 2999coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
2924{ 3000{
2925 SV *coro_sv; 3001 SV *coro_sv;
2926 struct coro *coro; 3002 struct coro *coro;
2927 MAGIC *mg; 3003 MAGIC *mg;
2928 HV *hv; 3004 HV *hv;
… …
3054SV * 3130SV *
3055new (SV *klass, ...) 3131new (SV *klass, ...)
3056 ALIAS: 3132 ALIAS:
3057 Coro::new = 1 3133 Coro::new = 1
3058 CODE: 3134 CODE:
3059 RETVAL = coro_new (ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix); 3135 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
3060 OUTPUT: 3136 OUTPUT:
3061 RETVAL 3137 RETVAL
3062 3138
3063void 3139void
3064transfer (...) 3140transfer (...)
… …
3202 RETVAL = boolSV (coro->flags & ix); 3278 RETVAL = boolSV (coro->flags & ix);
3203 OUTPUT: 3279 OUTPUT:
3204 RETVAL 3280 RETVAL
3205 3281
3206void 3282void
3207throw (Coro::State self, SV *throw = &PL_sv_undef) 3283throw (Coro::State self, SV *exception = &PL_sv_undef)
3208 PROTOTYPE: $;$ 3284 PROTOTYPE: $;$
3209 CODE: 3285 CODE:
3210{ 3286{
3211 struct coro *current = SvSTATE_current; 3287 struct coro *current = SvSTATE_current;
3212 SV **throwp = self == current ? &CORO_THROW : &self->except; 3288 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3213 SvREFCNT_dec (*throwp); 3289 SvREFCNT_dec (*exceptionp);
3214 SvGETMAGIC (throw); 3290 SvGETMAGIC (exception);
3215 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3291 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3216} 3292}
3217 3293
3218void 3294void
3219api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3295api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3220 PROTOTYPE: $;$ 3296 PROTOTYPE: $;$
… …
3315 3391
3316 if (expect_false (current == self)) 3392 if (expect_false (current == self))
3317 coro_times_sub (SvSTATE (coro_current)); 3393 coro_times_sub (SvSTATE (coro_current));
3318} 3394}
3319 3395
3396void
3397swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3398 CODE:
3399{
3400 struct coro *current = SvSTATE_current;
3401
3402 if (current == coro)
3403 SWAP_SVS (current);
3404
3405 if (!coro->swap_sv)
3406 coro->swap_sv = newAV ();
3407
3408 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3409 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3410
3411 if (current == coro)
3412 SWAP_SVS (current);
3413}
3414
3415
3320MODULE = Coro::State PACKAGE = Coro 3416MODULE = Coro::State PACKAGE = Coro
3321 3417
3322BOOT: 3418BOOT:
3323{ 3419{
3324 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3420 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
… …
3332 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3428 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3333 3429
3334 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3430 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3335 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3431 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3336 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3432 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3337 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3433 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3338 3434
3339 coro_stash = gv_stashpv ("Coro", TRUE); 3435 coro_stash = gv_stashpv ("Coro", TRUE);
3340 3436
3341 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3437 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3342 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3438 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3343 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3439 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3365 3461
3366SV * 3462SV *
3367async (...) 3463async (...)
3368 PROTOTYPE: &@ 3464 PROTOTYPE: &@
3369 CODE: 3465 CODE:
3370 RETVAL = coro_new (coro_stash, &ST (0), items, 1); 3466 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3371 api_ready (RETVAL); 3467 api_ready (aTHX_ RETVAL);
3372 OUTPUT: 3468 OUTPUT:
3373 RETVAL 3469 RETVAL
3374 3470
3375void 3471void
3376terminate (...) 3472terminate (...)
… …
3496 for (i = 1; i < items; ++i) 3592 for (i = 1; i < items; ++i)
3497 av_push (av, SvREFCNT_inc_NN (ST (i))); 3593 av_push (av, SvREFCNT_inc_NN (ST (i)));
3498 3594
3499 if ((SV *)hv == &PL_sv_undef) 3595 if ((SV *)hv == &PL_sv_undef)
3500 { 3596 {
3501 PUSHMARK (SP); 3597 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3502 EXTEND (SP, 2);
3503 PUSHs (sv_Coro);
3504 PUSHs ((SV *)cv_pool_handler);
3505 PUTBACK;
3506 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3507 SPAGAIN;
3508
3509 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3598 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3599 SvREFCNT_dec (sv);
3510 } 3600 }
3511 3601
3512 { 3602 {
3513 struct coro *coro = SvSTATE_hv (hv); 3603 struct coro *coro = SvSTATE_hv (hv);
3514 3604
… …
3786 { 3876 {
3787 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 3877 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3788 coro_old_pp_sselect = 0; 3878 coro_old_pp_sselect = 0;
3789 } 3879 }
3790 3880
3791

Diff Legend

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