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.53 by pcg, Sat Feb 14 12:39:41 2004 UTC vs.
Revision 1.132 by root, Fri Dec 29 13:03:05 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines