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.8 by root, Thu Jul 19 04:13:22 2001 UTC vs.
Revision 1.65 by root, Mon Dec 5 23:50:48 2005 UTC

1#define PERL_NO_GET_CONTEXT
2
3#include "libcoro/coro.c"
4
1#include "EXTERN.h" 5#include "EXTERN.h"
2#include "perl.h" 6#include "perl.h"
3#include "XSUB.h" 7#include "XSUB.h"
4 8
5#if 1 9#include "patchlevel.h"
6# define CHK(x) (void *)0 10
11#if PERL_VERSION < 6
12# ifndef PL_ppaddr
13# define PL_ppaddr ppaddr
14# endif
15# ifndef call_sv
16# define call_sv perl_call_sv
17# endif
18# ifndef get_sv
19# define get_sv perl_get_sv
20# endif
21# ifndef get_cv
22# define get_cv perl_get_cv
23# endif
24# ifndef IS_PADGV
25# define IS_PADGV(v) 0
26# endif
27# ifndef IS_PADCONST
28# define IS_PADCONST(v) 0
29# endif
30#endif
31
32#include <signal.h>
33
34#ifdef HAVE_MMAP
35# include <unistd.h>
36# include <sys/mman.h>
37# ifndef MAP_ANONYMOUS
38# ifdef MAP_ANON
39# define MAP_ANONYMOUS MAP_ANON
40# else
41# undef HAVE_MMAP
42# endif
43# endif
44#endif
45
46#define SUB_INIT "Coro::State::initialize"
47#define UCORO_STATE "_coro_state"
48
49/* The next macro should declare a variable stacklevel that contains and approximation
50 * to the current C stack pointer. Its property is that it changes with each call
51 * and should be unique. */
52#define dSTACKLEVEL void *stacklevel = &stacklevel
53
54#define IN_DESTRUCT (PL_main_cv == Nullcv)
55
56#define labs(l) ((l) >= 0 ? (l) : -(l))
57
58#include "CoroAPI.h"
59
60#ifdef USE_ITHREADS
61static perl_mutex coro_mutex;
62# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0)
63# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0)
7#else 64#else
8# define CHK(x) if (!(x)) croak("FATAL, CHK: " #x) 65# define LOCK 0
66# define UNLOCK 0
9#endif 67#endif
10 68
11#define MAY_FLUSH /* increases codesize */ 69static struct CoroAPI coroapi;
70static AV *main_mainstack; /* used to differentiate between $main and others */
71static HV *coro_state_stash;
72static SV *ucoro_state_sv;
73static U32 ucoro_state_hash;
74static SV *coro_mortal; /* will be freed after next transfer */
12 75
13#define SUB_INIT "Coro::State::_newcoro" 76/* this is actually not only the c stack but also c registers etc... */
77typedef struct {
78 int refcnt; /* pointer reference counter */
79 int usecnt; /* shared by how many coroutines */
80 int gencnt; /* generation counter */
14 81
15#define SAVE_DEFAV 0x00000001 82 coro_context cctx;
16#define SAVE_DEFSV 0x00000002
17#define SAVE_ERRSV 0x00000004
18 83
19#define SAVE_ALL -1 84 void *sptr;
85 long ssize; /* positive == mmap, otherwise malloc */
86} coro_stack;
20 87
21struct coro { 88struct coro {
89 /* the top-level JMPENV for each coroutine, needed to catch dies. */
90 JMPENV start_env;
91
92 /* the optional C context */
93 coro_stack *stack;
94 void *cursp;
95 int gencnt;
96
22 /* optionally saved, might be zero */ 97 /* optionally saved, might be zero */
23 AV *defav; 98 AV *defav;
24 SV *defsv; 99 SV *defsv;
25 SV *errsv; 100 SV *errsv;
26 101
27 /* saved global state not related to stacks */ 102 /* saved global state not related to stacks */
28 U8 dowarn; 103 U8 dowarn;
104 I32 in_eval;
29 105
30 /* the stacks and related info (callchain etc..) */ 106 /* the stacks and related info (callchain etc..) */
31 PERL_SI *curstackinfo; 107 PERL_SI *curstackinfo;
32 AV *curstack; 108 AV *curstack;
33 AV *mainstack; 109 AV *mainstack;
34 SV **stack_sp; 110 SV **stack_sp;
35 OP *op; 111 OP *op;
36 SV **curpad; 112 SV **curpad;
113 AV *comppad;
114 CV *compcv;
37 SV **stack_base; 115 SV **stack_base;
38 SV **stack_max; 116 SV **stack_max;
39 SV **tmps_stack; 117 SV **tmps_stack;
40 I32 tmps_floor; 118 I32 tmps_floor;
41 I32 tmps_ix; 119 I32 tmps_ix;
51 I32 savestack_max; 129 I32 savestack_max;
52 OP **retstack; 130 OP **retstack;
53 I32 retstack_ix; 131 I32 retstack_ix;
54 I32 retstack_max; 132 I32 retstack_max;
55 COP *curcop; 133 COP *curcop;
134 JMPENV *top_env;
56 135
57 /* data associated with this coroutine (initial args) */ 136 /* data associated with this coroutine (initial args) */
58 AV *args; 137 AV *args;
59}; 138};
60 139
61typedef struct coro *Coro__State; 140typedef struct coro *Coro__State;
62typedef struct coro *Coro__State_or_hashref; 141typedef struct coro *Coro__State_or_hashref;
63 142
64static HV *padlist_cache;
65
66/* mostly copied from op.c:cv_clone2 */ 143/* mostly copied from op.c:cv_clone2 */
67STATIC AV * 144STATIC AV *
68clone_padlist (AV *protopadlist) 145clone_padlist (pTHX_ AV *protopadlist)
69{ 146{
70 AV *av; 147 AV *av;
71 I32 ix; 148 I32 ix;
72 AV *protopad_name = (AV *) * av_fetch (protopadlist, 0, FALSE); 149 AV *protopad_name = (AV *) * av_fetch (protopadlist, 0, FALSE);
73 AV *protopad = (AV *) * av_fetch (protopadlist, 1, FALSE); 150 AV *protopad = (AV *) * av_fetch (protopadlist, 1, FALSE);
97 AvFLAGS (av) = AVf_REIFY; 174 AvFLAGS (av) = AVf_REIFY;
98 175
99 for (ix = fpad; ix > 0; ix--) 176 for (ix = fpad; ix > 0; ix--)
100 { 177 {
101 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv; 178 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv;
179
102 if (namesv && namesv != &PL_sv_undef) 180 if (namesv && namesv != &PL_sv_undef)
103 { 181 {
104 char *name = SvPVX (namesv); /* XXX */ 182 char *name = SvPVX (namesv); /* XXX */
183
105 if (SvFLAGS (namesv) & SVf_FAKE || *name == '&') 184 if (SvFLAGS (namesv) & SVf_FAKE || *name == '&')
106 { /* lexical from outside? */ 185 { /* lexical from outside? */
107 npad[ix] = SvREFCNT_inc (ppad[ix]); 186 npad[ix] = SvREFCNT_inc (ppad[ix]);
108 } 187 }
109 else 188 else
115 sv = (SV *) newAV (); 194 sv = (SV *) newAV ();
116 else if (*name == '%') 195 else if (*name == '%')
117 sv = (SV *) newHV (); 196 sv = (SV *) newHV ();
118 else 197 else
119 sv = NEWSV (0, 0); 198 sv = NEWSV (0, 0);
199
200#ifdef SvPADBUSY
120 if (!SvPADBUSY (sv)) 201 if (!SvPADBUSY (sv))
202#endif
121 SvPADMY_on (sv); 203 SvPADMY_on (sv);
204
122 npad[ix] = sv; 205 npad[ix] = sv;
123 } 206 }
124 } 207 }
125 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix])) 208 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix]))
126 { 209 {
155#endif 238#endif
156 239
157 return newpadlist; 240 return newpadlist;
158} 241}
159 242
160#ifdef MAY_FLUSH 243STATIC void
161STATIC AV *
162free_padlist (AV *padlist) 244free_padlist (pTHX_ AV *padlist)
163{ 245{
164 /* may be during global destruction */ 246 /* may be during global destruction */
165 if (SvREFCNT(padlist)) 247 if (SvREFCNT (padlist))
166 { 248 {
167 I32 i = AvFILLp(padlist); 249 I32 i = AvFILLp (padlist);
168 while (i >= 0) 250 while (i >= 0)
169 { 251 {
170 SV **svp = av_fetch(padlist, i--, FALSE); 252 SV **svp = av_fetch (padlist, i--, FALSE);
171 SV *sv = svp ? *svp : Nullsv;
172 if (sv) 253 if (svp)
254 {
255 SV *sv;
256 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp)))
173 SvREFCNT_dec(sv); 257 SvREFCNT_dec (sv);
258
259 SvREFCNT_dec (*svp);
260 }
174 } 261 }
175 262
176 SvREFCNT_dec((SV*)padlist); 263 SvREFCNT_dec ((SV*)padlist);
177 } 264 }
178} 265}
179#endif 266
267STATIC int
268coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
269{
270 AV *padlist;
271 AV *av = (AV *)mg->mg_obj;
272
273 /* casting is fun. */
274 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
275 free_padlist (aTHX_ padlist);
276
277 SvREFCNT_dec (av);
278}
279
280#define PERL_MAGIC_coro PERL_MAGIC_ext
281
282static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
180 283
181/* the next two functions merely cache the padlists */ 284/* the next two functions merely cache the padlists */
182STATIC void 285STATIC void
183get_padlist (CV *cv) 286get_padlist (pTHX_ CV *cv)
184{ 287{
185 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 0); 288 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
186 289
187 if (he && AvFILLp ((AV *)*he) >= 0) 290 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
188 CvPADLIST (cv) = (AV *)av_pop ((AV *)*he); 291 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
189 else 292 else
190 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv)); 293 CvPADLIST (cv) = clone_padlist (aTHX_ CvPADLIST (cv));
191} 294}
192 295
193STATIC void 296STATIC void
194put_padlist (CV *cv) 297put_padlist (pTHX_ CV *cv)
195{ 298{
196 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 1); 299 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
197 300
198 if (SvTYPE (*he) != SVt_PVAV) 301 if (!mg)
199 { 302 {
200 SvREFCNT_dec (*he); 303 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
304 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
305 mg->mg_virtual = &vtbl_coro;
201 *he = (SV *)newAV (); 306 mg->mg_obj = (SV *)newAV ();
202 } 307 }
203 308
204 av_push ((AV *)*he, (SV *)CvPADLIST (cv)); 309 av_push ((AV *)mg->mg_obj, (SV *)CvPADLIST (cv));
205} 310}
206
207#ifdef MAY_FLUSH
208STATIC void
209flush_padlist_cache ()
210{
211 HV *hv = padlist_cache;
212 padlist_cache = newHV ();
213
214 if (hv_iterinit (hv))
215 {
216 HE *he;
217 AV *padlist;
218
219 while (!!(he = hv_iternext (hv)))
220 {
221 AV *av = (AV *)HeVAL(he);
222
223 /* casting is fun. */
224 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
225 free_padlist (padlist);
226 }
227 }
228
229 SvREFCNT_dec (hv);
230}
231#endif
232 311
233#define SB do { 312#define SB do {
234#define SE } while (0) 313#define SE } while (0)
235 314
236#define LOAD(state) SB load_state(aTHX_ state); SPAGAIN; SE 315#define LOAD(state) load_state(aTHX_ (state));
237#define SAVE(state,flags) SB PUTBACK; save_state(aTHX_ state,flags); SE 316#define SAVE(state,flags) save_state(aTHX_ (state),(flags));
238 317
239#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); SE 318#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); (val) = 0; SE
240 319
241static void 320static void
242load_state(pTHX_ Coro__State c) 321load_state(pTHX_ Coro__State c)
243{ 322{
244 PL_dowarn = c->dowarn; 323 PL_dowarn = c->dowarn;
324 PL_in_eval = c->in_eval;
245 325
246 PL_curstackinfo = c->curstackinfo; 326 PL_curstackinfo = c->curstackinfo;
247 PL_curstack = c->curstack; 327 PL_curstack = c->curstack;
248 PL_mainstack = c->mainstack; 328 PL_mainstack = c->mainstack;
249 PL_stack_sp = c->stack_sp; 329 PL_stack_sp = c->stack_sp;
250 PL_op = c->op; 330 PL_op = c->op;
251 PL_curpad = c->curpad; 331 PL_curpad = c->curpad;
332 PL_comppad = c->comppad;
333 PL_compcv = c->compcv;
252 PL_stack_base = c->stack_base; 334 PL_stack_base = c->stack_base;
253 PL_stack_max = c->stack_max; 335 PL_stack_max = c->stack_max;
254 PL_tmps_stack = c->tmps_stack; 336 PL_tmps_stack = c->tmps_stack;
255 PL_tmps_floor = c->tmps_floor; 337 PL_tmps_floor = c->tmps_floor;
256 PL_tmps_ix = c->tmps_ix; 338 PL_tmps_ix = c->tmps_ix;
266 PL_savestack_max = c->savestack_max; 348 PL_savestack_max = c->savestack_max;
267 PL_retstack = c->retstack; 349 PL_retstack = c->retstack;
268 PL_retstack_ix = c->retstack_ix; 350 PL_retstack_ix = c->retstack_ix;
269 PL_retstack_max = c->retstack_max; 351 PL_retstack_max = c->retstack_max;
270 PL_curcop = c->curcop; 352 PL_curcop = c->curcop;
353 PL_top_env = c->top_env;
271 354
272 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 355 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
273 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 356 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
274 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 357 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
275 358
282 { 365 {
283 AV *padlist = (AV *)POPs; 366 AV *padlist = (AV *)POPs;
284 367
285 if (padlist) 368 if (padlist)
286 { 369 {
287 put_padlist (cv); /* mark this padlist as available */ 370 put_padlist (aTHX_ cv); /* mark this padlist as available */
288 CvPADLIST(cv) = padlist; 371 CvPADLIST(cv) = padlist;
289#ifdef USE_THREADS
290 /*CvOWNER(cv) = (struct perl_thread *)POPs;*/
291#endif
292 } 372 }
293 373
294 ++CvDEPTH(cv); 374 ++CvDEPTH(cv);
295 } 375 }
296 376
302save_state(pTHX_ Coro__State c, int flags) 382save_state(pTHX_ Coro__State c, int flags)
303{ 383{
304 { 384 {
305 dSP; 385 dSP;
306 I32 cxix = cxstack_ix; 386 I32 cxix = cxstack_ix;
387 PERL_CONTEXT *ccstk = cxstack;
307 PERL_SI *top_si = PL_curstackinfo; 388 PERL_SI *top_si = PL_curstackinfo;
308 PERL_CONTEXT *ccstk = cxstack;
309 389
310 /* 390 /*
311 * the worst thing you can imagine happens first - we have to save 391 * the worst thing you can imagine happens first - we have to save
312 * (and reinitialize) all cv's in the whole callchain :( 392 * (and reinitialize) all cv's in the whole callchain :(
313 */ 393 */
314 394
315 PUSHs (Nullsv); 395 PUSHs (Nullsv);
316 /* this loop was inspired by pp_caller */ 396 /* this loop was inspired by pp_caller */
317 for (;;) 397 for (;;)
318 { 398 {
319 do 399 while (cxix >= 0)
320 { 400 {
321 PERL_CONTEXT *cx = &ccstk[cxix--]; 401 PERL_CONTEXT *cx = &ccstk[cxix--];
322 402
323 if (CxTYPE(cx) == CXt_SUB) 403 if (CxTYPE(cx) == CXt_SUB)
324 { 404 {
325 CV *cv = cx->blk_sub.cv; 405 CV *cv = cx->blk_sub.cv;
326 if (CvDEPTH(cv)) 406 if (CvDEPTH(cv))
327 { 407 {
328#ifdef USE_THREADS
329 /*XPUSHs ((SV *)CvOWNER(cv));*/
330 /*CvOWNER(cv) = 0;*/
331 /*error must unlock this cv etc.. etc...*/
332#endif
333 EXTEND (SP, CvDEPTH(cv)*2); 408 EXTEND (SP, CvDEPTH(cv)*2);
334 409
335 while (--CvDEPTH(cv)) 410 while (--CvDEPTH(cv))
336 { 411 {
337 /* this tells the restore code to increment CvDEPTH */ 412 /* this tells the restore code to increment CvDEPTH */
340 } 415 }
341 416
342 PUSHs ((SV *)CvPADLIST(cv)); 417 PUSHs ((SV *)CvPADLIST(cv));
343 PUSHs ((SV *)cv); 418 PUSHs ((SV *)cv);
344 419
345 get_padlist (cv); /* this is a monster */ 420 get_padlist (aTHX_ cv); /* this is a monster */
346 } 421 }
347 } 422 }
423#ifdef CXt_FORMAT
348 else if (CxTYPE(cx) == CXt_FORMAT) 424 else if (CxTYPE(cx) == CXt_FORMAT)
349 { 425 {
350 /* I never used formats, so how should I know how these are implemented? */ 426 /* I never used formats, so how should I know how these are implemented? */
351 /* my bold guess is as a simple, plain sub... */ 427 /* my bold guess is as a simple, plain sub... */
352 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats"); 428 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats");
353 } 429 }
430#endif
354 } 431 }
355 while (cxix >= 0);
356 432
357 if (top_si->si_type == PERLSI_MAIN) 433 if (top_si->si_type == PERLSI_MAIN)
358 break; 434 break;
359 435
360 top_si = top_si->si_prev; 436 top_si = top_si->si_prev;
363 } 439 }
364 440
365 PUTBACK; 441 PUTBACK;
366 } 442 }
367 443
368 c->defav = flags & SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 444 c->defav = flags & TRANSFER_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0;
369 c->defsv = flags & SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 445 c->defsv = flags & TRANSFER_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0;
370 c->errsv = flags & SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 446 c->errsv = flags & TRANSFER_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0;
371 447
372 c->dowarn = PL_dowarn; 448 c->dowarn = PL_dowarn;
449 c->in_eval = PL_in_eval;
373 450
374 c->curstackinfo = PL_curstackinfo; 451 c->curstackinfo = PL_curstackinfo;
375 c->curstack = PL_curstack; 452 c->curstack = PL_curstack;
376 c->mainstack = PL_mainstack; 453 c->mainstack = PL_mainstack;
377 c->stack_sp = PL_stack_sp; 454 c->stack_sp = PL_stack_sp;
378 c->op = PL_op; 455 c->op = PL_op;
379 c->curpad = PL_curpad; 456 c->curpad = PL_curpad;
457 c->comppad = PL_comppad;
458 c->compcv = PL_compcv;
380 c->stack_base = PL_stack_base; 459 c->stack_base = PL_stack_base;
381 c->stack_max = PL_stack_max; 460 c->stack_max = PL_stack_max;
382 c->tmps_stack = PL_tmps_stack; 461 c->tmps_stack = PL_tmps_stack;
383 c->tmps_floor = PL_tmps_floor; 462 c->tmps_floor = PL_tmps_floor;
384 c->tmps_ix = PL_tmps_ix; 463 c->tmps_ix = PL_tmps_ix;
394 c->savestack_max = PL_savestack_max; 473 c->savestack_max = PL_savestack_max;
395 c->retstack = PL_retstack; 474 c->retstack = PL_retstack;
396 c->retstack_ix = PL_retstack_ix; 475 c->retstack_ix = PL_retstack_ix;
397 c->retstack_max = PL_retstack_max; 476 c->retstack_max = PL_retstack_max;
398 c->curcop = PL_curcop; 477 c->curcop = PL_curcop;
478 c->top_env = PL_top_env;
479}
480
481/*
482 * allocate various perl stacks. This is an exact copy
483 * of perl.c:init_stacks, except that it uses less memory
484 * on the (sometimes correct) assumption that coroutines do
485 * not usually need a lot of stackspace.
486 */
487STATIC void
488coro_init_stacks (pTHX)
489{
490 LOCK;
491
492 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
493 PL_curstackinfo->si_type = PERLSI_MAIN;
494 PL_curstack = PL_curstackinfo->si_stack;
495 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
496
497 PL_stack_base = AvARRAY(PL_curstack);
498 PL_stack_sp = PL_stack_base;
499 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
500
501 New(50,PL_tmps_stack,96,SV*);
502 PL_tmps_floor = -1;
503 PL_tmps_ix = -1;
504 PL_tmps_max = 96;
505
506 New(54,PL_markstack,16,I32);
507 PL_markstack_ptr = PL_markstack;
508 PL_markstack_max = PL_markstack + 16;
509
510#ifdef SET_MARK_OFFSET
511 SET_MARK_OFFSET;
512#endif
513
514 New(54,PL_scopestack,16,I32);
515 PL_scopestack_ix = 0;
516 PL_scopestack_max = 16;
517
518 New(54,PL_savestack,96,ANY);
519 PL_savestack_ix = 0;
520 PL_savestack_max = 96;
521
522 New(54,PL_retstack,8,OP*);
523 PL_retstack_ix = 0;
524 PL_retstack_max = 8;
525
526 UNLOCK;
399} 527}
400 528
401/* 529/*
402 * destroy the stacks, the callchain etc... 530 * destroy the stacks, the callchain etc...
403 * still there is a memleak of 128 bytes...
404 */ 531 */
405STATIC void 532STATIC void
406destroy_stacks(pTHX) 533destroy_stacks(pTHX)
407{ 534{
535 if (!IN_DESTRUCT)
536 {
408 /* is this ugly, I ask? */ 537 /* is this ugly, I ask? */
409 while (PL_scopestack_ix) 538 LEAVE_SCOPE (0);
410 LEAVE;
411 539
412 /* sure it is, but more important: is it correct?? :/ */ 540 /* sure it is, but more important: is it correct?? :/ */
413 while (PL_tmps_ix > PL_tmps_floor) /* should only ever be one iteration */
414 FREETMPS; 541 FREETMPS;
542
543 /*POPSTACK_TO (PL_mainstack);*//*D*//*use*/
544 }
415 545
416 while (PL_curstackinfo->si_next) 546 while (PL_curstackinfo->si_next)
417 PL_curstackinfo = PL_curstackinfo->si_next; 547 PL_curstackinfo = PL_curstackinfo->si_next;
418 548
419 while (PL_curstackinfo) 549 while (PL_curstackinfo)
420 { 550 {
421 PERL_SI *p = PL_curstackinfo->si_prev; 551 PERL_SI *p = PL_curstackinfo->si_prev;
422 552
423 { 553 { /*D*//*remove*/
424 dSP; 554 dSP;
425 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack); 555 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
426 PUTBACK; /* possibly superfluous */ 556 PUTBACK; /* possibly superfluous */
427 } 557 }
428 558
429 dounwind(-1); 559 if (!IN_DESTRUCT)
430 560 {
561 dounwind (-1);/*D*//*remove*/
431 SvREFCNT_dec(PL_curstackinfo->si_stack); 562 SvREFCNT_dec (PL_curstackinfo->si_stack);
563 }
564
432 Safefree(PL_curstackinfo->si_cxstack); 565 Safefree (PL_curstackinfo->si_cxstack);
433 Safefree(PL_curstackinfo); 566 Safefree (PL_curstackinfo);
434 PL_curstackinfo = p; 567 PL_curstackinfo = p;
435 } 568 }
436 569
437 Safefree(PL_tmps_stack); 570 Safefree (PL_tmps_stack);
438 Safefree(PL_markstack); 571 Safefree (PL_markstack);
439 Safefree(PL_scopestack); 572 Safefree (PL_scopestack);
440 Safefree(PL_savestack); 573 Safefree (PL_savestack);
441 Safefree(PL_retstack); 574 Safefree (PL_retstack);
575}
576
577static void
578allocate_stack (Coro__State ctx, int alloc)
579{
580 coro_stack *stack;
581
582 New (0, stack, 1, coro_stack);
583
584 stack->refcnt = 1;
585 stack->usecnt = 1;
586 stack->gencnt = ctx->gencnt = 0;
587
588 if (alloc)
589 {
590#if HAVE_MMAP
591 stack->ssize = 16384 * sizeof (long); /* mmap should do allocate-on-write for us */
592 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
593 if (stack->sptr == (void *)-1)
594#endif
595 {
596 /*FIXME*//*D*//* reasonable stack size! */
597 stack->ssize = - (8192 * sizeof (long));
598 New (0, stack->sptr, 8192, long);
599 }
600 }
601 else
602 stack->sptr = 0;
603
604 ctx->stack = stack;
605}
606
607static void
608deallocate_stack (Coro__State ctx)
609{
610 coro_stack *stack = ctx->stack;
611
612 ctx->stack = 0;
613
614 if (stack)
615 {
616 if (!--stack->refcnt)
617 {
618#ifdef HAVE_MMAP
619 if (stack->ssize > 0 && stack->sptr)
620 munmap (stack->sptr, stack->ssize);
621 else
622#endif
623 Safefree (stack->sptr);
624
625 Safefree (stack);
626 }
627 else if (ctx->gencnt == stack->gencnt)
628 --stack->usecnt;
629 }
630}
631
632static void
633setup_coro (void *arg)
634{
635 /*
636 * emulate part of the perl startup here.
637 */
638 dTHX;
639 dSP;
640 Coro__State ctx = (Coro__State)arg;
641 SV *sub_init = (SV *)get_cv (SUB_INIT, FALSE);
642
643 coro_init_stacks (aTHX);
644 /*PL_curcop = 0;*/
645 /*PL_in_eval = PL_in_eval;*/ /* inherit */
646 SvREFCNT_dec (GvAV (PL_defgv));
647 GvAV (PL_defgv) = ctx->args; ctx->args = 0;
648
649 SPAGAIN;
650
651 if (ctx->stack)
652 {
653 ctx->cursp = 0;
654
655 PUSHMARK(SP);
656 PUTBACK;
657 (void) call_sv (sub_init, G_VOID|G_NOARGS|G_EVAL);
658
659 if (SvTRUE (ERRSV))
660 croak (NULL);
661 else
662 croak ("FATAL: CCTXT coroutine returned!");
663 }
664 else
665 {
666 UNOP myop;
667
668 PL_op = (OP *)&myop;
669
670 Zero(&myop, 1, UNOP);
671 myop.op_next = Nullop;
672 myop.op_flags = OPf_WANT_VOID;
673
674 PUSHMARK(SP);
675 XPUSHs (sub_init);
676 /*
677 * the next line is slightly wrong, as PL_op->op_next
678 * is actually being executed so we skip the first op.
679 * that doesn't matter, though, since it is only
680 * pp_nextstate and we never return...
681 * ah yes, and I don't care anyways ;)
682 */
683 PUTBACK;
684 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
685 SPAGAIN;
686
687 ENTER; /* necessary e.g. for dounwind */
688 }
689}
690
691static void
692continue_coro (void *arg)
693{
694 /*
695 * this is a _very_ stripped down perl interpreter ;)
696 */
697 dTHX;
698 Coro__State ctx = (Coro__State)arg;
699 JMPENV coro_start_env;
700
701 PL_top_env = &ctx->start_env;
702
703 ctx->cursp = 0;
704 PL_op = PL_op->op_next;
705 CALLRUNOPS(aTHX);
706
707 abort ();
442} 708}
443 709
444STATIC void 710STATIC void
445transfer(pTHX_ struct coro *prev, struct coro *next, int flags) 711transfer (pTHX_ struct coro *prev, struct coro *next, int flags)
446{ 712{
447 dSP; 713 dSTACKLEVEL;
448 714
449 if (prev != next) 715 if (prev != next)
450 { 716 {
451 /*
452 * this could be done in newprocess which would lead to
453 * extremely elegant and fast (just SAVE/LOAD)
454 * code here, but lazy allocation of stacks has also
455 * some virtues and the overhead of the if() is nil.
456 */
457 if (next->mainstack) 717 if (next->mainstack)
458 { 718 {
719 LOCK;
459 SAVE (prev, flags); 720 SAVE (prev, flags);
460 LOAD (next); 721 LOAD (next);
722 UNLOCK;
723
461 /* mark this state as in-use */ 724 /* mark this state as in-use */
462 next->mainstack = 0; 725 next->mainstack = 0;
463 next->tmps_ix = -2; 726 next->tmps_ix = -2;
727
728 /* stacklevel changed? if yes, grab the stack for us! */
729 if (flags & TRANSFER_SAVE_CCTXT)
730 {
731 if (!prev->stack)
732 allocate_stack (prev, 0);
733 else if (prev->cursp != stacklevel
734 && prev->stack->usecnt > 1)
735 {
736 prev->gencnt = ++prev->stack->gencnt;
737 prev->stack->usecnt = 1;
738 }
739
740 /* has our stack been invalidated? */
741 if (next->stack && next->stack->gencnt != next->gencnt)
742 {
743 deallocate_stack (next);
744 allocate_stack (next, 1);
745 coro_create (&(next->stack->cctx),
746 continue_coro, (void *)next,
747 next->stack->sptr, labs (next->stack->ssize));
748 }
749
750 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
751 prev->cursp = stacklevel;
752 /* don't add any code here */
753 }
754 else
755 next->cursp = stacklevel;
464 } 756 }
465 else if (next->tmps_ix == -2) 757 else if (next->tmps_ix == -2)
466 {
467 croak ("tried to transfer to running coroutine"); 758 croak ("tried to transfer to running coroutine");
468 }
469 else 759 else
470 { 760 {
471 /* 761 LOCK;
472 * emulate part of the perl startup here.
473 */
474 UNOP myop;
475
476 SAVE (prev, -1); /* first get rid of the old state */ 762 SAVE (prev, -1); /* first get rid of the old state */
763 UNLOCK;
477 764
478 init_stacks (); /* from perl.c */ 765 if (flags & TRANSFER_SAVE_CCTXT)
479 SPAGAIN;
480
481 PL_op = (OP *)&myop;
482 /*PL_curcop = 0;*/
483 SvREFCNT_dec (GvAV (PL_defgv));
484 GvAV (PL_defgv) = next->args;
485
486 Zero(&myop, 1, UNOP);
487 myop.op_next = Nullop;
488 myop.op_flags = OPf_WANT_VOID;
489
490 PUSHMARK(SP);
491 XPUSHs ((SV*)get_cv(SUB_INIT, TRUE));
492 /*
493 * the next line is slightly wrong, as PL_op->op_next
494 * is actually being executed so we skip the first op.
495 * that doesn't matter, though, since it is only
496 * pp_nextstate and we never return...
497 * ah yes, and I don't care anyways ;)
498 */ 766 {
499 PUTBACK; 767 if (!prev->stack)
500 PL_op = pp_entersub(aTHX); 768 allocate_stack (prev, 0);
501 SPAGAIN;
502 769
503 ENTER; /* necessary e.g. for dounwind */ 770 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
771 {
772 PL_top_env = &next->start_env;
773
774 setup_coro (next);
775 next->cursp = stacklevel;
776
777 prev->stack->refcnt++;
778 prev->stack->usecnt++;
779 next->stack = prev->stack;
780 next->gencnt = prev->gencnt;
781 }
782 else
783 {
784 assert (!next->stack);
785 allocate_stack (next, 1);
786 coro_create (&(next->stack->cctx),
787 setup_coro, (void *)next,
788 next->stack->sptr, labs (next->stack->ssize));
789 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
790 prev->cursp = stacklevel;
791 /* don't add any code here */
792 }
793 }
794 else
795 {
796 setup_coro (next);
797 next->cursp = stacklevel;
798 }
504 } 799 }
505 } 800 }
801
802 LOCK;
803 if (coro_mortal)
804 {
805 SvREFCNT_dec (coro_mortal);
806 coro_mortal = 0;
807 }
808 UNLOCK;
809}
810
811#define SV_CORO(sv,func) \
812 do { \
813 if (SvROK (sv)) \
814 sv = SvRV (sv); \
815 \
816 if (SvTYPE (sv) == SVt_PVHV) \
817 { \
818 HE *he = hv_fetch_ent ((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \
819 \
820 if (!he) \
821 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \
822 \
823 (sv) = SvRV (HeVAL(he)); \
824 } \
825 \
826 /* must also be changed inside Coro::Cont::yield */ \
827 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \
828 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \
829 \
830 } while(0)
831
832#define SvSTATE(sv) (struct coro *)SvIV (sv)
833
834static void
835api_transfer(pTHX_ SV *prev, SV *next, int flags)
836{
837 SV_CORO (prev, "Coro::transfer");
838 SV_CORO (next, "Coro::transfer");
839
840 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
841}
842
843/** Coro ********************************************************************/
844
845#define PRIO_MAX 3
846#define PRIO_HIGH 1
847#define PRIO_NORMAL 0
848#define PRIO_LOW -1
849#define PRIO_IDLE -3
850#define PRIO_MIN -4
851
852/* for Coro.pm */
853static GV *coro_current, *coro_idle;
854static AV *coro_ready[PRIO_MAX-PRIO_MIN+1];
855static int coro_nready;
856
857static void
858coro_enq (pTHX_ SV *sv)
859{
860 if (SvTYPE (sv) == SVt_PVHV)
861 {
862 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
863 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
864
865 prio = prio > PRIO_MAX ? PRIO_MAX
866 : prio < PRIO_MIN ? PRIO_MIN
867 : prio;
868
869 av_push (coro_ready [prio - PRIO_MIN], sv);
870 coro_nready++;
871
872 return;
873 }
874
875 croak ("Coro::ready tried to enqueue something that is not a coroutine");
876}
877
878static SV *
879coro_deq (pTHX_ int min_prio)
880{
881 int prio = PRIO_MAX - PRIO_MIN;
882
883 min_prio -= PRIO_MIN;
884 if (min_prio < 0)
885 min_prio = 0;
886
887 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; )
888 if (av_len (coro_ready[prio]) >= 0)
889 {
890 coro_nready--;
891 return av_shift (coro_ready[prio]);
892 }
893
894 return 0;
895}
896
897static void
898api_ready (SV *coro)
899{
900 dTHX;
901
902 if (SvROK (coro))
903 coro = SvRV (coro);
904
905 LOCK;
906 coro_enq (aTHX_ SvREFCNT_inc (coro));
907 UNLOCK;
908}
909
910static void
911api_schedule (void)
912{
913 dTHX;
914
915 SV *prev, *next;
916
917 LOCK;
918
919 prev = SvRV (GvSV (coro_current));
920 next = coro_deq (aTHX_ PRIO_MIN);
921
922 if (!next)
923 next = SvREFCNT_inc (SvRV (GvSV (coro_idle)));
924
925 /* free this only after the transfer */
926 coro_mortal = prev;
927 SV_CORO (prev, "Coro::schedule");
928
929 SvRV (GvSV (coro_current)) = next;
930
931 SV_CORO (next, "Coro::schedule");
932
933 UNLOCK;
934
935 transfer (aTHX_ SvSTATE (prev), SvSTATE (next),
936 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
937}
938
939static void
940api_cede (void)
941{
942 dTHX;
943
944 LOCK;
945 coro_enq (aTHX_ SvREFCNT_inc (SvRV (GvSV (coro_current))));
946 UNLOCK;
947
948 api_schedule ();
506} 949}
507 950
508MODULE = Coro::State PACKAGE = Coro::State 951MODULE = Coro::State PACKAGE = Coro::State
509 952
510PROTOTYPES: ENABLE 953PROTOTYPES: ENABLE
511 954
512BOOT: 955BOOT:
956{ /* {} necessary for stoopid perl-5.6.x */
957#ifdef USE_ITHREADS
958 MUTEX_INIT (&coro_mutex);
959#endif
960
961 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1);
962 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1);
513 HV * stash = gv_stashpvn("Coro::State", 10, TRUE); 963 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
514 964
515 newCONSTSUB (stash, "SAVE_DEFAV", newSViv (SAVE_DEFAV)); 965 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV));
516 newCONSTSUB (stash, "SAVE_DEFSV", newSViv (SAVE_DEFSV)); 966 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV));
517 newCONSTSUB (stash, "SAVE_ERRSV", newSViv (SAVE_ERRSV)); 967 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV));
968 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT));
518 969
519 if (!padlist_cache) 970 main_mainstack = PL_mainstack;
520 padlist_cache = newHV (); 971
972 coroapi.ver = CORO_API_VERSION;
973 coroapi.transfer = api_transfer;
974}
521 975
522Coro::State 976Coro::State
523_newprocess(args) 977_newprocess(args)
524 SV * args 978 SV * args
525 PROTOTYPE: $ 979 PROTOTYPE: $
527 Coro__State coro; 981 Coro__State coro;
528 982
529 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV) 983 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV)
530 croak ("Coro::State::_newprocess expects an arrayref"); 984 croak ("Coro::State::_newprocess expects an arrayref");
531 985
532 New (0, coro, 1, struct coro); 986 Newz (0, coro, 1, struct coro);
533 987
534 coro->mainstack = 0; /* actual work is done inside transfer */
535 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 988 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
989 /*coro->mainstack = 0; *//*actual work is done inside transfer */
990 /*coro->stack = 0;*/
991
992 /* same as JMPENV_BOOTSTRAP */
993 /* we might be able to recycle start_env, but safe is safe */
994 /*Zero(&coro->start_env, 1, JMPENV);*/
995 coro->start_env.je_ret = -1;
996 coro->start_env.je_mustcatch = TRUE;
536 997
537 RETVAL = coro; 998 RETVAL = coro;
538 OUTPUT: 999 OUTPUT:
539 RETVAL 1000 RETVAL
540 1001
541void 1002void
542transfer(prev, next, flags = SAVE_DEFAV) 1003transfer(prev, next, flags)
543 Coro::State_or_hashref prev 1004 SV *prev
544 Coro::State_or_hashref next 1005 SV *next
545 int flags 1006 int flags
546 PROTOTYPE: @ 1007 PROTOTYPE: @
547 CODE: 1008 CODE:
548 1009 PUTBACK;
1010 SV_CORO (next, "Coro::transfer");
1011 SV_CORO (prev, "Coro::transfer");
549 transfer (aTHX_ prev, next, flags); 1012 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
1013 SPAGAIN;
550 1014
551void 1015void
552DESTROY(coro) 1016DESTROY(coro)
553 Coro::State coro 1017 Coro::State coro
554 CODE: 1018 CODE:
555 1019
556 if (coro->mainstack) 1020 if (coro->mainstack && coro->mainstack != main_mainstack)
557 { 1021 {
558 struct coro temp; 1022 struct coro temp;
559 1023
1024 PUTBACK;
560 SAVE(aTHX_ (&temp), SAVE_ALL); 1025 SAVE (aTHX_ (&temp), TRANSFER_SAVE_ALL);
561 LOAD(aTHX_ coro); 1026 LOAD (aTHX_ coro);
1027 SPAGAIN;
562 1028
563 destroy_stacks (); 1029 destroy_stacks (aTHX);
564 1030
565 LOAD((&temp)); /* this will get rid of defsv etc.. */ 1031 LOAD ((&temp)); /* this will get rid of defsv etc.. */
1032 SPAGAIN;
1033
1034 coro->mainstack = 0;
566 } 1035 }
567 1036
1037 deallocate_stack (coro);
1038 SvREFCNT_dec (coro->args);
568 Safefree (coro); 1039 Safefree (coro);
569 1040
570void 1041void
571flush() 1042_exit(code)
1043 int code
1044 PROTOTYPE: $
572 CODE: 1045 CODE:
573#ifdef MAY_FLUSH 1046 _exit (code);
574 flush_padlist_cache ();
575#endif
576 1047
577MODULE = Coro::State PACKAGE = Coro::Cont 1048MODULE = Coro::State PACKAGE = Coro::Cont
578 1049
579# this is dirty and should be in it's own .xs 1050# this is slightly dirty (should expose a c-level api)
580 1051
581void 1052void
582result(...) 1053yield(...)
583 PROTOTYPE: @ 1054 PROTOTYPE: @
584 CODE: 1055 CODE:
585 static SV *returnstk; 1056 SV *yieldstack;
586 SV *sv; 1057 SV *sv;
587 AV *defav = GvAV (PL_defgv); 1058 AV *defav = GvAV (PL_defgv);
588 struct coro *prev, *next; 1059 struct coro *prev, *next;
589 1060
590 if (!returnstk) 1061 yieldstack = *hv_fetch (
591 returnstk = SvRV (get_sv ("Coro::Cont::return", FALSE)); 1062 (HV *)SvRV (GvSV (coro_current)),
1063 "yieldstack", sizeof ("yieldstack") - 1,
1064 0
1065 );
592 1066
593 /* set up @_ */ 1067 /* set up @_ -- ugly */
594 av_clear (defav); 1068 av_clear (defav);
595 av_fill (defav, items - 1); 1069 av_fill (defav, items - 1);
596 while (items--) 1070 while (items--)
597 av_store (defav, items, SvREFCNT_inc (ST(items))); 1071 av_store (defav, items, SvREFCNT_inc (ST(items)));
598 1072
599 mg_get (returnstk); /* isn't documentation wrong for mg_get? */
600 sv = av_pop ((AV *)SvRV (returnstk)); 1073 sv = av_pop ((AV *)SvRV (yieldstack));
601 prev = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0))); 1074 prev = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0)));
602 next = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0))); 1075 next = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0)));
603 SvREFCNT_dec (sv); 1076 SvREFCNT_dec (sv);
1077
604 transfer(prev, next, 0); 1078 transfer (aTHX_ prev, next, 0);
605 1079
1080MODULE = Coro::State PACKAGE = Coro
1081
1082# this is slightly dirty (should expose a c-level api)
1083
1084BOOT:
1085{
1086 int i;
1087 HV *stash = gv_stashpv ("Coro", TRUE);
1088
1089 newCONSTSUB (stash, "PRIO_MAX", newSViv (PRIO_MAX));
1090 newCONSTSUB (stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1091 newCONSTSUB (stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1092 newCONSTSUB (stash, "PRIO_LOW", newSViv (PRIO_LOW));
1093 newCONSTSUB (stash, "PRIO_IDLE", newSViv (PRIO_IDLE));
1094 newCONSTSUB (stash, "PRIO_MIN", newSViv (PRIO_MIN));
1095
1096 coro_current = gv_fetchpv ("Coro::current", TRUE, SVt_PV);
1097 coro_idle = gv_fetchpv ("Coro::idle" , TRUE, SVt_PV);
1098
1099 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1100 coro_ready[i] = newAV ();
1101
1102 {
1103 SV *sv = perl_get_sv("Coro::API", 1);
1104
1105 coroapi.schedule = api_schedule;
1106 coroapi.cede = api_cede;
1107 coroapi.ready = api_ready;
1108 coroapi.nready = &coro_nready;
1109 coroapi.current = coro_current;
1110
1111 GCoroAPI = &coroapi;
1112 sv_setiv(sv, (IV)&coroapi);
1113 SvREADONLY_on(sv);
1114 }
1115}
1116
1117#if !PERL_MICRO
1118
1119void
1120ready(self)
1121 SV * self
1122 PROTOTYPE: $
1123 CODE:
1124 api_ready (self);
1125
1126#endif
1127
1128int
1129nready(...)
1130 PROTOTYPE:
1131 CODE:
1132 RETVAL = coro_nready;
1133 OUTPUT:
1134 RETVAL
1135
1136void
1137schedule(...)
1138 PROTOTYPE:
1139 CODE:
1140 api_schedule ();
1141
1142void
1143cede(...)
1144 PROTOTYPE:
1145 CODE:
1146 api_cede ();
1147

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines