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.87 by root, Fri Nov 24 13:40:36 2006 UTC vs.
Revision 1.131 by root, Fri Dec 29 11:37:49 2006 UTC

1#define PERL_NO_GET_CONTEXT
2
3#include "libcoro/coro.c" 1#include "libcoro/coro.c"
4 2
5#include "EXTERN.h" 3#include "EXTERN.h"
6#include "perl.h" 4#include "perl.h"
7#include "XSUB.h" 5#include "XSUB.h"
8 6
9#include "patchlevel.h" 7#include "patchlevel.h"
10 8
11#if PERL_VERSION < 6 9#include <stdio.h>
10#include <errno.h>
11#include <assert.h>
12
13#ifdef HAVE_MMAP
14# include <unistd.h>
15# include <sys/mman.h>
16# ifndef MAP_ANONYMOUS
17# ifdef MAP_ANON
18# define MAP_ANONYMOUS MAP_ANON
19# else
20# undef HAVE_MMAP
21# endif
22# endif
23# include <limits.h>
24# ifndef PAGESIZE
25# define PAGESIZE pagesize
26# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
27static long pagesize;
28# else
29# define BOOT_PAGESIZE (void)0
30# endif
31#else
32# define PAGESIZE 0
33# define BOOT_PAGESIZE (void)0
34#endif
35
36#if USE_VALGRIND
37# include <valgrind/valgrind.h>
38#endif
39
40/* the maximum number of idle cctx that will be pooled */
41#define MAX_IDLE_CCTX 8
42
43#define PERL_VERSION_ATLEAST(a,b,c) \
44 (PERL_REVISION > (a) \
45 || (PERL_REVISION == (a) \
46 && (PERL_VERSION > (b) \
47 || (PERL_VERSION == (b) && PERLSUBVERSION >= (c)))))
48
49#if !PERL_VERSION_ATLEAST (5,6,0)
12# ifndef PL_ppaddr 50# ifndef PL_ppaddr
13# define PL_ppaddr ppaddr 51# define PL_ppaddr ppaddr
14# endif 52# endif
15# ifndef call_sv 53# ifndef call_sv
16# define call_sv perl_call_sv 54# define call_sv perl_call_sv
27# ifndef IS_PADCONST 65# ifndef IS_PADCONST
28# define IS_PADCONST(v) 0 66# define IS_PADCONST(v) 0
29# endif 67# endif
30#endif 68#endif
31 69
32#include <errno.h> 70/* 5.8.7 */
71#ifndef SvRV_set
72# define SvRV_set(s,v) SvRV(s) = (v)
73#endif
33 74
34#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 75#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
35# undef STACKGUARD 76# undef STACKGUARD
36#endif 77#endif
37 78
38#ifndef STACKGUARD 79#ifndef STACKGUARD
39# define STACKGUARD 0 80# define STACKGUARD 0
40#endif 81#endif
41 82
42#ifdef HAVE_MMAP 83/* prefer perl internal functions over our own? */
43# include <unistd.h> 84#ifndef PREFER_PERL_FUNCTIONS
44# include <sys/mman.h> 85# define PREFER_PERL_FUNCTIONS 0
45# ifndef MAP_ANONYMOUS
46# ifdef MAP_ANON
47# define MAP_ANONYMOUS MAP_ANON
48# else
49# undef HAVE_MMAP
50# endif
51# endif 86#endif
52# include <limits.h>
53# ifndef PAGESIZE
54# define PAGESIZE pagesize
55# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
56static long pagesize;
57# else
58# define BOOT_PAGESIZE
59# endif
60#endif
61
62#define SUB_INIT "Coro::State::initialize"
63#define UCORO_STATE "_coro_state"
64 87
65/* The next macro should declare a variable stacklevel that contains and approximation 88/* The next macro should declare a variable stacklevel that contains and approximation
66 * to the current C stack pointer. Its property is that it changes with each call 89 * to the current C stack pointer. Its property is that it changes with each call
67 * and should be unique. */ 90 * and should be unique. */
91#define dSTACKLEVEL int stacklevel
68#define dSTACKLEVEL void *stacklevel = &stacklevel 92#define STACKLEVEL ((void *)&stacklevel)
69 93
70#define IN_DESTRUCT (PL_main_cv == Nullcv) 94#define IN_DESTRUCT (PL_main_cv == Nullcv)
71 95
72#define labs(l) ((l) >= 0 ? (l) : -(l)) 96#if __GNUC__ >= 3
97# define attribute(x) __attribute__(x)
98# define BARRIER __asm__ __volatile__ ("" : : : "memory")
99#else
100# define attribute(x)
101# define BARRIER
102#endif
103
104#define NOINLINE attribute ((noinline))
73 105
74#include "CoroAPI.h" 106#include "CoroAPI.h"
75 107
76#ifdef USE_ITHREADS 108#ifdef USE_ITHREADS
77static perl_mutex coro_mutex; 109static perl_mutex coro_mutex;
80#else 112#else
81# define LOCK (void)0 113# define LOCK (void)0
82# define UNLOCK (void)0 114# define UNLOCK (void)0
83#endif 115#endif
84 116
117struct io_state
118{
119 int errorno;
120 I32 laststype;
121 int laststatval;
122 Stat_t statcache;
123};
124
85static struct CoroAPI coroapi; 125static struct CoroAPI coroapi;
86static AV *main_mainstack; /* used to differentiate between $main and others */ 126static AV *main_mainstack; /* used to differentiate between $main and others */
87static HV *coro_state_stash; 127static HV *coro_state_stash, *coro_stash;
88static SV *ucoro_state_sv;
89static U32 ucoro_state_hash;
90static SV *coro_mortal; /* will be freed after next transfer */ 128static SV *coro_mortal; /* will be freed after next transfer */
91 129
92/* this is actually not only the c stack but also c registers etc... */ 130static struct coro_cctx *cctx_first;
131static int cctx_count, cctx_idle;
132
133/* this is a structure representing a c-level coroutine */
93typedef struct { 134typedef struct coro_cctx {
94 int refcnt; /* pointer reference counter */ 135 struct coro_cctx *next;
95 int usecnt; /* shared by how many coroutines */
96 int gencnt; /* generation counter */
97 136
98 coro_context cctx; 137 /* the stack */
99
100 void *sptr; 138 void *sptr;
101 long ssize; /* positive == mmap, otherwise malloc */ 139 long ssize; /* positive == mmap, otherwise malloc */
102} coro_stack;
103 140
141 /* cpu state */
142 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
143 JMPENV *top_env;
144 coro_context cctx;
145
146 int inuse;
147
148#if USE_VALGRIND
149 int valgrind_id;
150#endif
151} coro_cctx;
152
153enum {
154 CF_RUNNING = 0x0001, /* coroutine is running */
155 CF_READY = 0x0002, /* coroutine is ready */
156 CF_NEW = 0x0004, /* ahs never been switched to */
157};
158
159/* this is a structure representing a perl-level coroutine */
104struct coro { 160struct coro {
105 /* the optional C context */ 161 /* the c coroutine allocated to this perl coroutine, if any */
106 coro_stack *stack; 162 coro_cctx *cctx;
107 void *cursp;
108 int gencnt;
109
110 /* optionally saved, might be zero */
111 AV *defav;
112 SV *defsv;
113 SV *errsv;
114
115 /* saved global state not related to stacks */
116 U8 dowarn;
117 I32 in_eval;
118
119 /* the stacks and related info (callchain etc..) */
120 PERL_SI *curstackinfo;
121 AV *curstack;
122 AV *mainstack;
123 SV **stack_sp;
124 OP *op;
125 SV **curpad;
126 AV *comppad;
127 CV *compcv;
128 SV **stack_base;
129 SV **stack_max;
130 SV **tmps_stack;
131 I32 tmps_floor;
132 I32 tmps_ix;
133 I32 tmps_max;
134 I32 *markstack;
135 I32 *markstack_ptr;
136 I32 *markstack_max;
137 I32 *scopestack;
138 I32 scopestack_ix;
139 I32 scopestack_max;
140 ANY *savestack;
141 I32 savestack_ix;
142 I32 savestack_max;
143 OP **retstack;
144 I32 retstack_ix;
145 I32 retstack_max;
146 PMOP *curpm;
147 COP *curcop;
148 JMPENV *top_env;
149
150 /* coro process data */
151 int prio;
152 163
153 /* data associated with this coroutine (initial args) */ 164 /* data associated with this coroutine (initial args) */
154 AV *args; 165 AV *args;
155 int refcnt; 166 int refcnt;
167 int save; /* CORO_SAVE flags */
168 int flags; /* CF_ flags */
169
170 /* optionally saved, might be zero */
171 AV *defav; /* @_ */
172 SV *defsv; /* $_ */
173 SV *errsv; /* $@ */
174 SV *irssv; /* $/ */
175 SV *irssv_sv; /* real $/ cache */
176
177#define VAR(name,type) type name;
178# include "state.h"
179#undef VAR
180
181 /* coro process data */
182 int prio;
156}; 183};
157 184
158typedef struct coro *Coro__State; 185typedef struct coro *Coro__State;
159typedef struct coro *Coro__State_or_hashref; 186typedef struct coro *Coro__State_or_hashref;
160 187
161static AV * 188static AV *
162coro_clone_padlist (pTHX_ CV *cv) 189coro_clone_padlist (CV *cv)
163{ 190{
164 AV *padlist = CvPADLIST (cv); 191 AV *padlist = CvPADLIST (cv);
165 AV *newpadlist, *newpad; 192 AV *newpadlist, *newpad;
166 193
167 newpadlist = newAV (); 194 newpadlist = newAV ();
168 AvREAL_off (newpadlist); 195 AvREAL_off (newpadlist);
169#if PERL_VERSION < 9 196#if PERL_VERSION_ATLEAST (5,9,0)
197 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
198#else
170 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 199 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
171#else
172 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
173#endif 200#endif
174 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 201 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
175 --AvFILLp (padlist); 202 --AvFILLp (padlist);
176 203
177 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE))); 204 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE)));
179 206
180 return newpadlist; 207 return newpadlist;
181} 208}
182 209
183static void 210static void
184free_padlist (pTHX_ AV *padlist) 211free_padlist (AV *padlist)
185{ 212{
186 /* may be during global destruction */ 213 /* may be during global destruction */
187 if (SvREFCNT (padlist)) 214 if (SvREFCNT (padlist))
188 { 215 {
189 I32 i = AvFILLp (padlist); 216 I32 i = AvFILLp (padlist);
210 AV *padlist; 237 AV *padlist;
211 AV *av = (AV *)mg->mg_obj; 238 AV *av = (AV *)mg->mg_obj;
212 239
213 /* casting is fun. */ 240 /* casting is fun. */
214 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 241 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
215 free_padlist (aTHX_ padlist); 242 free_padlist (padlist);
216 243
217 SvREFCNT_dec (av); 244 SvREFCNT_dec (av);
218 245
219 return 0; 246 return 0;
220} 247}
221 248
222#define PERL_MAGIC_coro PERL_MAGIC_ext 249#define PERL_MAGIC_coro PERL_MAGIC_ext
223 250
224static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 251static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
225 252
253#define CORO_MAGIC(cv) \
254 SvMAGIC (cv) \
255 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \
256 ? SvMAGIC (cv) \
257 : mg_find ((SV *)cv, PERL_MAGIC_coro) \
258 : 0
259
226/* the next two functions merely cache the padlists */ 260/* the next two functions merely cache the padlists */
227static void 261static void
228get_padlist (pTHX_ CV *cv) 262get_padlist (CV *cv)
229{ 263{
230 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 264 MAGIC *mg = CORO_MAGIC (cv);
265 AV *av;
231 266
232 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0) 267 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)
233 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj); 268 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
234 else 269 else
235 { 270 {
236#if 0 271#if PREFER_PERL_FUNCTIONS
237 /* this should work - but it doesn't :( */ 272 /* this is probably cleaner, but also slower? */
238 CV *cp = Perl_cv_clone (aTHX_ cv); 273 CV *cp = Perl_cv_clone (cv);
239 CvPADLIST (cv) = CvPADLIST (cp); 274 CvPADLIST (cv) = CvPADLIST (cp);
240 CvPADLIST (cp) = 0; 275 CvPADLIST (cp) = 0;
241 SvREFCNT_dec (cp); 276 SvREFCNT_dec (cp);
242#else 277#else
243 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 278 CvPADLIST (cv) = coro_clone_padlist (cv);
244#endif 279#endif
245 } 280 }
246} 281}
247 282
248static void 283static void
249put_padlist (pTHX_ CV *cv) 284put_padlist (CV *cv)
250{ 285{
251 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 286 MAGIC *mg = CORO_MAGIC (cv);
287 AV *av;
252 288
253 if (!mg) 289 if (!mg)
254 { 290 {
255 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 291 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
256 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 292 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
257 mg->mg_virtual = &vtbl_coro; 293 mg->mg_virtual = &vtbl_coro;
258 mg->mg_obj = (SV *)newAV (); 294 mg->mg_obj = (SV *)newAV ();
259 } 295 }
260 296
261 av_push ((AV *)mg->mg_obj, (SV *)CvPADLIST (cv)); 297 av = (AV *)mg->mg_obj;
298
299 if (AvFILLp (av) >= AvMAX (av))
300 av_extend (av, AvMAX (av) + 1);
301
302 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
262} 303}
263 304
264#define SB do { 305#define SB do {
265#define SE } while (0) 306#define SE } while (0)
266 307
267#define LOAD(state) load_state(aTHX_ (state));
268#define SAVE(state,flags) save_state(aTHX_ (state),(flags));
269
270#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); (val) = 0; SE 308#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
271 309
272static void 310static void
273load_state(pTHX_ Coro__State c) 311load_perl (Coro__State c)
274{ 312{
275 PL_dowarn = c->dowarn; 313#define VAR(name,type) PL_ ## name = c->name;
276 PL_in_eval = c->in_eval; 314# include "state.h"
277 315#undef VAR
278 PL_curstackinfo = c->curstackinfo;
279 PL_curstack = c->curstack;
280 PL_mainstack = c->mainstack;
281 PL_stack_sp = c->stack_sp;
282 PL_op = c->op;
283 PL_curpad = c->curpad;
284 PL_comppad = c->comppad;
285 PL_compcv = c->compcv;
286 PL_stack_base = c->stack_base;
287 PL_stack_max = c->stack_max;
288 PL_tmps_stack = c->tmps_stack;
289 PL_tmps_floor = c->tmps_floor;
290 PL_tmps_ix = c->tmps_ix;
291 PL_tmps_max = c->tmps_max;
292 PL_markstack = c->markstack;
293 PL_markstack_ptr = c->markstack_ptr;
294 PL_markstack_max = c->markstack_max;
295 PL_scopestack = c->scopestack;
296 PL_scopestack_ix = c->scopestack_ix;
297 PL_scopestack_max = c->scopestack_max;
298 PL_savestack = c->savestack;
299 PL_savestack_ix = c->savestack_ix;
300 PL_savestack_max = c->savestack_max;
301#if PERL_VERSION < 9
302 PL_retstack = c->retstack;
303 PL_retstack_ix = c->retstack_ix;
304 PL_retstack_max = c->retstack_max;
305#endif
306 PL_curpm = c->curpm;
307 PL_curcop = c->curcop;
308 PL_top_env = c->top_env;
309 316
310 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 317 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
311 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 318 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
312 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 319 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
320 if (c->irssv)
321 {
322 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
323 SvREFCNT_dec (c->irssv);
324 else
325 {
326 REPLACE_SV (PL_rs, c->irssv);
327 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
328 sv_setsv (c->irssv_sv, PL_rs);
329 }
330 }
313 331
314 { 332 {
315 dSP; 333 dSP;
316 CV *cv; 334 CV *cv;
317 335
318 /* now do the ugly restore mess */ 336 /* now do the ugly restore mess */
319 while ((cv = (CV *)POPs)) 337 while ((cv = (CV *)POPs))
320 { 338 {
321 AV *padlist = (AV *)POPs;
322
323 if (padlist)
324 {
325 put_padlist (aTHX_ cv); /* mark this padlist as available */ 339 put_padlist (cv); /* mark this padlist as available */
326 CvPADLIST(cv) = padlist; 340 CvDEPTH (cv) = PTR2IV (POPs);
327 } 341 CvPADLIST (cv) = (AV *)POPs;
328
329 ++CvDEPTH(cv);
330 } 342 }
331 343
332 PUTBACK; 344 PUTBACK;
333 } 345 }
334} 346}
335 347
336static void 348static void
337save_state(pTHX_ Coro__State c, int flags) 349save_perl (Coro__State c)
338{ 350{
339 { 351 {
340 dSP; 352 dSP;
341 I32 cxix = cxstack_ix; 353 I32 cxix = cxstack_ix;
342 PERL_CONTEXT *ccstk = cxstack; 354 PERL_CONTEXT *ccstk = cxstack;
345 /* 357 /*
346 * the worst thing you can imagine happens first - we have to save 358 * the worst thing you can imagine happens first - we have to save
347 * (and reinitialize) all cv's in the whole callchain :( 359 * (and reinitialize) all cv's in the whole callchain :(
348 */ 360 */
349 361
362 EXTEND (SP, 3 + 1);
350 PUSHs (Nullsv); 363 PUSHs (Nullsv);
351 /* this loop was inspired by pp_caller */ 364 /* this loop was inspired by pp_caller */
352 for (;;) 365 for (;;)
353 { 366 {
354 while (cxix >= 0) 367 while (cxix >= 0)
355 { 368 {
356 PERL_CONTEXT *cx = &ccstk[cxix--]; 369 PERL_CONTEXT *cx = &ccstk[cxix--];
357 370
358 if (CxTYPE(cx) == CXt_SUB) 371 if (CxTYPE (cx) == CXt_SUB)
359 { 372 {
360 CV *cv = cx->blk_sub.cv; 373 CV *cv = cx->blk_sub.cv;
374
361 if (CvDEPTH(cv)) 375 if (CvDEPTH (cv))
362 { 376 {
363 EXTEND (SP, CvDEPTH(cv)*2); 377 EXTEND (SP, 3);
364
365 while (--CvDEPTH(cv))
366 {
367 /* this tells the restore code to increment CvDEPTH */
368 PUSHs (Nullsv);
369 PUSHs ((SV *)cv);
370 }
371
372 PUSHs ((SV *)CvPADLIST(cv)); 378 PUSHs ((SV *)CvPADLIST (cv));
379 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
373 PUSHs ((SV *)cv); 380 PUSHs ((SV *)cv);
374 381
382 CvDEPTH (cv) = 0;
375 get_padlist (aTHX_ cv); 383 get_padlist (cv);
376 } 384 }
377 } 385 }
378#ifdef CXt_FORMAT
379 else if (CxTYPE(cx) == CXt_FORMAT)
380 {
381 /* I never used formats, so how should I know how these are implemented? */
382 /* my bold guess is as a simple, plain sub... */
383 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats");
384 }
385#endif
386 } 386 }
387 387
388 if (top_si->si_type == PERLSI_MAIN) 388 if (top_si->si_type == PERLSI_MAIN)
389 break; 389 break;
390 390
394 } 394 }
395 395
396 PUTBACK; 396 PUTBACK;
397 } 397 }
398 398
399 c->defav = flags & TRANSFER_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 399 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0;
400 c->defsv = flags & TRANSFER_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 400 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0;
401 c->errsv = flags & TRANSFER_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 401 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0;
402 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0;
402 403
403 c->dowarn = PL_dowarn; 404#define VAR(name,type)c->name = PL_ ## name;
404 c->in_eval = PL_in_eval; 405# include "state.h"
405 406#undef VAR
406 c->curstackinfo = PL_curstackinfo;
407 c->curstack = PL_curstack;
408 c->mainstack = PL_mainstack;
409 c->stack_sp = PL_stack_sp;
410 c->op = PL_op;
411 c->curpad = PL_curpad;
412 c->comppad = PL_comppad;
413 c->compcv = PL_compcv;
414 c->stack_base = PL_stack_base;
415 c->stack_max = PL_stack_max;
416 c->tmps_stack = PL_tmps_stack;
417 c->tmps_floor = PL_tmps_floor;
418 c->tmps_ix = PL_tmps_ix;
419 c->tmps_max = PL_tmps_max;
420 c->markstack = PL_markstack;
421 c->markstack_ptr = PL_markstack_ptr;
422 c->markstack_max = PL_markstack_max;
423 c->scopestack = PL_scopestack;
424 c->scopestack_ix = PL_scopestack_ix;
425 c->scopestack_max = PL_scopestack_max;
426 c->savestack = PL_savestack;
427 c->savestack_ix = PL_savestack_ix;
428 c->savestack_max = PL_savestack_max;
429#if PERL_VERSION < 9
430 c->retstack = PL_retstack;
431 c->retstack_ix = PL_retstack_ix;
432 c->retstack_max = PL_retstack_max;
433#endif
434 c->curpm = PL_curpm;
435 c->curcop = PL_curcop;
436 c->top_env = PL_top_env;
437} 407}
438 408
439/* 409/*
440 * allocate various perl stacks. This is an exact copy 410 * allocate various perl stacks. This is an exact copy
441 * of perl.c:init_stacks, except that it uses less memory 411 * of perl.c:init_stacks, except that it uses less memory
442 * on the (sometimes correct) assumption that coroutines do 412 * on the (sometimes correct) assumption that coroutines do
443 * not usually need a lot of stackspace. 413 * not usually need a lot of stackspace.
444 */ 414 */
415#if PREFER_PERL_FUNCTIONS
416# define coro_init_stacks init_stacks
417#else
445static void 418static void
446coro_init_stacks (pTHX) 419coro_init_stacks ()
447{ 420{
448 LOCK;
449
450 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 421 PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT));
451 PL_curstackinfo->si_type = PERLSI_MAIN; 422 PL_curstackinfo->si_type = PERLSI_MAIN;
452 PL_curstack = PL_curstackinfo->si_stack; 423 PL_curstack = PL_curstackinfo->si_stack;
453 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 424 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
454 425
455 PL_stack_base = AvARRAY(PL_curstack); 426 PL_stack_base = AvARRAY(PL_curstack);
456 PL_stack_sp = PL_stack_base; 427 PL_stack_sp = PL_stack_base;
457 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 428 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
458 429
459 New(50,PL_tmps_stack,96,SV*); 430 New(50,PL_tmps_stack,128,SV*);
460 PL_tmps_floor = -1; 431 PL_tmps_floor = -1;
461 PL_tmps_ix = -1; 432 PL_tmps_ix = -1;
462 PL_tmps_max = 96; 433 PL_tmps_max = 128;
463 434
464 New(54,PL_markstack,16,I32); 435 New(54,PL_markstack,32,I32);
465 PL_markstack_ptr = PL_markstack; 436 PL_markstack_ptr = PL_markstack;
466 PL_markstack_max = PL_markstack + 16; 437 PL_markstack_max = PL_markstack + 32;
467 438
468#ifdef SET_MARK_OFFSET 439#ifdef SET_MARK_OFFSET
469 SET_MARK_OFFSET; 440 SET_MARK_OFFSET;
470#endif 441#endif
471 442
472 New(54,PL_scopestack,16,I32); 443 New(54,PL_scopestack,32,I32);
473 PL_scopestack_ix = 0; 444 PL_scopestack_ix = 0;
474 PL_scopestack_max = 16; 445 PL_scopestack_max = 32;
475 446
476 New(54,PL_savestack,96,ANY); 447 New(54,PL_savestack,64,ANY);
477 PL_savestack_ix = 0; 448 PL_savestack_ix = 0;
478 PL_savestack_max = 96; 449 PL_savestack_max = 64;
479 450
480#if PERL_VERSION < 9 451#if !PERL_VERSION_ATLEAST (5,9,0)
481 New(54,PL_retstack,8,OP*); 452 New(54,PL_retstack,16,OP*);
482 PL_retstack_ix = 0; 453 PL_retstack_ix = 0;
483 PL_retstack_max = 8; 454 PL_retstack_max = 16;
484#endif 455#endif
485
486 UNLOCK;
487} 456}
457#endif
488 458
489/* 459/*
490 * destroy the stacks, the callchain etc... 460 * destroy the stacks, the callchain etc...
491 */ 461 */
492static void 462static void
493destroy_stacks(pTHX) 463coro_destroy_stacks ()
494{ 464{
495 if (!IN_DESTRUCT) 465 if (!IN_DESTRUCT)
496 { 466 {
497 /* is this ugly, I ask? */ 467 /* restore all saved variables and stuff */
498 LEAVE_SCOPE (0); 468 LEAVE_SCOPE (0);
469 assert (PL_tmps_floor == -1);
499 470
500 /* sure it is, but more important: is it correct?? :/ */ 471 /* free all temporaries */
501 FREETMPS; 472 FREETMPS;
473 assert (PL_tmps_ix == -1);
502 474
503 /*POPSTACK_TO (PL_mainstack);*//*D*//*use*/ 475 POPSTACK_TO (PL_mainstack);
504 } 476 }
505 477
506 while (PL_curstackinfo->si_next) 478 while (PL_curstackinfo->si_next)
507 PL_curstackinfo = PL_curstackinfo->si_next; 479 PL_curstackinfo = PL_curstackinfo->si_next;
508 480
509 while (PL_curstackinfo) 481 while (PL_curstackinfo)
510 { 482 {
511 PERL_SI *p = PL_curstackinfo->si_prev; 483 PERL_SI *p = PL_curstackinfo->si_prev;
512 484
513 { /*D*//*remove*/
514 dSP;
515 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
516 PUTBACK; /* possibly superfluous */
517 }
518
519 if (!IN_DESTRUCT) 485 if (!IN_DESTRUCT)
520 {
521 dounwind (-1);/*D*//*remove*/
522 SvREFCNT_dec (PL_curstackinfo->si_stack); 486 SvREFCNT_dec (PL_curstackinfo->si_stack);
523 }
524 487
525 Safefree (PL_curstackinfo->si_cxstack); 488 Safefree (PL_curstackinfo->si_cxstack);
526 Safefree (PL_curstackinfo); 489 Safefree (PL_curstackinfo);
527 PL_curstackinfo = p; 490 PL_curstackinfo = p;
528 } 491 }
529 492
530 Safefree (PL_tmps_stack); 493 Safefree (PL_tmps_stack);
531 Safefree (PL_markstack); 494 Safefree (PL_markstack);
532 Safefree (PL_scopestack); 495 Safefree (PL_scopestack);
533 Safefree (PL_savestack); 496 Safefree (PL_savestack);
534#if PERL_VERSION < 9 497#if !PERL_VERSION_ATLEAST (5,9,0)
535 Safefree (PL_retstack); 498 Safefree (PL_retstack);
536#endif 499#endif
537} 500}
538 501
539static void 502static void
540allocate_stack (Coro__State ctx, int alloc) 503setup_coro (struct coro *coro)
541{
542 coro_stack *stack;
543
544 New (0, stack, 1, coro_stack);
545
546 stack->refcnt = 1;
547 stack->usecnt = 1;
548 stack->gencnt = ctx->gencnt = 0;
549
550 if (alloc)
551 {
552#if HAVE_MMAP
553 stack->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; /* mmap should do allocate-on-write for us */
554 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
555 if (stack->sptr != (void *)-1)
556 {
557# if STACKGUARD
558 mprotect (stack->sptr, STACKGUARD * PAGESIZE, PROT_NONE);
559# endif
560 }
561 else
562#endif
563 {
564 stack->ssize = - (STACKSIZE * (long)sizeof (long));
565 New (0, stack->sptr, STACKSIZE, long);
566 }
567 }
568 else
569 stack->sptr = 0;
570
571 ctx->stack = stack;
572}
573
574static void
575deallocate_stack (Coro__State ctx)
576{
577 coro_stack *stack = ctx->stack;
578
579 ctx->stack = 0;
580
581 if (stack)
582 {
583 if (!--stack->refcnt)
584 {
585#ifdef HAVE_MMAP
586 if (stack->ssize > 0 && stack->sptr)
587 munmap (stack->sptr, stack->ssize);
588 else
589#endif
590 Safefree (stack->sptr);
591
592 Safefree (stack);
593 }
594 else if (ctx->gencnt == stack->gencnt)
595 --stack->usecnt;
596 }
597}
598
599static void
600setup_coro (void *arg)
601{ 504{
602 /* 505 /*
603 * emulate part of the perl startup here. 506 * emulate part of the perl startup here.
604 */ 507 */
605 dTHX; 508
509 coro_init_stacks ();
510
511 PL_curcop = &PL_compiling;
512 PL_in_eval = EVAL_NULL;
513 PL_curpm = 0;
514 PL_localizing = 0;
515 PL_dirty = 0;
516 PL_restartop = 0;
517
518 {
519 dSP;
520 LOGOP myop;
521
522 SvREFCNT_dec (GvAV (PL_defgv));
523 GvAV (PL_defgv) = coro->args; coro->args = 0;
524
525 Zero (&myop, 1, LOGOP);
526 myop.op_next = Nullop;
527 myop.op_flags = OPf_WANT_VOID;
528
529 PUSHMARK (SP);
530 XPUSHs ((SV *)get_cv ("Coro::State::_coro_init", FALSE));
531 PUTBACK;
532 PL_op = (OP *)&myop;
533 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
534 SPAGAIN;
535 }
536
537 ENTER; /* necessary e.g. for dounwind */
538}
539
540static void
541free_coro_mortal ()
542{
543 if (coro_mortal)
544 {
545 SvREFCNT_dec (coro_mortal);
546 coro_mortal = 0;
547 }
548}
549
550/* inject a fake call to Coro::State::_cctx_init into the execution */
551static void NOINLINE
552prepare_cctx (coro_cctx *cctx)
553{
606 dSP; 554 dSP;
607 Coro__State ctx = (Coro__State)arg; 555 LOGOP myop;
608 SV *sub_init = (SV *)get_cv (SUB_INIT, FALSE);
609 556
610 coro_init_stacks (aTHX); 557 Zero (&myop, 1, LOGOP);
611 /*PL_curcop = 0;*/ 558 myop.op_next = PL_op;
612 /*PL_in_eval = PL_in_eval;*/ /* inherit */ 559 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
613 SvREFCNT_dec (GvAV (PL_defgv));
614 GvAV (PL_defgv) = ctx->args; ctx->args = 0;
615 560
561 PUSHMARK (SP);
562 EXTEND (SP, 2);
563 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx))));
564 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
565 PUTBACK;
566 PL_op = (OP *)&myop;
567 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
616 SPAGAIN; 568 SPAGAIN;
617
618 if (ctx->stack)
619 {
620 ctx->cursp = 0;
621
622 PUSHMARK(SP);
623 PUTBACK;
624 (void) call_sv (sub_init, G_VOID|G_NOARGS|G_EVAL);
625
626 if (SvTRUE (ERRSV))
627 croak (NULL);
628 else
629 croak ("FATAL: CCTXT coroutine returned!");
630 }
631 else
632 {
633 UNOP myop;
634
635 Zero(&myop, 1, UNOP);
636 myop.op_next = Nullop;
637 myop.op_flags = OPf_WANT_VOID;
638
639 PL_op = (OP *)&myop;
640
641 PUSHMARK(SP);
642 XPUSHs (sub_init);
643 /*
644 * the next line is slightly wrong, as PL_op->op_next
645 * is actually being executed so we skip the first op.
646 * that doesn't matter, though, since it is only
647 * pp_nextstate and we never return...
648 * ah yes, and I don't care anyways ;)
649 */
650 PUTBACK;
651 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
652 SPAGAIN;
653
654 ENTER; /* necessary e.g. for dounwind */
655 }
656} 569}
657 570
658static void 571static void
659continue_coro (void *arg) 572coro_run (void *arg)
660{ 573{
574 /* coro_run is the alternative tail of transfer(), so unlock here. */
575 UNLOCK;
576
661 /* 577 /*
662 * this is a _very_ stripped down perl interpreter ;) 578 * this is a _very_ stripped down perl interpreter ;)
663 */ 579 */
664 dTHX;
665 Coro__State ctx = (Coro__State)arg;
666
667 PL_top_env = &PL_start_env; 580 PL_top_env = &PL_start_env;
668 581
669 ctx->cursp = 0; 582 /* inject call to cctx_init */
670 PL_op = PL_op->op_next; 583 prepare_cctx ((coro_cctx *)arg);
671 CALLRUNOPS(aTHX);
672 584
585 /* somebody will hit me for both perl_run and PL_restartop */
586 PL_restartop = PL_op;
587 perl_run (PL_curinterp);
588
589 fputs ("FATAL: C coroutine fell over the edge of the world, aborting. Did you call exit in a coroutine?\n", stderr);
673 abort (); 590 abort ();
674} 591}
675 592
593static coro_cctx *
594cctx_new ()
595{
596 coro_cctx *cctx;
597
598 ++cctx_count;
599
600 Newz (0, cctx, 1, coro_cctx);
601
602#if HAVE_MMAP
603
604 cctx->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE;
605 /* mmap supposedly does allocate-on-write for us */
606 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
607
608 if (cctx->sptr == (void *)-1)
609 {
610 perror ("FATAL: unable to mmap stack for coroutine");
611 _exit (EXIT_FAILURE);
612 }
613
614# if STACKGUARD
615 mprotect (cctx->sptr, STACKGUARD * PAGESIZE, PROT_NONE);
616# endif
617
618#else
619
620 cctx->ssize = STACKSIZE * (long)sizeof (long);
621 New (0, cctx->sptr, STACKSIZE, long);
622
623 if (!cctx->sptr)
624 {
625 perror ("FATAL: unable to malloc stack for coroutine");
626 _exit (EXIT_FAILURE);
627 }
628
629#endif
630
631#if USE_VALGRIND
632 cctx->valgrind_id = VALGRIND_STACK_REGISTER (
633 STACKGUARD * PAGESIZE + (char *)cctx->sptr,
634 cctx->ssize + (char *)cctx->sptr
635 );
636#endif
637
638 coro_create (&cctx->cctx, coro_run, (void *)cctx, cctx->sptr, cctx->ssize);
639
640 return cctx;
641}
642
643static void
644cctx_destroy (coro_cctx *cctx)
645{
646 if (!cctx)
647 return;
648
649 --cctx_count;
650
651#if USE_VALGRIND
652 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
653#endif
654
655#if HAVE_MMAP
656 munmap (cctx->sptr, cctx->ssize);
657#else
658 Safefree (cctx->sptr);
659#endif
660
661 Safefree (cctx);
662}
663
664static coro_cctx *
665cctx_get ()
666{
667 coro_cctx *cctx;
668
669 if (cctx_first)
670 {
671 cctx = cctx_first;
672 cctx_first = cctx->next;
673 --cctx_idle;
674 }
675 else
676 {
677 cctx = cctx_new ();
678 PL_op = PL_op->op_next;
679 }
680
681 return cctx;
682}
683
684static void
685cctx_put (coro_cctx *cctx)
686{
687 /* free another cctx if overlimit */
688 if (cctx_idle >= MAX_IDLE_CCTX)
689 {
690 coro_cctx *first = cctx_first;
691 cctx_first = first->next;
692 --cctx_idle;
693
694 assert (!first->inuse);
695 cctx_destroy (first);
696 }
697
698 ++cctx_idle;
699 cctx->next = cctx_first;
700 cctx_first = cctx;
701}
702
676/* never call directly, always through the coro_state_transfer global variable */ 703/* never call directly, always through the coro_state_transfer global variable */
677static void 704static void NOINLINE
678transfer_impl (pTHX_ struct coro *prev, struct coro *next, int flags) 705transfer (struct coro *prev, struct coro *next)
679{ 706{
680 dSTACKLEVEL; 707 dSTACKLEVEL;
681 708
709 /* sometimes transfer is only called to set idle_sp */
710 if (!next)
711 {
712 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
713 assert (((coro_cctx *)prev)->top_env = PL_top_env); /* just for the side effetc when assert is enabled */
714 }
682 if (prev != next) 715 else if (prev != next)
683 { 716 {
684 /* has this coro been created yet? */ 717 coro_cctx *prev__cctx;
685 if (next->mainstack) 718
719 if (prev->flags & CF_NEW)
686 { 720 {
687 LOCK; 721 /* create a new empty context */
688 SAVE (prev, flags); 722 Newz (0, prev->cctx, 1, coro_cctx);
689 LOAD (next); 723 prev->cctx->inuse = 1;
690 UNLOCK; 724 prev->flags &= ~CF_NEW;
691 725 prev->flags |= CF_RUNNING;
692 /* mark this state as in-use */
693 next->mainstack = 0;
694 next->tmps_ix = -2;
695
696 /* stacklevel changed? if yes, grab the stack for us! */
697 if (flags & TRANSFER_SAVE_CCTXT)
698 {
699 if (!prev->stack)
700 allocate_stack (prev, 0);
701 else if (prev->cursp != stacklevel
702 && prev->stack->usecnt > 1)
703 {
704 prev->gencnt = ++prev->stack->gencnt;
705 prev->stack->usecnt = 1;
706 }
707
708 /* has our stack been invalidated? */
709 if (next->stack && next->stack->gencnt != next->gencnt)
710 {
711 deallocate_stack (next);
712 allocate_stack (next, 1);
713 coro_create (&(next->stack->cctx),
714 continue_coro, (void *)next,
715 next->stack->sptr, labs (next->stack->ssize));
716 }
717
718 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
719 prev->cursp = stacklevel;
720 /* don't add any code here */
721 }
722 else
723 next->cursp = stacklevel;
724 } 726 }
725 else if (next->tmps_ix == -2) 727
726 croak ("tried to transfer to running coroutine"); 728 /*TODO: must not croak here */
729 if (!prev->flags & CF_RUNNING)
730 croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states");
731
732 if (next->flags & CF_RUNNING)
733 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
734
735 prev->flags &= ~CF_RUNNING;
736 next->flags |= CF_RUNNING;
737
738 LOCK;
739
740 if (next->flags & CF_NEW)
741 {
742 /* need to start coroutine */
743 next->flags &= ~CF_NEW;
744 /* first get rid of the old state */
745 save_perl (prev);
746 /* setup coroutine call */
747 setup_coro (next);
748 /* need a new stack */
749 assert (!next->cctx);
750 }
727 else 751 else
728 { 752 {
729 LOCK; 753 /* coroutine already started */
730 SAVE (prev, -1); /* first get rid of the old state */ 754 save_perl (prev);
731 UNLOCK; 755 load_perl (next);
732
733 /* create the coroutine for the first time */
734 if (flags & TRANSFER_SAVE_CCTXT)
735 {
736 if (!prev->stack)
737 allocate_stack (prev, 0);
738
739 /* the new coroutine starts with start_env again */
740 PL_top_env = &PL_start_env;
741
742 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
743 {
744 setup_coro (next);
745 next->cursp = stacklevel;
746
747 prev->stack->refcnt++;
748 prev->stack->usecnt++;
749 next->stack = prev->stack;
750 next->gencnt = prev->gencnt;
751 }
752 else
753 {
754 assert (!next->stack);
755 allocate_stack (next, 1);
756 coro_create (&(next->stack->cctx),
757 setup_coro, (void *)next,
758 next->stack->sptr, labs (next->stack->ssize));
759 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
760 prev->cursp = stacklevel;
761 /* don't add any code here */
762 }
763 }
764 else
765 {
766 setup_coro (next);
767 next->cursp = stacklevel;
768 }
769 } 756 }
770 }
771 757
772 LOCK; 758 prev__cctx = prev->cctx;
773 if (coro_mortal) 759
774 { 760 /* possibly "free" the cctx */
775 SvREFCNT_dec (coro_mortal); 761 if (prev__cctx->idle_sp == STACKLEVEL)
762 {
763 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
764 assert (PL_top_env == prev__cctx->top_env);
765
766 prev->cctx = 0;
767
768 cctx_put (prev__cctx);
769 prev__cctx->inuse = 0;
770 }
771
772 if (!next->cctx)
773 {
774 next->cctx = cctx_get ();
775 assert (!next->cctx->inuse);
776 next->cctx->inuse = 1;
777 }
778
779 if (prev__cctx != next->cctx)
780 {
781 prev__cctx->top_env = PL_top_env;
782 PL_top_env = next->cctx->top_env;
783 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
784 }
785
776 coro_mortal = 0; 786 free_coro_mortal ();
777 } 787
778 UNLOCK; 788 UNLOCK;
789 }
779} 790}
780 791
781/* use this function pointer to call the above function */ 792struct transfer_args
782/* this is done to increase chances of the compiler not inlining the call */ 793{
783void (*coro_state_transfer)(pTHX_ struct coro *prev, struct coro *next, int flags) = transfer_impl; 794 struct coro *prev, *next;
795};
784 796
785#define SV_CORO(sv,func) \ 797#define TRANSFER(ta) transfer ((ta).prev, (ta).next)
786 do { \
787 if (SvROK (sv)) \
788 sv = SvRV (sv); \
789 \
790 if (SvTYPE (sv) == SVt_PVHV && SvSTASH (sv) != coro_state_stash) \
791 { \
792 HE *he = hv_fetch_ent ((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \
793 \
794 if (!he) \
795 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \
796 \
797 (sv) = SvRV (HeVAL(he)); \
798 } \
799 \
800 /* must also be changed inside Coro::Cont::yield */ \
801 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \
802 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \
803 \
804 } while(0)
805 798
806static void 799static void
807coro_state_destroy (struct coro *coro) 800coro_state_destroy (struct coro *coro)
808{ 801{
809 if (coro->refcnt--) 802 if (coro->refcnt--)
810 return; 803 return;
811 804
812 if (coro->mainstack && coro->mainstack != main_mainstack) 805 if (coro->mainstack && coro->mainstack != main_mainstack)
813 { 806 {
814 struct coro temp; 807 struct coro temp;
808 Zero (&temp, 1, struct coro);
809 temp.save = CORO_SAVE_ALL;
815 810
816 SAVE (aTHX_ (&temp), TRANSFER_SAVE_ALL); 811 if (coro->flags & CF_RUNNING)
817 LOAD (aTHX_ coro); 812 croak ("FATAL: tried to destroy currently running coroutine");
818 813
814 save_perl (&temp);
815 load_perl (coro);
816
819 destroy_stacks (aTHX); 817 coro_destroy_stacks ();
820 818
821 LOAD ((&temp)); /* this will get rid of defsv etc.. */ 819 load_perl (&temp); /* this will get rid of defsv etc.. */
822 820
823 coro->mainstack = 0; 821 coro->mainstack = 0;
824 } 822 }
825 823
826 deallocate_stack (coro); 824 cctx_destroy (coro->cctx);
827 SvREFCNT_dec (coro->args); 825 SvREFCNT_dec (coro->args);
828 Safefree (coro); 826 Safefree (coro);
829} 827}
830 828
831static int 829static int
832coro_state_clear (SV *sv, MAGIC *mg) 830coro_state_clear (pTHX_ SV *sv, MAGIC *mg)
833{ 831{
834 struct coro *coro = (struct coro *)mg->mg_ptr; 832 struct coro *coro = (struct coro *)mg->mg_ptr;
835 mg->mg_ptr = 0; 833 mg->mg_ptr = 0;
836 834
837 coro_state_destroy (coro); 835 coro_state_destroy (coro);
838 836
839 return 0; 837 return 0;
840} 838}
841 839
842static int 840static int
843coro_state_dup (MAGIC *mg, CLONE_PARAMS *params) 841coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
844{ 842{
845 struct coro *coro = (struct coro *)mg->mg_ptr; 843 struct coro *coro = (struct coro *)mg->mg_ptr;
846 844
847 ++coro->refcnt; 845 ++coro->refcnt;
848 846
849 return 0; 847 return 0;
850} 848}
851 849
852static MGVTBL coro_state_vtbl = { 0, 0, 0, 0, coro_state_clear, 0, coro_state_dup, 0 }; 850static MGVTBL coro_state_vtbl = {
851 0, 0, 0, 0,
852 coro_state_clear,
853 0,
854#ifdef MGf_DUP
855 coro_state_dup,
856#else
857# define MGf_DUP 0
858#endif
859};
853 860
854static struct coro * 861static struct coro *
855SvSTATE (SV *coro) 862SvSTATE (SV *coro)
856{ 863{
857 MAGIC *mg = SvMAGIC (SvROK (coro) ? SvRV (coro) : coro); 864 HV *stash;
865 MAGIC *mg;
866
867 if (SvROK (coro))
868 coro = SvRV (coro);
869
870 stash = SvSTASH (coro);
871 if (stash != coro_stash && stash != coro_state_stash)
872 {
873 /* very slow, but rare, check */
874 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
875 croak ("Coro::State object required");
876 }
877
878 mg = SvMAGIC (coro);
858 assert (mg->mg_type == PERL_MAGIC_ext); 879 assert (mg->mg_type == PERL_MAGIC_ext);
859 return (struct coro *)mg->mg_ptr; 880 return (struct coro *)mg->mg_ptr;
860} 881}
861 882
862static void 883static void
884prepare_transfer (struct transfer_args *ta, SV *prev_sv, SV *next_sv)
885{
886 ta->prev = SvSTATE (prev_sv);
887 ta->next = SvSTATE (next_sv);
888}
889
890static void
863api_transfer (pTHX_ SV *prev, SV *next, int flags) 891api_transfer (SV *prev_sv, SV *next_sv)
864{ 892{
865 SV_CORO (prev, "Coro::transfer"); 893 struct transfer_args ta;
866 SV_CORO (next, "Coro::transfer");
867 894
868 coro_state_transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags); 895 prepare_transfer (&ta, prev_sv, next_sv);
896 TRANSFER (ta);
897}
898
899static int
900api_save (SV *coro_sv, int new_save)
901{
902 struct coro *coro = SvSTATE (coro_sv);
903 int old_save = coro->save;
904
905 if (new_save >= 0)
906 coro->save = new_save;
907
908 return old_save;
869} 909}
870 910
871/** Coro ********************************************************************/ 911/** Coro ********************************************************************/
872 912
873#define PRIO_MAX 3 913#define PRIO_MAX 3
876#define PRIO_LOW -1 916#define PRIO_LOW -1
877#define PRIO_IDLE -3 917#define PRIO_IDLE -3
878#define PRIO_MIN -4 918#define PRIO_MIN -4
879 919
880/* for Coro.pm */ 920/* for Coro.pm */
881static GV *coro_current, *coro_idle; 921static SV *coro_current;
882static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 922static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
883static int coro_nready; 923static int coro_nready;
884 924
885static void 925static void
886coro_enq (pTHX_ SV *sv) 926coro_enq (SV *coro_sv)
887{ 927{
888 int prio;
889
890 if (SvTYPE (sv) != SVt_PVHV)
891 croak ("Coro::ready tried to enqueue something that is not a coroutine");
892
893 {
894 SV *coro = sv;
895 SV_CORO (coro, "omg");
896 prio = SvSTATE (coro)->prio;
897 }
898
899 av_push (coro_ready [prio - PRIO_MIN], sv); 928 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
900 coro_nready++; 929 coro_nready++;
901} 930}
902 931
903static SV * 932static SV *
904coro_deq (pTHX_ int min_prio) 933coro_deq (int min_prio)
905{ 934{
906 int prio = PRIO_MAX - PRIO_MIN; 935 int prio = PRIO_MAX - PRIO_MIN;
907 936
908 min_prio -= PRIO_MIN; 937 min_prio -= PRIO_MIN;
909 if (min_prio < 0) 938 if (min_prio < 0)
917 } 946 }
918 947
919 return 0; 948 return 0;
920} 949}
921 950
922static void 951static int
923api_ready (SV *coro) 952api_ready (SV *coro_sv)
924{ 953{
925 dTHX; 954 struct coro *coro;
926 955
927 if (SvROK (coro)) 956 if (SvROK (coro_sv))
928 coro = SvRV (coro); 957 coro_sv = SvRV (coro_sv);
958
959 coro = SvSTATE (coro_sv);
960
961 if (coro->flags & CF_READY)
962 return 0;
963
964 coro->flags |= CF_READY;
929 965
930 LOCK; 966 LOCK;
931 coro_enq (aTHX_ SvREFCNT_inc (coro)); 967 coro_enq (SvREFCNT_inc (coro_sv));
932 UNLOCK; 968 UNLOCK;
969
970 return 1;
971}
972
973static int
974api_is_ready (SV *coro_sv)
975{
976 return !!(SvSTATE (coro_sv)->flags & CF_READY);
977}
978
979static void
980prepare_schedule (struct transfer_args *ta)
981{
982 SV *prev, *next;
983
984 for (;;)
985 {
986 LOCK;
987 next = coro_deq (PRIO_MIN);
988 UNLOCK;
989
990 if (next)
991 break;
992
993 {
994 dSP;
995
996 ENTER;
997 SAVETMPS;
998
999 PUSHMARK (SP);
1000 PUTBACK;
1001 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1002
1003 FREETMPS;
1004 LEAVE;
1005 }
1006 }
1007
1008 prev = SvRV (coro_current);
1009 SvRV_set (coro_current, next);
1010
1011 /* free this only after the transfer */
1012 LOCK;
1013 free_coro_mortal ();
1014 UNLOCK;
1015 coro_mortal = prev;
1016
1017 assert (!SvROK(prev));//D
1018 assert (!SvROK(next));//D
1019
1020 ta->prev = SvSTATE (prev);
1021 ta->next = SvSTATE (next);
1022
1023 assert (ta->next->flags & CF_READY);
1024 ta->next->flags &= ~CF_READY;
1025}
1026
1027static void
1028prepare_cede (struct transfer_args *ta)
1029{
1030 api_ready (coro_current);
1031 prepare_schedule (ta);
1032}
1033
1034static int
1035prepare_cede_notself (struct transfer_args *ta)
1036{
1037 if (coro_nready)
1038 {
1039 SV *prev = SvRV (coro_current);
1040 prepare_schedule (ta);
1041 api_ready (prev);
1042 return 1;
1043 }
1044 else
1045 return 0;
933} 1046}
934 1047
935static void 1048static void
936api_schedule (void) 1049api_schedule (void)
937{ 1050{
938 dTHX; 1051 struct transfer_args ta;
939 1052
940 SV *prev, *next; 1053 prepare_schedule (&ta);
941 1054 TRANSFER (ta);
942 LOCK;
943
944 prev = SvRV (GvSV (coro_current));
945 next = coro_deq (aTHX_ PRIO_MIN);
946
947 if (!next)
948 next = SvREFCNT_inc (SvRV (GvSV (coro_idle)));
949
950 /* free this only after the transfer */
951 coro_mortal = prev;
952 SV_CORO (prev, "Coro::schedule");
953
954 SvRV (GvSV (coro_current)) = next;
955
956 SV_CORO (next, "Coro::schedule");
957
958 UNLOCK;
959
960 coro_state_transfer (aTHX_ SvSTATE (prev), SvSTATE (next),
961 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
962} 1055}
963 1056
964static void 1057static int
965api_cede (void) 1058api_cede (void)
966{ 1059{
967 dTHX; 1060 struct transfer_args ta;
968 1061
969 LOCK; 1062 prepare_cede (&ta);
970 coro_enq (aTHX_ SvREFCNT_inc (SvRV (GvSV (coro_current))));
971 UNLOCK;
972 1063
973 api_schedule (); 1064 if (ta.prev != ta.next)
1065 {
1066 TRANSFER (ta);
1067 return 1;
1068 }
1069 else
1070 return 0;
1071}
1072
1073static int
1074api_cede_notself (void)
1075{
1076 struct transfer_args ta;
1077
1078 if (prepare_cede_notself (&ta))
1079 {
1080 TRANSFER (ta);
1081 return 1;
1082 }
1083 else
1084 return 0;
974} 1085}
975 1086
976MODULE = Coro::State PACKAGE = Coro::State 1087MODULE = Coro::State PACKAGE = Coro::State
977 1088
978PROTOTYPES: DISABLE 1089PROTOTYPES: DISABLE
979 1090
980BOOT: 1091BOOT:
981{ /* {} necessary for stoopid perl-5.6.x */ 1092{
982#ifdef USE_ITHREADS 1093#ifdef USE_ITHREADS
983 MUTEX_INIT (&coro_mutex); 1094 MUTEX_INIT (&coro_mutex);
984#endif 1095#endif
985 BOOT_PAGESIZE; 1096 BOOT_PAGESIZE;
986 1097
987 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1);
988 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1);
989 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1098 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
990 1099
991 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV)); 1100 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
992 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV)); 1101 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
993 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV)); 1102 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1103 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
994 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT)); 1104 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
995 1105
996 main_mainstack = PL_mainstack; 1106 main_mainstack = PL_mainstack;
997 1107
998 coroapi.ver = CORO_API_VERSION; 1108 coroapi.ver = CORO_API_VERSION;
999 coroapi.transfer = api_transfer; 1109 coroapi.transfer = api_transfer;
1009 HV *hv; 1119 HV *hv;
1010 int i; 1120 int i;
1011 1121
1012 Newz (0, coro, 1, struct coro); 1122 Newz (0, coro, 1, struct coro);
1013 coro->args = newAV (); 1123 coro->args = newAV ();
1014 1124 coro->save = CORO_SAVE_ALL;
1015 for (i = 1; i < items; i++) 1125 coro->flags = CF_NEW;
1016 av_push (coro->args, newSVsv (ST (i)));
1017
1018 /*coro->mainstack = 0; *//*actual work is done inside transfer */
1019 /*coro->stack = 0;*/
1020 1126
1021 hv = newHV (); 1127 hv = newHV ();
1022 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1128 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1023 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1129 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1130
1131 for (i = 1; i < items; i++)
1132 av_push (coro->args, newSVsv (ST (i)));
1024} 1133}
1025 OUTPUT: 1134 OUTPUT:
1026 RETVAL 1135 RETVAL
1027 1136
1137int
1138save (SV *coro, int new_save = -1)
1139 CODE:
1140 RETVAL = api_save (coro, new_save);
1141 OUTPUT:
1142 RETVAL
1143
1028void 1144void
1029transfer(prev, next, flags) 1145_set_stacklevel (...)
1030 SV *prev 1146 ALIAS:
1031 SV *next 1147 Coro::State::transfer = 1
1032 int flags 1148 Coro::schedule = 2
1149 Coro::cede = 3
1150 Coro::cede_notself = 4
1033 CODE: 1151 CODE:
1034 PUTBACK;
1035 SV_CORO (next, "Coro::transfer");
1036 SV_CORO (prev, "Coro::transfer");
1037 coro_state_transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
1038 SPAGAIN;
1039
1040int
1041prio (Coro::State coro, int newprio = 0)
1042 ALIAS:
1043 nice = 1
1044 CODE:
1045{ 1152{
1046 RETVAL = coro->prio; 1153 struct transfer_args ta;
1047 1154
1048 if (items > 1) 1155 switch (ix)
1049 { 1156 {
1157 case 0:
1158 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1159 ta.next = 0;
1160 break;
1161
1162 case 1:
1050 if (ix) 1163 if (items != 2)
1051 newprio += coro->prio; 1164 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1052 1165
1053 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 1166 prepare_transfer (&ta, ST (0), ST (1));
1054 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 1167 break;
1055 1168
1056 coro->prio = newprio; 1169 case 2:
1170 prepare_schedule (&ta);
1171 break;
1172
1173 case 3:
1174 prepare_cede (&ta);
1175 break;
1176
1177 case 4:
1178 if (!prepare_cede_notself (&ta))
1179 XSRETURN_EMPTY;
1180
1181 break;
1057 } 1182 }
1183
1184 BARRIER;
1185 TRANSFER (ta);
1058} 1186}
1059 1187
1060void 1188void
1061_clone_state_from (SV *dst, SV *src) 1189_clone_state_from (SV *dst, SV *src)
1062 CODE: 1190 CODE:
1074 int code 1202 int code
1075 PROTOTYPE: $ 1203 PROTOTYPE: $
1076 CODE: 1204 CODE:
1077 _exit (code); 1205 _exit (code);
1078 1206
1079MODULE = Coro::State PACKAGE = Coro::Cont 1207int
1208cctx_count ()
1209 CODE:
1210 RETVAL = cctx_count;
1211 OUTPUT:
1212 RETVAL
1080 1213
1081void 1214int
1082yield (...) 1215cctx_idle ()
1083 PROTOTYPE: @ 1216 CODE:
1084 CODE: 1217 RETVAL = cctx_idle;
1085 SV *yieldstack; 1218 OUTPUT:
1086 SV *sv; 1219 RETVAL
1087 AV *defav = GvAV (PL_defgv);
1088 struct coro *prev, *next;
1089
1090 yieldstack = *hv_fetch (
1091 (HV *)SvRV (GvSV (coro_current)),
1092 "yieldstack", sizeof ("yieldstack") - 1,
1093 0
1094 );
1095
1096 /* set up @_ -- ugly */
1097 av_clear (defav);
1098 av_fill (defav, items - 1);
1099 while (items--)
1100 av_store (defav, items, SvREFCNT_inc (ST(items)));
1101
1102 sv = av_pop ((AV *)SvRV (yieldstack));
1103 prev = SvSTATE ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0)));
1104 next = SvSTATE ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0)));
1105 SvREFCNT_dec (sv);
1106
1107 coro_state_transfer (aTHX_ prev, next, 0);
1108 1220
1109MODULE = Coro::State PACKAGE = Coro 1221MODULE = Coro::State PACKAGE = Coro
1110 1222
1111BOOT: 1223BOOT:
1112{ 1224{
1113 int i; 1225 int i;
1226
1114 HV *stash = gv_stashpv ("Coro", TRUE); 1227 coro_stash = gv_stashpv ("Coro", TRUE);
1115 1228
1116 newCONSTSUB (stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1229 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1117 newCONSTSUB (stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1230 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1118 newCONSTSUB (stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1231 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1119 newCONSTSUB (stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1232 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1120 newCONSTSUB (stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 1233 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE));
1121 newCONSTSUB (stash, "PRIO_MIN", newSViv (PRIO_MIN)); 1234 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN));
1122 1235
1123 coro_current = gv_fetchpv ("Coro::current", TRUE, SVt_PV); 1236 coro_current = get_sv ("Coro::current", FALSE);
1124 coro_idle = gv_fetchpv ("Coro::idle" , TRUE, SVt_PV); 1237 SvREADONLY_on (coro_current);
1125 1238
1126 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1239 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1127 coro_ready[i] = newAV (); 1240 coro_ready[i] = newAV ();
1128 1241
1129 { 1242 {
1130 SV *sv = perl_get_sv("Coro::API", 1); 1243 SV *sv = perl_get_sv("Coro::API", 1);
1131 1244
1132 coroapi.schedule = api_schedule; 1245 coroapi.schedule = api_schedule;
1246 coroapi.save = api_save;
1133 coroapi.cede = api_cede; 1247 coroapi.cede = api_cede;
1248 coroapi.cede_notself = api_cede_notself;
1134 coroapi.ready = api_ready; 1249 coroapi.ready = api_ready;
1250 coroapi.is_ready = api_is_ready;
1135 coroapi.nready = &coro_nready; 1251 coroapi.nready = &coro_nready;
1136 coroapi.current = coro_current; 1252 coroapi.current = coro_current;
1137 1253
1138 GCoroAPI = &coroapi; 1254 GCoroAPI = &coroapi;
1139 sv_setiv (sv, (IV)&coroapi); 1255 sv_setiv (sv, (IV)&coroapi);
1140 SvREADONLY_on (sv); 1256 SvREADONLY_on (sv);
1141 } 1257 }
1142} 1258}
1143 1259
1144#if !PERL_MICRO
1145
1146void 1260void
1147ready (self) 1261_set_current (SV *current)
1148 SV * self
1149 PROTOTYPE: $ 1262 PROTOTYPE: $
1150 CODE: 1263 CODE:
1151 api_ready (self); 1264 SvREFCNT_dec (SvRV (coro_current));
1265 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
1152 1266
1153#endif 1267int
1268prio (Coro::State coro, int newprio = 0)
1269 ALIAS:
1270 nice = 1
1271 CODE:
1272{
1273 RETVAL = coro->prio;
1274
1275 if (items > 1)
1276 {
1277 if (ix)
1278 newprio = coro->prio - newprio;
1279
1280 if (newprio < PRIO_MIN) newprio = PRIO_MIN;
1281 if (newprio > PRIO_MAX) newprio = PRIO_MAX;
1282
1283 coro->prio = newprio;
1284 }
1285}
1286 OUTPUT:
1287 RETVAL
1288
1289SV *
1290ready (SV *self)
1291 PROTOTYPE: $
1292 CODE:
1293 RETVAL = boolSV (api_ready (self));
1294 OUTPUT:
1295 RETVAL
1296
1297SV *
1298is_ready (SV *self)
1299 PROTOTYPE: $
1300 CODE:
1301 RETVAL = boolSV (api_is_ready (self));
1302 OUTPUT:
1303 RETVAL
1154 1304
1155int 1305int
1156nready (...) 1306nready (...)
1157 PROTOTYPE: 1307 PROTOTYPE:
1158 CODE: 1308 CODE:
1159 RETVAL = coro_nready; 1309 RETVAL = coro_nready;
1160 OUTPUT: 1310 OUTPUT:
1161 RETVAL 1311 RETVAL
1162 1312
1163void 1313MODULE = Coro::State PACKAGE = Coro::AIO
1164schedule (...) 1314
1165 PROTOTYPE: 1315SV *
1316_get_state ()
1166 CODE: 1317 CODE:
1167 api_schedule ();
1168
1169void
1170cede (...)
1171 PROTOTYPE:
1172 CODE:
1173 api_cede ();
1174
1175# and these are hacks
1176SV *
1177_aio_get_state ()
1178 CODE:
1179{ 1318{
1180 struct { 1319 struct io_state *data;
1181 int errorno;
1182 int laststype;
1183 int laststatval;
1184 Stat_t statcache;
1185 } data;
1186 1320
1321 RETVAL = newSV (sizeof (struct io_state));
1322 data = (struct io_state *)SvPVX (RETVAL);
1323 SvCUR_set (RETVAL, sizeof (struct io_state));
1324 SvPOK_only (RETVAL);
1325
1187 data.errorno = errno; 1326 data->errorno = errno;
1188 data.laststype = PL_laststype; 1327 data->laststype = PL_laststype;
1189 data.laststatval = PL_laststatval; 1328 data->laststatval = PL_laststatval;
1190 data.statcache = PL_statcache; 1329 data->statcache = PL_statcache;
1191
1192 RETVAL = newSVpvn ((char *)&data, sizeof data);
1193} 1330}
1194 OUTPUT: 1331 OUTPUT:
1195 RETVAL 1332 RETVAL
1196 1333
1197void 1334void
1198_aio_set_state (char *data_) 1335_set_state (char *data_)
1199 PROTOTYPE: $ 1336 PROTOTYPE: $
1200 CODE: 1337 CODE:
1201{ 1338{
1202 struct { 1339 struct io_state *data = (void *)data_;
1203 int errorno;
1204 int laststype;
1205 int laststatval;
1206 Stat_t statcache;
1207 } *data = (void *)data_;
1208 1340
1209 errno = data->errorno; 1341 errno = data->errorno;
1210 PL_laststype = data->laststype; 1342 PL_laststype = data->laststype;
1211 PL_laststatval = data->laststatval; 1343 PL_laststatval = data->laststatval;
1212 PL_statcache = data->statcache; 1344 PL_statcache = data->statcache;
1213} 1345}
1346

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines