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.106 by root, Mon Nov 27 02:08:55 2006 UTC vs.
Revision 1.211 by root, Wed Oct 10 03:37:58 2007 UTC

1#include "libcoro/coro.c" 1#include "libcoro/coro.c"
2
3#define PERL_NO_GET_CONTEXT
4#define PERL_EXT
2 5
3#include "EXTERN.h" 6#include "EXTERN.h"
4#include "perl.h" 7#include "perl.h"
5#include "XSUB.h" 8#include "XSUB.h"
6 9
7#include "patchlevel.h" 10#include "patchlevel.h"
8 11
9#if USE_VALGRIND
10# include <valgrind/valgrind.h>
11#endif
12
13#define PERL_VERSION_ATLEAST(a,b,c) \
14 (PERL_REVISION > (a) \
15 || (PERL_REVISION == (a) \
16 && (PERL_VERSION > (b) \
17 || (PERL_VERSION == (b) && PERLSUBVERSION >= (c)))))
18
19#if !PERL_VERSION_ATLEAST (5,6,0)
20# ifndef PL_ppaddr
21# define PL_ppaddr ppaddr
22# endif
23# ifndef call_sv
24# define call_sv perl_call_sv
25# endif
26# ifndef get_sv
27# define get_sv perl_get_sv
28# endif
29# ifndef get_cv
30# define get_cv perl_get_cv
31# endif
32# ifndef IS_PADGV
33# define IS_PADGV(v) 0
34# endif
35# ifndef IS_PADCONST
36# define IS_PADCONST(v) 0
37# endif
38#endif
39
40#include <stdio.h> 12#include <stdio.h>
41#include <errno.h> 13#include <errno.h>
42 14#include <assert.h>
43#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 15#include <inttypes.h> /* portable stdint.h */
44# undef STACKGUARD
45#endif
46
47#ifndef STACKGUARD
48# define STACKGUARD 0
49#endif
50 16
51#ifdef HAVE_MMAP 17#ifdef HAVE_MMAP
52# include <unistd.h> 18# include <unistd.h>
53# include <sys/mman.h> 19# include <sys/mman.h>
54# ifndef MAP_ANONYMOUS 20# ifndef MAP_ANONYMOUS
69#else 35#else
70# define PAGESIZE 0 36# define PAGESIZE 0
71# define BOOT_PAGESIZE (void)0 37# define BOOT_PAGESIZE (void)0
72#endif 38#endif
73 39
74/* The next macro should declare a variable stacklevel that contains and approximation 40#if CORO_USE_VALGRIND
75 * to the current C stack pointer. Its property is that it changes with each call 41# include <valgrind/valgrind.h>
76 * and should be unique. */ 42# define REGISTER_STACK(cctx,start,end) (cctx)->valgrind_id = VALGRIND_STACK_REGISTER ((start), (end))
43#else
44# define REGISTER_STACK(cctx,start,end)
45#endif
46
47/* the maximum number of idle cctx that will be pooled */
48#define MAX_IDLE_CCTX 8
49
50#define PERL_VERSION_ATLEAST(a,b,c) \
51 (PERL_REVISION > (a) \
52 || (PERL_REVISION == (a) \
53 && (PERL_VERSION > (b) \
54 || (PERL_VERSION == (b) && PERLSUBVERSION >= (c)))))
55
56#if !PERL_VERSION_ATLEAST (5,6,0)
57# ifndef PL_ppaddr
58# define PL_ppaddr ppaddr
59# endif
60# ifndef call_sv
61# define call_sv perl_call_sv
62# endif
63# ifndef get_sv
64# define get_sv perl_get_sv
65# endif
66# ifndef get_cv
67# define get_cv perl_get_cv
68# endif
69# ifndef IS_PADGV
70# define IS_PADGV(v) 0
71# endif
72# ifndef IS_PADCONST
73# define IS_PADCONST(v) 0
74# endif
75#endif
76
77/* 5.8.7 */
78#ifndef SvRV_set
79# define SvRV_set(s,v) SvRV(s) = (v)
80#endif
81
82/* 5.8.8 */
83#ifndef GV_NOTQUAL
84# define GV_NOTQUAL 0
85#endif
86#ifndef newSV
87# define newSV(l) NEWSV(0,l)
88#endif
89
90#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
91# undef CORO_STACKGUARD
92#endif
93
94#ifndef CORO_STACKGUARD
95# define CORO_STACKGUARD 0
96#endif
97
98/* prefer perl internal functions over our own? */
99#ifndef CORO_PREFER_PERL_FUNCTIONS
100# define CORO_PREFER_PERL_FUNCTIONS 0
101#endif
102
103/* The next macros try to return the current stack pointer, in an as
104 * portable way as possible. */
77#define dSTACKLEVEL int stacklevel 105#define dSTACKLEVEL volatile char stacklevel
78#define STACKLEVEL ((void *)&stacklevel) 106#define STACKLEVEL ((void *)&stacklevel)
79 107
80#define IN_DESTRUCT (PL_main_cv == Nullcv) 108#define IN_DESTRUCT (PL_main_cv == Nullcv)
81 109
82#if __GNUC__ >= 3 110#if __GNUC__ >= 3
83# define attribute(x) __attribute__(x) 111# define attribute(x) __attribute__(x)
112# define BARRIER __asm__ __volatile__ ("" : : : "memory")
113# define expect(expr,value) __builtin_expect ((expr),(value))
84#else 114#else
85# define attribute(x) 115# define attribute(x)
116# define BARRIER
117# define expect(expr,value) (expr)
86#endif 118#endif
119
120#define expect_false(expr) expect ((expr) != 0, 0)
121#define expect_true(expr) expect ((expr) != 0, 1)
87 122
88#define NOINLINE attribute ((noinline)) 123#define NOINLINE attribute ((noinline))
89 124
90#include "CoroAPI.h" 125#include "CoroAPI.h"
91
92#define TRANSFER_SET_STACKLEVEL 0x8bfbfbfb /* magic cookie */
93 126
94#ifdef USE_ITHREADS 127#ifdef USE_ITHREADS
95static perl_mutex coro_mutex; 128static perl_mutex coro_mutex;
96# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0) 129# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0)
97# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0) 130# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0)
98#else 131#else
99# define LOCK (void)0 132# define LOCK (void)0
100# define UNLOCK (void)0 133# define UNLOCK (void)0
101#endif 134#endif
102 135
136#define strpair(const) const, sizeof (const) - 1
137
138/* helper storage struct for Coro::AIO */
139struct io_state
140{
141 int errorno;
142 I32 laststype;
143 int laststatval;
144 Stat_t statcache;
145};
146
147static size_t coro_stacksize = CORO_STACKSIZE;
103static struct CoroAPI coroapi; 148static struct CoroAPI coroapi;
104static AV *main_mainstack; /* used to differentiate between $main and others */ 149static AV *main_mainstack; /* used to differentiate between $main and others */
150static JMPENV *main_top_env;
105static HV *coro_state_stash, *coro_stash; 151static HV *coro_state_stash, *coro_stash;
106static SV *coro_mortal; /* will be freed after next transfer */ 152static SV *coro_mortal; /* will be freed after next transfer */
153
154static GV *irsgv; /* $/ */
155static GV *stdoutgv; /* *STDOUT */
156
157static HV *hv_sig; /* %SIG */
158static SV *sv_diehook;
159static SV *sv_warnhook;
160
161/* async_pool helper stuff */
162static SV *sv_pool_rss;
163static SV *sv_pool_size;
164static AV *av_async_pool;
165
166static struct coro_cctx *cctx_first;
167static int cctx_count, cctx_idle;
168
169enum {
170 CC_MAPPED = 0x01,
171 CC_NOREUSE = 0x02, /* throw this away after tracing */
172 CC_TRACE = 0x04,
173 CC_TRACE_SUB = 0x08, /* trace sub calls */
174 CC_TRACE_LINE = 0x10, /* trace each statement */
175 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE,
176};
107 177
108/* this is a structure representing a c-level coroutine */ 178/* this is a structure representing a c-level coroutine */
109typedef struct coro_cctx { 179typedef struct coro_cctx {
110 struct coro_cctx *next; 180 struct coro_cctx *next;
111 181
112 /* the stack */ 182 /* the stack */
113 void *sptr; 183 void *sptr;
114 long ssize; /* positive == mmap, otherwise malloc */ 184 size_t ssize;
115 185
116 /* cpu state */ 186 /* cpu state */
117 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 187 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
188 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */
118 JMPENV *top_env; 189 JMPENV *top_env;
119 coro_context cctx; 190 coro_context cctx;
120 191
121#if USE_VALGRIND 192#if CORO_USE_VALGRIND
122 int valgrind_id; 193 int valgrind_id;
123#endif 194#endif
195 unsigned char flags;
124} coro_cctx; 196} coro_cctx;
197
198enum {
199 CF_RUNNING = 0x0001, /* coroutine is running */
200 CF_READY = 0x0002, /* coroutine is ready */
201 CF_NEW = 0x0004, /* has never been switched to */
202 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
203};
204
205/* the structure where most of the perl state is stored, overlaid on the cxstack */
206typedef struct {
207 SV *defsv;
208 AV *defav;
209 SV *errsv;
210 SV *irsgv;
211#define VAR(name,type) type name;
212# include "state.h"
213#undef VAR
214} perl_slots;
215
216#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
125 217
126/* this is a structure representing a perl-level coroutine */ 218/* this is a structure representing a perl-level coroutine */
127struct coro { 219struct coro {
128 /* the c coroutine allocated to this perl coroutine, if any */ 220 /* the c coroutine allocated to this perl coroutine, if any */
129 coro_cctx *cctx; 221 coro_cctx *cctx;
130 222
131 /* data associated with this coroutine (initial args) */ 223 /* process data */
132 AV *args;
133 int refcnt;
134
135 /* optionally saved, might be zero */
136 AV *defav;
137 SV *defsv;
138 SV *errsv;
139
140 /* saved global state not related to stacks */
141 U8 dowarn;
142 I32 in_eval;
143
144 /* the stacks and related info (callchain etc..) */
145 PERL_SI *curstackinfo;
146 AV *curstack;
147 AV *mainstack; 224 AV *mainstack;
148 SV **stack_sp; 225 perl_slots *slot; /* basically the saved sp */
149 OP *op; 226
150 SV **curpad; 227 AV *args; /* data associated with this coroutine (initial args) */
151 AV *comppad; 228 int refcnt; /* coroutines are refcounted, yes */
152 CV *compcv; 229 int flags; /* CF_ flags */
153 SV **stack_base; 230 HV *hv; /* the perl hash associated with this coro, if any */
154 SV **stack_max; 231
155 SV **tmps_stack; 232 /* statistics */
156 I32 tmps_floor; 233 int usecount; /* number of transfers to this coro */
157 I32 tmps_ix;
158 I32 tmps_max;
159 I32 *markstack;
160 I32 *markstack_ptr;
161 I32 *markstack_max;
162 I32 *scopestack;
163 I32 scopestack_ix;
164 I32 scopestack_max;
165 ANY *savestack;
166 I32 savestack_ix;
167 I32 savestack_max;
168 OP **retstack;
169 I32 retstack_ix;
170 I32 retstack_max;
171 PMOP *curpm;
172 COP *curcop;
173 234
174 /* coro process data */ 235 /* coro process data */
175 int prio; 236 int prio;
237 SV *throw; /* exception to be thrown */
238
239 /* async_pool */
240 SV *saved_deffh;
241
242 /* linked list */
243 struct coro *next, *prev;
176}; 244};
177 245
178typedef struct coro *Coro__State; 246typedef struct coro *Coro__State;
179typedef struct coro *Coro__State_or_hashref; 247typedef struct coro *Coro__State_or_hashref;
180 248
249/** Coro ********************************************************************/
250
251#define PRIO_MAX 3
252#define PRIO_HIGH 1
253#define PRIO_NORMAL 0
254#define PRIO_LOW -1
255#define PRIO_IDLE -3
256#define PRIO_MIN -4
257
258/* for Coro.pm */
259static SV *coro_current;
260static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
261static int coro_nready;
262static struct coro *coro_first;
263
264/** lowlevel stuff **********************************************************/
265
266static SV *
267coro_get_sv (const char *name, int create)
268{
269#if PERL_VERSION_ATLEAST (5,9,0)
270 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
271 get_sv (name, create);
272#endif
273 return get_sv (name, create);
274}
275
181static AV * 276static AV *
277coro_get_av (const char *name, int create)
278{
279#if PERL_VERSION_ATLEAST (5,9,0)
280 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
281 get_av (name, create);
282#endif
283 return get_av (name, create);
284}
285
286static HV *
287coro_get_hv (const char *name, int create)
288{
289#if PERL_VERSION_ATLEAST (5,9,0)
290 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
291 get_hv (name, create);
292#endif
293 return get_hv (name, create);
294}
295
296static AV *
182coro_clone_padlist (CV *cv) 297coro_clone_padlist (pTHX_ CV *cv)
183{ 298{
184 AV *padlist = CvPADLIST (cv); 299 AV *padlist = CvPADLIST (cv);
185 AV *newpadlist, *newpad; 300 AV *newpadlist, *newpad;
186 301
187 newpadlist = newAV (); 302 newpadlist = newAV ();
199 314
200 return newpadlist; 315 return newpadlist;
201} 316}
202 317
203static void 318static void
204free_padlist (AV *padlist) 319free_padlist (pTHX_ AV *padlist)
205{ 320{
206 /* may be during global destruction */ 321 /* may be during global destruction */
207 if (SvREFCNT (padlist)) 322 if (SvREFCNT (padlist))
208 { 323 {
209 I32 i = AvFILLp (padlist); 324 I32 i = AvFILLp (padlist);
230 AV *padlist; 345 AV *padlist;
231 AV *av = (AV *)mg->mg_obj; 346 AV *av = (AV *)mg->mg_obj;
232 347
233 /* casting is fun. */ 348 /* casting is fun. */
234 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 349 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
235 free_padlist (padlist); 350 free_padlist (aTHX_ padlist);
236 351
237 SvREFCNT_dec (av); 352 SvREFCNT_dec (av);
238 353
239 return 0; 354 return 0;
240} 355}
241 356
242#define PERL_MAGIC_coro PERL_MAGIC_ext 357#define PERL_MAGIC_coro PERL_MAGIC_ext
243 358
244static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 359static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
245 360
361#define CORO_MAGIC(cv) \
362 SvMAGIC (cv) \
363 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \
364 ? SvMAGIC (cv) \
365 : mg_find ((SV *)cv, PERL_MAGIC_coro) \
366 : 0
367
368static struct coro *
369SvSTATE_ (pTHX_ SV *coro)
370{
371 HV *stash;
372 MAGIC *mg;
373
374 if (SvROK (coro))
375 coro = SvRV (coro);
376
377 if (expect_false (SvTYPE (coro) != SVt_PVHV))
378 croak ("Coro::State object required");
379
380 stash = SvSTASH (coro);
381 if (expect_false (stash != coro_stash && stash != coro_state_stash))
382 {
383 /* very slow, but rare, check */
384 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
385 croak ("Coro::State object required");
386 }
387
388 mg = CORO_MAGIC (coro);
389 return (struct coro *)mg->mg_ptr;
390}
391
392#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
393
246/* the next two functions merely cache the padlists */ 394/* the next two functions merely cache the padlists */
247static void 395static void
248get_padlist (CV *cv) 396get_padlist (pTHX_ CV *cv)
249{ 397{
250 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 398 MAGIC *mg = CORO_MAGIC (cv);
399 AV *av;
251 400
252 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0) 401 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
253 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj); 402 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
254 else 403 else
255 { 404 {
256#if 0 405#if CORO_PREFER_PERL_FUNCTIONS
257 /* this is probably cleaner, but also slower? */ 406 /* this is probably cleaner, but also slower? */
258 CV *cp = Perl_cv_clone (cv); 407 CV *cp = Perl_cv_clone (cv);
259 CvPADLIST (cv) = CvPADLIST (cp); 408 CvPADLIST (cv) = CvPADLIST (cp);
260 CvPADLIST (cp) = 0; 409 CvPADLIST (cp) = 0;
261 SvREFCNT_dec (cp); 410 SvREFCNT_dec (cp);
262#else 411#else
263 CvPADLIST (cv) = coro_clone_padlist (cv); 412 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv);
264#endif 413#endif
265 } 414 }
266} 415}
267 416
268static void 417static void
269put_padlist (CV *cv) 418put_padlist (pTHX_ CV *cv)
270{ 419{
271 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 420 MAGIC *mg = CORO_MAGIC (cv);
421 AV *av;
272 422
273 if (!mg) 423 if (expect_false (!mg))
274 { 424 {
275 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 425 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
276 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 426 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
277 mg->mg_virtual = &vtbl_coro; 427 mg->mg_virtual = &vtbl_coro;
278 mg->mg_obj = (SV *)newAV (); 428 mg->mg_obj = (SV *)newAV ();
279 } 429 }
280 430
281 av_push ((AV *)mg->mg_obj, (SV *)CvPADLIST (cv)); 431 av = (AV *)mg->mg_obj;
282}
283 432
284#define SB do { 433 if (expect_false (AvFILLp (av) >= AvMAX (av)))
285#define SE } while (0) 434 av_extend (av, AvMAX (av) + 1);
286 435
287#define LOAD(state) load_state((state)); 436 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
288#define SAVE(state,flags) save_state((state),(flags)); 437}
289 438
290#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); (val) = 0; SE 439/** load & save, init *******************************************************/
291 440
292static void 441static void
293load_state(Coro__State c) 442load_perl (pTHX_ Coro__State c)
294{ 443{
295 PL_dowarn = c->dowarn; 444 perl_slots *slot = c->slot;
296 PL_in_eval = c->in_eval; 445 c->slot = 0;
297 446
298 PL_curstackinfo = c->curstackinfo;
299 PL_curstack = c->curstack;
300 PL_mainstack = c->mainstack; 447 PL_mainstack = c->mainstack;
301 PL_stack_sp = c->stack_sp;
302 PL_op = c->op;
303 PL_curpad = c->curpad;
304 PL_comppad = c->comppad;
305 PL_compcv = c->compcv;
306 PL_stack_base = c->stack_base;
307 PL_stack_max = c->stack_max;
308 PL_tmps_stack = c->tmps_stack;
309 PL_tmps_floor = c->tmps_floor;
310 PL_tmps_ix = c->tmps_ix;
311 PL_tmps_max = c->tmps_max;
312 PL_markstack = c->markstack;
313 PL_markstack_ptr = c->markstack_ptr;
314 PL_markstack_max = c->markstack_max;
315 PL_scopestack = c->scopestack;
316 PL_scopestack_ix = c->scopestack_ix;
317 PL_scopestack_max = c->scopestack_max;
318 PL_savestack = c->savestack;
319 PL_savestack_ix = c->savestack_ix;
320 PL_savestack_max = c->savestack_max;
321#if !PERL_VERSION_ATLEAST (5,9,0)
322 PL_retstack = c->retstack;
323 PL_retstack_ix = c->retstack_ix;
324 PL_retstack_max = c->retstack_max;
325#endif
326 PL_curpm = c->curpm;
327 PL_curcop = c->curcop;
328 448
329 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 449 GvSV (PL_defgv) = slot->defsv;
330 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 450 GvAV (PL_defgv) = slot->defav;
331 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 451 GvSV (PL_errgv) = slot->errsv;
452 GvSV (irsgv) = slot->irsgv;
453
454 #define VAR(name,type) PL_ ## name = slot->name;
455 # include "state.h"
456 #undef VAR
457
458 /*hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);*/
459 /*hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);*/
332 460
333 { 461 {
334 dSP; 462 dSP;
463
335 CV *cv; 464 CV *cv;
336 465
337 /* now do the ugly restore mess */ 466 /* now do the ugly restore mess */
338 while ((cv = (CV *)POPs)) 467 while (expect_true (cv = (CV *)POPs))
339 { 468 {
340 AV *padlist = (AV *)POPs;
341
342 if (padlist)
343 {
344 put_padlist (cv); /* mark this padlist as available */ 469 put_padlist (aTHX_ cv); /* mark this padlist as available */
345 CvPADLIST(cv) = padlist; 470 CvDEPTH (cv) = PTR2IV (POPs);
346 } 471 CvPADLIST (cv) = (AV *)POPs;
347
348 ++CvDEPTH(cv);
349 } 472 }
350 473
351 PUTBACK; 474 PUTBACK;
352 } 475 }
353} 476}
354 477
355static void 478static void
356save_state(Coro__State c, int flags) 479save_perl (pTHX_ Coro__State c)
357{ 480{
358 { 481 {
359 dSP; 482 dSP;
360 I32 cxix = cxstack_ix; 483 I32 cxix = cxstack_ix;
361 PERL_CONTEXT *ccstk = cxstack; 484 PERL_CONTEXT *ccstk = cxstack;
364 /* 487 /*
365 * the worst thing you can imagine happens first - we have to save 488 * the worst thing you can imagine happens first - we have to save
366 * (and reinitialize) all cv's in the whole callchain :( 489 * (and reinitialize) all cv's in the whole callchain :(
367 */ 490 */
368 491
369 PUSHs (Nullsv); 492 XPUSHs (Nullsv);
370 /* this loop was inspired by pp_caller */ 493 /* this loop was inspired by pp_caller */
371 for (;;) 494 for (;;)
372 { 495 {
373 while (cxix >= 0) 496 while (expect_true (cxix >= 0))
374 { 497 {
375 PERL_CONTEXT *cx = &ccstk[cxix--]; 498 PERL_CONTEXT *cx = &ccstk[cxix--];
376 499
377 if (CxTYPE(cx) == CXt_SUB) 500 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
378 { 501 {
379 CV *cv = cx->blk_sub.cv; 502 CV *cv = cx->blk_sub.cv;
503
380 if (CvDEPTH(cv)) 504 if (expect_true (CvDEPTH (cv)))
381 { 505 {
382 EXTEND (SP, CvDEPTH(cv)*2); 506 EXTEND (SP, 3);
383
384 while (--CvDEPTH(cv))
385 {
386 /* this tells the restore code to increment CvDEPTH */
387 PUSHs (Nullsv);
388 PUSHs ((SV *)cv);
389 }
390
391 PUSHs ((SV *)CvPADLIST(cv)); 507 PUSHs ((SV *)CvPADLIST (cv));
508 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
392 PUSHs ((SV *)cv); 509 PUSHs ((SV *)cv);
393 510
511 CvDEPTH (cv) = 0;
394 get_padlist (cv); 512 get_padlist (aTHX_ cv);
395 } 513 }
396 } 514 }
397#ifdef CXt_FORMAT
398 else if (CxTYPE(cx) == CXt_FORMAT)
399 {
400 /* I never used formats, so how should I know how these are implemented? */
401 /* my bold guess is as a simple, plain sub... */
402 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats");
403 }
404#endif
405 } 515 }
406 516
407 if (top_si->si_type == PERLSI_MAIN) 517 if (expect_true (top_si->si_type == PERLSI_MAIN))
408 break; 518 break;
409 519
410 top_si = top_si->si_prev; 520 top_si = top_si->si_prev;
411 ccstk = top_si->si_cxstack; 521 ccstk = top_si->si_cxstack;
412 cxix = top_si->si_cxix; 522 cxix = top_si->si_cxix;
413 } 523 }
414 524
415 PUTBACK; 525 PUTBACK;
416 } 526 }
417 527
418 c->defav = flags & TRANSFER_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 528 /* allocate some space on the context stack for our purposes */
419 c->defsv = flags & TRANSFER_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 529 /* we manually unroll here, as usually 2 slots is enough */
420 c->errsv = flags & TRANSFER_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 530 if (SLOT_COUNT >= 1) CXINC;
531 if (SLOT_COUNT >= 2) CXINC;
532 if (SLOT_COUNT >= 3) CXINC;
533 {
534 int i;
535 for (i = 3; i < SLOT_COUNT; ++i)
536 CXINC;
537 }
538 cxstack_ix -= SLOT_COUNT; /* undo allocation */
421 539
422 c->dowarn = PL_dowarn;
423 c->in_eval = PL_in_eval;
424
425 c->curstackinfo = PL_curstackinfo;
426 c->curstack = PL_curstack;
427 c->mainstack = PL_mainstack; 540 c->mainstack = PL_mainstack;
428 c->stack_sp = PL_stack_sp; 541
429 c->op = PL_op; 542 {
430 c->curpad = PL_curpad; 543 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
431 c->comppad = PL_comppad; 544
432 c->compcv = PL_compcv; 545 slot->defav = GvAV (PL_defgv);
433 c->stack_base = PL_stack_base; 546 slot->defsv = DEFSV;
434 c->stack_max = PL_stack_max; 547 slot->errsv = ERRSV;
435 c->tmps_stack = PL_tmps_stack; 548 slot->irsgv = GvSV (irsgv);
436 c->tmps_floor = PL_tmps_floor; 549
437 c->tmps_ix = PL_tmps_ix; 550 #define VAR(name,type) slot->name = PL_ ## name;
438 c->tmps_max = PL_tmps_max; 551 # include "state.h"
439 c->markstack = PL_markstack; 552 #undef VAR
440 c->markstack_ptr = PL_markstack_ptr; 553 }
441 c->markstack_max = PL_markstack_max;
442 c->scopestack = PL_scopestack;
443 c->scopestack_ix = PL_scopestack_ix;
444 c->scopestack_max = PL_scopestack_max;
445 c->savestack = PL_savestack;
446 c->savestack_ix = PL_savestack_ix;
447 c->savestack_max = PL_savestack_max;
448#if !PERL_VERSION_ATLEAST (5,9,0)
449 c->retstack = PL_retstack;
450 c->retstack_ix = PL_retstack_ix;
451 c->retstack_max = PL_retstack_max;
452#endif
453 c->curpm = PL_curpm;
454 c->curcop = PL_curcop;
455} 554}
456 555
457/* 556/*
458 * allocate various perl stacks. This is an exact copy 557 * allocate various perl stacks. This is an exact copy
459 * of perl.c:init_stacks, except that it uses less memory 558 * of perl.c:init_stacks, except that it uses less memory
460 * on the (sometimes correct) assumption that coroutines do 559 * on the (sometimes correct) assumption that coroutines do
461 * not usually need a lot of stackspace. 560 * not usually need a lot of stackspace.
462 */ 561 */
562#if CORO_PREFER_PERL_FUNCTIONS
563# define coro_init_stacks init_stacks
564#else
463static void 565static void
464coro_init_stacks () 566coro_init_stacks (pTHX)
465{ 567{
466 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 568 PL_curstackinfo = new_stackinfo(32, 8);
467 PL_curstackinfo->si_type = PERLSI_MAIN; 569 PL_curstackinfo->si_type = PERLSI_MAIN;
468 PL_curstack = PL_curstackinfo->si_stack; 570 PL_curstack = PL_curstackinfo->si_stack;
469 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 571 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
470 572
471 PL_stack_base = AvARRAY(PL_curstack); 573 PL_stack_base = AvARRAY(PL_curstack);
472 PL_stack_sp = PL_stack_base; 574 PL_stack_sp = PL_stack_base;
473 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 575 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
474 576
475 New(50,PL_tmps_stack,96,SV*); 577 New(50,PL_tmps_stack,32,SV*);
476 PL_tmps_floor = -1; 578 PL_tmps_floor = -1;
477 PL_tmps_ix = -1; 579 PL_tmps_ix = -1;
478 PL_tmps_max = 96; 580 PL_tmps_max = 32;
479 581
480 New(54,PL_markstack,16,I32); 582 New(54,PL_markstack,16,I32);
481 PL_markstack_ptr = PL_markstack; 583 PL_markstack_ptr = PL_markstack;
482 PL_markstack_max = PL_markstack + 16; 584 PL_markstack_max = PL_markstack + 16;
483 585
484#ifdef SET_MARK_OFFSET 586#ifdef SET_MARK_OFFSET
485 SET_MARK_OFFSET; 587 SET_MARK_OFFSET;
486#endif 588#endif
487 589
488 New(54,PL_scopestack,16,I32); 590 New(54,PL_scopestack,8,I32);
489 PL_scopestack_ix = 0; 591 PL_scopestack_ix = 0;
490 PL_scopestack_max = 16; 592 PL_scopestack_max = 8;
491 593
492 New(54,PL_savestack,96,ANY); 594 New(54,PL_savestack,24,ANY);
493 PL_savestack_ix = 0; 595 PL_savestack_ix = 0;
494 PL_savestack_max = 96; 596 PL_savestack_max = 24;
495 597
496#if !PERL_VERSION_ATLEAST (5,9,0) 598#if !PERL_VERSION_ATLEAST (5,9,0)
497 New(54,PL_retstack,8,OP*); 599 New(54,PL_retstack,4,OP*);
498 PL_retstack_ix = 0; 600 PL_retstack_ix = 0;
499 PL_retstack_max = 8; 601 PL_retstack_max = 4;
500#endif 602#endif
501} 603}
604#endif
502 605
503/* 606/*
504 * destroy the stacks, the callchain etc... 607 * destroy the stacks, the callchain etc...
505 */ 608 */
506static void 609static void
507coro_destroy_stacks () 610coro_destroy_stacks (pTHX)
508{ 611{
509 if (!IN_DESTRUCT)
510 {
511 /* is this ugly, I ask? */
512 LEAVE_SCOPE (0);
513
514 /* sure it is, but more important: is it correct?? :/ */
515 FREETMPS;
516
517 /*POPSTACK_TO (PL_mainstack);*//*D*//*use*/
518 }
519
520 while (PL_curstackinfo->si_next) 612 while (PL_curstackinfo->si_next)
521 PL_curstackinfo = PL_curstackinfo->si_next; 613 PL_curstackinfo = PL_curstackinfo->si_next;
522 614
523 while (PL_curstackinfo) 615 while (PL_curstackinfo)
524 { 616 {
525 PERL_SI *p = PL_curstackinfo->si_prev; 617 PERL_SI *p = PL_curstackinfo->si_prev;
526 618
527 { /*D*//*remove*/
528 dSP;
529 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
530 PUTBACK; /* possibly superfluous */
531 }
532
533 if (!IN_DESTRUCT) 619 if (!IN_DESTRUCT)
534 {
535 dounwind (-1);/*D*//*remove*/
536 SvREFCNT_dec (PL_curstackinfo->si_stack); 620 SvREFCNT_dec (PL_curstackinfo->si_stack);
537 }
538 621
539 Safefree (PL_curstackinfo->si_cxstack); 622 Safefree (PL_curstackinfo->si_cxstack);
540 Safefree (PL_curstackinfo); 623 Safefree (PL_curstackinfo);
541 PL_curstackinfo = p; 624 PL_curstackinfo = p;
542 } 625 }
548#if !PERL_VERSION_ATLEAST (5,9,0) 631#if !PERL_VERSION_ATLEAST (5,9,0)
549 Safefree (PL_retstack); 632 Safefree (PL_retstack);
550#endif 633#endif
551} 634}
552 635
553static void 636static size_t
554setup_coro (struct coro *coro) 637coro_rss (pTHX_ struct coro *coro)
638{
639 size_t rss = sizeof (*coro);
640
641 if (coro->mainstack)
642 {
643 perl_slots tmp_slot;
644 perl_slots *slot;
645
646 if (coro->flags & CF_RUNNING)
647 {
648 slot = &tmp_slot;
649
650 #define VAR(name,type) slot->name = PL_ ## name;
651 # include "state.h"
652 #undef VAR
653 }
654 else
655 slot = coro->slot;
656
657 rss += sizeof (slot->curstackinfo);
658 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
659 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
660 rss += slot->tmps_max * sizeof (SV *);
661 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
662 rss += slot->scopestack_max * sizeof (I32);
663 rss += slot->savestack_max * sizeof (ANY);
664
665#if !PERL_VERSION_ATLEAST (5,9,0)
666 rss += slot->retstack_max * sizeof (OP *);
667#endif
668 }
669
670 return rss;
671}
672
673/** coroutine stack handling ************************************************/
674
675static void
676coro_setup (pTHX_ struct coro *coro)
555{ 677{
556 /* 678 /*
557 * emulate part of the perl startup here. 679 * emulate part of the perl startup here.
558 */ 680 */
559
560 coro_init_stacks (); 681 coro_init_stacks (aTHX);
561 682
683 PL_runops = RUNOPS_DEFAULT;
684 PL_curcop = &PL_compiling;
685 PL_in_eval = EVAL_NULL;
562 PL_curcop = 0; 686 PL_comppad = 0;
563 PL_in_eval = 0;
564 PL_curpm = 0; 687 PL_curpm = 0;
688 PL_curpad = 0;
689 PL_localizing = 0;
690 PL_dirty = 0;
691 PL_restartop = 0;
692 PL_diehook = 0; hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
693 PL_warnhook = 0; hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
694
695 GvSV (PL_defgv) = newSV (0);
696 GvAV (PL_defgv) = coro->args; coro->args = 0;
697 GvSV (PL_errgv) = newSV (0);
698 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
699 PL_rs = newSVsv (GvSV (irsgv));
700 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
565 701
566 { 702 {
567 dSP; 703 dSP;
568 LOGOP myop; 704 LOGOP myop;
569 705
570 /* I have no idea why this is needed, but it is */
571 PUSHMARK (SP);
572
573 SvREFCNT_dec (GvAV (PL_defgv));
574 GvAV (PL_defgv) = coro->args; coro->args = 0;
575
576 Zero (&myop, 1, LOGOP); 706 Zero (&myop, 1, LOGOP);
577 myop.op_next = Nullop; 707 myop.op_next = Nullop;
578 myop.op_flags = OPf_WANT_VOID; 708 myop.op_flags = OPf_WANT_VOID;
579 709
710 PUSHMARK (SP);
711 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
712 PUTBACK;
580 PL_op = (OP *)&myop; 713 PL_op = (OP *)&myop;
581
582 PUSHMARK (SP);
583 XPUSHs ((SV *)get_cv ("Coro::State::coro_init", FALSE));
584 PUTBACK;
585 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 714 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
586 SPAGAIN; 715 SPAGAIN;
587
588 ENTER; /* necessary e.g. for dounwind */
589 } 716 }
590}
591 717
718 /* this newly created coroutine might be run on an existing cctx which most
719 * likely was suspended in set_stacklevel, called from entersub.
720 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
721 * so we ENTER here for symmetry
722 */
723 ENTER;
724}
725
592static void 726static void
727coro_destroy (pTHX_ struct coro *coro)
728{
729 if (!IN_DESTRUCT)
730 {
731 /* restore all saved variables and stuff */
732 LEAVE_SCOPE (0);
733 assert (PL_tmps_floor == -1);
734
735 /* free all temporaries */
736 FREETMPS;
737 assert (PL_tmps_ix == -1);
738
739 /* unwind all extra stacks */
740 POPSTACK_TO (PL_mainstack);
741
742 /* unwind main stack */
743 dounwind (-1);
744 }
745
746 SvREFCNT_dec (GvSV (PL_defgv));
747 SvREFCNT_dec (GvAV (PL_defgv));
748 SvREFCNT_dec (GvSV (PL_errgv));
749 SvREFCNT_dec (PL_defoutgv);
750 SvREFCNT_dec (PL_rs);
751 SvREFCNT_dec (GvSV (irsgv));
752
753 SvREFCNT_dec (PL_diehook);
754 SvREFCNT_dec (PL_warnhook);
755
756 SvREFCNT_dec (coro->saved_deffh);
757 SvREFCNT_dec (coro->throw);
758
759 coro_destroy_stacks (aTHX);
760}
761
762static void
593free_coro_mortal () 763free_coro_mortal (pTHX)
594{ 764{
595 if (coro_mortal) 765 if (expect_true (coro_mortal))
596 { 766 {
597 SvREFCNT_dec (coro_mortal); 767 SvREFCNT_dec (coro_mortal);
598 coro_mortal = 0; 768 coro_mortal = 0;
599 } 769 }
600} 770}
601 771
772static int
773runops_trace (pTHX)
774{
775 COP *oldcop = 0;
776 int oldcxix = -2;
777 struct coro *coro = SvSTATE (coro_current); /* trace cctx is tied to specific coro */
778 coro_cctx *cctx = coro->cctx;
779
780 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
781 {
782 PERL_ASYNC_CHECK ();
783
784 if (cctx->flags & CC_TRACE_ALL)
785 {
786 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB)
787 {
788 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
789 SV **bot, **top;
790 AV *av = newAV (); /* return values */
791 SV **cb;
792 dSP;
793
794 GV *gv = CvGV (cx->blk_sub.cv);
795 SV *fullname = sv_2mortal (newSV (0));
796 if (isGV (gv))
797 gv_efullname3 (fullname, gv, 0);
798
799 bot = PL_stack_base + cx->blk_oldsp + 1;
800 top = cx->blk_gimme == G_ARRAY ? SP + 1
801 : cx->blk_gimme == G_SCALAR ? bot + 1
802 : bot;
803
804 av_extend (av, top - bot);
805 while (bot < top)
806 av_push (av, SvREFCNT_inc (*bot++));
807
808 PL_runops = RUNOPS_DEFAULT;
809 ENTER;
810 SAVETMPS;
811 EXTEND (SP, 3);
812 PUSHMARK (SP);
813 PUSHs (&PL_sv_no);
814 PUSHs (fullname);
815 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
816 PUTBACK;
817 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0);
818 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
819 SPAGAIN;
820 FREETMPS;
821 LEAVE;
822 PL_runops = runops_trace;
823 }
824
825 if (oldcop != PL_curcop)
826 {
827 oldcop = PL_curcop;
828
829 if (PL_curcop != &PL_compiling)
830 {
831 SV **cb;
832
833 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB)
834 {
835 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
836
837 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
838 {
839 runops_proc_t old_runops = PL_runops;
840 dSP;
841 GV *gv = CvGV (cx->blk_sub.cv);
842 SV *fullname = sv_2mortal (newSV (0));
843
844 if (isGV (gv))
845 gv_efullname3 (fullname, gv, 0);
846
847 PL_runops = RUNOPS_DEFAULT;
848 ENTER;
849 SAVETMPS;
850 EXTEND (SP, 3);
851 PUSHMARK (SP);
852 PUSHs (&PL_sv_yes);
853 PUSHs (fullname);
854 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
855 PUTBACK;
856 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0);
857 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
858 SPAGAIN;
859 FREETMPS;
860 LEAVE;
861 PL_runops = runops_trace;
862 }
863
864 oldcxix = cxstack_ix;
865 }
866
867 if (cctx->flags & CC_TRACE_LINE)
868 {
869 dSP;
870
871 PL_runops = RUNOPS_DEFAULT;
872 ENTER;
873 SAVETMPS;
874 EXTEND (SP, 3);
875 PL_runops = RUNOPS_DEFAULT;
876 PUSHMARK (SP);
877 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
878 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
879 PUTBACK;
880 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_line_cb"), 0);
881 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
882 SPAGAIN;
883 FREETMPS;
884 LEAVE;
885 PL_runops = runops_trace;
886 }
887 }
888 }
889 }
890 }
891
892 TAINT_NOT;
893 return 0;
894}
895
896/* inject a fake call to Coro::State::_cctx_init into the execution */
897/* _cctx_init should be careful, as it could be called at almost any time */
898/* during execution of a perl program */
602static void NOINLINE 899static void NOINLINE
603prepare_cctx (coro_cctx *cctx) 900cctx_prepare (pTHX_ coro_cctx *cctx)
604{ 901{
605 dSP; 902 dSP;
606 LOGOP myop; 903 LOGOP myop;
607 904
905 PL_top_env = &PL_start_env;
906
907 if (cctx->flags & CC_TRACE)
908 PL_runops = runops_trace;
909
608 Zero (&myop, 1, LOGOP); 910 Zero (&myop, 1, LOGOP);
609 myop.op_next = PL_op; 911 myop.op_next = PL_op;
610 myop.op_flags = OPf_WANT_VOID; 912 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
611
612 sv_setiv (get_sv ("Coro::State::cctx", FALSE), PTR2IV (cctx));
613 913
614 PUSHMARK (SP); 914 PUSHMARK (SP);
915 EXTEND (SP, 2);
916 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx))));
615 XPUSHs ((SV *)get_cv ("Coro::State::cctx_init", FALSE)); 917 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
616 PUTBACK; 918 PUTBACK;
919 PL_op = (OP *)&myop;
617 PL_restartop = PL_ppaddr[OP_ENTERSUB](aTHX); 920 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
618 SPAGAIN; 921 SPAGAIN;
619} 922}
620 923
924/*
925 * this is a _very_ stripped down perl interpreter ;)
926 */
621static void 927static void
622coro_run (void *arg) 928cctx_run (void *arg)
623{ 929{
930 dTHX;
931
624 /* coro_run is the alternative epilogue of transfer() */ 932 /* cctx_run is the alternative tail of transfer(), so unlock here. */
625 UNLOCK; 933 UNLOCK;
626 934
935 /* we now skip the entersub that lead to transfer() */
936 PL_op = PL_op->op_next;
937
938 /* inject a fake subroutine call to cctx_init */
939 cctx_prepare (aTHX_ (coro_cctx *)arg);
940
941 /* somebody or something will hit me for both perl_run and PL_restartop */
942 PL_restartop = PL_op;
943 perl_run (PL_curinterp);
944
627 /* 945 /*
628 * this is a _very_ stripped down perl interpreter ;) 946 * If perl-run returns we assume exit() was being called or the coro
947 * fell off the end, which seems to be the only valid (non-bug)
948 * reason for perl_run to return. We try to exit by jumping to the
949 * bootstrap-time "top" top_env, as we cannot restore the "main"
950 * coroutine as Coro has no such concept
629 */ 951 */
630 PL_top_env = &PL_start_env; 952 PL_top_env = main_top_env;
631 /* inject call to cctx_init */ 953 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
632 prepare_cctx ((coro_cctx *)arg);
633
634 /* somebody will hit me for both perl_run and PL_restartop */
635 perl_run (PL_curinterp);
636
637 fputs ("FATAL: C coroutine fell over the edge of the world, aborting. Did you call exit in a coroutine?\n", stderr);
638 abort ();
639} 954}
640 955
641static coro_cctx * 956static coro_cctx *
642cctx_new () 957cctx_new ()
643{ 958{
644 coro_cctx *cctx; 959 coro_cctx *cctx;
960 void *stack_start;
961 size_t stack_size;
645 962
963 ++cctx_count;
964
646 New (0, cctx, 1, coro_cctx); 965 Newz (0, cctx, 1, coro_cctx);
647 966
648#if HAVE_MMAP 967#if HAVE_MMAP
649
650 cctx->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; 968 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
651 /* mmap suppsedly does allocate-on-write for us */ 969 /* mmap supposedly does allocate-on-write for us */
652 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 970 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
653 971
654 if (cctx->sptr == (void *)-1) 972 if (cctx->sptr != (void *)-1)
655 {
656 perror ("FATAL: unable to mmap stack for coroutine");
657 _exit (EXIT_FAILURE);
658 } 973 {
659
660# if STACKGUARD 974# if CORO_STACKGUARD
661 mprotect (cctx->sptr, STACKGUARD * PAGESIZE, PROT_NONE); 975 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
662# endif 976# endif
977 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr;
978 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
979 cctx->flags |= CC_MAPPED;
980 }
981 else
982#endif
983 {
984 cctx->ssize = coro_stacksize * (long)sizeof (long);
985 New (0, cctx->sptr, coro_stacksize, long);
663 986
664#else
665
666 cctx->ssize = STACKSIZE * (long)sizeof (long);
667 New (0, cctx->sptr, STACKSIZE, long);
668
669 if (!cctx->sptr) 987 if (!cctx->sptr)
670 { 988 {
671 perror ("FATAL: unable to malloc stack for coroutine"); 989 perror ("FATAL: unable to allocate stack for coroutine");
672 _exit (EXIT_FAILURE); 990 _exit (EXIT_FAILURE);
673 } 991 }
674 992
675#endif 993 stack_start = cctx->sptr;
994 stack_size = cctx->ssize;
995 }
676 996
677#if USE_VALGRIND 997 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
678 cctx->valgrind_id = VALGRIND_STACK_REGISTER ( 998 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
679 STACKGUARD * PAGESIZE + (char *)cctx->sptr,
680 cctx->ssize + (char *)cctx->sptr
681 );
682#endif
683
684 coro_create (&cctx->cctx, coro_run, (void *)cctx, cctx->sptr, cctx->ssize);
685 999
686 return cctx; 1000 return cctx;
687} 1001}
688 1002
689static void 1003static void
690cctx_free (coro_cctx *cctx) 1004cctx_destroy (coro_cctx *cctx)
691{ 1005{
692 if (!cctx) 1006 if (!cctx)
693 return; 1007 return;
694 1008
1009 --cctx_count;
1010
695#if USE_VALGRIND 1011#if CORO_USE_VALGRIND
696 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1012 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
697#endif 1013#endif
698 1014
699#if HAVE_MMAP 1015#if HAVE_MMAP
1016 if (cctx->flags & CC_MAPPED)
700 munmap (cctx->sptr, cctx->ssize); 1017 munmap (cctx->sptr, cctx->ssize);
701#else 1018 else
1019#endif
702 Safefree (cctx->sptr); 1020 Safefree (cctx->sptr);
703#endif
704 1021
705 Safefree (cctx); 1022 Safefree (cctx);
706} 1023}
707 1024
708static coro_cctx *cctx_first; 1025/* wether this cctx should be destructed */
709static int cctx_count, cctx_idle; 1026#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
710 1027
711static coro_cctx * 1028static coro_cctx *
712cctx_get () 1029cctx_get (pTHX)
713{ 1030{
714 coro_cctx *cctx; 1031 while (expect_true (cctx_first))
715
716 if (cctx_first)
717 { 1032 {
1033 coro_cctx *cctx = cctx_first;
1034 cctx_first = cctx->next;
718 --cctx_idle; 1035 --cctx_idle;
719 cctx = cctx_first; 1036
720 cctx_first = cctx->next; 1037 if (expect_true (!CCTX_EXPIRED (cctx)))
721 } 1038 return cctx;
722 else 1039
723 { 1040 cctx_destroy (cctx);
724 ++cctx_count;
725 cctx = cctx_new ();
726 PL_op = PL_op->op_next;
727 } 1041 }
728 1042
729 return cctx; 1043 return cctx_new ();
730} 1044}
731 1045
732static void 1046static void
733cctx_put (coro_cctx *cctx) 1047cctx_put (coro_cctx *cctx)
734{ 1048{
1049 /* free another cctx if overlimit */
1050 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
1051 {
1052 coro_cctx *first = cctx_first;
1053 cctx_first = first->next;
1054 --cctx_idle;
1055
1056 cctx_destroy (first);
1057 }
1058
735 ++cctx_idle; 1059 ++cctx_idle;
736 cctx->next = cctx_first; 1060 cctx->next = cctx_first;
737 cctx_first = cctx; 1061 cctx_first = cctx;
738} 1062}
739 1063
740/* never call directly, always through the coro_state_transfer global variable */ 1064/** coroutine switching *****************************************************/
1065
1066static void
1067transfer_check (pTHX_ struct coro *prev, struct coro *next)
1068{
1069 if (expect_true (prev != next))
1070 {
1071 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1072 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
1073
1074 if (expect_false (next->flags & CF_RUNNING))
1075 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
1076
1077 if (expect_false (next->flags & CF_DESTROYED))
1078 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
1079
1080 if (
1081#if PERL_VERSION_ATLEAST (5,9,0)
1082 expect_false (PL_parser)
1083#else
1084 expect_false (PL_lex_state != LEX_NOTPARSING)
1085#endif
1086 )
1087 croak ("Coro::State::transfer called while parsing, but this is not supported");
1088 }
1089}
1090
1091/* always use the TRANSFER macro */
741static void NOINLINE 1092static void NOINLINE
742transfer (struct coro *prev, struct coro *next, int flags) 1093transfer (pTHX_ struct coro *prev, struct coro *next)
743{ 1094{
744 dSTACKLEVEL; 1095 dSTACKLEVEL;
745 1096
746 /* sometimes transfer is only called to set idle_sp */ 1097 /* sometimes transfer is only called to set idle_sp */
747 if (flags == TRANSFER_SET_STACKLEVEL) 1098 if (expect_false (!next))
1099 {
748 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1100 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1101 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1102 }
749 else if (prev != next) 1103 else if (expect_true (prev != next))
750 { 1104 {
751 coro_cctx *prev__cctx; 1105 coro_cctx *prev__cctx;
752 1106
1107 if (expect_false (prev->flags & CF_NEW))
1108 {
1109 /* create a new empty context */
1110 Newz (0, prev->cctx, 1, coro_cctx);
1111 prev->flags &= ~CF_NEW;
1112 prev->flags |= CF_RUNNING;
1113 }
1114
1115 prev->flags &= ~CF_RUNNING;
1116 next->flags |= CF_RUNNING;
1117
753 LOCK; 1118 LOCK;
754 1119
755 if (next->mainstack) 1120 if (expect_false (next->flags & CF_NEW))
756 { 1121 {
757 /* coroutine already started */ 1122 /* need to start coroutine */
758 SAVE (prev, flags); 1123 next->flags &= ~CF_NEW;
759 LOAD (next); 1124 /* first get rid of the old state */
1125 save_perl (aTHX_ prev);
1126 /* setup coroutine call */
1127 coro_setup (aTHX_ next);
760 } 1128 }
761 else 1129 else
762 { 1130 {
763 /* need to start coroutine */ 1131 /* coroutine already started */
764 /* first get rid of the old state */ 1132 save_perl (aTHX_ prev);
765 SAVE (prev, -1); 1133 load_perl (aTHX_ next);
766 /* setup coroutine call */
767 setup_coro (next);
768 /* need a stack */
769 next->cctx = 0;
770 } 1134 }
771 1135
772 if (!prev->cctx)
773 /* create a new empty context */
774 Newz (0, prev->cctx, 1, coro_cctx);
775
776 prev__cctx = prev->cctx; 1136 prev__cctx = prev->cctx;
777 1137
778 /* possibly "free" the cctx */ 1138 /* possibly "free" the cctx */
779 if (prev__cctx->idle_sp == STACKLEVEL) 1139 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
780 { 1140 {
1141 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1142 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1143
1144 prev->cctx = 0;
1145
1146 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1147 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1148 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1149 if (!next->cctx)
1150 next->cctx = cctx_get (aTHX);
1151
781 cctx_put (prev__cctx); 1152 cctx_put (prev__cctx);
782 prev->cctx = 0;
783 } 1153 }
784 1154
1155 ++next->usecount;
1156
785 if (!next->cctx) 1157 if (expect_true (!next->cctx))
786 next->cctx = cctx_get (); 1158 next->cctx = cctx_get (aTHX);
787 1159
788 if (prev__cctx != next->cctx) 1160 if (expect_false (prev__cctx != next->cctx))
789 { 1161 {
790 prev__cctx->top_env = PL_top_env; 1162 prev__cctx->top_env = PL_top_env;
791 PL_top_env = next->cctx->top_env; 1163 PL_top_env = next->cctx->top_env;
792 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1164 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
793 } 1165 }
794 1166
795 free_coro_mortal (); 1167 free_coro_mortal (aTHX);
796
797 UNLOCK; 1168 UNLOCK;
1169
1170 if (expect_false (prev->throw || next->throw))
1171 {
1172 struct coro *coro = SvSTATE (coro_current);
1173
1174 if (coro->throw)
1175 {
1176 SV *exception = coro->throw;
1177 coro->throw = 0;
1178 sv_setsv (ERRSV, exception);
1179 croak (0);
1180 }
1181 }
798 } 1182 }
799} 1183}
800 1184
801struct transfer_args 1185struct transfer_args
802{ 1186{
803 struct coro *prev, *next; 1187 struct coro *prev, *next;
804 int flags;
805}; 1188};
806 1189
807#define TRANSFER(ta) transfer ((ta).prev, (ta).next, (ta).flags) 1190#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next)
1191#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
808 1192
1193/** high level stuff ********************************************************/
1194
809static void 1195static int
810coro_state_destroy (struct coro *coro) 1196coro_state_destroy (pTHX_ struct coro *coro)
811{ 1197{
812 if (coro->refcnt--) 1198 if (coro->flags & CF_DESTROYED)
813 return; 1199 return 0;
1200
1201 coro->flags |= CF_DESTROYED;
1202
1203 if (coro->flags & CF_READY)
1204 {
1205 /* reduce nready, as destroying a ready coro effectively unreadies it */
1206 /* alternative: look through all ready queues and remove the coro */
1207 LOCK;
1208 --coro_nready;
1209 UNLOCK;
1210 }
1211 else
1212 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
814 1213
815 if (coro->mainstack && coro->mainstack != main_mainstack) 1214 if (coro->mainstack && coro->mainstack != main_mainstack)
816 { 1215 {
817 struct coro temp; 1216 struct coro temp;
818 1217
819 SAVE ((&temp), TRANSFER_SAVE_ALL); 1218 if (coro->flags & CF_RUNNING)
820 LOAD (coro); 1219 croak ("FATAL: tried to destroy currently running coroutine");
821 1220
822 coro_destroy_stacks (); 1221 save_perl (aTHX_ &temp);
1222 load_perl (aTHX_ coro);
823 1223
824 LOAD ((&temp)); /* this will get rid of defsv etc.. */ 1224 coro_destroy (aTHX_ coro);
825 1225
1226 load_perl (aTHX_ &temp);
1227
826 coro->mainstack = 0; 1228 coro->slot = 0;
827 } 1229 }
828 1230
829 cctx_free (coro->cctx); 1231 cctx_destroy (coro->cctx);
830 SvREFCNT_dec (coro->args); 1232 SvREFCNT_dec (coro->args);
831 Safefree (coro); 1233
1234 if (coro->next) coro->next->prev = coro->prev;
1235 if (coro->prev) coro->prev->next = coro->next;
1236 if (coro == coro_first) coro_first = coro->next;
1237
1238 return 1;
832} 1239}
833 1240
834static int 1241static int
835coro_state_clear (pTHX_ SV *sv, MAGIC *mg) 1242coro_state_free (pTHX_ SV *sv, MAGIC *mg)
836{ 1243{
837 struct coro *coro = (struct coro *)mg->mg_ptr; 1244 struct coro *coro = (struct coro *)mg->mg_ptr;
838 mg->mg_ptr = 0; 1245 mg->mg_ptr = 0;
839 1246
1247 coro->hv = 0;
1248
1249 if (--coro->refcnt < 0)
1250 {
840 coro_state_destroy (coro); 1251 coro_state_destroy (aTHX_ coro);
1252 Safefree (coro);
1253 }
841 1254
842 return 0; 1255 return 0;
843} 1256}
844 1257
845static int 1258static int
852 return 0; 1265 return 0;
853} 1266}
854 1267
855static MGVTBL coro_state_vtbl = { 1268static MGVTBL coro_state_vtbl = {
856 0, 0, 0, 0, 1269 0, 0, 0, 0,
857 coro_state_clear, 1270 coro_state_free,
858 0, 1271 0,
859#ifdef MGf_DUP 1272#ifdef MGf_DUP
860 coro_state_dup, 1273 coro_state_dup,
861#else 1274#else
862# define MGf_DUP 0 1275# define MGf_DUP 0
863#endif 1276#endif
864}; 1277};
865 1278
866static struct coro *
867SvSTATE (SV *coro)
868{
869 HV *stash;
870 MAGIC *mg;
871
872 if (SvROK (coro))
873 coro = SvRV (coro);
874
875 stash = SvSTASH (coro);
876 if (stash != coro_stash && stash != coro_state_stash)
877 {
878 /* very slow, but rare, check */
879 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
880 croak ("Coro::State object required");
881 }
882
883 mg = SvMAGIC (coro);
884 assert (mg->mg_type == PERL_MAGIC_ext);
885 return (struct coro *)mg->mg_ptr;
886}
887
888static void 1279static void
889prepare_transfer (struct transfer_args *ta, SV *prev, SV *next, int flags) 1280prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv)
890{ 1281{
891 ta->prev = SvSTATE (prev); 1282 ta->prev = SvSTATE (prev_sv);
892 ta->next = SvSTATE (next); 1283 ta->next = SvSTATE (next_sv);
893 ta->flags = flags; 1284 TRANSFER_CHECK (*ta);
894} 1285}
895 1286
896static void 1287static void
897api_transfer (SV *prev, SV *next, int flags) 1288api_transfer (SV *prev_sv, SV *next_sv)
898{ 1289{
899 dTHX; 1290 dTHX;
900 struct transfer_args ta; 1291 struct transfer_args ta;
901 1292
902 prepare_transfer (&ta, prev, next, flags); 1293 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
903 TRANSFER (ta); 1294 TRANSFER (ta);
904} 1295}
905 1296
906/** Coro ********************************************************************/ 1297/** Coro ********************************************************************/
907 1298
908#define PRIO_MAX 3
909#define PRIO_HIGH 1
910#define PRIO_NORMAL 0
911#define PRIO_LOW -1
912#define PRIO_IDLE -3
913#define PRIO_MIN -4
914
915/* for Coro.pm */
916static GV *coro_current, *coro_idle;
917static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
918static int coro_nready;
919
920static void 1299static void
921coro_enq (SV *sv) 1300coro_enq (pTHX_ SV *coro_sv)
922{ 1301{
923 int prio;
924
925 if (SvTYPE (sv) != SVt_PVHV)
926 croak ("Coro::ready tried to enqueue something that is not a coroutine");
927
928 prio = SvSTATE (sv)->prio;
929
930 av_push (coro_ready [prio - PRIO_MIN], sv); 1302 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
931 coro_nready++;
932} 1303}
933 1304
934static SV * 1305static SV *
935coro_deq (int min_prio) 1306coro_deq (pTHX_ int min_prio)
936{ 1307{
937 int prio = PRIO_MAX - PRIO_MIN; 1308 int prio = PRIO_MAX - PRIO_MIN;
938 1309
939 min_prio -= PRIO_MIN; 1310 min_prio -= PRIO_MIN;
940 if (min_prio < 0) 1311 if (min_prio < 0)
941 min_prio = 0; 1312 min_prio = 0;
942 1313
943 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1314 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; )
944 if (AvFILLp (coro_ready [prio]) >= 0) 1315 if (AvFILLp (coro_ready [prio]) >= 0)
945 {
946 coro_nready--;
947 return av_shift (coro_ready [prio]); 1316 return av_shift (coro_ready [prio]);
948 }
949 1317
950 return 0; 1318 return 0;
951} 1319}
952 1320
953static void 1321static int
954api_ready (SV *coro) 1322api_ready (SV *coro_sv)
955{ 1323{
956 dTHX; 1324 dTHX;
1325 struct coro *coro;
957 1326
958 if (SvROK (coro)) 1327 if (SvROK (coro_sv))
959 coro = SvRV (coro); 1328 coro_sv = SvRV (coro_sv);
1329
1330 coro = SvSTATE (coro_sv);
1331
1332 if (coro->flags & CF_READY)
1333 return 0;
1334
1335 coro->flags |= CF_READY;
960 1336
961 LOCK; 1337 LOCK;
962 coro_enq (SvREFCNT_inc (coro)); 1338 coro_enq (aTHX_ SvREFCNT_inc (coro_sv));
1339 ++coro_nready;
963 UNLOCK; 1340 UNLOCK;
964}
965 1341
1342 return 1;
1343}
1344
966static void 1345static int
1346api_is_ready (SV *coro_sv)
1347{
1348 dTHX;
1349 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1350}
1351
1352static void
967prepare_schedule (struct transfer_args *ta) 1353prepare_schedule (pTHX_ struct transfer_args *ta)
968{ 1354{
969 SV *current, *prev, *next; 1355 SV *prev_sv, *next_sv;
970
971 current = GvSV (coro_current);
972 1356
973 for (;;) 1357 for (;;)
974 { 1358 {
975 LOCK; 1359 LOCK;
976 next = coro_deq (PRIO_MIN); 1360 next_sv = coro_deq (aTHX_ PRIO_MIN);
1361
1362 /* nothing to schedule: call the idle handler */
1363 if (expect_false (!next_sv))
1364 {
1365 dSP;
1366 UNLOCK;
1367
1368 ENTER;
1369 SAVETMPS;
1370
1371 PUSHMARK (SP);
1372 PUTBACK;
1373 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1374
1375 FREETMPS;
1376 LEAVE;
1377 continue;
1378 }
1379
1380 ta->next = SvSTATE (next_sv);
1381
1382 /* cannot transfer to destroyed coros, skip and look for next */
1383 if (expect_false (ta->next->flags & CF_DESTROYED))
1384 {
1385 UNLOCK;
1386 SvREFCNT_dec (next_sv);
1387 /* coro_nready is already taken care of by destroy */
1388 continue;
1389 }
1390
1391 --coro_nready;
977 UNLOCK; 1392 UNLOCK;
978
979 if (next)
980 break; 1393 break;
981
982 {
983 dSP;
984
985 ENTER;
986 SAVETMPS;
987
988 PUSHMARK (SP);
989 PUTBACK;
990 call_sv (GvSV (coro_idle), G_DISCARD);
991
992 FREETMPS;
993 LEAVE;
994 } 1394 }
995 }
996
997 prev = SvRV (current);
998 SvRV (current) = next;
999 1395
1000 /* free this only after the transfer */ 1396 /* free this only after the transfer */
1397 prev_sv = SvRV (coro_current);
1398 ta->prev = SvSTATE (prev_sv);
1399 TRANSFER_CHECK (*ta);
1400 assert (ta->next->flags & CF_READY);
1401 ta->next->flags &= ~CF_READY;
1402 SvRV_set (coro_current, next_sv);
1403
1001 LOCK; 1404 LOCK;
1002 free_coro_mortal (); 1405 free_coro_mortal (aTHX);
1406 coro_mortal = prev_sv;
1003 UNLOCK; 1407 UNLOCK;
1004 coro_mortal = prev;
1005
1006 ta->prev = SvSTATE (prev);
1007 ta->next = SvSTATE (next);
1008 ta->flags = TRANSFER_SAVE_ALL;
1009} 1408}
1010 1409
1011static void 1410static void
1012prepare_cede (struct transfer_args *ta) 1411prepare_cede (pTHX_ struct transfer_args *ta)
1013{ 1412{
1014 LOCK; 1413 api_ready (coro_current);
1015 coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current))));
1016 UNLOCK;
1017
1018 prepare_schedule (ta); 1414 prepare_schedule (aTHX_ ta);
1415}
1416
1417static int
1418prepare_cede_notself (pTHX_ struct transfer_args *ta)
1419{
1420 if (coro_nready)
1421 {
1422 SV *prev = SvRV (coro_current);
1423 prepare_schedule (aTHX_ ta);
1424 api_ready (prev);
1425 return 1;
1426 }
1427 else
1428 return 0;
1019} 1429}
1020 1430
1021static void 1431static void
1022api_schedule (void) 1432api_schedule (void)
1023{ 1433{
1024 dTHX; 1434 dTHX;
1025 struct transfer_args ta; 1435 struct transfer_args ta;
1026 1436
1027 prepare_schedule (&ta); 1437 prepare_schedule (aTHX_ &ta);
1028 TRANSFER (ta); 1438 TRANSFER (ta);
1029} 1439}
1030 1440
1031static void 1441static int
1032api_cede (void) 1442api_cede (void)
1033{ 1443{
1034 dTHX; 1444 dTHX;
1035 struct transfer_args ta; 1445 struct transfer_args ta;
1036 1446
1037 prepare_cede (&ta); 1447 prepare_cede (aTHX_ &ta);
1448
1449 if (expect_true (ta.prev != ta.next))
1450 {
1038 TRANSFER (ta); 1451 TRANSFER (ta);
1452 return 1;
1453 }
1454 else
1455 return 0;
1039} 1456}
1040 1457
1458static int
1459api_cede_notself (void)
1460{
1461 dTHX;
1462 struct transfer_args ta;
1463
1464 if (prepare_cede_notself (aTHX_ &ta))
1465 {
1466 TRANSFER (ta);
1467 return 1;
1468 }
1469 else
1470 return 0;
1471}
1472
1473static void
1474api_trace (SV *coro_sv, int flags)
1475{
1476 dTHX;
1477 struct coro *coro = SvSTATE (coro_sv);
1478
1479 if (flags & CC_TRACE)
1480 {
1481 if (!coro->cctx)
1482 coro->cctx = cctx_new ();
1483 else if (!(coro->cctx->flags & CC_TRACE))
1484 croak ("cannot enable tracing on coroutine with custom stack");
1485
1486 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1487 }
1488 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1489 {
1490 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1491
1492 if (coro->flags & CF_RUNNING)
1493 PL_runops = RUNOPS_DEFAULT;
1494 else
1495 coro->slot->runops = RUNOPS_DEFAULT;
1496 }
1497}
1498
1041MODULE = Coro::State PACKAGE = Coro::State 1499MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1042 1500
1043PROTOTYPES: DISABLE 1501PROTOTYPES: DISABLE
1044 1502
1045BOOT: 1503BOOT:
1046{ 1504{
1047#ifdef USE_ITHREADS 1505#ifdef USE_ITHREADS
1048 MUTEX_INIT (&coro_mutex); 1506 MUTEX_INIT (&coro_mutex);
1049#endif 1507#endif
1050 BOOT_PAGESIZE; 1508 BOOT_PAGESIZE;
1051 1509
1510 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1511 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1512
1513 hv_sig = coro_get_hv ("SIG", TRUE);
1514 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE);
1515 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE);
1516
1517 if (!PL_diehook ) hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
1518 if (!PL_warnhook) hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
1519
1052 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1520 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1053 1521
1054 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV)); 1522 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1055 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV)); 1523 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1056 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV)); 1524 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1525 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1057 1526
1058 main_mainstack = PL_mainstack; 1527 main_mainstack = PL_mainstack;
1528 main_top_env = PL_top_env;
1529
1530 while (main_top_env->je_prev)
1531 main_top_env = main_top_env->je_prev;
1059 1532
1060 coroapi.ver = CORO_API_VERSION; 1533 coroapi.ver = CORO_API_VERSION;
1534 coroapi.rev = CORO_API_REVISION;
1061 coroapi.transfer = api_transfer; 1535 coroapi.transfer = api_transfer;
1062 1536
1063 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1537 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1064} 1538}
1065 1539
1070 struct coro *coro; 1544 struct coro *coro;
1071 HV *hv; 1545 HV *hv;
1072 int i; 1546 int i;
1073 1547
1074 Newz (0, coro, 1, struct coro); 1548 Newz (0, coro, 1, struct coro);
1075 coro->args = newAV (); 1549 coro->args = newAV ();
1550 coro->flags = CF_NEW;
1076 1551
1552 if (coro_first) coro_first->prev = coro;
1553 coro->next = coro_first;
1554 coro_first = coro;
1555
1077 hv = newHV (); 1556 coro->hv = hv = newHV ();
1078 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1557 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1079 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1558 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1080 1559
1560 av_extend (coro->args, items - 1);
1081 for (i = 1; i < items; i++) 1561 for (i = 1; i < items; i++)
1082 av_push (coro->args, newSVsv (ST (i))); 1562 av_push (coro->args, newSVsv (ST (i)));
1083} 1563}
1084 OUTPUT: 1564 OUTPUT:
1085 RETVAL 1565 RETVAL
1086 1566
1567# these not obviously related functions are all rolled into the same xs
1568# function to increase chances that they all will call transfer with the same
1569# stack offset
1087void 1570void
1088_set_stacklevel (...) 1571_set_stacklevel (...)
1089 ALIAS: 1572 ALIAS:
1090 Coro::State::transfer = 1 1573 Coro::State::transfer = 1
1091 Coro::schedule = 2 1574 Coro::schedule = 2
1092 Coro::cede = 3 1575 Coro::cede = 3
1093 Coro::Cont::yield = 4 1576 Coro::cede_notself = 4
1094 CODE: 1577 CODE:
1095{ 1578{
1096 struct transfer_args ta; 1579 struct transfer_args ta;
1097 1580
1098 switch (ix) 1581 switch (ix)
1099 { 1582 {
1100 case 0: 1583 case 0:
1101 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1584 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1102 ta.next = 0; 1585 ta.next = 0;
1103 ta.flags = TRANSFER_SET_STACKLEVEL;
1104 break; 1586 break;
1105 1587
1106 case 1: 1588 case 1:
1107 if (items != 3) 1589 if (items != 2)
1108 croak ("Coro::State::transfer(prev,next,flags) expects three arguments, not %d", items); 1590 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1109 1591
1110 prepare_transfer (&ta, ST (0), ST (1), SvIV (ST (2))); 1592 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1111 break; 1593 break;
1112 1594
1113 case 2: 1595 case 2:
1114 prepare_schedule (&ta); 1596 prepare_schedule (aTHX_ &ta);
1115 break; 1597 break;
1116 1598
1117 case 3: 1599 case 3:
1118 prepare_cede (&ta); 1600 prepare_cede (aTHX_ &ta);
1119 break; 1601 break;
1120 1602
1121 case 4: 1603 case 4:
1122 { 1604 if (!prepare_cede_notself (aTHX_ &ta))
1123 SV *yieldstack; 1605 XSRETURN_EMPTY;
1124 SV *sv;
1125 AV *defav = GvAV (PL_defgv);
1126 1606
1127 yieldstack = *hv_fetch (
1128 (HV *)SvRV (GvSV (coro_current)),
1129 "yieldstack", sizeof ("yieldstack") - 1,
1130 0
1131 );
1132
1133 /* set up @_ -- ugly */
1134 av_clear (defav);
1135 av_fill (defav, items - 1);
1136 while (items--)
1137 av_store (defav, items, SvREFCNT_inc (ST(items)));
1138
1139 sv = av_pop ((AV *)SvRV (yieldstack));
1140 ta.prev = SvSTATE (*av_fetch ((AV *)SvRV (sv), 0, 0));
1141 ta.next = SvSTATE (*av_fetch ((AV *)SvRV (sv), 1, 0));
1142 ta.flags = 0;
1143 SvREFCNT_dec (sv);
1144 }
1145 break; 1607 break;
1146
1147 } 1608 }
1148 1609
1610 BARRIER;
1611 PUTBACK;
1149 TRANSFER (ta); 1612 TRANSFER (ta);
1613 SPAGAIN; /* might be the sp of a different coroutine now */
1614 /* be extra careful not to ever do anything after TRANSFER */
1150} 1615}
1151 1616
1152void 1617bool
1153_clone_state_from (SV *dst, SV *src) 1618_destroy (SV *coro_sv)
1154 CODE: 1619 CODE:
1155{ 1620 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1156 struct coro *coro_src = SvSTATE (src); 1621 OUTPUT:
1157 1622 RETVAL
1158 sv_unmagic (SvRV (dst), PERL_MAGIC_ext);
1159
1160 ++coro_src->refcnt;
1161 sv_magicext (SvRV (dst), 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro_src, 0)->mg_flags |= MGf_DUP;
1162}
1163 1623
1164void 1624void
1165_exit (code) 1625_exit (code)
1166 int code 1626 int code
1167 PROTOTYPE: $ 1627 PROTOTYPE: $
1168 CODE: 1628 CODE:
1169 _exit (code); 1629 _exit (code);
1170 1630
1171int 1631int
1632cctx_stacksize (int new_stacksize = 0)
1633 CODE:
1634 RETVAL = coro_stacksize;
1635 if (new_stacksize)
1636 coro_stacksize = new_stacksize;
1637 OUTPUT:
1638 RETVAL
1639
1640int
1172cctx_count () 1641cctx_count ()
1173 CODE: 1642 CODE:
1174 RETVAL = cctx_count; 1643 RETVAL = cctx_count;
1175 OUTPUT: 1644 OUTPUT:
1176 RETVAL 1645 RETVAL
1180 CODE: 1649 CODE:
1181 RETVAL = cctx_idle; 1650 RETVAL = cctx_idle;
1182 OUTPUT: 1651 OUTPUT:
1183 RETVAL 1652 RETVAL
1184 1653
1654void
1655list ()
1656 PPCODE:
1657{
1658 struct coro *coro;
1659 for (coro = coro_first; coro; coro = coro->next)
1660 if (coro->hv)
1661 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
1662}
1663
1664void
1665call (Coro::State coro, SV *coderef)
1666 ALIAS:
1667 eval = 1
1668 CODE:
1669{
1670 if (coro->mainstack)
1671 {
1672 struct coro temp;
1673
1674 if (!(coro->flags & CF_RUNNING))
1675 {
1676 save_perl (aTHX_ &temp);
1677 load_perl (aTHX_ coro);
1678 }
1679
1680 {
1681 dSP;
1682 ENTER;
1683 SAVETMPS;
1684 PUTBACK;
1685 PUSHSTACK;
1686 PUSHMARK (SP);
1687
1688 if (ix)
1689 eval_sv (coderef, 0);
1690 else
1691 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1692
1693 POPSTACK;
1694 SPAGAIN;
1695 FREETMPS;
1696 LEAVE;
1697 PUTBACK;
1698 }
1699
1700 if (!(coro->flags & CF_RUNNING))
1701 {
1702 save_perl (aTHX_ coro);
1703 load_perl (aTHX_ &temp);
1704 }
1705 }
1706}
1707
1708SV *
1709is_ready (Coro::State coro)
1710 PROTOTYPE: $
1711 ALIAS:
1712 is_ready = CF_READY
1713 is_running = CF_RUNNING
1714 is_new = CF_NEW
1715 is_destroyed = CF_DESTROYED
1716 CODE:
1717 RETVAL = boolSV (coro->flags & ix);
1718 OUTPUT:
1719 RETVAL
1720
1721void
1722api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1723
1724SV *
1725has_stack (Coro::State coro)
1726 PROTOTYPE: $
1727 CODE:
1728 RETVAL = boolSV (!!coro->cctx);
1729 OUTPUT:
1730 RETVAL
1731
1732int
1733is_traced (Coro::State coro)
1734 PROTOTYPE: $
1735 CODE:
1736 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL;
1737 OUTPUT:
1738 RETVAL
1739
1740IV
1741rss (Coro::State coro)
1742 PROTOTYPE: $
1743 ALIAS:
1744 usecount = 1
1745 CODE:
1746 switch (ix)
1747 {
1748 case 0: RETVAL = coro_rss (aTHX_ coro); break;
1749 case 1: RETVAL = coro->usecount; break;
1750 }
1751 OUTPUT:
1752 RETVAL
1753
1754
1185MODULE = Coro::State PACKAGE = Coro 1755MODULE = Coro::State PACKAGE = Coro
1186 1756
1187BOOT: 1757BOOT:
1188{ 1758{
1189 int i; 1759 int i;
1190 1760
1761 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1762 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1763 av_async_pool = coro_get_av ("Coro::async_pool", TRUE);
1764
1765 coro_current = coro_get_sv ("Coro::current", FALSE);
1766 SvREADONLY_on (coro_current);
1767
1191 coro_stash = gv_stashpv ("Coro", TRUE); 1768 coro_stash = gv_stashpv ("Coro", TRUE);
1192 1769
1193 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1770 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1194 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1771 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1195 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1772 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1196 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1773 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1197 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 1774 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE));
1198 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 1775 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN));
1199 1776
1200 coro_current = gv_fetchpv ("Coro::current", TRUE, SVt_PV);
1201 coro_idle = gv_fetchpv ("Coro::idle" , TRUE, SVt_PV);
1202
1203 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1777 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1204 coro_ready[i] = newAV (); 1778 coro_ready[i] = newAV ();
1205 1779
1206 { 1780 {
1207 SV *sv = perl_get_sv("Coro::API", 1); 1781 SV *sv = perl_get_sv ("Coro::API", TRUE);
1782 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1208 1783
1209 coroapi.schedule = api_schedule; 1784 coroapi.schedule = api_schedule;
1210 coroapi.cede = api_cede; 1785 coroapi.cede = api_cede;
1786 coroapi.cede_notself = api_cede_notself;
1211 coroapi.ready = api_ready; 1787 coroapi.ready = api_ready;
1788 coroapi.is_ready = api_is_ready;
1212 coroapi.nready = &coro_nready; 1789 coroapi.nready = &coro_nready;
1213 coroapi.current = coro_current; 1790 coroapi.current = coro_current;
1214 1791
1215 GCoroAPI = &coroapi; 1792 GCoroAPI = &coroapi;
1216 sv_setiv (sv, (IV)&coroapi); 1793 sv_setiv (sv, (IV)&coroapi);
1217 SvREADONLY_on (sv); 1794 SvREADONLY_on (sv);
1218 } 1795 }
1219} 1796}
1797
1798void
1799_set_current (SV *current)
1800 PROTOTYPE: $
1801 CODE:
1802 SvREFCNT_dec (SvRV (coro_current));
1803 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
1220 1804
1221int 1805int
1222prio (Coro::State coro, int newprio = 0) 1806prio (Coro::State coro, int newprio = 0)
1223 ALIAS: 1807 ALIAS:
1224 nice = 1 1808 nice = 1
1227 RETVAL = coro->prio; 1811 RETVAL = coro->prio;
1228 1812
1229 if (items > 1) 1813 if (items > 1)
1230 { 1814 {
1231 if (ix) 1815 if (ix)
1232 newprio += coro->prio; 1816 newprio = coro->prio - newprio;
1233 1817
1234 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 1818 if (newprio < PRIO_MIN) newprio = PRIO_MIN;
1235 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 1819 if (newprio > PRIO_MAX) newprio = PRIO_MAX;
1236 1820
1237 coro->prio = newprio; 1821 coro->prio = newprio;
1238 } 1822 }
1239} 1823}
1824 OUTPUT:
1825 RETVAL
1240 1826
1241void 1827SV *
1242ready (SV *self) 1828ready (SV *self)
1243 PROTOTYPE: $ 1829 PROTOTYPE: $
1244 CODE: 1830 CODE:
1245 api_ready (self); 1831 RETVAL = boolSV (api_ready (self));
1832 OUTPUT:
1833 RETVAL
1246 1834
1247int 1835int
1248nready (...) 1836nready (...)
1249 PROTOTYPE: 1837 PROTOTYPE:
1250 CODE: 1838 CODE:
1251 RETVAL = coro_nready; 1839 RETVAL = coro_nready;
1252 OUTPUT: 1840 OUTPUT:
1253 RETVAL 1841 RETVAL
1254 1842
1843void
1844throw (Coro::State self, SV *throw = &PL_sv_undef)
1845 PROTOTYPE: $;$
1846 CODE:
1847 SvREFCNT_dec (self->throw);
1848 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1849
1850# for async_pool speedup
1851void
1852_pool_1 (SV *cb)
1853 CODE:
1854{
1855 struct coro *coro = SvSTATE (coro_current);
1856 HV *hv = (HV *)SvRV (coro_current);
1857 AV *defav = GvAV (PL_defgv);
1858 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0);
1859 AV *invoke_av;
1860 int i, len;
1861
1862 if (!invoke)
1863 croak ("\3async_pool terminate\2\n");
1864
1865 SvREFCNT_dec (coro->saved_deffh);
1866 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1867
1868 hv_store (hv, "desc", sizeof ("desc") - 1,
1869 newSVpvn (strpair ("[async_pool]")), 0);
1870
1871 invoke_av = (AV *)SvRV (invoke);
1872 len = av_len (invoke_av);
1873
1874 sv_setsv (cb, AvARRAY (invoke_av)[0]);
1875
1876 if (len > 0)
1877 {
1878 av_fill (defav, len - 1);
1879 for (i = 0; i < len; ++i)
1880 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1]));
1881 }
1882
1883 SvREFCNT_dec (invoke);
1884}
1885
1886void
1887_pool_2 (SV *cb)
1888 CODE:
1889{
1890 struct coro *coro = SvSTATE (coro_current);
1891
1892 sv_setsv (cb, &PL_sv_undef);
1893
1894 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1895 coro->saved_deffh = 0;
1896
1897 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1898 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1899 croak ("\3async_pool terminate\2\n");
1900
1901 av_clear (GvAV (PL_defgv));
1902 hv_store ((HV *)SvRV (coro_current), strpair ("desc"),
1903 newSVpvn (strpair ("[async_pool idle]")), 0);
1904
1905 coro->prio = 0;
1906
1907 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1908 api_trace (coro_current, 0);
1909
1910 av_push (av_async_pool, newSVsv (coro_current));
1911}
1912
1913
1255MODULE = Coro::State PACKAGE = Coro::AIO 1914MODULE = Coro::State PACKAGE = Coro::AIO
1256 1915
1257SV * 1916SV *
1258_get_state () 1917_get_state ()
1259 CODE: 1918 CODE:
1260{ 1919{
1261 struct { 1920 struct io_state *data;
1262 int errorno;
1263 int laststype;
1264 int laststatval;
1265 Stat_t statcache;
1266 } data;
1267 1921
1922 RETVAL = newSV (sizeof (struct io_state));
1923 data = (struct io_state *)SvPVX (RETVAL);
1924 SvCUR_set (RETVAL, sizeof (struct io_state));
1925 SvPOK_only (RETVAL);
1926
1268 data.errorno = errno; 1927 data->errorno = errno;
1269 data.laststype = PL_laststype; 1928 data->laststype = PL_laststype;
1270 data.laststatval = PL_laststatval; 1929 data->laststatval = PL_laststatval;
1271 data.statcache = PL_statcache; 1930 data->statcache = PL_statcache;
1272
1273 RETVAL = newSVpvn ((char *)&data, sizeof data);
1274} 1931}
1275 OUTPUT: 1932 OUTPUT:
1276 RETVAL 1933 RETVAL
1277 1934
1278void 1935void
1279_set_state (char *data_) 1936_set_state (char *data_)
1280 PROTOTYPE: $ 1937 PROTOTYPE: $
1281 CODE: 1938 CODE:
1282{ 1939{
1283 struct { 1940 struct io_state *data = (void *)data_;
1284 int errorno;
1285 int laststype;
1286 int laststatval;
1287 Stat_t statcache;
1288 } *data = (void *)data_;
1289 1941
1290 errno = data->errorno; 1942 errno = data->errorno;
1291 PL_laststype = data->laststype; 1943 PL_laststype = data->laststype;
1292 PL_laststatval = data->laststatval; 1944 PL_laststatval = data->laststatval;
1293 PL_statcache = data->statcache; 1945 PL_statcache = data->statcache;
1294} 1946}
1947

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines