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.10 by root, Sat Jul 21 04:19:34 2001 UTC vs.
Revision 1.18 by root, Thu Jul 26 03:46:15 2001 UTC

1#include "EXTERN.h" 1#include "EXTERN.h"
2#include "perl.h" 2#include "perl.h"
3#include "XSUB.h" 3#include "XSUB.h"
4 4
5#if 1 5#include "libcoro/coro.c"
6# define CHK(x) (void *)0 6
7#ifdef HAVE_MMAP
8# include <unistd.h>
9# include <sys/mman.h>
10# ifndef MAP_ANON
11# ifdef MAP_ANONYMOUS
12# define MAP_ANON MAP_ANONYMOUS
13# else
14# undef HAVE_MMAP
15# endif
16# endif
17#endif
18
19#define MAY_FLUSH /* increases codesize */
20
21/* perl-related */
22#define TRANSFER_SAVE_DEFAV 0x00000001
23#define TRANSFER_SAVE_DEFSV 0x00000002
24#define TRANSFER_SAVE_ERRSV 0x00000004
25/* c-related */
26#define TRANSFER_SAVE_CCTXT 0x00000008
27#ifdef CORO_LAZY_STACK
28# define TRANSFER_LAZY_STACK 0x00000010
7#else 29#else
8# define CHK(x) if (!(x)) croak("FATAL, CHK: " #x) 30# define TRANSFER_LAZY_STACK 0x00000000
9#endif 31#endif
10 32
11#define MAY_FLUSH /* increases codesize */ 33#define TRANSFER_SAVE_ALL (TRANSFER_SAVE_DEFAV|TRANSFER_SAVE_DEFSV \
34 |TRANSFER_SAVE_ERRSV|TRANSFER_SAVE_CCTXT)
12 35
13#define SUB_INIT "Coro::State::coroutine_initialization" 36#define SUB_INIT "Coro::State::initialize"
37#define UCORO_STATE "_coro_state"
14 38
15#define SAVE_DEFAV 0x00000001 39/* The next macro should delcare a variable stacklevel that contains and approximation
16#define SAVE_DEFSV 0x00000002 40 * to the current C stack pointer. It's property is that it changes with each call
17#define SAVE_ERRSV 0x00000004 41 * and should be unique. */
42#define dSTACKLEVEL void *stacklevel = &stacklevel
18 43
19#define SAVE_ALL -1 44#define labs(l) ((l) >= 0 ? (l) : -(l))
45
46/* this is actually not only the c stack but also c registers etc... */
47typedef struct {
48 int refcnt; /* pointer reference counter */
49 int usecnt; /* shared by how many coroutines */
50 int gencnt; /* generation counter */
51
52 coro_context cctx;
53
54 void *sptr;
55 long ssize; /* positive == mmap, otherwise malloc */
56} coro_stack;
20 57
21struct coro { 58struct coro {
59 /* the optional C context */
60 coro_stack *stack;
61 void *cursp;
62 int gencnt;
63
22 /* optionally saved, might be zero */ 64 /* optionally saved, might be zero */
23 AV *defav; 65 AV *defav;
24 SV *defsv; 66 SV *defsv;
25 SV *errsv; 67 SV *errsv;
26 68
51 I32 savestack_max; 93 I32 savestack_max;
52 OP **retstack; 94 OP **retstack;
53 I32 retstack_ix; 95 I32 retstack_ix;
54 I32 retstack_max; 96 I32 retstack_max;
55 COP *curcop; 97 COP *curcop;
98 JMPENV start_env;
99 JMPENV *top_env;
56 100
57 /* data associated with this coroutine (initial args) */ 101 /* data associated with this coroutine (initial args) */
58 AV *args; 102 AV *args;
59}; 103};
60 104
61typedef struct coro *Coro__State; 105typedef struct coro *Coro__State;
62typedef struct coro *Coro__State_or_hashref; 106typedef struct coro *Coro__State_or_hashref;
63 107
108static AV *main_mainstack; /* used to differentiate between $main and others */
109static HV *coro_state_stash;
110static SV *ucoro_state_sv;
111static U32 ucoro_state_hash;
64static HV *padlist_cache; 112static HV *padlist_cache;
65 113
66/* mostly copied from op.c:cv_clone2 */ 114/* mostly copied from op.c:cv_clone2 */
67STATIC AV * 115STATIC AV *
68clone_padlist (AV *protopadlist) 116clone_padlist (AV *protopadlist)
231#endif 279#endif
232 280
233#define SB do { 281#define SB do {
234#define SE } while (0) 282#define SE } while (0)
235 283
236#define LOAD(state) SB load_state(aTHX_ state); SPAGAIN; SE 284#define LOAD(state) SB load_state(aTHX_ (state)); SPAGAIN; SE
237#define SAVE(state,flags) SB PUTBACK; save_state(aTHX_ state,flags); SE 285#define SAVE(state,flags) SB PUTBACK; save_state(aTHX_ (state),(flags)); SE
238 286
239#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); SE 287#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); SE
240 288
241static void 289static void
242load_state(pTHX_ Coro__State c) 290load_state(pTHX_ Coro__State c)
266 PL_savestack_max = c->savestack_max; 314 PL_savestack_max = c->savestack_max;
267 PL_retstack = c->retstack; 315 PL_retstack = c->retstack;
268 PL_retstack_ix = c->retstack_ix; 316 PL_retstack_ix = c->retstack_ix;
269 PL_retstack_max = c->retstack_max; 317 PL_retstack_max = c->retstack_max;
270 PL_curcop = c->curcop; 318 PL_curcop = c->curcop;
319 PL_start_env = c->start_env;
320 PL_top_env = c->top_env;
271 321
272 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 322 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
273 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 323 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
274 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 324 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
275 325
302save_state(pTHX_ Coro__State c, int flags) 352save_state(pTHX_ Coro__State c, int flags)
303{ 353{
304 { 354 {
305 dSP; 355 dSP;
306 I32 cxix = cxstack_ix; 356 I32 cxix = cxstack_ix;
357 PERL_CONTEXT *ccstk = cxstack;
307 PERL_SI *top_si = PL_curstackinfo; 358 PERL_SI *top_si = PL_curstackinfo;
308 PERL_CONTEXT *ccstk = cxstack;
309 359
310 /* 360 /*
311 * the worst thing you can imagine happens first - we have to save 361 * the worst thing you can imagine happens first - we have to save
312 * (and reinitialize) all cv's in the whole callchain :( 362 * (and reinitialize) all cv's in the whole callchain :(
313 */ 363 */
314 364
315 PUSHs (Nullsv); 365 PUSHs (Nullsv);
316 /* this loop was inspired by pp_caller */ 366 /* this loop was inspired by pp_caller */
317 for (;;) 367 for (;;)
318 { 368 {
319 do 369 do
320 { 370 {
321 PERL_CONTEXT *cx = &ccstk[cxix--]; 371 PERL_CONTEXT *cx = &ccstk[cxix--];
322 372
323 if (CxTYPE(cx) == CXt_SUB) 373 if (CxTYPE(cx) == CXt_SUB)
324 { 374 {
363 } 413 }
364 414
365 PUTBACK; 415 PUTBACK;
366 } 416 }
367 417
368 c->defav = flags & SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 418 c->defav = flags & TRANSFER_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0;
369 c->defsv = flags & SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 419 c->defsv = flags & TRANSFER_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0;
370 c->errsv = flags & SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 420 c->errsv = flags & TRANSFER_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0;
421
422 /* I have not the slightest idea of why av_reify is necessary */
423 /* but if it's missing the defav contents magically get replaced sometimes */
424 if (c->defav)
425 av_reify (c->defav);
371 426
372 c->dowarn = PL_dowarn; 427 c->dowarn = PL_dowarn;
373 428
374 c->curstackinfo = PL_curstackinfo; 429 c->curstackinfo = PL_curstackinfo;
375 c->curstack = PL_curstack; 430 c->curstack = PL_curstack;
394 c->savestack_max = PL_savestack_max; 449 c->savestack_max = PL_savestack_max;
395 c->retstack = PL_retstack; 450 c->retstack = PL_retstack;
396 c->retstack_ix = PL_retstack_ix; 451 c->retstack_ix = PL_retstack_ix;
397 c->retstack_max = PL_retstack_max; 452 c->retstack_max = PL_retstack_max;
398 c->curcop = PL_curcop; 453 c->curcop = PL_curcop;
454 c->start_env = PL_start_env;
455 c->top_env = PL_top_env;
456}
457
458/*
459 * allocate various perl stacks. This is an exact copy
460 * of perl.c:init_stacks, except that it uses less memory
461 * on the assumption that coroutines do not usually need
462 * a lot of stackspace.
463 */
464STATIC void
465coro_init_stacks (pTHX)
466{
467 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
468 PL_curstackinfo->si_type = PERLSI_MAIN;
469 PL_curstack = PL_curstackinfo->si_stack;
470 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
471
472 PL_stack_base = AvARRAY(PL_curstack);
473 PL_stack_sp = PL_stack_base;
474 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
475
476 New(50,PL_tmps_stack,96,SV*);
477 PL_tmps_floor = -1;
478 PL_tmps_ix = -1;
479 PL_tmps_max = 96;
480
481 New(54,PL_markstack,16,I32);
482 PL_markstack_ptr = PL_markstack;
483 PL_markstack_max = PL_markstack + 16;
484
485 SET_MARK_OFFSET;
486
487 New(54,PL_scopestack,16,I32);
488 PL_scopestack_ix = 0;
489 PL_scopestack_max = 16;
490
491 New(54,PL_savestack,96,ANY);
492 PL_savestack_ix = 0;
493 PL_savestack_max = 96;
494
495 New(54,PL_retstack,8,OP*);
496 PL_retstack_ix = 0;
497 PL_retstack_max = 8;
399} 498}
400 499
401/* 500/*
402 * destroy the stacks, the callchain etc... 501 * destroy the stacks, the callchain etc...
403 * still there is a memleak of 128 bytes... 502 * still there is a memleak of 128 bytes...
439 Safefree(PL_scopestack); 538 Safefree(PL_scopestack);
440 Safefree(PL_savestack); 539 Safefree(PL_savestack);
441 Safefree(PL_retstack); 540 Safefree(PL_retstack);
442} 541}
443 542
543static void
544allocate_stack (Coro__State ctx, int alloc)
545{
546 coro_stack *stack;
547
548 New (0, stack, 1, coro_stack);
549
550 stack->refcnt = 1;
551 stack->usecnt = 1;
552 stack->gencnt = ctx->gencnt = 0;
553 if (alloc)
554 {
555#ifdef HAVE_MMAP
556 stack->ssize = 128 * 1024 * sizeof (long); /* mmap should do allocate-on-write for us */
557 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, 0, 0);
558 if (stack->sptr == (void *)-1)
559#endif
560 {
561 /*FIXME*//*D*//* reasonable stack size! */
562 stack->ssize = -4096 * sizeof (long);
563 New (0, stack->sptr, 4096, long);
564 }
565 }
566 else
567 stack->sptr = 0;
568
569 ctx->stack = stack;
570}
571
572static void
573deallocate_stack (Coro__State ctx)
574{
575 coro_stack *stack = ctx->stack;
576
577 ctx->stack = 0;
578
579 if (stack)
580 {
581 if (!--stack->refcnt)
582 {
583#ifdef HAVE_MMAP
584 if (stack->ssize > 0 && stack->sptr)
585 munmap (stack->sptr, stack->ssize);
586 else
587#else
588 Safefree (stack->sptr);
589#endif
590 Safefree (stack);
591 }
592 else if (ctx->gencnt == stack->gencnt)
593 --stack->usecnt;
594 }
595}
596
597static void
598setup_coro (void *arg)
599{
600 /*
601 * emulate part of the perl startup here.
602 */
603 dSP;
604 Coro__State ctx = (Coro__State)arg;
605 SV *sub_init = (SV*)get_cv(SUB_INIT, FALSE);
606
607 coro_init_stacks (aTHX);
608 JMPENV_BOOTSTRAP;
609 SPAGAIN;
610
611 /*PL_curcop = 0;*/
612 SvREFCNT_dec (GvAV (PL_defgv));
613 GvAV (PL_defgv) = ctx->args;
614
615 if (ctx->stack)
616 {
617 ctx->cursp = 0;
618
619 PUSHMARK(SP);
620 PUTBACK;
621 (void) call_sv (sub_init, G_VOID|G_NOARGS);
622 croak ("FATAL: CCTXT coroutine returned!");
623 }
624 else
625 {
626 UNOP myop;
627
628 PL_op = (OP *)&myop;
629
630 Zero(&myop, 1, UNOP);
631 myop.op_next = Nullop;
632 myop.op_flags = OPf_WANT_VOID;
633
634 PUSHMARK(SP);
635 XPUSHs (sub_init);
636 /*
637 * the next line is slightly wrong, as PL_op->op_next
638 * is actually being executed so we skip the first op.
639 * that doesn't matter, though, since it is only
640 * pp_nextstate and we never return...
641 * ah yes, and I don't care anyways ;)
642 */
643 PUTBACK;
644 PL_op = pp_entersub();
645 SPAGAIN;
646
647 ENTER; /* necessary e.g. for dounwind */
648 }
649}
650
651static void
652continue_coro (void *arg)
653{
654 /*
655 * this is a _very_ stripped down perl interpreter ;)
656 */
657 Coro__State ctx = (Coro__State)arg;
658
659 ctx->cursp = 0;
660 PL_op = PL_op->op_next;
661 CALLRUNOPS(aTHX);
662 /*NORETURN*/
663 abort ();
664}
665
444STATIC void 666STATIC void
445transfer(pTHX_ struct coro *prev, struct coro *next, int flags) 667transfer(pTHX_ struct coro *prev, struct coro *next, int flags)
446{ 668{
447 dSP; 669 dSP;
670 dSTACKLEVEL;
448 671
449 if (prev != next) 672 if (prev != next)
450 { 673 {
451 /*
452 * this could be done in newprocess which would lead to
453 * extremely elegant and fast (just SAVE/LOAD)
454 * code here, but lazy allocation of stacks has also
455 * some virtues and the overhead of the if() is nil.
456 */
457 if (next->mainstack) 674 if (next->mainstack)
458 { 675 {
459 SAVE (prev, flags); 676 SAVE (prev, flags);
460 LOAD (next); 677 LOAD (next);
678
461 /* mark this state as in-use */ 679 /* mark this state as in-use */
462 next->mainstack = 0; 680 next->mainstack = 0;
463 next->tmps_ix = -2; 681 next->tmps_ix = -2;
682
683 /* stacklevel changed? if yes, grab the stack for us! */
684 if (flags & TRANSFER_SAVE_CCTXT)
685 {
686 if (!prev->stack)
687 allocate_stack (prev, 0);
688 else if (prev->cursp != stacklevel
689 && prev->stack->usecnt > 1)
690 {
691 prev->gencnt = ++prev->stack->gencnt;
692 prev->stack->usecnt = 1;
693 }
694
695 /* has our stack been invalidated? */
696 if (next->stack && next->stack->gencnt != next->gencnt)
697 {
698 deallocate_stack (next);
699 allocate_stack (next, 1);
700 coro_create (&(next->stack->cctx),
701 continue_coro, (void *)next,
702 next->stack->sptr, labs (next->stack->ssize));
703 }
704
705 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
706 }
707
464 } 708 }
465 else if (next->tmps_ix == -2) 709 else if (next->tmps_ix == -2)
466 {
467 croak ("tried to transfer to running coroutine"); 710 croak ("tried to transfer to running coroutine");
468 }
469 else 711 else
470 { 712 {
471 /*
472 * emulate part of the perl startup here.
473 */
474 UNOP myop;
475
476 SAVE (prev, -1); /* first get rid of the old state */ 713 SAVE (prev, -1); /* first get rid of the old state */
477 714
478 init_stacks (); /* from perl.c */ 715 if (flags & TRANSFER_SAVE_CCTXT)
479 SPAGAIN;
480
481 PL_op = (OP *)&myop;
482 /*PL_curcop = 0;*/
483 SvREFCNT_dec (GvAV (PL_defgv));
484 GvAV (PL_defgv) = next->args;
485
486 Zero(&myop, 1, UNOP);
487 myop.op_next = Nullop;
488 myop.op_flags = OPf_WANT_VOID;
489
490 PUSHMARK(SP);
491 XPUSHs ((SV*)get_cv(SUB_INIT, TRUE));
492 /*
493 * the next line is slightly wrong, as PL_op->op_next
494 * is actually being executed so we skip the first op.
495 * that doesn't matter, though, since it is only
496 * pp_nextstate and we never return...
497 * ah yes, and I don't care anyways ;)
498 */ 716 {
499 PUTBACK; 717 if (!prev->stack)
500 PL_op = pp_entersub(aTHX); 718 allocate_stack (prev, 0);
501 SPAGAIN;
502 719
503 ENTER; /* necessary e.g. for dounwind */ 720 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
721 {
722 setup_coro (next);
723
724 prev->stack->refcnt++;
725 prev->stack->usecnt++;
726 next->stack = prev->stack;
727 next->gencnt = prev->gencnt;
728 }
729 else
730 {
731 allocate_stack (next, 1);
732 coro_create (&(next->stack->cctx),
733 setup_coro, (void *)next,
734 next->stack->sptr, labs (next->stack->ssize));
735 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
736 }
737 }
738 else
739 setup_coro (next);
504 } 740 }
505 } 741 }
742
743 next->cursp = stacklevel;
506} 744}
507 745
508MODULE = Coro::State PACKAGE = Coro::State 746MODULE = Coro::State PACKAGE = Coro::State
509 747
510PROTOTYPES: ENABLE 748PROTOTYPES: ENABLE
511 749
512BOOT: 750BOOT:
513{ /* {} necessary for stoopid perl-5.6.x */ 751{ /* {} necessary for stoopid perl-5.6.x */
752 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1);
753 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1);
514 HV * stash = gv_stashpvn("Coro::State", 10, TRUE); 754 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
515 755
516 newCONSTSUB (stash, "SAVE_DEFAV", newSViv (SAVE_DEFAV)); 756 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV));
517 newCONSTSUB (stash, "SAVE_DEFSV", newSViv (SAVE_DEFSV)); 757 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV));
518 newCONSTSUB (stash, "SAVE_ERRSV", newSViv (SAVE_ERRSV)); 758 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV));
759 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT));
519 760
520 if (!padlist_cache) 761 if (!padlist_cache)
521 padlist_cache = newHV (); 762 padlist_cache = newHV ();
763
764 main_mainstack = PL_mainstack;
522} 765}
523 766
524Coro::State 767Coro::State
525_newprocess(args) 768_newprocess(args)
526 SV * args 769 SV * args
531 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV) 774 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV)
532 croak ("Coro::State::_newprocess expects an arrayref"); 775 croak ("Coro::State::_newprocess expects an arrayref");
533 776
534 New (0, coro, 1, struct coro); 777 New (0, coro, 1, struct coro);
535 778
779 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
536 coro->mainstack = 0; /* actual work is done inside transfer */ 780 coro->mainstack = 0; /* actual work is done inside transfer */
537 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 781 coro->stack = 0;
538 782
539 RETVAL = coro; 783 RETVAL = coro;
540 OUTPUT: 784 OUTPUT:
541 RETVAL 785 RETVAL
542 786
543void 787void
544transfer(prev, next, flags = SAVE_DEFAV) 788transfer(prev, next, flags = TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK)
545 Coro::State_or_hashref prev 789 Coro::State_or_hashref prev
546 Coro::State_or_hashref next 790 Coro::State_or_hashref next
547 int flags 791 int flags
548 PROTOTYPE: @ 792 PROTOTYPE: @
549 CODE: 793 CODE:
550
551 transfer (aTHX_ prev, next, flags); 794 transfer (aTHX_ prev, next, flags);
552 795
553void 796void
554DESTROY(coro) 797DESTROY(coro)
555 Coro::State coro 798 Coro::State coro
556 CODE: 799 CODE:
557 800
558 if (coro->mainstack) 801 if (coro->mainstack && coro->mainstack != main_mainstack)
559 { 802 {
560 struct coro temp; 803 struct coro temp;
561 804
562 SAVE(aTHX_ (&temp), SAVE_ALL); 805 SAVE(aTHX_ (&temp), TRANSFER_SAVE_ALL);
563 LOAD(aTHX_ coro); 806 LOAD(aTHX_ coro);
564 807
565 destroy_stacks (); 808 destroy_stacks (aTHX);
566 809
567 LOAD((&temp)); /* this will get rid of defsv etc.. */ 810 LOAD((&temp)); /* this will get rid of defsv etc.. */
811
812 coro->mainstack = 0;
568 } 813 }
814
815 deallocate_stack (coro);
569 816
570 Safefree (coro); 817 Safefree (coro);
571 818
572void 819void
573flush() 820flush()
576 flush_padlist_cache (); 823 flush_padlist_cache ();
577#endif 824#endif
578 825
579MODULE = Coro::State PACKAGE = Coro::Cont 826MODULE = Coro::State PACKAGE = Coro::Cont
580 827
581# this is dirty and should be in it's own .xs 828# this is slightly dirty
582 829
583void 830void
584result(...) 831yield(...)
585 PROTOTYPE: @ 832 PROTOTYPE: @
586 CODE: 833 CODE:
587 static SV *returnstk; 834 static SV *returnstk;
588 SV *sv; 835 SV *sv;
589 AV *defav = GvAV (PL_defgv); 836 AV *defav = GvAV (PL_defgv);
590 struct coro *prev, *next; 837 struct coro *prev, *next;
591 838
592 if (!returnstk) 839 if (!returnstk)
593 returnstk = SvRV (get_sv ("Coro::Cont::return", FALSE)); 840 returnstk = SvRV (get_sv ("Coro::Cont::return", FALSE));
594 841
595 /* set up @_ */ 842 /* set up @_ -- ugly */
596 av_clear (defav); 843 av_clear (defav);
597 av_fill (defav, items - 1); 844 av_fill (defav, items - 1);
598 while (items--) 845 while (items--)
599 av_store (defav, items, SvREFCNT_inc (ST(items))); 846 av_store (defav, items, SvREFCNT_inc (ST(items)));
600 847
601 mg_get (returnstk); /* isn't documentation wrong for mg_get? */ 848 mg_get (returnstk); /* isn't documentation wrong for mg_get? */
602 sv = av_pop ((AV *)SvRV (returnstk)); 849 sv = av_pop ((AV *)SvRV (returnstk));
603 prev = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0))); 850 prev = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0)));
604 next = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0))); 851 next = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0)));
605 SvREFCNT_dec (sv); 852 SvREFCNT_dec (sv);
853
606 transfer(prev, next, 0); 854 transfer(aTHX_ prev, next, 0);
607 855

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines