ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/Coro/State.xs
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines