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.78 by root, Wed Nov 1 01:21:21 2006 UTC vs.
Revision 1.132 by root, Fri Dec 29 13:03:05 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines