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.99 by root, Sun Nov 26 23:53:20 2006 UTC vs.
Revision 1.136 by root, Fri Jan 12 01:05:55 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines