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.144 by root, Sun Mar 4 11:45:23 2007 UTC vs.
Revision 1.148 by root, Fri Apr 13 12:56:55 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
124 I32 laststype; 126 I32 laststype;
125 int laststatval; 127 int laststatval;
126 Stat_t statcache; 128 Stat_t statcache;
127}; 129};
128 130
131static size_t coro_stacksize = CORO_STACKSIZE;
129static struct CoroAPI coroapi; 132static struct CoroAPI coroapi;
130static AV *main_mainstack; /* used to differentiate between $main and others */ 133static AV *main_mainstack; /* used to differentiate between $main and others */
134static JMPENV *main_top_env;
131static HV *coro_state_stash, *coro_stash; 135static HV *coro_state_stash, *coro_stash;
132static SV *coro_mortal; /* will be freed after next transfer */ 136static SV *coro_mortal; /* will be freed after next transfer */
133 137
134static struct coro_cctx *cctx_first; 138static struct coro_cctx *cctx_first;
135static int cctx_count, cctx_idle; 139static int cctx_count, cctx_idle;
138typedef struct coro_cctx { 142typedef struct coro_cctx {
139 struct coro_cctx *next; 143 struct coro_cctx *next;
140 144
141 /* the stack */ 145 /* the stack */
142 void *sptr; 146 void *sptr;
143 ssize_t ssize; /* positive == mmap, otherwise malloc */ 147 size_t ssize;
144 148
145 /* cpu state */ 149 /* cpu state */
146 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 150 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
147 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 151 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */
148 JMPENV *top_env; 152 JMPENV *top_env;
149 coro_context cctx; 153 coro_context cctx;
150 154
151 int inuse;
152
153#if CORO_USE_VALGRIND 155#if CORO_USE_VALGRIND
154 int valgrind_id; 156 int valgrind_id;
155#endif 157#endif
158 char inuse, mapped;
156} coro_cctx; 159} coro_cctx;
157 160
158enum { 161enum {
159 CF_RUNNING = 0x0001, /* coroutine is running */ 162 CF_RUNNING = 0x0001, /* coroutine is running */
160 CF_READY = 0x0002, /* coroutine is ready */ 163 CF_READY = 0x0002, /* coroutine is ready */
175 178
176 /* optionally saved, might be zero */ 179 /* optionally saved, might be zero */
177 AV *defav; /* @_ */ 180 AV *defav; /* @_ */
178 SV *defsv; /* $_ */ 181 SV *defsv; /* $_ */
179 SV *errsv; /* $@ */ 182 SV *errsv; /* $@ */
183 GV *deffh; /* default filehandle */
180 SV *irssv; /* $/ */ 184 SV *irssv; /* $/ */
181 SV *irssv_sv; /* real $/ cache */ 185 SV *irssv_sv; /* real $/ cache */
182 186
183#define VAR(name,type) type name; 187#define VAR(name,type) type name;
184# include "state.h" 188# include "state.h"
206static int coro_nready; 210static int coro_nready;
207 211
208/** lowlevel stuff **********************************************************/ 212/** lowlevel stuff **********************************************************/
209 213
210static AV * 214static AV *
211coro_clone_padlist (CV *cv) 215coro_clone_padlist (pTHX_ CV *cv)
212{ 216{
213 AV *padlist = CvPADLIST (cv); 217 AV *padlist = CvPADLIST (cv);
214 AV *newpadlist, *newpad; 218 AV *newpadlist, *newpad;
215 219
216 newpadlist = newAV (); 220 newpadlist = newAV ();
228 232
229 return newpadlist; 233 return newpadlist;
230} 234}
231 235
232static void 236static void
233free_padlist (AV *padlist) 237free_padlist (pTHX_ AV *padlist)
234{ 238{
235 /* may be during global destruction */ 239 /* may be during global destruction */
236 if (SvREFCNT (padlist)) 240 if (SvREFCNT (padlist))
237 { 241 {
238 I32 i = AvFILLp (padlist); 242 I32 i = AvFILLp (padlist);
259 AV *padlist; 263 AV *padlist;
260 AV *av = (AV *)mg->mg_obj; 264 AV *av = (AV *)mg->mg_obj;
261 265
262 /* casting is fun. */ 266 /* casting is fun. */
263 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 267 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
264 free_padlist (padlist); 268 free_padlist (aTHX_ padlist);
265 269
266 SvREFCNT_dec (av); 270 SvREFCNT_dec (av);
267 271
268 return 0; 272 return 0;
269} 273}
279 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 283 : mg_find ((SV *)cv, PERL_MAGIC_coro) \
280 : 0 284 : 0
281 285
282/* the next two functions merely cache the padlists */ 286/* the next two functions merely cache the padlists */
283static void 287static void
284get_padlist (CV *cv) 288get_padlist (pTHX_ CV *cv)
285{ 289{
286 MAGIC *mg = CORO_MAGIC (cv); 290 MAGIC *mg = CORO_MAGIC (cv);
287 AV *av; 291 AV *av;
288 292
289 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 293 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)
295 CV *cp = Perl_cv_clone (cv); 299 CV *cp = Perl_cv_clone (cv);
296 CvPADLIST (cv) = CvPADLIST (cp); 300 CvPADLIST (cv) = CvPADLIST (cp);
297 CvPADLIST (cp) = 0; 301 CvPADLIST (cp) = 0;
298 SvREFCNT_dec (cp); 302 SvREFCNT_dec (cp);
299#else 303#else
300 CvPADLIST (cv) = coro_clone_padlist (cv); 304 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv);
301#endif 305#endif
302 } 306 }
303} 307}
304 308
305static void 309static void
306put_padlist (CV *cv) 310put_padlist (pTHX_ CV *cv)
307{ 311{
308 MAGIC *mg = CORO_MAGIC (cv); 312 MAGIC *mg = CORO_MAGIC (cv);
309 AV *av; 313 AV *av;
310 314
311 if (!mg) 315 if (!mg)
330#define SE } while (0) 334#define SE } while (0)
331 335
332#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE 336#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
333 337
334static void 338static void
335load_perl (Coro__State c) 339load_perl (pTHX_ Coro__State c)
336{ 340{
337#define VAR(name,type) PL_ ## name = c->name; 341#define VAR(name,type) PL_ ## name = c->name;
338# include "state.h" 342# include "state.h"
339#undef VAR 343#undef VAR
340 344
341 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 345 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
342 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 346 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
343 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 347 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
348 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh);
349
344 if (c->irssv) 350 if (c->irssv)
345 { 351 {
346 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv)) 352 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
353 {
347 SvREFCNT_dec (c->irssv); 354 SvREFCNT_dec (c->irssv);
355 c->irssv = 0;
356 }
348 else 357 else
349 { 358 {
350 REPLACE_SV (PL_rs, c->irssv); 359 REPLACE_SV (PL_rs, c->irssv);
351 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0); 360 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
352 sv_setsv (c->irssv_sv, PL_rs); 361 sv_setsv (c->irssv_sv, PL_rs);
358 CV *cv; 367 CV *cv;
359 368
360 /* now do the ugly restore mess */ 369 /* now do the ugly restore mess */
361 while ((cv = (CV *)POPs)) 370 while ((cv = (CV *)POPs))
362 { 371 {
363 put_padlist (cv); /* mark this padlist as available */ 372 put_padlist (aTHX_ cv); /* mark this padlist as available */
364 CvDEPTH (cv) = PTR2IV (POPs); 373 CvDEPTH (cv) = PTR2IV (POPs);
365 CvPADLIST (cv) = (AV *)POPs; 374 CvPADLIST (cv) = (AV *)POPs;
366 } 375 }
367 376
368 PUTBACK; 377 PUTBACK;
369 } 378 }
370 assert (!PL_comppad || AvARRAY (PL_comppad));//D 379 assert (!PL_comppad || AvARRAY (PL_comppad));//D
371} 380}
372 381
373static void 382static void
374save_perl (Coro__State c) 383save_perl (pTHX_ Coro__State c)
375{ 384{
376 assert (!PL_comppad || AvARRAY (PL_comppad));//D 385 assert (!PL_comppad || AvARRAY (PL_comppad));//D
377 { 386 {
378 dSP; 387 dSP;
379 I32 cxix = cxstack_ix; 388 I32 cxix = cxstack_ix;
404 PUSHs ((SV *)CvPADLIST (cv)); 413 PUSHs ((SV *)CvPADLIST (cv));
405 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 414 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
406 PUSHs ((SV *)cv); 415 PUSHs ((SV *)cv);
407 416
408 CvDEPTH (cv) = 0; 417 CvDEPTH (cv) = 0;
409 get_padlist (cv); 418 get_padlist (aTHX_ cv);
410 } 419 }
411 } 420 }
412 } 421 }
413 422
414 if (top_si->si_type == PERLSI_MAIN) 423 if (top_si->si_type == PERLSI_MAIN)
423 } 432 }
424 433
425 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 434 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0;
426 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 435 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0;
427 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 436 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0;
437 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0;
428 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0; 438 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0;
429 439
430#define VAR(name,type)c->name = PL_ ## name; 440#define VAR(name,type)c->name = PL_ ## name;
431# include "state.h" 441# include "state.h"
432#undef VAR 442#undef VAR
440 */ 450 */
441#if CORO_PREFER_PERL_FUNCTIONS 451#if CORO_PREFER_PERL_FUNCTIONS
442# define coro_init_stacks init_stacks 452# define coro_init_stacks init_stacks
443#else 453#else
444static void 454static void
445coro_init_stacks () 455coro_init_stacks (pTHX)
446{ 456{
447 PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT)); 457 PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT));
448 PL_curstackinfo->si_type = PERLSI_MAIN; 458 PL_curstackinfo->si_type = PERLSI_MAIN;
449 PL_curstack = PL_curstackinfo->si_stack; 459 PL_curstack = PL_curstackinfo->si_stack;
450 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 460 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
484 494
485/* 495/*
486 * destroy the stacks, the callchain etc... 496 * destroy the stacks, the callchain etc...
487 */ 497 */
488static void 498static void
489coro_destroy_stacks () 499coro_destroy_stacks (pTHX)
490{ 500{
491 if (!IN_DESTRUCT) 501 if (!IN_DESTRUCT)
492 { 502 {
493 /* restore all saved variables and stuff */ 503 /* restore all saved variables and stuff */
494 LEAVE_SCOPE (0); 504 LEAVE_SCOPE (0);
530} 540}
531 541
532/** coroutine stack handling ************************************************/ 542/** coroutine stack handling ************************************************/
533 543
534static void 544static void
535setup_coro (struct coro *coro) 545setup_coro (pTHX_ struct coro *coro)
536{ 546{
537 /* 547 /*
538 * emulate part of the perl startup here. 548 * emulate part of the perl startup here.
539 */ 549 */
540
541 coro_init_stacks (); 550 coro_init_stacks (aTHX);
542 551
543 PL_curcop = &PL_compiling; 552 PL_curcop = &PL_compiling;
544 PL_in_eval = EVAL_NULL; 553 PL_in_eval = EVAL_NULL;
545 PL_comppad = 0; 554 PL_comppad = 0;
546 PL_curpm = 0; 555 PL_curpm = 0;
569 578
570 ENTER; /* necessary e.g. for dounwind */ 579 ENTER; /* necessary e.g. for dounwind */
571} 580}
572 581
573static void 582static void
574free_coro_mortal () 583free_coro_mortal (pTHX)
575{ 584{
576 if (coro_mortal) 585 if (coro_mortal)
577 { 586 {
578 SvREFCNT_dec (coro_mortal); 587 SvREFCNT_dec (coro_mortal);
579 coro_mortal = 0; 588 coro_mortal = 0;
580 } 589 }
581} 590}
582 591
583/* inject a fake call to Coro::State::_cctx_init into the execution */ 592/* inject a fake call to Coro::State::_cctx_init into the execution */
593/* _cctx_init shoukld be careful, as it could be called at almost any time */
594/* during execution of a pelr program */
584static void NOINLINE 595static void NOINLINE
585prepare_cctx (coro_cctx *cctx) 596prepare_cctx (pTHX_ coro_cctx *cctx)
586{ 597{
587 dSP; 598 dSP;
588 LOGOP myop; 599 LOGOP myop;
589 600
590 Zero (&myop, 1, LOGOP); 601 Zero (&myop, 1, LOGOP);
599 PL_op = (OP *)&myop; 610 PL_op = (OP *)&myop;
600 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 611 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
601 SPAGAIN; 612 SPAGAIN;
602} 613}
603 614
615/*
616 * this is a _very_ stripped down perl interpreter ;)
617 */
604static void 618static void
605coro_run (void *arg) 619coro_run (void *arg)
606{ 620{
621 dTHX;
622
607 /* coro_run is the alternative tail of transfer(), so unlock here. */ 623 /* coro_run is the alternative tail of transfer(), so unlock here. */
608 UNLOCK; 624 UNLOCK;
609 625
610 /*
611 * this is a _very_ stripped down perl interpreter ;)
612 */
613 PL_top_env = &PL_start_env; 626 PL_top_env = &PL_start_env;
614 627
615 /* inject call to cctx_init */ 628 /* inject a fake subroutine call to cctx_init */
616 prepare_cctx ((coro_cctx *)arg); 629 prepare_cctx (aTHX_ (coro_cctx *)arg);
617 630
618 /* somebody will hit me for both perl_run and PL_restartop */ 631 /* somebody or something will hit me for both perl_run and PL_restartop */
619 PL_restartop = PL_op; 632 PL_restartop = PL_op;
620 perl_run (PL_curinterp); 633 perl_run (PL_curinterp);
621 634
622 fputs ("FATAL: C coroutine fell over the edge of the world, aborting. Did you call exit in a coroutine?\n", stderr); 635 /* If perl-run returns we assume exit() was being called, which */
623 abort (); 636 /* seems to be the only valid (non-bug) reason for perl_run to return. */
637 /* We try to exit by jumping to the bootstrap-time "top" top_env, as */
638 /* we cannot restore the "main" coroutine as Coro has no such concept */
639 PL_top_env = main_top_env;
640 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
624} 641}
625 642
626static coro_cctx * 643static coro_cctx *
627cctx_new () 644cctx_new ()
628{ 645{
629 coro_cctx *cctx; 646 coro_cctx *cctx;
647 void *stack_start;
648 size_t stack_size;
630 649
631 ++cctx_count; 650 ++cctx_count;
632 651
633 Newz (0, cctx, 1, coro_cctx); 652 Newz (0, cctx, 1, coro_cctx);
634 653
635#if HAVE_MMAP 654#if HAVE_MMAP
636 655
637 cctx->ssize = ((CORO_STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 656 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
638 /* mmap supposedly does allocate-on-write for us */ 657 /* mmap supposedly does allocate-on-write for us */
639 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 658 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
640 659
641 if (cctx->sptr != (void *)-1) 660 if (cctx->sptr != (void *)-1)
642 { 661 {
643# if CORO_STACKGUARD 662# if CORO_STACKGUARD
644 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 663 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
645# endif 664# endif
646 REGISTER_STACK (
647 cctx,
648 CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr, 665 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr;
649 cctx->ssize + (char *)cctx->sptr 666 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
650 ); 667 cctx->mapped = 1;
651
652 coro_create (&cctx->cctx, coro_run, (void *)cctx, cctx->sptr, cctx->ssize);
653 } 668 }
654 else 669 else
655#endif 670#endif
656 { 671 {
657 cctx->ssize = -CORO_STACKSIZE * (long)sizeof (long); 672 cctx->ssize = coro_stacksize * (long)sizeof (long);
658 New (0, cctx->sptr, CORO_STACKSIZE, long); 673 New (0, cctx->sptr, coro_stacksize, long);
659 674
660 if (!cctx->sptr) 675 if (!cctx->sptr)
661 { 676 {
662 perror ("FATAL: unable to allocate stack for coroutine"); 677 perror ("FATAL: unable to allocate stack for coroutine");
663 _exit (EXIT_FAILURE); 678 _exit (EXIT_FAILURE);
664 } 679 }
665 680
666 REGISTER_STACK ( 681 stack_start = cctx->sptr;
667 cctx, 682 stack_size = cctx->ssize;
668 (char *)cctx->sptr, 683 }
669 (char *)cctx->sptr - cctx->ssize
670 );
671 684
685 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
672 coro_create (&cctx->cctx, coro_run, (void *)cctx, cctx->sptr, -cctx->ssize); 686 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size);
673 }
674 687
675 return cctx; 688 return cctx;
676} 689}
677 690
678static void 691static void
686#if CORO_USE_VALGRIND 699#if CORO_USE_VALGRIND
687 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 700 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
688#endif 701#endif
689 702
690#if HAVE_MMAP 703#if HAVE_MMAP
691 if (cctx->ssize > 0) 704 if (cctx->mapped)
692 munmap (cctx->sptr, cctx->ssize); 705 munmap (cctx->sptr, cctx->ssize);
693 else 706 else
694#endif 707#endif
695 Safefree (cctx->sptr); 708 Safefree (cctx->sptr);
696 709
697 Safefree (cctx); 710 Safefree (cctx);
698} 711}
699 712
700static coro_cctx * 713static coro_cctx *
701cctx_get () 714cctx_get (pTHX)
702{ 715{
703 coro_cctx *cctx;
704
705 if (cctx_first) 716 while (cctx_first)
706 { 717 {
707 cctx = cctx_first; 718 coro_cctx *cctx = cctx_first;
708 cctx_first = cctx->next; 719 cctx_first = cctx->next;
709 --cctx_idle; 720 --cctx_idle;
721
722 if (cctx->ssize >= coro_stacksize)
723 return cctx;
724
725 cctx_destroy (cctx);
710 } 726 }
711 else 727
712 {
713 cctx = cctx_new ();
714 PL_op = PL_op->op_next; 728 PL_op = PL_op->op_next;
715 }
716
717 return cctx; 729 return cctx_new ();
718} 730}
719 731
720static void 732static void
721cctx_put (coro_cctx *cctx) 733cctx_put (coro_cctx *cctx)
722{ 734{
738 750
739/** coroutine switching *****************************************************/ 751/** coroutine switching *****************************************************/
740 752
741/* never call directly, always through the coro_state_transfer global variable */ 753/* never call directly, always through the coro_state_transfer global variable */
742static void NOINLINE 754static void NOINLINE
743transfer (struct coro *prev, struct coro *next) 755transfer (pTHX_ struct coro *prev, struct coro *next)
744{ 756{
745 dSTACKLEVEL; 757 dSTACKLEVEL;
746 758
747 /* sometimes transfer is only called to set idle_sp */ 759 /* sometimes transfer is only called to set idle_sp */
748 if (!next) 760 if (!next)
781 if (next->flags & CF_NEW) 793 if (next->flags & CF_NEW)
782 { 794 {
783 /* need to start coroutine */ 795 /* need to start coroutine */
784 next->flags &= ~CF_NEW; 796 next->flags &= ~CF_NEW;
785 /* first get rid of the old state */ 797 /* first get rid of the old state */
786 save_perl (prev); 798 save_perl (aTHX_ prev);
787 /* setup coroutine call */ 799 /* setup coroutine call */
788 setup_coro (next); 800 setup_coro (aTHX_ next);
789 /* need a new stack */ 801 /* need a new stack */
790 assert (!next->cctx); 802 assert (!next->cctx);
791 } 803 }
792 else 804 else
793 { 805 {
794 /* coroutine already started */ 806 /* coroutine already started */
795 save_perl (prev); 807 save_perl (aTHX_ prev);
796 load_perl (next); 808 load_perl (aTHX_ next);
797 } 809 }
798 810
799 prev__cctx = prev->cctx; 811 prev__cctx = prev->cctx;
800 812
801 /* possibly "free" the cctx */ 813 /* possibly "free" the cctx */
810 prev__cctx->inuse = 0; 822 prev__cctx->inuse = 0;
811 } 823 }
812 824
813 if (!next->cctx) 825 if (!next->cctx)
814 { 826 {
815 next->cctx = cctx_get (); 827 next->cctx = cctx_get (aTHX);
816 assert (!next->cctx->inuse); 828 assert (!next->cctx->inuse);
817 next->cctx->inuse = 1; 829 next->cctx->inuse = 1;
818 } 830 }
819 831
820 if (prev__cctx != next->cctx) 832 if (prev__cctx != next->cctx)
822 prev__cctx->top_env = PL_top_env; 834 prev__cctx->top_env = PL_top_env;
823 PL_top_env = next->cctx->top_env; 835 PL_top_env = next->cctx->top_env;
824 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 836 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
825 } 837 }
826 838
827 free_coro_mortal (); 839 free_coro_mortal (aTHX);
828 UNLOCK; 840 UNLOCK;
829 } 841 }
830} 842}
831 843
832struct transfer_args 844struct transfer_args
833{ 845{
834 struct coro *prev, *next; 846 struct coro *prev, *next;
835}; 847};
836 848
837#define TRANSFER(ta) transfer ((ta).prev, (ta).next) 849#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next)
838 850
839/** high level stuff ********************************************************/ 851/** high level stuff ********************************************************/
840 852
841static int 853static int
842coro_state_destroy (struct coro *coro) 854coro_state_destroy (pTHX_ struct coro *coro)
843{ 855{
844 if (coro->flags & CF_DESTROYED) 856 if (coro->flags & CF_DESTROYED)
845 return 0; 857 return 0;
846 858
847 coro->flags |= CF_DESTROYED; 859 coro->flags |= CF_DESTROYED;
862 struct coro temp; 874 struct coro temp;
863 875
864 assert (!(coro->flags & CF_RUNNING)); 876 assert (!(coro->flags & CF_RUNNING));
865 877
866 Zero (&temp, 1, struct coro); 878 Zero (&temp, 1, struct coro);
867 temp.save = CORO_SAVE_ALL; 879 temp.save = CORO_SAVE_DEF;
868 880
869 if (coro->flags & CF_RUNNING) 881 if (coro->flags & CF_RUNNING)
870 croak ("FATAL: tried to destroy currently running coroutine"); 882 croak ("FATAL: tried to destroy currently running coroutine");
871 883
872 save_perl (&temp); 884 save_perl (aTHX_ &temp);
873 load_perl (coro); 885 load_perl (aTHX_ coro);
874 886
875 coro_destroy_stacks (); 887 coro_destroy_stacks (aTHX);
876 888
877 load_perl (&temp); /* this will get rid of defsv etc.. */ 889 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */
878 890
879 coro->mainstack = 0; 891 coro->mainstack = 0;
880 } 892 }
881 893
882 cctx_destroy (coro->cctx); 894 cctx_destroy (coro->cctx);
891 struct coro *coro = (struct coro *)mg->mg_ptr; 903 struct coro *coro = (struct coro *)mg->mg_ptr;
892 mg->mg_ptr = 0; 904 mg->mg_ptr = 0;
893 905
894 if (--coro->refcnt < 0) 906 if (--coro->refcnt < 0)
895 { 907 {
896 coro_state_destroy (coro); 908 coro_state_destroy (aTHX_ coro);
897 Safefree (coro); 909 Safefree (coro);
898 } 910 }
899 911
900 return 0; 912 return 0;
901} 913}
920# define MGf_DUP 0 932# define MGf_DUP 0
921#endif 933#endif
922}; 934};
923 935
924static struct coro * 936static struct coro *
925SvSTATE (SV *coro) 937SvSTATE_ (pTHX_ SV *coro)
926{ 938{
927 HV *stash; 939 HV *stash;
928 MAGIC *mg; 940 MAGIC *mg;
929 941
930 if (SvROK (coro)) 942 if (SvROK (coro))
940 952
941 mg = CORO_MAGIC (coro); 953 mg = CORO_MAGIC (coro);
942 return (struct coro *)mg->mg_ptr; 954 return (struct coro *)mg->mg_ptr;
943} 955}
944 956
957#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
958
945static void 959static void
946prepare_transfer (struct transfer_args *ta, SV *prev_sv, SV *next_sv) 960prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv)
947{ 961{
948 ta->prev = SvSTATE (prev_sv); 962 ta->prev = SvSTATE (prev_sv);
949 ta->next = SvSTATE (next_sv); 963 ta->next = SvSTATE (next_sv);
950} 964}
951 965
952static void 966static void
953api_transfer (SV *prev_sv, SV *next_sv) 967api_transfer (SV *prev_sv, SV *next_sv)
954{ 968{
969 dTHX;
955 struct transfer_args ta; 970 struct transfer_args ta;
956 971
957 prepare_transfer (&ta, prev_sv, next_sv); 972 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
958 TRANSFER (ta); 973 TRANSFER (ta);
959} 974}
960 975
961static int 976static int
962api_save (SV *coro_sv, int new_save) 977api_save (SV *coro_sv, int new_save)
963{ 978{
979 dTHX;
964 struct coro *coro = SvSTATE (coro_sv); 980 struct coro *coro = SvSTATE (coro_sv);
965 int old_save = coro->save; 981 int old_save = coro->save;
966 982
967 if (new_save >= 0) 983 if (new_save >= 0)
968 coro->save = new_save; 984 coro->save = new_save;
971} 987}
972 988
973/** Coro ********************************************************************/ 989/** Coro ********************************************************************/
974 990
975static void 991static void
976coro_enq (SV *coro_sv) 992coro_enq (pTHX_ SV *coro_sv)
977{ 993{
978 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 994 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
979} 995}
980 996
981static SV * 997static SV *
982coro_deq (int min_prio) 998coro_deq (pTHX_ int min_prio)
983{ 999{
984 int prio = PRIO_MAX - PRIO_MIN; 1000 int prio = PRIO_MAX - PRIO_MIN;
985 1001
986 min_prio -= PRIO_MIN; 1002 min_prio -= PRIO_MIN;
987 if (min_prio < 0) 1003 if (min_prio < 0)
995} 1011}
996 1012
997static int 1013static int
998api_ready (SV *coro_sv) 1014api_ready (SV *coro_sv)
999{ 1015{
1016 dTHX;
1000 struct coro *coro; 1017 struct coro *coro;
1001 1018
1002 if (SvROK (coro_sv)) 1019 if (SvROK (coro_sv))
1003 coro_sv = SvRV (coro_sv); 1020 coro_sv = SvRV (coro_sv);
1004 1021
1008 return 0; 1025 return 0;
1009 1026
1010 coro->flags |= CF_READY; 1027 coro->flags |= CF_READY;
1011 1028
1012 LOCK; 1029 LOCK;
1013 coro_enq (SvREFCNT_inc (coro_sv)); 1030 coro_enq (aTHX_ SvREFCNT_inc (coro_sv));
1014 ++coro_nready; 1031 ++coro_nready;
1015 UNLOCK; 1032 UNLOCK;
1016 1033
1017 return 1; 1034 return 1;
1018} 1035}
1019 1036
1020static int 1037static int
1021api_is_ready (SV *coro_sv) 1038api_is_ready (SV *coro_sv)
1022{ 1039{
1040 dTHX;
1023 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1041 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1024} 1042}
1025 1043
1026static void 1044static void
1027prepare_schedule (struct transfer_args *ta) 1045prepare_schedule (pTHX_ struct transfer_args *ta)
1028{ 1046{
1029 SV *prev_sv, *next_sv; 1047 SV *prev_sv, *next_sv;
1030 1048
1031 for (;;) 1049 for (;;)
1032 { 1050 {
1033 LOCK; 1051 LOCK;
1034 next_sv = coro_deq (PRIO_MIN); 1052 next_sv = coro_deq (aTHX_ PRIO_MIN);
1035 1053
1036 /* nothing to schedule: call the idle handler */ 1054 /* nothing to schedule: call the idle handler */
1037 if (!next_sv) 1055 if (!next_sv)
1038 { 1056 {
1039 dSP; 1057 dSP;
1074 1092
1075 assert (ta->next->flags & CF_READY); 1093 assert (ta->next->flags & CF_READY);
1076 ta->next->flags &= ~CF_READY; 1094 ta->next->flags &= ~CF_READY;
1077 1095
1078 LOCK; 1096 LOCK;
1079 free_coro_mortal (); 1097 free_coro_mortal (aTHX);
1080 coro_mortal = prev_sv; 1098 coro_mortal = prev_sv;
1081 UNLOCK; 1099 UNLOCK;
1082} 1100}
1083 1101
1084static void 1102static void
1085prepare_cede (struct transfer_args *ta) 1103prepare_cede (pTHX_ struct transfer_args *ta)
1086{ 1104{
1087 api_ready (coro_current); 1105 api_ready (coro_current);
1088 prepare_schedule (ta); 1106 prepare_schedule (aTHX_ ta);
1089} 1107}
1090 1108
1091static int 1109static int
1092prepare_cede_notself (struct transfer_args *ta) 1110prepare_cede_notself (pTHX_ struct transfer_args *ta)
1093{ 1111{
1094 if (coro_nready) 1112 if (coro_nready)
1095 { 1113 {
1096 SV *prev = SvRV (coro_current); 1114 SV *prev = SvRV (coro_current);
1097 prepare_schedule (ta); 1115 prepare_schedule (aTHX_ ta);
1098 api_ready (prev); 1116 api_ready (prev);
1099 return 1; 1117 return 1;
1100 } 1118 }
1101 else 1119 else
1102 return 0; 1120 return 0;
1103} 1121}
1104 1122
1105static void 1123static void
1106api_schedule (void) 1124api_schedule (void)
1107{ 1125{
1126 dTHX;
1108 struct transfer_args ta; 1127 struct transfer_args ta;
1109 1128
1110 prepare_schedule (&ta); 1129 prepare_schedule (aTHX_ &ta);
1111 TRANSFER (ta); 1130 TRANSFER (ta);
1112} 1131}
1113 1132
1114static int 1133static int
1115api_cede (void) 1134api_cede (void)
1116{ 1135{
1136 dTHX;
1117 struct transfer_args ta; 1137 struct transfer_args ta;
1118 1138
1119 prepare_cede (&ta); 1139 prepare_cede (aTHX_ &ta);
1120 1140
1121 if (ta.prev != ta.next) 1141 if (ta.prev != ta.next)
1122 { 1142 {
1123 TRANSFER (ta); 1143 TRANSFER (ta);
1124 return 1; 1144 return 1;
1128} 1148}
1129 1149
1130static int 1150static int
1131api_cede_notself (void) 1151api_cede_notself (void)
1132{ 1152{
1153 dTHX;
1133 struct transfer_args ta; 1154 struct transfer_args ta;
1134 1155
1135 if (prepare_cede_notself (&ta)) 1156 if (prepare_cede_notself (aTHX_ &ta))
1136 { 1157 {
1137 TRANSFER (ta); 1158 TRANSFER (ta);
1138 return 1; 1159 return 1;
1139 } 1160 }
1140 else 1161 else
1156 1177
1157 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV)); 1178 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1158 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV)); 1179 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1159 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV)); 1180 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1160 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV)); 1181 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1182 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1183 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF));
1161 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL)); 1184 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1162 1185
1163 main_mainstack = PL_mainstack; 1186 main_mainstack = PL_mainstack;
1187 main_top_env = PL_top_env;
1188
1189 while (main_top_env->je_prev)
1190 main_top_env = main_top_env->je_prev;
1164 1191
1165 coroapi.ver = CORO_API_VERSION; 1192 coroapi.ver = CORO_API_VERSION;
1166 coroapi.transfer = api_transfer; 1193 coroapi.transfer = api_transfer;
1167 1194
1168 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1195 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1176 HV *hv; 1203 HV *hv;
1177 int i; 1204 int i;
1178 1205
1179 Newz (0, coro, 1, struct coro); 1206 Newz (0, coro, 1, struct coro);
1180 coro->args = newAV (); 1207 coro->args = newAV ();
1181 coro->save = CORO_SAVE_ALL; 1208 coro->save = CORO_SAVE_DEF;
1182 coro->flags = CF_NEW; 1209 coro->flags = CF_NEW;
1183 1210
1184 hv = newHV (); 1211 hv = newHV ();
1185 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1212 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1186 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1213 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1193 1220
1194int 1221int
1195save (SV *coro, int new_save = -1) 1222save (SV *coro, int new_save = -1)
1196 CODE: 1223 CODE:
1197 RETVAL = api_save (coro, new_save); 1224 RETVAL = api_save (coro, new_save);
1225 OUTPUT:
1226 RETVAL
1227
1228int
1229save_also (SV *coro_sv, int save_also)
1230 CODE:
1231{
1232 struct coro *coro = SvSTATE (coro_sv);
1233 RETVAL = coro->save;
1234 coro->save |= save_also;
1235}
1198 OUTPUT: 1236 OUTPUT:
1199 RETVAL 1237 RETVAL
1200 1238
1201void 1239void
1202_set_stacklevel (...) 1240_set_stacklevel (...)
1218 1256
1219 case 1: 1257 case 1:
1220 if (items != 2) 1258 if (items != 2)
1221 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items); 1259 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1222 1260
1223 prepare_transfer (&ta, ST (0), ST (1)); 1261 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1224 break; 1262 break;
1225 1263
1226 case 2: 1264 case 2:
1227 prepare_schedule (&ta); 1265 prepare_schedule (aTHX_ &ta);
1228 break; 1266 break;
1229 1267
1230 case 3: 1268 case 3:
1231 prepare_cede (&ta); 1269 prepare_cede (aTHX_ &ta);
1232 break; 1270 break;
1233 1271
1234 case 4: 1272 case 4:
1235 if (!prepare_cede_notself (&ta)) 1273 if (!prepare_cede_notself (aTHX_ &ta))
1236 XSRETURN_EMPTY; 1274 XSRETURN_EMPTY;
1237 1275
1238 break; 1276 break;
1239 } 1277 }
1240 1278
1246} 1284}
1247 1285
1248bool 1286bool
1249_destroy (SV *coro_sv) 1287_destroy (SV *coro_sv)
1250 CODE: 1288 CODE:
1251 RETVAL = coro_state_destroy (SvSTATE (coro_sv)); 1289 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1252 OUTPUT: 1290 OUTPUT:
1253 RETVAL 1291 RETVAL
1254 1292
1255void 1293void
1256_exit (code) 1294_exit (code)
1257 int code 1295 int code
1258 PROTOTYPE: $ 1296 PROTOTYPE: $
1259 CODE: 1297 CODE:
1260 _exit (code); 1298 _exit (code);
1299
1300int
1301cctx_stacksize (int new_stacksize = 0)
1302 CODE:
1303 RETVAL = coro_stacksize;
1304 if (new_stacksize)
1305 coro_stacksize = new_stacksize;
1306 OUTPUT:
1307 RETVAL
1261 1308
1262int 1309int
1263cctx_count () 1310cctx_count ()
1264 CODE: 1311 CODE:
1265 RETVAL = cctx_count; 1312 RETVAL = cctx_count;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines