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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines