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.78 by root, Wed Nov 1 01:21:21 2006 UTC vs.
Revision 1.84 by root, Fri Nov 24 00:31:21 2006 UTC

… …
100 void *sptr; 100 void *sptr;
101 long ssize; /* positive == mmap, otherwise malloc */ 101 long ssize; /* positive == mmap, otherwise malloc */
102} coro_stack; 102} coro_stack;
103 103
104struct coro { 104struct coro {
105 /* the top-level JMPENV for each coroutine, needed to catch dies. */
106 JMPENV start_env;
107
108 /* the optional C context */ 105 /* the optional C context */
109 coro_stack *stack; 106 coro_stack *stack;
110 void *cursp; 107 void *cursp;
111 int gencnt; 108 int gencnt;
112 109
… …
163 AV *padlist = CvPADLIST (cv); 160 AV *padlist = CvPADLIST (cv);
164 AV *newpadlist, *newpad; 161 AV *newpadlist, *newpad;
165 162
166 newpadlist = newAV (); 163 newpadlist = newAV ();
167 AvREAL_off (newpadlist); 164 AvREAL_off (newpadlist);
165#if PERL_VERSION < 9
168 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 166 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
167#else
168 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
169#endif
169 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 170 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
170 --AvFILLp (padlist); 171 --AvFILLp (padlist);
171 172
172 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE))); 173 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE)));
173 av_store (newpadlist, 1, (SV *)newpad); 174 av_store (newpadlist, 1, (SV *)newpad);
… …
625 } 626 }
626 else 627 else
627 { 628 {
628 UNOP myop; 629 UNOP myop;
629 630
630 PL_op = (OP *)&myop;
631
632 Zero(&myop, 1, UNOP); 631 Zero(&myop, 1, UNOP);
633 myop.op_next = Nullop; 632 myop.op_next = Nullop;
634 myop.op_flags = OPf_WANT_VOID; 633 myop.op_flags = OPf_WANT_VOID;
634
635 PL_op = (OP *)&myop;
635 636
636 PUSHMARK(SP); 637 PUSHMARK(SP);
637 XPUSHs (sub_init); 638 XPUSHs (sub_init);
638 /* 639 /*
639 * the next line is slightly wrong, as PL_op->op_next 640 * the next line is slightly wrong, as PL_op->op_next
… …
657 * this is a _very_ stripped down perl interpreter ;) 658 * this is a _very_ stripped down perl interpreter ;)
658 */ 659 */
659 dTHX; 660 dTHX;
660 Coro__State ctx = (Coro__State)arg; 661 Coro__State ctx = (Coro__State)arg;
661 662
662 PL_top_env = &ctx->start_env; 663 PL_top_env = &PL_start_env;
663 664
664 ctx->cursp = 0; 665 ctx->cursp = 0;
665 PL_op = PL_op->op_next; 666 PL_op = PL_op->op_next;
666 CALLRUNOPS(aTHX); 667 CALLRUNOPS(aTHX);
667 668
668 abort (); 669 abort ();
669} 670}
670 671
672/* never call directly, always through the coro_state_transfer global variable */
671static void 673static void
672transfer (pTHX_ struct coro *prev, struct coro *next, int flags) 674transfer_impl (pTHX_ struct coro *prev, struct coro *next, int flags)
673{ 675{
674 dSTACKLEVEL; 676 dSTACKLEVEL;
675 677
676 if (prev != next) 678 if (prev != next)
677 { 679 {
680 /* has this coro been created yet? */
678 if (next->mainstack) 681 if (next->mainstack)
679 { 682 {
680 LOCK; 683 LOCK;
681 SAVE (prev, flags); 684 SAVE (prev, flags);
682 LOAD (next); 685 LOAD (next);
… …
721 { 724 {
722 LOCK; 725 LOCK;
723 SAVE (prev, -1); /* first get rid of the old state */ 726 SAVE (prev, -1); /* first get rid of the old state */
724 UNLOCK; 727 UNLOCK;
725 728
729 /* create the coroutine for the first time */
726 if (flags & TRANSFER_SAVE_CCTXT) 730 if (flags & TRANSFER_SAVE_CCTXT)
727 { 731 {
728 if (!prev->stack) 732 if (!prev->stack)
729 allocate_stack (prev, 0); 733 allocate_stack (prev, 0);
730 734
735 /* the new coroutine starts with start_env again */
736 PL_top_env = &PL_start_env;
737
731 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 738 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
732 { 739 {
733 PL_top_env = &next->start_env;
734
735 setup_coro (next); 740 setup_coro (next);
736 next->cursp = stacklevel; 741 next->cursp = stacklevel;
737 742
738 prev->stack->refcnt++; 743 prev->stack->refcnt++;
739 prev->stack->usecnt++; 744 prev->stack->usecnt++;
… …
767 coro_mortal = 0; 772 coro_mortal = 0;
768 } 773 }
769 UNLOCK; 774 UNLOCK;
770} 775}
771 776
777void (*coro_state_transfer)(pTHX_ struct coro *prev, struct coro *next, int flags) = transfer_impl;
778
772#define SV_CORO(sv,func) \ 779#define SV_CORO(sv,func) \
773 do { \ 780 do { \
774 if (SvROK (sv)) \ 781 if (SvROK (sv)) \
775 sv = SvRV (sv); \ 782 sv = SvRV (sv); \
776 \ 783 \
… …
788 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \ 795 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \
789 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \ 796 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \
790 \ 797 \
791 } while(0) 798 } while(0)
792 799
793#define SvSTATE(sv) INT2PTR (struct coro *, SvIV (sv)) 800#define SvSTATE(sv) INT2PTR (struct coro *, SvIVX (sv))
794 801
795static void 802static void
796api_transfer(pTHX_ SV *prev, SV *next, int flags) 803api_transfer (pTHX_ SV *prev, SV *next, int flags)
797{ 804{
798 SV_CORO (prev, "Coro::transfer"); 805 SV_CORO (prev, "Coro::transfer");
799 SV_CORO (next, "Coro::transfer"); 806 SV_CORO (next, "Coro::transfer");
800 807
801 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags); 808 coro_state_transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
802} 809}
803 810
804/** Coro ********************************************************************/ 811/** Coro ********************************************************************/
805 812
806#define PRIO_MAX 3 813#define PRIO_MAX 3
… …
810#define PRIO_IDLE -3 817#define PRIO_IDLE -3
811#define PRIO_MIN -4 818#define PRIO_MIN -4
812 819
813/* for Coro.pm */ 820/* for Coro.pm */
814static GV *coro_current, *coro_idle; 821static GV *coro_current, *coro_idle;
815static AV *coro_ready[PRIO_MAX-PRIO_MIN+1]; 822static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
816static int coro_nready; 823static int coro_nready;
817 824
818static void 825static void
819coro_enq (pTHX_ SV *sv) 826coro_enq (pTHX_ SV *sv)
820{ 827{
… …
843 min_prio -= PRIO_MIN; 850 min_prio -= PRIO_MIN;
844 if (min_prio < 0) 851 if (min_prio < 0)
845 min_prio = 0; 852 min_prio = 0;
846 853
847 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 854 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; )
848 if (av_len (coro_ready[prio]) >= 0) 855 if (AvFILLp (coro_ready [prio]) >= 0)
849 { 856 {
850 coro_nready--; 857 coro_nready--;
851 return av_shift (coro_ready[prio]); 858 return av_shift (coro_ready [prio]);
852 } 859 }
853 860
854 return 0; 861 return 0;
855} 862}
856 863
… …
890 897
891 SV_CORO (next, "Coro::schedule"); 898 SV_CORO (next, "Coro::schedule");
892 899
893 UNLOCK; 900 UNLOCK;
894 901
895 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), 902 coro_state_transfer (aTHX_ SvSTATE (prev), SvSTATE (next),
896 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK); 903 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
897} 904}
898 905
899static void 906static void
900api_cede (void) 907api_cede (void)
901{ 908{
… …
947 Newz (0, coro, 1, struct coro); 954 Newz (0, coro, 1, struct coro);
948 955
949 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 956 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
950 /*coro->mainstack = 0; *//*actual work is done inside transfer */ 957 /*coro->mainstack = 0; *//*actual work is done inside transfer */
951 /*coro->stack = 0;*/ 958 /*coro->stack = 0;*/
952
953 /* same as JMPENV_BOOTSTRAP */
954 /* we might be able to recycle start_env, but safe is safe */
955 /*Zero(&coro->start_env, 1, JMPENV);*/
956 coro->start_env.je_ret = -1;
957 coro->start_env.je_mustcatch = TRUE;
958 959
959 RETVAL = coro; 960 RETVAL = coro;
960 OUTPUT: 961 OUTPUT:
961 RETVAL 962 RETVAL
962 963
… …
968 PROTOTYPE: @ 969 PROTOTYPE: @
969 CODE: 970 CODE:
970 PUTBACK; 971 PUTBACK;
971 SV_CORO (next, "Coro::transfer"); 972 SV_CORO (next, "Coro::transfer");
972 SV_CORO (prev, "Coro::transfer"); 973 SV_CORO (prev, "Coro::transfer");
973 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags); 974 coro_state_transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
974 SPAGAIN; 975 SPAGAIN;
975 976
976void 977void
977DESTROY(coro) 978DESTROY(coro)
978 Coro::State coro 979 Coro::State coro
… …
1005 PROTOTYPE: $ 1006 PROTOTYPE: $
1006 CODE: 1007 CODE:
1007 _exit (code); 1008 _exit (code);
1008 1009
1009MODULE = Coro::State PACKAGE = Coro::Cont 1010MODULE = Coro::State PACKAGE = Coro::Cont
1010
1011# this is slightly dirty (should expose a c-level api)
1012 1011
1013void 1012void
1014yield(...) 1013yield(...)
1015 PROTOTYPE: @ 1014 PROTOTYPE: @
1016 CODE: 1015 CODE:
… …
1030 av_fill (defav, items - 1); 1029 av_fill (defav, items - 1);
1031 while (items--) 1030 while (items--)
1032 av_store (defav, items, SvREFCNT_inc (ST(items))); 1031 av_store (defav, items, SvREFCNT_inc (ST(items)));
1033 1032
1034 sv = av_pop ((AV *)SvRV (yieldstack)); 1033 sv = av_pop ((AV *)SvRV (yieldstack));
1035 prev = INT2PTR (struct coro *, SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0)))); 1034 prev = SvSTATE ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0)));
1036 next = INT2PTR (struct coro *, SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0)))); 1035 next = SvSTATE ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0)));
1037 SvREFCNT_dec (sv); 1036 SvREFCNT_dec (sv);
1038 1037
1039 transfer (aTHX_ prev, next, 0); 1038 coro_state_transfer (aTHX_ prev, next, 0);
1040 1039
1041MODULE = Coro::State PACKAGE = Coro 1040MODULE = Coro::State PACKAGE = Coro
1042
1043# this is slightly dirty (should expose a c-level api)
1044 1041
1045BOOT: 1042BOOT:
1046{ 1043{
1047 int i; 1044 int i;
1048 HV *stash = gv_stashpv ("Coro", TRUE); 1045 HV *stash = gv_stashpv ("Coro", TRUE);
… …
1068 coroapi.ready = api_ready; 1065 coroapi.ready = api_ready;
1069 coroapi.nready = &coro_nready; 1066 coroapi.nready = &coro_nready;
1070 coroapi.current = coro_current; 1067 coroapi.current = coro_current;
1071 1068
1072 GCoroAPI = &coroapi; 1069 GCoroAPI = &coroapi;
1073 sv_setiv(sv, (IV)&coroapi); 1070 sv_setiv (sv, (IV)&coroapi);
1074 SvREADONLY_on(sv); 1071 SvREADONLY_on (sv);
1075 } 1072 }
1076} 1073}
1077 1074
1078#if !PERL_MICRO 1075#if !PERL_MICRO
1079 1076

Diff Legend

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