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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines