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.139 by root, Sun Jan 14 21:13:41 2007 UTC vs.
Revision 1.147 by root, Mon Mar 19 15:50:48 2007 UTC

1#include "libcoro/coro.c" 1#include "libcoro/coro.c"
2
3#define PERL_NO_GET_CONTEXT
2 4
3#include "EXTERN.h" 5#include "EXTERN.h"
4#include "perl.h" 6#include "perl.h"
5#include "XSUB.h" 7#include "XSUB.h"
6 8
… …
31#else 33#else
32# define PAGESIZE 0 34# define PAGESIZE 0
33# define BOOT_PAGESIZE (void)0 35# define BOOT_PAGESIZE (void)0
34#endif 36#endif
35 37
36#if USE_VALGRIND 38#if CORO_USE_VALGRIND
37# include <valgrind/valgrind.h> 39# include <valgrind/valgrind.h>
40# define REGISTER_STACK(cctx,start,end) (cctx)->valgrind_id = VALGRIND_STACK_REGISTER ((start), (end))
41#else
42# define REGISTER_STACK(cctx,start,end)
38#endif 43#endif
39 44
40/* the maximum number of idle cctx that will be pooled */ 45/* the maximum number of idle cctx that will be pooled */
41#define MAX_IDLE_CCTX 8 46#define MAX_IDLE_CCTX 8
42 47
… …
71#ifndef SvRV_set 76#ifndef SvRV_set
72# define SvRV_set(s,v) SvRV(s) = (v) 77# define SvRV_set(s,v) SvRV(s) = (v)
73#endif 78#endif
74 79
75#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 80#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
76# undef STACKGUARD 81# undef CORO_STACKGUARD
77#endif 82#endif
78 83
79#ifndef STACKGUARD 84#ifndef CORO_STACKGUARD
80# define STACKGUARD 0 85# define CORO_STACKGUARD 0
81#endif 86#endif
82 87
83/* prefer perl internal functions over our own? */ 88/* prefer perl internal functions over our own? */
84#ifndef PREFER_PERL_FUNCTIONS 89#ifndef CORO_PREFER_PERL_FUNCTIONS
85# define PREFER_PERL_FUNCTIONS 0 90# define CORO_PREFER_PERL_FUNCTIONS 0
86#endif 91#endif
87 92
88/* The next macro should declare a variable stacklevel that contains and approximation 93/* The next macro should declare a variable stacklevel that contains and approximation
89 * to the current C stack pointer. Its property is that it changes with each call 94 * to the current C stack pointer. Its property is that it changes with each call
90 * and should be unique. */ 95 * and should be unique. */
… …
121 I32 laststype; 126 I32 laststype;
122 int laststatval; 127 int laststatval;
123 Stat_t statcache; 128 Stat_t statcache;
124}; 129};
125 130
131static size_t coro_stacksize = CORO_STACKSIZE;
126static struct CoroAPI coroapi; 132static struct CoroAPI coroapi;
127static AV *main_mainstack; /* used to differentiate between $main and others */ 133static AV *main_mainstack; /* used to differentiate between $main and others */
128static HV *coro_state_stash, *coro_stash; 134static HV *coro_state_stash, *coro_stash;
129static SV *coro_mortal; /* will be freed after next transfer */ 135static SV *coro_mortal; /* will be freed after next transfer */
130 136
… …
135typedef struct coro_cctx { 141typedef struct coro_cctx {
136 struct coro_cctx *next; 142 struct coro_cctx *next;
137 143
138 /* the stack */ 144 /* the stack */
139 void *sptr; 145 void *sptr;
140 long ssize; /* positive == mmap, otherwise malloc */ 146 size_t ssize;
141 147
142 /* cpu state */ 148 /* cpu state */
143 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 149 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
144 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 150 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */
145 JMPENV *top_env; 151 JMPENV *top_env;
146 coro_context cctx; 152 coro_context cctx;
147 153
148 int inuse;
149
150#if USE_VALGRIND 154#if CORO_USE_VALGRIND
151 int valgrind_id; 155 int valgrind_id;
152#endif 156#endif
157 char inuse, mapped;
153} coro_cctx; 158} coro_cctx;
154 159
155enum { 160enum {
156 CF_RUNNING = 0x0001, /* coroutine is running */ 161 CF_RUNNING = 0x0001, /* coroutine is running */
157 CF_READY = 0x0002, /* coroutine is ready */ 162 CF_READY = 0x0002, /* coroutine is ready */
… …
172 177
173 /* optionally saved, might be zero */ 178 /* optionally saved, might be zero */
174 AV *defav; /* @_ */ 179 AV *defav; /* @_ */
175 SV *defsv; /* $_ */ 180 SV *defsv; /* $_ */
176 SV *errsv; /* $@ */ 181 SV *errsv; /* $@ */
182 GV *deffh; /* default filehandle */
177 SV *irssv; /* $/ */ 183 SV *irssv; /* $/ */
178 SV *irssv_sv; /* real $/ cache */ 184 SV *irssv_sv; /* real $/ cache */
179 185
180#define VAR(name,type) type name; 186#define VAR(name,type) type name;
181# include "state.h" 187# include "state.h"
… …
203static int coro_nready; 209static int coro_nready;
204 210
205/** lowlevel stuff **********************************************************/ 211/** lowlevel stuff **********************************************************/
206 212
207static AV * 213static AV *
208coro_clone_padlist (CV *cv) 214coro_clone_padlist (pTHX_ CV *cv)
209{ 215{
210 AV *padlist = CvPADLIST (cv); 216 AV *padlist = CvPADLIST (cv);
211 AV *newpadlist, *newpad; 217 AV *newpadlist, *newpad;
212 218
213 newpadlist = newAV (); 219 newpadlist = newAV ();
… …
225 231
226 return newpadlist; 232 return newpadlist;
227} 233}
228 234
229static void 235static void
230free_padlist (AV *padlist) 236free_padlist (pTHX_ AV *padlist)
231{ 237{
232 /* may be during global destruction */ 238 /* may be during global destruction */
233 if (SvREFCNT (padlist)) 239 if (SvREFCNT (padlist))
234 { 240 {
235 I32 i = AvFILLp (padlist); 241 I32 i = AvFILLp (padlist);
… …
256 AV *padlist; 262 AV *padlist;
257 AV *av = (AV *)mg->mg_obj; 263 AV *av = (AV *)mg->mg_obj;
258 264
259 /* casting is fun. */ 265 /* casting is fun. */
260 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 266 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
261 free_padlist (padlist); 267 free_padlist (aTHX_ padlist);
262 268
263 SvREFCNT_dec (av); 269 SvREFCNT_dec (av);
264 270
265 return 0; 271 return 0;
266} 272}
… …
276 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 282 : mg_find ((SV *)cv, PERL_MAGIC_coro) \
277 : 0 283 : 0
278 284
279/* the next two functions merely cache the padlists */ 285/* the next two functions merely cache the padlists */
280static void 286static void
281get_padlist (CV *cv) 287get_padlist (pTHX_ CV *cv)
282{ 288{
283 MAGIC *mg = CORO_MAGIC (cv); 289 MAGIC *mg = CORO_MAGIC (cv);
284 AV *av; 290 AV *av;
285 291
286 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 292 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)
287 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 293 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
288 else 294 else
289 { 295 {
290#if PREFER_PERL_FUNCTIONS 296#if CORO_PREFER_PERL_FUNCTIONS
291 /* this is probably cleaner, but also slower? */ 297 /* this is probably cleaner, but also slower? */
292 CV *cp = Perl_cv_clone (cv); 298 CV *cp = Perl_cv_clone (cv);
293 CvPADLIST (cv) = CvPADLIST (cp); 299 CvPADLIST (cv) = CvPADLIST (cp);
294 CvPADLIST (cp) = 0; 300 CvPADLIST (cp) = 0;
295 SvREFCNT_dec (cp); 301 SvREFCNT_dec (cp);
296#else 302#else
297 CvPADLIST (cv) = coro_clone_padlist (cv); 303 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv);
298#endif 304#endif
299 } 305 }
300} 306}
301 307
302static void 308static void
303put_padlist (CV *cv) 309put_padlist (pTHX_ CV *cv)
304{ 310{
305 MAGIC *mg = CORO_MAGIC (cv); 311 MAGIC *mg = CORO_MAGIC (cv);
306 AV *av; 312 AV *av;
307 313
308 if (!mg) 314 if (!mg)
… …
327#define SE } while (0) 333#define SE } while (0)
328 334
329#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE 335#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
330 336
331static void 337static void
332load_perl (Coro__State c) 338load_perl (pTHX_ Coro__State c)
333{ 339{
334#define VAR(name,type) PL_ ## name = c->name; 340#define VAR(name,type) PL_ ## name = c->name;
335# include "state.h" 341# include "state.h"
336#undef VAR 342#undef VAR
337 343
338 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 344 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
339 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 345 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
340 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 346 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
347 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh);
348
341 if (c->irssv) 349 if (c->irssv)
342 { 350 {
343 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv)) 351 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
352 {
344 SvREFCNT_dec (c->irssv); 353 SvREFCNT_dec (c->irssv);
354 c->irssv = 0;
355 }
345 else 356 else
346 { 357 {
347 REPLACE_SV (PL_rs, c->irssv); 358 REPLACE_SV (PL_rs, c->irssv);
348 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0); 359 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
349 sv_setsv (c->irssv_sv, PL_rs); 360 sv_setsv (c->irssv_sv, PL_rs);
… …
355 CV *cv; 366 CV *cv;
356 367
357 /* now do the ugly restore mess */ 368 /* now do the ugly restore mess */
358 while ((cv = (CV *)POPs)) 369 while ((cv = (CV *)POPs))
359 { 370 {
360 put_padlist (cv); /* mark this padlist as available */ 371 put_padlist (aTHX_ cv); /* mark this padlist as available */
361 CvDEPTH (cv) = PTR2IV (POPs); 372 CvDEPTH (cv) = PTR2IV (POPs);
362 CvPADLIST (cv) = (AV *)POPs; 373 CvPADLIST (cv) = (AV *)POPs;
363 } 374 }
364 375
365 PUTBACK; 376 PUTBACK;
366 } 377 }
378 assert (!PL_comppad || AvARRAY (PL_comppad));//D
367} 379}
368 380
369static void 381static void
370save_perl (Coro__State c) 382save_perl (pTHX_ Coro__State c)
371{ 383{
384 assert (!PL_comppad || AvARRAY (PL_comppad));//D
372 { 385 {
373 dSP; 386 dSP;
374 I32 cxix = cxstack_ix; 387 I32 cxix = cxstack_ix;
375 PERL_CONTEXT *ccstk = cxstack; 388 PERL_CONTEXT *ccstk = cxstack;
376 PERL_SI *top_si = PL_curstackinfo; 389 PERL_SI *top_si = PL_curstackinfo;
… …
399 PUSHs ((SV *)CvPADLIST (cv)); 412 PUSHs ((SV *)CvPADLIST (cv));
400 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 413 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
401 PUSHs ((SV *)cv); 414 PUSHs ((SV *)cv);
402 415
403 CvDEPTH (cv) = 0; 416 CvDEPTH (cv) = 0;
404 get_padlist (cv); 417 get_padlist (aTHX_ cv);
405 } 418 }
406 } 419 }
407 } 420 }
408 421
409 if (top_si->si_type == PERLSI_MAIN) 422 if (top_si->si_type == PERLSI_MAIN)
… …
418 } 431 }
419 432
420 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 433 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0;
421 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 434 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0;
422 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 435 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0;
436 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0;
423 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0; 437 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0;
424 438
425#define VAR(name,type)c->name = PL_ ## name; 439#define VAR(name,type)c->name = PL_ ## name;
426# include "state.h" 440# include "state.h"
427#undef VAR 441#undef VAR
… …
431 * allocate various perl stacks. This is an exact copy 445 * allocate various perl stacks. This is an exact copy
432 * of perl.c:init_stacks, except that it uses less memory 446 * of perl.c:init_stacks, except that it uses less memory
433 * on the (sometimes correct) assumption that coroutines do 447 * on the (sometimes correct) assumption that coroutines do
434 * not usually need a lot of stackspace. 448 * not usually need a lot of stackspace.
435 */ 449 */
436#if PREFER_PERL_FUNCTIONS 450#if CORO_PREFER_PERL_FUNCTIONS
437# define coro_init_stacks init_stacks 451# define coro_init_stacks init_stacks
438#else 452#else
439static void 453static void
440coro_init_stacks () 454coro_init_stacks (pTHX)
441{ 455{
442 PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT)); 456 PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT));
443 PL_curstackinfo->si_type = PERLSI_MAIN; 457 PL_curstackinfo->si_type = PERLSI_MAIN;
444 PL_curstack = PL_curstackinfo->si_stack; 458 PL_curstack = PL_curstackinfo->si_stack;
445 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 459 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
… …
479 493
480/* 494/*
481 * destroy the stacks, the callchain etc... 495 * destroy the stacks, the callchain etc...
482 */ 496 */
483static void 497static void
484coro_destroy_stacks () 498coro_destroy_stacks (pTHX)
485{ 499{
486 if (!IN_DESTRUCT) 500 if (!IN_DESTRUCT)
487 { 501 {
488 /* restore all saved variables and stuff */ 502 /* restore all saved variables and stuff */
489 LEAVE_SCOPE (0); 503 LEAVE_SCOPE (0);
… …
525} 539}
526 540
527/** coroutine stack handling ************************************************/ 541/** coroutine stack handling ************************************************/
528 542
529static void 543static void
530setup_coro (struct coro *coro) 544setup_coro (pTHX_ struct coro *coro)
531{ 545{
532 /* 546 /*
533 * emulate part of the perl startup here. 547 * emulate part of the perl startup here.
534 */ 548 */
535
536 coro_init_stacks (); 549 coro_init_stacks (aTHX);
537 550
538 PL_curcop = &PL_compiling; 551 PL_curcop = &PL_compiling;
539 PL_in_eval = EVAL_NULL; 552 PL_in_eval = EVAL_NULL;
553 PL_comppad = 0;
540 PL_curpm = 0; 554 PL_curpm = 0;
541 PL_localizing = 0; 555 PL_localizing = 0;
542 PL_dirty = 0; 556 PL_dirty = 0;
543 PL_restartop = 0; 557 PL_restartop = 0;
544 558
… …
563 577
564 ENTER; /* necessary e.g. for dounwind */ 578 ENTER; /* necessary e.g. for dounwind */
565} 579}
566 580
567static void 581static void
568free_coro_mortal () 582free_coro_mortal (pTHX)
569{ 583{
570 if (coro_mortal) 584 if (coro_mortal)
571 { 585 {
572 SvREFCNT_dec (coro_mortal); 586 SvREFCNT_dec (coro_mortal);
573 coro_mortal = 0; 587 coro_mortal = 0;
574 } 588 }
575} 589}
576 590
577/* inject a fake call to Coro::State::_cctx_init into the execution */ 591/* inject a fake call to Coro::State::_cctx_init into the execution */
578static void NOINLINE 592static void NOINLINE
579prepare_cctx (coro_cctx *cctx) 593prepare_cctx (pTHX_ coro_cctx *cctx)
580{ 594{
581 dSP; 595 dSP;
582 LOGOP myop; 596 LOGOP myop;
583 597
584 Zero (&myop, 1, LOGOP); 598 Zero (&myop, 1, LOGOP);
… …
596} 610}
597 611
598static void 612static void
599coro_run (void *arg) 613coro_run (void *arg)
600{ 614{
615 dTHX;
616
601 /* coro_run is the alternative tail of transfer(), so unlock here. */ 617 /* coro_run is the alternative tail of transfer(), so unlock here. */
602 UNLOCK; 618 UNLOCK;
603 619
604 /* 620 /*
605 * this is a _very_ stripped down perl interpreter ;) 621 * this is a _very_ stripped down perl interpreter ;)
606 */ 622 */
607 PL_top_env = &PL_start_env; 623 PL_top_env = &PL_start_env;
608 624
609 /* inject call to cctx_init */ 625 /* inject call to cctx_init */
610 prepare_cctx ((coro_cctx *)arg); 626 prepare_cctx (aTHX_ (coro_cctx *)arg);
611 627
612 /* somebody will hit me for both perl_run and PL_restartop */ 628 /* somebody will hit me for both perl_run and PL_restartop */
613 PL_restartop = PL_op; 629 PL_restartop = PL_op;
614 perl_run (PL_curinterp); 630 perl_run (PL_curinterp);
615 631
… …
619 635
620static coro_cctx * 636static coro_cctx *
621cctx_new () 637cctx_new ()
622{ 638{
623 coro_cctx *cctx; 639 coro_cctx *cctx;
640 void *stack_start;
641 size_t stack_size;
624 642
625 ++cctx_count; 643 ++cctx_count;
626 644
627 Newz (0, cctx, 1, coro_cctx); 645 Newz (0, cctx, 1, coro_cctx);
628 646
629#if HAVE_MMAP 647#if HAVE_MMAP
630 648
631 cctx->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; 649 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
632 /* mmap supposedly does allocate-on-write for us */ 650 /* mmap supposedly does allocate-on-write for us */
633 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 651 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
634 652
635 if (cctx->sptr == (void *)-1) 653 if (cctx->sptr != (void *)-1)
636 {
637 perror ("FATAL: unable to mmap stack for coroutine");
638 _exit (EXIT_FAILURE);
639 } 654 {
640
641# if STACKGUARD 655# if CORO_STACKGUARD
642 mprotect (cctx->sptr, STACKGUARD * PAGESIZE, PROT_NONE); 656 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
643# endif 657# endif
658 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr;
659 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
660 cctx->mapped = 1;
661 }
662 else
663#endif
664 {
665 cctx->ssize = coro_stacksize * (long)sizeof (long);
666 New (0, cctx->sptr, coro_stacksize, long);
644 667
645#else
646
647 cctx->ssize = STACKSIZE * (long)sizeof (long);
648 New (0, cctx->sptr, STACKSIZE, long);
649
650 if (!cctx->sptr) 668 if (!cctx->sptr)
651 { 669 {
652 perror ("FATAL: unable to malloc stack for coroutine"); 670 perror ("FATAL: unable to allocate stack for coroutine");
653 _exit (EXIT_FAILURE); 671 _exit (EXIT_FAILURE);
654 } 672 }
655 673
656#endif 674 stack_start = cctx->sptr;
675 stack_size = cctx->ssize;
676 }
657 677
658#if USE_VALGRIND 678 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
659 cctx->valgrind_id = VALGRIND_STACK_REGISTER (
660 STACKGUARD * PAGESIZE + (char *)cctx->sptr,
661 cctx->ssize + (char *)cctx->sptr
662 );
663#endif
664
665 coro_create (&cctx->cctx, coro_run, (void *)cctx, cctx->sptr, cctx->ssize); 679 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size);
666 680
667 return cctx; 681 return cctx;
668} 682}
669 683
670static void 684static void
… …
673 if (!cctx) 687 if (!cctx)
674 return; 688 return;
675 689
676 --cctx_count; 690 --cctx_count;
677 691
678#if USE_VALGRIND 692#if CORO_USE_VALGRIND
679 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 693 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
680#endif 694#endif
681 695
682#if HAVE_MMAP 696#if HAVE_MMAP
697 if (cctx->mapped)
683 munmap (cctx->sptr, cctx->ssize); 698 munmap (cctx->sptr, cctx->ssize);
684#else 699 else
700#endif
685 Safefree (cctx->sptr); 701 Safefree (cctx->sptr);
686#endif
687 702
688 Safefree (cctx); 703 Safefree (cctx);
689} 704}
690 705
691static coro_cctx * 706static coro_cctx *
692cctx_get () 707cctx_get (pTHX)
693{ 708{
694 coro_cctx *cctx;
695
696 if (cctx_first) 709 while (cctx_first)
697 { 710 {
698 cctx = cctx_first; 711 coro_cctx *cctx = cctx_first;
699 cctx_first = cctx->next; 712 cctx_first = cctx->next;
700 --cctx_idle; 713 --cctx_idle;
714
715 if (cctx->ssize >= coro_stacksize)
716 return cctx;
717
718 cctx_destroy (cctx);
701 } 719 }
702 else 720
703 {
704 cctx = cctx_new ();
705 PL_op = PL_op->op_next; 721 PL_op = PL_op->op_next;
706 }
707
708 return cctx; 722 return cctx_new ();
709} 723}
710 724
711static void 725static void
712cctx_put (coro_cctx *cctx) 726cctx_put (coro_cctx *cctx)
713{ 727{
… …
729 743
730/** coroutine switching *****************************************************/ 744/** coroutine switching *****************************************************/
731 745
732/* never call directly, always through the coro_state_transfer global variable */ 746/* never call directly, always through the coro_state_transfer global variable */
733static void NOINLINE 747static void NOINLINE
734transfer (struct coro *prev, struct coro *next) 748transfer (pTHX_ struct coro *prev, struct coro *next)
735{ 749{
736 dSTACKLEVEL; 750 dSTACKLEVEL;
737 751
738 /* sometimes transfer is only called to set idle_sp */ 752 /* sometimes transfer is only called to set idle_sp */
739 if (!next) 753 if (!next)
… …
772 if (next->flags & CF_NEW) 786 if (next->flags & CF_NEW)
773 { 787 {
774 /* need to start coroutine */ 788 /* need to start coroutine */
775 next->flags &= ~CF_NEW; 789 next->flags &= ~CF_NEW;
776 /* first get rid of the old state */ 790 /* first get rid of the old state */
777 save_perl (prev); 791 save_perl (aTHX_ prev);
778 /* setup coroutine call */ 792 /* setup coroutine call */
779 setup_coro (next); 793 setup_coro (aTHX_ next);
780 /* need a new stack */ 794 /* need a new stack */
781 assert (!next->cctx); 795 assert (!next->cctx);
782 } 796 }
783 else 797 else
784 { 798 {
785 /* coroutine already started */ 799 /* coroutine already started */
786 save_perl (prev); 800 save_perl (aTHX_ prev);
787 load_perl (next); 801 load_perl (aTHX_ next);
788 } 802 }
789 803
790 prev__cctx = prev->cctx; 804 prev__cctx = prev->cctx;
791 805
792 /* possibly "free" the cctx */ 806 /* possibly "free" the cctx */
… …
801 prev__cctx->inuse = 0; 815 prev__cctx->inuse = 0;
802 } 816 }
803 817
804 if (!next->cctx) 818 if (!next->cctx)
805 { 819 {
806 next->cctx = cctx_get (); 820 next->cctx = cctx_get (aTHX);
807 assert (!next->cctx->inuse); 821 assert (!next->cctx->inuse);
808 next->cctx->inuse = 1; 822 next->cctx->inuse = 1;
809 } 823 }
810 824
811 if (prev__cctx != next->cctx) 825 if (prev__cctx != next->cctx)
… …
813 prev__cctx->top_env = PL_top_env; 827 prev__cctx->top_env = PL_top_env;
814 PL_top_env = next->cctx->top_env; 828 PL_top_env = next->cctx->top_env;
815 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 829 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
816 } 830 }
817 831
818 free_coro_mortal (); 832 free_coro_mortal (aTHX);
819 UNLOCK; 833 UNLOCK;
820 } 834 }
821} 835}
822 836
823struct transfer_args 837struct transfer_args
824{ 838{
825 struct coro *prev, *next; 839 struct coro *prev, *next;
826}; 840};
827 841
828#define TRANSFER(ta) transfer ((ta).prev, (ta).next) 842#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next)
829 843
830/** high level stuff ********************************************************/ 844/** high level stuff ********************************************************/
831 845
832static int 846static int
833coro_state_destroy (struct coro *coro) 847coro_state_destroy (pTHX_ struct coro *coro)
834{ 848{
835 if (coro->flags & CF_DESTROYED) 849 if (coro->flags & CF_DESTROYED)
836 return 0; 850 return 0;
837 851
838 coro->flags |= CF_DESTROYED; 852 coro->flags |= CF_DESTROYED;
… …
848 else 862 else
849 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 863 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
850 864
851 if (coro->mainstack && coro->mainstack != main_mainstack) 865 if (coro->mainstack && coro->mainstack != main_mainstack)
852 { 866 {
867 struct coro temp;
868
853 assert (!(coro->flags & CF_RUNNING)); 869 assert (!(coro->flags & CF_RUNNING));
854 870
855 struct coro temp;
856 Zero (&temp, 1, struct coro); 871 Zero (&temp, 1, struct coro);
857 temp.save = CORO_SAVE_ALL; 872 temp.save = CORO_SAVE_DEF;
858 873
859 if (coro->flags & CF_RUNNING) 874 if (coro->flags & CF_RUNNING)
860 croak ("FATAL: tried to destroy currently running coroutine"); 875 croak ("FATAL: tried to destroy currently running coroutine");
861 876
862 save_perl (&temp); 877 save_perl (aTHX_ &temp);
863 load_perl (coro); 878 load_perl (aTHX_ coro);
864 879
865 coro_destroy_stacks (); 880 coro_destroy_stacks (aTHX);
866 881
867 load_perl (&temp); /* this will get rid of defsv etc.. */ 882 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */
868 883
869 coro->mainstack = 0; 884 coro->mainstack = 0;
870 } 885 }
871 886
872 cctx_destroy (coro->cctx); 887 cctx_destroy (coro->cctx);
… …
881 struct coro *coro = (struct coro *)mg->mg_ptr; 896 struct coro *coro = (struct coro *)mg->mg_ptr;
882 mg->mg_ptr = 0; 897 mg->mg_ptr = 0;
883 898
884 if (--coro->refcnt < 0) 899 if (--coro->refcnt < 0)
885 { 900 {
886 coro_state_destroy (coro); 901 coro_state_destroy (aTHX_ coro);
887 Safefree (coro); 902 Safefree (coro);
888 } 903 }
889 904
890 return 0; 905 return 0;
891} 906}
… …
910# define MGf_DUP 0 925# define MGf_DUP 0
911#endif 926#endif
912}; 927};
913 928
914static struct coro * 929static struct coro *
915SvSTATE (SV *coro) 930SvSTATE_ (pTHX_ SV *coro)
916{ 931{
917 HV *stash; 932 HV *stash;
918 MAGIC *mg; 933 MAGIC *mg;
919 934
920 if (SvROK (coro)) 935 if (SvROK (coro))
… …
926 /* very slow, but rare, check */ 941 /* very slow, but rare, check */
927 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 942 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
928 croak ("Coro::State object required"); 943 croak ("Coro::State object required");
929 } 944 }
930 945
931 mg = SvMAGIC (coro); 946 mg = CORO_MAGIC (coro);
932 assert (mg->mg_type == PERL_MAGIC_ext);
933 return (struct coro *)mg->mg_ptr; 947 return (struct coro *)mg->mg_ptr;
934} 948}
935 949
950#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
951
936static void 952static void
937prepare_transfer (struct transfer_args *ta, SV *prev_sv, SV *next_sv) 953prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv)
938{ 954{
939 ta->prev = SvSTATE (prev_sv); 955 ta->prev = SvSTATE (prev_sv);
940 ta->next = SvSTATE (next_sv); 956 ta->next = SvSTATE (next_sv);
941} 957}
942 958
943static void 959static void
944api_transfer (SV *prev_sv, SV *next_sv) 960api_transfer (SV *prev_sv, SV *next_sv)
945{ 961{
962 dTHX;
946 struct transfer_args ta; 963 struct transfer_args ta;
947 964
948 prepare_transfer (&ta, prev_sv, next_sv); 965 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
949 TRANSFER (ta); 966 TRANSFER (ta);
950} 967}
951 968
952static int 969static int
953api_save (SV *coro_sv, int new_save) 970api_save (SV *coro_sv, int new_save)
954{ 971{
972 dTHX;
955 struct coro *coro = SvSTATE (coro_sv); 973 struct coro *coro = SvSTATE (coro_sv);
956 int old_save = coro->save; 974 int old_save = coro->save;
957 975
958 if (new_save >= 0) 976 if (new_save >= 0)
959 coro->save = new_save; 977 coro->save = new_save;
… …
962} 980}
963 981
964/** Coro ********************************************************************/ 982/** Coro ********************************************************************/
965 983
966static void 984static void
967coro_enq (SV *coro_sv) 985coro_enq (pTHX_ SV *coro_sv)
968{ 986{
969 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 987 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
970} 988}
971 989
972static SV * 990static SV *
973coro_deq (int min_prio) 991coro_deq (pTHX_ int min_prio)
974{ 992{
975 int prio = PRIO_MAX - PRIO_MIN; 993 int prio = PRIO_MAX - PRIO_MIN;
976 994
977 min_prio -= PRIO_MIN; 995 min_prio -= PRIO_MIN;
978 if (min_prio < 0) 996 if (min_prio < 0)
… …
986} 1004}
987 1005
988static int 1006static int
989api_ready (SV *coro_sv) 1007api_ready (SV *coro_sv)
990{ 1008{
1009 dTHX;
991 struct coro *coro; 1010 struct coro *coro;
992 1011
993 if (SvROK (coro_sv)) 1012 if (SvROK (coro_sv))
994 coro_sv = SvRV (coro_sv); 1013 coro_sv = SvRV (coro_sv);
995 1014
… …
999 return 0; 1018 return 0;
1000 1019
1001 coro->flags |= CF_READY; 1020 coro->flags |= CF_READY;
1002 1021
1003 LOCK; 1022 LOCK;
1004 coro_enq (SvREFCNT_inc (coro_sv)); 1023 coro_enq (aTHX_ SvREFCNT_inc (coro_sv));
1005 ++coro_nready; 1024 ++coro_nready;
1006 UNLOCK; 1025 UNLOCK;
1007 1026
1008 return 1; 1027 return 1;
1009} 1028}
1010 1029
1011static int 1030static int
1012api_is_ready (SV *coro_sv) 1031api_is_ready (SV *coro_sv)
1013{ 1032{
1033 dTHX;
1014 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1034 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1015} 1035}
1016 1036
1017static void 1037static void
1018prepare_schedule (struct transfer_args *ta) 1038prepare_schedule (pTHX_ struct transfer_args *ta)
1019{ 1039{
1020 SV *prev_sv, *next_sv; 1040 SV *prev_sv, *next_sv;
1021 1041
1022 for (;;) 1042 for (;;)
1023 { 1043 {
1024 LOCK; 1044 LOCK;
1025 next_sv = coro_deq (PRIO_MIN); 1045 next_sv = coro_deq (aTHX_ PRIO_MIN);
1026 1046
1027 /* nothing to schedule: call the idle handler */ 1047 /* nothing to schedule: call the idle handler */
1028 if (!next_sv) 1048 if (!next_sv)
1029 { 1049 {
1050 dSP;
1030 UNLOCK; 1051 UNLOCK;
1031 dSP;
1032 1052
1033 ENTER; 1053 ENTER;
1034 SAVETMPS; 1054 SAVETMPS;
1035 1055
1036 PUSHMARK (SP); 1056 PUSHMARK (SP);
… …
1065 1085
1066 assert (ta->next->flags & CF_READY); 1086 assert (ta->next->flags & CF_READY);
1067 ta->next->flags &= ~CF_READY; 1087 ta->next->flags &= ~CF_READY;
1068 1088
1069 LOCK; 1089 LOCK;
1070 free_coro_mortal (); 1090 free_coro_mortal (aTHX);
1071 coro_mortal = prev_sv; 1091 coro_mortal = prev_sv;
1072 UNLOCK; 1092 UNLOCK;
1073} 1093}
1074 1094
1075static void 1095static void
1076prepare_cede (struct transfer_args *ta) 1096prepare_cede (pTHX_ struct transfer_args *ta)
1077{ 1097{
1078 api_ready (coro_current); 1098 api_ready (coro_current);
1079 prepare_schedule (ta); 1099 prepare_schedule (aTHX_ ta);
1080} 1100}
1081 1101
1082static int 1102static int
1083prepare_cede_notself (struct transfer_args *ta) 1103prepare_cede_notself (pTHX_ struct transfer_args *ta)
1084{ 1104{
1085 if (coro_nready) 1105 if (coro_nready)
1086 { 1106 {
1087 SV *prev = SvRV (coro_current); 1107 SV *prev = SvRV (coro_current);
1088 prepare_schedule (ta); 1108 prepare_schedule (aTHX_ ta);
1089 api_ready (prev); 1109 api_ready (prev);
1090 return 1; 1110 return 1;
1091 } 1111 }
1092 else 1112 else
1093 return 0; 1113 return 0;
1094} 1114}
1095 1115
1096static void 1116static void
1097api_schedule (void) 1117api_schedule (void)
1098{ 1118{
1119 dTHX;
1099 struct transfer_args ta; 1120 struct transfer_args ta;
1100 1121
1101 prepare_schedule (&ta); 1122 prepare_schedule (aTHX_ &ta);
1102 TRANSFER (ta); 1123 TRANSFER (ta);
1103} 1124}
1104 1125
1105static int 1126static int
1106api_cede (void) 1127api_cede (void)
1107{ 1128{
1129 dTHX;
1108 struct transfer_args ta; 1130 struct transfer_args ta;
1109 1131
1110 prepare_cede (&ta); 1132 prepare_cede (aTHX_ &ta);
1111 1133
1112 if (ta.prev != ta.next) 1134 if (ta.prev != ta.next)
1113 { 1135 {
1114 TRANSFER (ta); 1136 TRANSFER (ta);
1115 return 1; 1137 return 1;
… …
1119} 1141}
1120 1142
1121static int 1143static int
1122api_cede_notself (void) 1144api_cede_notself (void)
1123{ 1145{
1146 dTHX;
1124 struct transfer_args ta; 1147 struct transfer_args ta;
1125 1148
1126 if (prepare_cede_notself (&ta)) 1149 if (prepare_cede_notself (aTHX_ &ta))
1127 { 1150 {
1128 TRANSFER (ta); 1151 TRANSFER (ta);
1129 return 1; 1152 return 1;
1130 } 1153 }
1131 else 1154 else
… …
1147 1170
1148 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV)); 1171 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1149 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV)); 1172 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1150 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV)); 1173 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1151 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV)); 1174 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1175 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1176 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF));
1152 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL)); 1177 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1153 1178
1154 main_mainstack = PL_mainstack; 1179 main_mainstack = PL_mainstack;
1155 1180
1156 coroapi.ver = CORO_API_VERSION; 1181 coroapi.ver = CORO_API_VERSION;
… …
1167 HV *hv; 1192 HV *hv;
1168 int i; 1193 int i;
1169 1194
1170 Newz (0, coro, 1, struct coro); 1195 Newz (0, coro, 1, struct coro);
1171 coro->args = newAV (); 1196 coro->args = newAV ();
1172 coro->save = CORO_SAVE_ALL; 1197 coro->save = CORO_SAVE_DEF;
1173 coro->flags = CF_NEW; 1198 coro->flags = CF_NEW;
1174 1199
1175 hv = newHV (); 1200 hv = newHV ();
1176 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1201 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1177 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1202 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
… …
1184 1209
1185int 1210int
1186save (SV *coro, int new_save = -1) 1211save (SV *coro, int new_save = -1)
1187 CODE: 1212 CODE:
1188 RETVAL = api_save (coro, new_save); 1213 RETVAL = api_save (coro, new_save);
1214 OUTPUT:
1215 RETVAL
1216
1217int
1218save_also (SV *coro_sv, int save_also)
1219 CODE:
1220{
1221 struct coro *coro = SvSTATE (coro_sv);
1222 RETVAL = coro->save;
1223 coro->save |= save_also;
1224}
1189 OUTPUT: 1225 OUTPUT:
1190 RETVAL 1226 RETVAL
1191 1227
1192void 1228void
1193_set_stacklevel (...) 1229_set_stacklevel (...)
… …
1209 1245
1210 case 1: 1246 case 1:
1211 if (items != 2) 1247 if (items != 2)
1212 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items); 1248 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1213 1249
1214 prepare_transfer (&ta, ST (0), ST (1)); 1250 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1215 break; 1251 break;
1216 1252
1217 case 2: 1253 case 2:
1218 prepare_schedule (&ta); 1254 prepare_schedule (aTHX_ &ta);
1219 break; 1255 break;
1220 1256
1221 case 3: 1257 case 3:
1222 prepare_cede (&ta); 1258 prepare_cede (aTHX_ &ta);
1223 break; 1259 break;
1224 1260
1225 case 4: 1261 case 4:
1226 if (!prepare_cede_notself (&ta)) 1262 if (!prepare_cede_notself (aTHX_ &ta))
1227 XSRETURN_EMPTY; 1263 XSRETURN_EMPTY;
1228 1264
1229 break; 1265 break;
1230 } 1266 }
1231 1267
… …
1237} 1273}
1238 1274
1239bool 1275bool
1240_destroy (SV *coro_sv) 1276_destroy (SV *coro_sv)
1241 CODE: 1277 CODE:
1242 RETVAL = coro_state_destroy (SvSTATE (coro_sv)); 1278 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1243 OUTPUT: 1279 OUTPUT:
1244 RETVAL 1280 RETVAL
1245 1281
1246void 1282void
1247_exit (code) 1283_exit (code)
1248 int code 1284 int code
1249 PROTOTYPE: $ 1285 PROTOTYPE: $
1250 CODE: 1286 CODE:
1251 _exit (code); 1287 _exit (code);
1288
1289int
1290cctx_stacksize (int new_stacksize = 0)
1291 CODE:
1292 RETVAL = coro_stacksize;
1293 if (new_stacksize)
1294 coro_stacksize = new_stacksize;
1295 OUTPUT:
1296 RETVAL
1252 1297
1253int 1298int
1254cctx_count () 1299cctx_count ()
1255 CODE: 1300 CODE:
1256 RETVAL = cctx_count; 1301 RETVAL = cctx_count;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines