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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines