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.303 by root, Wed Nov 19 05:52:42 2008 UTC vs.
Revision 1.325 by root, Sun Nov 23 06:48:45 2008 UTC

55 55
56#define PERL_VERSION_ATLEAST(a,b,c) \ 56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \ 57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \ 58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \ 59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERLSUBVERSION >= (c))))) 60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61 61
62#if !PERL_VERSION_ATLEAST (5,6,0) 62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr 63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr 64# define PL_ppaddr ppaddr
65# endif 65# endif
98# define newSV(l) NEWSV(0,l) 98# define newSV(l) NEWSV(0,l)
99#endif 99#endif
100#ifndef CvISXSUB_on 100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv 101# define CvISXSUB_on(cv) (void)cv
102#endif 102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
103 109
104/* 5.8.7 */ 110/* 5.8.7 */
105#ifndef SvRV_set 111#ifndef SvRV_set
106# define SvRV_set(s,v) SvRV(s) = (v) 112# define SvRV_set(s,v) SvRV(s) = (v)
107#endif 113#endif
167static AV *main_mainstack; /* used to differentiate between $main and others */ 173static AV *main_mainstack; /* used to differentiate between $main and others */
168static JMPENV *main_top_env; 174static JMPENV *main_top_env;
169static HV *coro_state_stash, *coro_stash; 175static HV *coro_state_stash, *coro_stash;
170static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 176static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
171 177
178static AV *av_destroy; /* destruction queue */
179static SV *sv_manager; /* the manager coro */
180
172static GV *irsgv; /* $/ */ 181static GV *irsgv; /* $/ */
173static GV *stdoutgv; /* *STDOUT */ 182static GV *stdoutgv; /* *STDOUT */
174static SV *rv_diehook; 183static SV *rv_diehook;
175static SV *rv_warnhook; 184static SV *rv_warnhook;
176static HV *hv_sig; /* %SIG */ 185static HV *hv_sig; /* %SIG */
177 186
178/* async_pool helper stuff */ 187/* async_pool helper stuff */
179static SV *sv_pool_rss; 188static SV *sv_pool_rss;
180static SV *sv_pool_size; 189static SV *sv_pool_size;
190static SV *sv_async_pool_idle; /* description string */
181static AV *av_async_pool; 191static AV *av_async_pool; /* idle pool */
192static SV *sv_Coro; /* class string */
193static CV *cv_pool_handler;
194static CV *cv_coro_state_new;
182 195
183/* Coro::AnyEvent */ 196/* Coro::AnyEvent */
184static SV *sv_activity; 197static SV *sv_activity;
185 198
186static struct coro_cctx *cctx_first; 199static struct coro_cctx *cctx_first;
215 int valgrind_id; 228 int valgrind_id;
216#endif 229#endif
217 unsigned char flags; 230 unsigned char flags;
218} coro_cctx; 231} coro_cctx;
219 232
233coro_cctx *cctx_current; /* the currently running cctx */
234
235/*****************************************************************************/
236
220enum { 237enum {
221 CF_RUNNING = 0x0001, /* coroutine is running */ 238 CF_RUNNING = 0x0001, /* coroutine is running */
222 CF_READY = 0x0002, /* coroutine is ready */ 239 CF_READY = 0x0002, /* coroutine is ready */
223 CF_NEW = 0x0004, /* has never been switched to */ 240 CF_NEW = 0x0004, /* has never been switched to */
224 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 241 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
246 /* state data */ 263 /* state data */
247 struct CoroSLF slf_frame; /* saved slf frame */ 264 struct CoroSLF slf_frame; /* saved slf frame */
248 AV *mainstack; 265 AV *mainstack;
249 perl_slots *slot; /* basically the saved sp */ 266 perl_slots *slot; /* basically the saved sp */
250 267
268 CV *startcv; /* the CV to execute */
251 AV *args; /* data associated with this coroutine (initial args) */ 269 AV *args; /* data associated with this coroutine (initial args) */
252 int refcnt; /* coroutines are refcounted, yes */ 270 int refcnt; /* coroutines are refcounted, yes */
253 int flags; /* CF_ flags */ 271 int flags; /* CF_ flags */
254 HV *hv; /* the perl hash associated with this coro, if any */ 272 HV *hv; /* the perl hash associated with this coro, if any */
255 void (*on_destroy)(pTHX_ struct coro *coro); 273 void (*on_destroy)(pTHX_ struct coro *coro);
256 274
257 /* statistics */ 275 /* statistics */
258 int usecount; /* number of transfers to this coro */ 276 int usecount; /* number of transfers to this coro */
259 277
262 SV *except; /* exception to be thrown */ 280 SV *except; /* exception to be thrown */
263 SV *rouse_cb; 281 SV *rouse_cb;
264 282
265 /* async_pool */ 283 /* async_pool */
266 SV *saved_deffh; 284 SV *saved_deffh;
285 SV *invoke_cb;
286 AV *invoke_av;
267 287
268 /* linked list */ 288 /* linked list */
269 struct coro *next, *prev; 289 struct coro *next, *prev;
270}; 290};
271 291
288 308
289/* for Coro.pm */ 309/* for Coro.pm */
290static SV *coro_current; 310static SV *coro_current;
291static SV *coro_readyhook; 311static SV *coro_readyhook;
292static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 312static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
313static CV *cv_coro_run, *cv_coro_terminate;
293static struct coro *coro_first; 314static struct coro *coro_first;
294#define coro_nready coroapi.nready 315#define coro_nready coroapi.nready
295 316
296/** lowlevel stuff **********************************************************/ 317/** lowlevel stuff **********************************************************/
297 318
323 get_hv (name, create); 344 get_hv (name, create);
324#endif 345#endif
325 return get_hv (name, create); 346 return get_hv (name, create);
326} 347}
327 348
349/* may croak */
350INLINE CV *
351coro_sv_2cv (pTHX_ SV *sv)
352{
353 HV *st;
354 GV *gvp;
355 return sv_2cv (sv, &st, &gvp, 0);
356}
357
328static AV * 358static AV *
329coro_clone_padlist (pTHX_ CV *cv) 359coro_derive_padlist (pTHX_ CV *cv)
330{ 360{
331 AV *padlist = CvPADLIST (cv); 361 AV *padlist = CvPADLIST (cv);
332 AV *newpadlist, *newpad; 362 AV *newpadlist, *newpad;
333 363
334 newpadlist = newAV (); 364 newpadlist = newAV ();
449 else 479 else
450 { 480 {
451#if CORO_PREFER_PERL_FUNCTIONS 481#if CORO_PREFER_PERL_FUNCTIONS
452 /* this is probably cleaner? but also slower! */ 482 /* this is probably cleaner? but also slower! */
453 /* in practise, it seems to be less stable */ 483 /* in practise, it seems to be less stable */
454 CV *cp = Perl_cv_clone (cv); 484 CV *cp = Perl_cv_clone (aTHX_ cv);
455 CvPADLIST (cv) = CvPADLIST (cp); 485 CvPADLIST (cv) = CvPADLIST (cp);
456 CvPADLIST (cp) = 0; 486 CvPADLIST (cp) = 0;
457 SvREFCNT_dec (cp); 487 SvREFCNT_dec (cp);
458#else 488#else
459 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 489 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
460#endif 490#endif
461 } 491 }
462} 492}
463 493
464static void 494static void
603 * of perl.c:init_stacks, except that it uses less memory 633 * of perl.c:init_stacks, except that it uses less memory
604 * on the (sometimes correct) assumption that coroutines do 634 * on the (sometimes correct) assumption that coroutines do
605 * not usually need a lot of stackspace. 635 * not usually need a lot of stackspace.
606 */ 636 */
607#if CORO_PREFER_PERL_FUNCTIONS 637#if CORO_PREFER_PERL_FUNCTIONS
608# define coro_init_stacks init_stacks 638# define coro_init_stacks(thx) init_stacks ()
609#else 639#else
610static void 640static void
611coro_init_stacks (pTHX) 641coro_init_stacks (pTHX)
612{ 642{
613 PL_curstackinfo = new_stackinfo(32, 8); 643 PL_curstackinfo = new_stackinfo(32, 8);
676#if !PERL_VERSION_ATLEAST (5,10,0) 706#if !PERL_VERSION_ATLEAST (5,10,0)
677 Safefree (PL_retstack); 707 Safefree (PL_retstack);
678#endif 708#endif
679} 709}
680 710
711#define CORO_RSS \
712 rss += sizeof (SYM (curstackinfo)); \
713 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
714 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
715 rss += SYM (tmps_max) * sizeof (SV *); \
716 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
717 rss += SYM (scopestack_max) * sizeof (I32); \
718 rss += SYM (savestack_max) * sizeof (ANY);
719
681static size_t 720static size_t
682coro_rss (pTHX_ struct coro *coro) 721coro_rss (pTHX_ struct coro *coro)
683{ 722{
684 size_t rss = sizeof (*coro); 723 size_t rss = sizeof (*coro);
685 724
686 if (coro->mainstack) 725 if (coro->mainstack)
687 { 726 {
688 perl_slots tmp_slot;
689 perl_slots *slot;
690
691 if (coro->flags & CF_RUNNING) 727 if (coro->flags & CF_RUNNING)
692 { 728 {
693 slot = &tmp_slot; 729 #define SYM(sym) PL_ ## sym
694 730 CORO_RSS;
695 #define VAR(name,type) slot->name = PL_ ## name;
696 # include "state.h"
697 #undef VAR 731 #undef SYM
698 } 732 }
699 else 733 else
700 slot = coro->slot;
701
702 if (slot)
703 { 734 {
704 rss += sizeof (slot->curstackinfo); 735 #define SYM(sym) coro->slot->sym
705 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 736 CORO_RSS;
706 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 737 #undef SYM
707 rss += slot->tmps_max * sizeof (SV *);
708 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
709 rss += slot->scopestack_max * sizeof (I32);
710 rss += slot->savestack_max * sizeof (ANY);
711
712#if !PERL_VERSION_ATLEAST (5,10,0)
713 rss += slot->retstack_max * sizeof (OP *);
714#endif
715 } 738 }
716 } 739 }
717 740
718 return rss; 741 return rss;
719} 742}
821slf_check_nop (pTHX_ struct CoroSLF *frame) 844slf_check_nop (pTHX_ struct CoroSLF *frame)
822{ 845{
823 return 0; 846 return 0;
824} 847}
825 848
849static int
850slf_check_repeat (pTHX_ struct CoroSLF *frame)
851{
852 return 1;
853}
854
826static UNOP coro_setup_op; 855static UNOP coro_setup_op;
827 856
828static void NOINLINE /* noinline to keep it out of the transfer fast path */ 857static void NOINLINE /* noinline to keep it out of the transfer fast path */
829coro_setup (pTHX_ struct coro *coro) 858coro_setup (pTHX_ struct coro *coro)
830{ 859{
861 dSP; 890 dSP;
862 UNOP myop; 891 UNOP myop;
863 892
864 Zero (&myop, 1, UNOP); 893 Zero (&myop, 1, UNOP);
865 myop.op_next = Nullop; 894 myop.op_next = Nullop;
895 myop.op_type = OP_ENTERSUB;
866 myop.op_flags = OPf_WANT_VOID; 896 myop.op_flags = OPf_WANT_VOID;
867 897
868 PUSHMARK (SP); 898 PUSHMARK (SP);
869 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 899 PUSHs ((SV *)coro->startcv);
870 PUTBACK; 900 PUTBACK;
871 PL_op = (OP *)&myop; 901 PL_op = (OP *)&myop;
872 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 902 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
873 SPAGAIN;
874 } 903 }
875 904
876 /* this newly created coroutine might be run on an existing cctx which most 905 /* this newly created coroutine might be run on an existing cctx which most
877 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 906 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
878 */ 907 */
879 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 908 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
880 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 909 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
881 910
882 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 911 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
883 coro_setup_op.op_next = PL_op; 912 coro_setup_op.op_next = PL_op;
884 coro_setup_op.op_type = OP_CUSTOM; 913 coro_setup_op.op_type = OP_ENTERSUB;
885 coro_setup_op.op_ppaddr = pp_slf; 914 coro_setup_op.op_ppaddr = pp_slf;
886 /* no flags required, as an init function won't be called */ 915 /* no flags etc. required, as an init function won't be called */
887 916
888 PL_op = (OP *)&coro_setup_op; 917 PL_op = (OP *)&coro_setup_op;
889 918
890 /* copy throw, in case it was set before coro_setup */ 919 /* copy throw, in case it was set before coro_setup */
891 CORO_THROW = coro->except; 920 CORO_THROW = coro->except;
919 SvREFCNT_dec (GvSV (irsgv)); 948 SvREFCNT_dec (GvSV (irsgv));
920 949
921 SvREFCNT_dec (PL_diehook); 950 SvREFCNT_dec (PL_diehook);
922 SvREFCNT_dec (PL_warnhook); 951 SvREFCNT_dec (PL_warnhook);
923 952
924 SvREFCNT_dec (CORO_THROW);
925 SvREFCNT_dec (coro->saved_deffh); 953 SvREFCNT_dec (coro->saved_deffh);
926 SvREFCNT_dec (coro->rouse_cb); 954 SvREFCNT_dec (coro->rouse_cb);
955 SvREFCNT_dec (coro->invoke_cb);
956 SvREFCNT_dec (coro->invoke_av);
927 957
928 coro_destruct_stacks (aTHX); 958 coro_destruct_stacks (aTHX);
929} 959}
930 960
931INLINE void 961INLINE void
941static int 971static int
942runops_trace (pTHX) 972runops_trace (pTHX)
943{ 973{
944 COP *oldcop = 0; 974 COP *oldcop = 0;
945 int oldcxix = -2; 975 int oldcxix = -2;
946 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
947 coro_cctx *cctx = coro->cctx;
948 976
949 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 977 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
950 { 978 {
951 PERL_ASYNC_CHECK (); 979 PERL_ASYNC_CHECK ();
952 980
953 if (cctx->flags & CC_TRACE_ALL) 981 if (cctx_current->flags & CC_TRACE_ALL)
954 { 982 {
955 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 983 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
956 { 984 {
957 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 985 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
958 SV **bot, **top; 986 SV **bot, **top;
959 AV *av = newAV (); /* return values */ 987 AV *av = newAV (); /* return values */
960 SV **cb; 988 SV **cb;
997 1025
998 if (PL_curcop != &PL_compiling) 1026 if (PL_curcop != &PL_compiling)
999 { 1027 {
1000 SV **cb; 1028 SV **cb;
1001 1029
1002 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1030 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1003 { 1031 {
1004 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1032 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1005 1033
1006 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1034 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1007 { 1035 {
1008 runops_proc_t old_runops = PL_runops;
1009 dSP; 1036 dSP;
1010 GV *gv = CvGV (cx->blk_sub.cv); 1037 GV *gv = CvGV (cx->blk_sub.cv);
1011 SV *fullname = sv_2mortal (newSV (0)); 1038 SV *fullname = sv_2mortal (newSV (0));
1012 1039
1013 if (isGV (gv)) 1040 if (isGV (gv))
1018 SAVETMPS; 1045 SAVETMPS;
1019 EXTEND (SP, 3); 1046 EXTEND (SP, 3);
1020 PUSHMARK (SP); 1047 PUSHMARK (SP);
1021 PUSHs (&PL_sv_yes); 1048 PUSHs (&PL_sv_yes);
1022 PUSHs (fullname); 1049 PUSHs (fullname);
1023 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1050 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
1024 PUTBACK; 1051 PUTBACK;
1025 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1052 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1026 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1053 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1027 SPAGAIN; 1054 SPAGAIN;
1028 FREETMPS; 1055 FREETMPS;
1031 } 1058 }
1032 1059
1033 oldcxix = cxstack_ix; 1060 oldcxix = cxstack_ix;
1034 } 1061 }
1035 1062
1036 if (cctx->flags & CC_TRACE_LINE) 1063 if (cctx_current->flags & CC_TRACE_LINE)
1037 { 1064 {
1038 dSP; 1065 dSP;
1039 1066
1040 PL_runops = RUNOPS_DEFAULT; 1067 PL_runops = RUNOPS_DEFAULT;
1041 ENTER; 1068 ENTER;
1060 1087
1061 TAINT_NOT; 1088 TAINT_NOT;
1062 return 0; 1089 return 0;
1063} 1090}
1064 1091
1065static struct coro_cctx *cctx_ssl_cctx;
1066static struct CoroSLF cctx_ssl_frame; 1092static struct CoroSLF cctx_ssl_frame;
1067 1093
1068static void 1094static void
1069slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1095slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1070{ 1096{
1071 ta->prev = (struct coro *)cctx_ssl_cctx;
1072 ta->next = 0; 1097 ta->prev = 0;
1073} 1098}
1074 1099
1075static int 1100static int
1076slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1101slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1077{ 1102{
1080 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1105 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1081} 1106}
1082 1107
1083/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1108/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1084static void NOINLINE 1109static void NOINLINE
1085cctx_prepare (pTHX_ coro_cctx *cctx) 1110cctx_prepare (pTHX)
1086{ 1111{
1087 PL_top_env = &PL_start_env; 1112 PL_top_env = &PL_start_env;
1088 1113
1089 if (cctx->flags & CC_TRACE) 1114 if (cctx_current->flags & CC_TRACE)
1090 PL_runops = runops_trace; 1115 PL_runops = runops_trace;
1091 1116
1092 /* we already must be executing an SLF op, there is no other valid way 1117 /* we already must be executing an SLF op, there is no other valid way
1093 * that can lead to creation of a new cctx */ 1118 * that can lead to creation of a new cctx */
1094 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1119 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1095 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1120 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1096 1121
1097 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1122 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1098 cctx_ssl_cctx = cctx;
1099 cctx_ssl_frame = slf_frame; 1123 cctx_ssl_frame = slf_frame;
1100 1124
1101 slf_frame.prepare = slf_prepare_set_stacklevel; 1125 slf_frame.prepare = slf_prepare_set_stacklevel;
1102 slf_frame.check = slf_check_set_stacklevel; 1126 slf_frame.check = slf_check_set_stacklevel;
1103} 1127}
1126 /* normally we would need to skip the entersub here */ 1150 /* normally we would need to skip the entersub here */
1127 /* not doing so will re-execute it, which is exactly what we want */ 1151 /* not doing so will re-execute it, which is exactly what we want */
1128 /* PL_nop = PL_nop->op_next */ 1152 /* PL_nop = PL_nop->op_next */
1129 1153
1130 /* inject a fake subroutine call to cctx_init */ 1154 /* inject a fake subroutine call to cctx_init */
1131 cctx_prepare (aTHX_ (coro_cctx *)arg); 1155 cctx_prepare (aTHX);
1132 1156
1133 /* cctx_run is the alternative tail of transfer() */ 1157 /* cctx_run is the alternative tail of transfer() */
1134 transfer_tail (aTHX); 1158 transfer_tail (aTHX);
1135 1159
1136 /* somebody or something will hit me for both perl_run and PL_restartop */ 1160 /* somebody or something will hit me for both perl_run and PL_restartop */
1137 PL_restartop = PL_op; 1161 PL_restartop = PL_op;
1138 perl_run (PL_curinterp); 1162 perl_run (PL_curinterp);
1163 /*
1164 * Unfortunately, there is no way to get at the return values of the
1165 * coro body here, as perl_run destroys these
1166 */
1139 1167
1140 /* 1168 /*
1141 * If perl-run returns we assume exit() was being called or the coro 1169 * If perl-run returns we assume exit() was being called or the coro
1142 * fell off the end, which seems to be the only valid (non-bug) 1170 * fell off the end, which seems to be the only valid (non-bug)
1143 * reason for perl_run to return. We try to exit by jumping to the 1171 * reason for perl_run to return. We try to exit by jumping to the
1227cctx_destroy (coro_cctx *cctx) 1255cctx_destroy (coro_cctx *cctx)
1228{ 1256{
1229 if (!cctx) 1257 if (!cctx)
1230 return; 1258 return;
1231 1259
1260 assert (cctx != cctx_current);//D temporary
1261
1232 --cctx_count; 1262 --cctx_count;
1233 coro_destroy (&cctx->cctx); 1263 coro_destroy (&cctx->cctx);
1234 1264
1235 /* coro_transfer creates new, empty cctx's */ 1265 /* coro_transfer creates new, empty cctx's */
1236 if (cctx->sptr) 1266 if (cctx->sptr)
1299 /* TODO: throwing up here is considered harmful */ 1329 /* TODO: throwing up here is considered harmful */
1300 1330
1301 if (expect_true (prev != next)) 1331 if (expect_true (prev != next))
1302 { 1332 {
1303 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1333 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1304 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1334 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,");
1305 1335
1306 if (expect_false (next->flags & CF_RUNNING)) 1336 if (expect_false (next->flags & CF_RUNNING))
1307 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,"); 1337 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1308 1338
1309 if (expect_false (next->flags & CF_DESTROYED)) 1339 if (expect_false (next->flags & CF_DESTROYED))
1321transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1351transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1322{ 1352{
1323 dSTACKLEVEL; 1353 dSTACKLEVEL;
1324 1354
1325 /* sometimes transfer is only called to set idle_sp */ 1355 /* sometimes transfer is only called to set idle_sp */
1326 if (expect_false (!next)) 1356 if (expect_false (!prev))
1327 { 1357 {
1328 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1358 cctx_current->idle_sp = STACKLEVEL;
1329 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1359 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1330 } 1360 }
1331 else if (expect_true (prev != next)) 1361 else if (expect_true (prev != next))
1332 { 1362 {
1333 coro_cctx *prev__cctx; 1363 coro_cctx *cctx_prev;
1334 1364
1335 if (expect_false (prev->flags & CF_NEW)) 1365 if (expect_false (prev->flags & CF_NEW))
1336 { 1366 {
1337 /* create a new empty/source context */ 1367 /* create a new empty/source context */
1338 prev->cctx = cctx_new_empty ();
1339 prev->flags &= ~CF_NEW; 1368 prev->flags &= ~CF_NEW;
1340 prev->flags |= CF_RUNNING; 1369 prev->flags |= CF_RUNNING;
1341 } 1370 }
1342 1371
1343 prev->flags &= ~CF_RUNNING; 1372 prev->flags &= ~CF_RUNNING;
1354 coro_setup (aTHX_ next); 1383 coro_setup (aTHX_ next);
1355 } 1384 }
1356 else 1385 else
1357 load_perl (aTHX_ next); 1386 load_perl (aTHX_ next);
1358 1387
1359 prev__cctx = prev->cctx; 1388 assert (!prev->cctx);//D temporary
1360 1389
1361 /* possibly untie and reuse the cctx */ 1390 /* possibly untie and reuse the cctx */
1362 if (expect_true ( 1391 if (expect_true (
1363 prev__cctx->idle_sp == STACKLEVEL 1392 cctx_current->idle_sp == STACKLEVEL
1364 && !(prev__cctx->flags & CC_TRACE) 1393 && !(cctx_current->flags & CC_TRACE)
1365 && !force_cctx 1394 && !force_cctx
1366 )) 1395 ))
1367 { 1396 {
1368 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1397 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1369 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1398 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1370 1399
1371 prev->cctx = 0;
1372
1373 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1400 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1374 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1401 /* without this the next cctx_get might destroy the running cctx while still in use */
1375 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1402 if (expect_false (CCTX_EXPIRED (cctx_current)))
1376 if (!next->cctx) 1403 if (expect_true (!next->cctx))
1377 next->cctx = cctx_get (aTHX); 1404 next->cctx = cctx_get (aTHX);
1378 1405
1379 cctx_put (prev__cctx); 1406 cctx_put (cctx_current);
1380 } 1407 }
1408 else
1409 prev->cctx = cctx_current;
1381 1410
1382 ++next->usecount; 1411 ++next->usecount;
1383 1412
1384 if (expect_true (!next->cctx)) 1413 cctx_prev = cctx_current;
1385 next->cctx = cctx_get (aTHX); 1414 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1386 1415
1387 if (expect_false (prev__cctx != next->cctx)) 1416 next->cctx = 0;
1417
1418 if (expect_false (cctx_prev != cctx_current))
1388 { 1419 {
1389 prev__cctx->top_env = PL_top_env; 1420 cctx_prev->top_env = PL_top_env;
1390 PL_top_env = next->cctx->top_env; 1421 PL_top_env = cctx_current->top_env;
1391 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1422 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1392 } 1423 }
1393 1424
1394 transfer_tail (aTHX); 1425 transfer_tail (aTHX);
1395 } 1426 }
1396} 1427}
1435 1466
1436 coro->slot = 0; 1467 coro->slot = 0;
1437 } 1468 }
1438 1469
1439 cctx_destroy (coro->cctx); 1470 cctx_destroy (coro->cctx);
1471 SvREFCNT_dec (coro->startcv);
1440 SvREFCNT_dec (coro->args); 1472 SvREFCNT_dec (coro->args);
1473 SvREFCNT_dec (CORO_THROW);
1441 1474
1442 if (coro->next) coro->next->prev = coro->prev; 1475 if (coro->next) coro->next->prev = coro->prev;
1443 if (coro->prev) coro->prev->next = coro->next; 1476 if (coro->prev) coro->prev->next = coro->next;
1444 if (coro == coro_first) coro_first = coro->next; 1477 if (coro == coro_first) coro_first = coro->next;
1445 1478
1592api_is_ready (pTHX_ SV *coro_sv) 1625api_is_ready (pTHX_ SV *coro_sv)
1593{ 1626{
1594 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1627 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1595} 1628}
1596 1629
1630/* expects to own a reference to next->hv */
1597INLINE void 1631INLINE void
1632prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1633{
1634 SV *prev_sv = SvRV (coro_current);
1635
1636 ta->prev = SvSTATE_hv (prev_sv);
1637 ta->next = next;
1638
1639 TRANSFER_CHECK (*ta);
1640
1641 SvRV_set (coro_current, (SV *)next->hv);
1642
1643 free_coro_mortal (aTHX);
1644 coro_mortal = prev_sv;
1645}
1646
1647static void
1598prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1648prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1599{ 1649{
1600 SV *prev_sv, *next_sv;
1601
1602 for (;;) 1650 for (;;)
1603 { 1651 {
1604 next_sv = coro_deq (aTHX); 1652 SV *next_sv = coro_deq (aTHX);
1605 1653
1606 /* nothing to schedule: call the idle handler */
1607 if (expect_false (!next_sv)) 1654 if (expect_true (next_sv))
1608 { 1655 {
1656 struct coro *next = SvSTATE_hv (next_sv);
1657
1658 /* cannot transfer to destroyed coros, skip and look for next */
1659 if (expect_false (next->flags & CF_DESTROYED))
1660 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */
1661 else
1662 {
1663 next->flags &= ~CF_READY;
1664 --coro_nready;
1665
1666 prepare_schedule_to (aTHX_ ta, next);
1667 break;
1668 }
1669 }
1670 else
1671 {
1672 /* nothing to schedule: call the idle handler */
1609 dSP; 1673 dSP;
1610 1674
1611 ENTER; 1675 ENTER;
1612 SAVETMPS; 1676 SAVETMPS;
1613 1677
1615 PUTBACK; 1679 PUTBACK;
1616 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD); 1680 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1617 1681
1618 FREETMPS; 1682 FREETMPS;
1619 LEAVE; 1683 LEAVE;
1620 continue;
1621 } 1684 }
1622
1623 ta->next = SvSTATE_hv (next_sv);
1624
1625 /* cannot transfer to destroyed coros, skip and look for next */
1626 if (expect_false (ta->next->flags & CF_DESTROYED))
1627 {
1628 SvREFCNT_dec (next_sv);
1629 /* coro_nready has already been taken care of by destroy */
1630 continue;
1631 }
1632
1633 --coro_nready;
1634 break;
1635 } 1685 }
1636
1637 /* free this only after the transfer */
1638 prev_sv = SvRV (coro_current);
1639 ta->prev = SvSTATE_hv (prev_sv);
1640 TRANSFER_CHECK (*ta);
1641 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY));
1642 ta->next->flags &= ~CF_READY;
1643 SvRV_set (coro_current, next_sv);
1644
1645 free_coro_mortal (aTHX);
1646 coro_mortal = prev_sv;
1647} 1686}
1648 1687
1649INLINE void 1688INLINE void
1650prepare_cede (pTHX_ struct coro_transfer_args *ta) 1689prepare_cede (pTHX_ struct coro_transfer_args *ta)
1651{ 1690{
1672{ 1711{
1673 struct coro_transfer_args ta; 1712 struct coro_transfer_args ta;
1674 1713
1675 prepare_schedule (aTHX_ &ta); 1714 prepare_schedule (aTHX_ &ta);
1676 TRANSFER (ta, 1); 1715 TRANSFER (ta, 1);
1716}
1717
1718static void
1719api_schedule_to (pTHX_ SV *coro_sv)
1720{
1721 struct coro_transfer_args ta;
1722 struct coro *next = SvSTATE (coro_sv);
1723
1724 SvREFCNT_inc_NN (coro_sv);
1725 prepare_schedule_to (aTHX_ &ta, next);
1677} 1726}
1678 1727
1679static int 1728static int
1680api_cede (pTHX) 1729api_cede (pTHX)
1681{ 1730{
1710static void 1759static void
1711api_trace (pTHX_ SV *coro_sv, int flags) 1760api_trace (pTHX_ SV *coro_sv, int flags)
1712{ 1761{
1713 struct coro *coro = SvSTATE (coro_sv); 1762 struct coro *coro = SvSTATE (coro_sv);
1714 1763
1764 if (coro->flags & CF_RUNNING)
1765 croak ("cannot enable tracing on a running coroutine, caught");
1766
1715 if (flags & CC_TRACE) 1767 if (flags & CC_TRACE)
1716 { 1768 {
1717 if (!coro->cctx) 1769 if (!coro->cctx)
1718 coro->cctx = cctx_new_run (); 1770 coro->cctx = cctx_new_run ();
1719 else if (!(coro->cctx->flags & CC_TRACE)) 1771 else if (!(coro->cctx->flags & CC_TRACE))
1720 croak ("cannot enable tracing on coroutine with custom stack,"); 1772 croak ("cannot enable tracing on coroutine with custom stack, caught");
1721 1773
1722 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1774 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1723 } 1775 }
1724 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1776 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1725 { 1777 {
1730 else 1782 else
1731 coro->slot->runops = RUNOPS_DEFAULT; 1783 coro->slot->runops = RUNOPS_DEFAULT;
1732 } 1784 }
1733} 1785}
1734 1786
1787static void
1788coro_call_on_destroy (pTHX_ struct coro *coro)
1789{
1790 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1791 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1792
1793 if (on_destroyp)
1794 {
1795 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1796
1797 while (AvFILLp (on_destroy) >= 0)
1798 {
1799 dSP; /* don't disturb outer sp */
1800 SV *cb = av_pop (on_destroy);
1801
1802 PUSHMARK (SP);
1803
1804 if (statusp)
1805 {
1806 int i;
1807 AV *status = (AV *)SvRV (*statusp);
1808 EXTEND (SP, AvFILLp (status) + 1);
1809
1810 for (i = 0; i <= AvFILLp (status); ++i)
1811 PUSHs (AvARRAY (status)[i]);
1812 }
1813
1814 PUTBACK;
1815 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1816 }
1817 }
1818}
1819
1820static void
1821slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1822{
1823 int i;
1824 HV *hv = (HV *)SvRV (coro_current);
1825 AV *av = newAV ();
1826
1827 av_extend (av, items - 1);
1828 for (i = 0; i < items; ++i)
1829 av_push (av, SvREFCNT_inc_NN (arg [i]));
1830
1831 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1832
1833 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1834 api_ready (aTHX_ sv_manager);
1835
1836 frame->prepare = prepare_schedule;
1837 frame->check = slf_check_repeat;
1838}
1839
1840/*****************************************************************************/
1841/* async pool handler */
1842
1843static int
1844slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
1845{
1846 HV *hv = (HV *)SvRV (coro_current);
1847 struct coro *coro = (struct coro *)frame->data;
1848
1849 if (!coro->invoke_cb)
1850 return 1; /* loop till we have invoke */
1851 else
1852 {
1853 hv_store (hv, "desc", sizeof ("desc") - 1,
1854 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1855
1856 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1857
1858 {
1859 dSP;
1860 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
1861 PUTBACK;
1862 }
1863
1864 SvREFCNT_dec (GvAV (PL_defgv));
1865 GvAV (PL_defgv) = coro->invoke_av;
1866 coro->invoke_av = 0;
1867
1868 return 0;
1869 }
1870}
1871
1872static void
1873slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1874{
1875 HV *hv = (HV *)SvRV (coro_current);
1876 struct coro *coro = SvSTATE_hv ((SV *)hv);
1877
1878 if (expect_true (coro->saved_deffh))
1879 {
1880 /* subsequent iteration */
1881 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1882 coro->saved_deffh = 0;
1883
1884 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1885 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1886 {
1887 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
1888 coro->invoke_av = newAV ();
1889
1890 frame->prepare = prepare_nop;
1891 }
1892 else
1893 {
1894 av_clear (GvAV (PL_defgv));
1895 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1896
1897 coro->prio = 0;
1898
1899 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1900 api_trace (aTHX_ coro_current, 0);
1901
1902 frame->prepare = prepare_schedule;
1903 av_push (av_async_pool, SvREFCNT_inc (hv));
1904 }
1905 }
1906 else
1907 {
1908 /* first iteration, simply fall through */
1909 frame->prepare = prepare_nop;
1910 }
1911
1912 frame->check = slf_check_pool_handler;
1913 frame->data = (void *)coro;
1914}
1915
1735/*****************************************************************************/ 1916/*****************************************************************************/
1736/* rouse callback */ 1917/* rouse callback */
1737 1918
1738#define CORO_MAGIC_type_rouse PERL_MAGIC_ext 1919#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1739 1920
1744 SV *data = (SV *)GENSUB_ARG; 1925 SV *data = (SV *)GENSUB_ARG;
1745 1926
1746 if (SvTYPE (SvRV (data)) != SVt_PVAV) 1927 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1747 { 1928 {
1748 /* first call, set args */ 1929 /* first call, set args */
1749 int i;
1750 AV *av = newAV (); 1930 AV *av = newAV ();
1751 SV *coro = SvRV (data); 1931 SV *coro = SvRV (data);
1752 1932
1753 SvRV_set (data, (SV *)av); 1933 SvRV_set (data, (SV *)av);
1754 api_ready (aTHX_ coro); 1934 api_ready (aTHX_ coro);
1895static void 2075static void
1896slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2076slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1897{ 2077{
1898 frame->prepare = prepare_schedule; 2078 frame->prepare = prepare_schedule;
1899 frame->check = slf_check_nop; 2079 frame->check = slf_check_nop;
2080}
2081
2082static void
2083slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2084{
2085 struct coro *next = (struct coro *)slf_frame.data;
2086
2087 SvREFCNT_inc_NN (next->hv);
2088 prepare_schedule_to (aTHX_ ta, next);
2089}
2090
2091static void
2092slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2093{
2094 if (!items)
2095 croak ("Coro::schedule_to expects a coroutine argument, caught");
2096
2097 frame->data = (void *)SvSTATE (arg [0]);
2098 frame->prepare = slf_prepare_schedule_to;
2099 frame->check = slf_check_nop;
2100}
2101
2102static void
2103slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2104{
2105 api_ready (aTHX_ SvRV (coro_current));
2106
2107 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1900} 2108}
1901 2109
1902static void 2110static void
1903slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2111slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1904{ 2112{
2050 } 2258 }
2051 else 2259 else
2052 slf_argc = 0; 2260 slf_argc = 0;
2053 2261
2054 PL_op->op_ppaddr = pp_slf; 2262 PL_op->op_ppaddr = pp_slf;
2055 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2263 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2056 2264
2057 PL_op = (OP *)&slf_restore; 2265 PL_op = (OP *)&slf_restore;
2058} 2266}
2059 2267
2060/*****************************************************************************/ 2268/*****************************************************************************/
2143 SV **ary; 2351 SV **ary;
2144 2352
2145 /* unfortunately, building manually saves memory */ 2353 /* unfortunately, building manually saves memory */
2146 Newx (ary, 2, SV *); 2354 Newx (ary, 2, SV *);
2147 AvALLOC (av) = ary; 2355 AvALLOC (av) = ary;
2148 AvARRAY (av) = ary; 2356 /*AvARRAY (av) = ary;*/
2357 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */
2149 AvMAX (av) = 1; 2358 AvMAX (av) = 1;
2150 AvFILLp (av) = 0; 2359 AvFILLp (av) = 0;
2151 ary [0] = newSViv (count); 2360 ary [0] = newSViv (count);
2152 2361
2153 return newRV_noinc ((SV *)av); 2362 return newRV_noinc ((SV *)av);
2173 AvARRAY (av)[0] = AvARRAY (av)[1]; 2382 AvARRAY (av)[0] = AvARRAY (av)[1];
2174 AvARRAY (av)[1] = count_sv; 2383 AvARRAY (av)[1] = count_sv;
2175 cb = av_shift (av); 2384 cb = av_shift (av);
2176 2385
2177 if (SvOBJECT (cb)) 2386 if (SvOBJECT (cb))
2387 {
2178 api_ready (aTHX_ cb); 2388 api_ready (aTHX_ cb);
2179 else 2389 --count;
2180 croak ("callbacks not yet supported"); 2390 }
2391 else if (SvTYPE (cb) == SVt_PVCV)
2392 {
2393 dSP;
2394 PUSHMARK (SP);
2395 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2396 PUTBACK;
2397 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2398 }
2181 2399
2182 SvREFCNT_dec (cb); 2400 SvREFCNT_dec (cb);
2183
2184 --count;
2185 } 2401 }
2186} 2402}
2187 2403
2188static void 2404static void
2189coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2405coro_semaphore_on_destroy (pTHX_ struct coro *coro)
2271} 2487}
2272 2488
2273static void 2489static void
2274slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2490slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2275{ 2491{
2492 if (items >= 2)
2493 {
2494 /* callback form */
2495 AV *av = (AV *)SvRV (arg [0]);
2496 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2497
2498 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv));
2499
2500 if (SvIVX (AvARRAY (av)[0]) > 0)
2501 coro_semaphore_adjust (aTHX_ av, 0);
2502
2503 frame->prepare = prepare_nop;
2504 frame->check = slf_check_nop;
2505 }
2506 else
2507 {
2276 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items); 2508 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2277 frame->check = slf_check_semaphore_wait; 2509 frame->check = slf_check_semaphore_wait;
2510 }
2278} 2511}
2279 2512
2280/* signal */ 2513/* signal */
2281 2514
2282static void 2515static void
2354 dXSARGS; 2587 dXSARGS;
2355 AV *state = (AV *)GENSUB_ARG; 2588 AV *state = (AV *)GENSUB_ARG;
2356 SV *coro = av_pop (state); 2589 SV *coro = av_pop (state);
2357 SV *data_sv = newSV (sizeof (struct io_state)); 2590 SV *data_sv = newSV (sizeof (struct io_state));
2358 2591
2359 av_extend (state, items); 2592 av_extend (state, items - 1);
2360 2593
2361 sv_upgrade (data_sv, SVt_PV); 2594 sv_upgrade (data_sv, SVt_PV);
2362 SvCUR_set (data_sv, sizeof (struct io_state)); 2595 SvCUR_set (data_sv, sizeof (struct io_state));
2363 SvPOK_only (data_sv); 2596 SvPOK_only (data_sv);
2364 2597
2499 XSRETURN_EMPTY; 2732 XSRETURN_EMPTY;
2500} 2733}
2501 2734
2502/*****************************************************************************/ 2735/*****************************************************************************/
2503 2736
2737#if CORO_CLONE
2738# include "clone.c"
2739#endif
2740
2504MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2741MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2505 2742
2506PROTOTYPES: DISABLE 2743PROTOTYPES: DISABLE
2507 2744
2508BOOT: 2745BOOT:
2512 coro_thx = PERL_GET_CONTEXT; 2749 coro_thx = PERL_GET_CONTEXT;
2513# endif 2750# endif
2514#endif 2751#endif
2515 BOOT_PAGESIZE; 2752 BOOT_PAGESIZE;
2516 2753
2754 cctx_current = cctx_new_empty ();
2755
2517 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2756 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2518 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2757 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2519 2758
2520 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2759 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2521 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 2760 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
2540 2779
2541 { 2780 {
2542 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 2781 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2543 2782
2544 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 2783 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2545 hv_store_ent (PL_custom_op_names, slf, 2784 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2546 newSVpv ("coro_slf", 0), 0);
2547 2785
2548 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 2786 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2549 hv_store_ent (PL_custom_op_descs, slf, 2787 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2550 newSVpv ("coro schedule like function", 0), 0);
2551 } 2788 }
2552 2789
2553 coroapi.ver = CORO_API_VERSION; 2790 coroapi.ver = CORO_API_VERSION;
2554 coroapi.rev = CORO_API_REVISION; 2791 coroapi.rev = CORO_API_REVISION;
2555 2792
2574 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2811 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
2575} 2812}
2576 2813
2577SV * 2814SV *
2578new (char *klass, ...) 2815new (char *klass, ...)
2816 ALIAS:
2817 Coro::new = 1
2579 CODE: 2818 CODE:
2580{ 2819{
2581 struct coro *coro; 2820 struct coro *coro;
2582 MAGIC *mg; 2821 MAGIC *mg;
2583 HV *hv; 2822 HV *hv;
2823 CV *cb;
2584 int i; 2824 int i;
2825
2826 if (items > 1)
2827 {
2828 cb = coro_sv_2cv (aTHX_ ST (1));
2829
2830 if (!ix)
2831 {
2832 if (CvISXSUB (cb))
2833 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2834
2835 if (!CvROOT (cb))
2836 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2837 }
2838 }
2585 2839
2586 Newz (0, coro, 1, struct coro); 2840 Newz (0, coro, 1, struct coro);
2587 coro->args = newAV (); 2841 coro->args = newAV ();
2588 coro->flags = CF_NEW; 2842 coro->flags = CF_NEW;
2589 2843
2594 coro->hv = hv = newHV (); 2848 coro->hv = hv = newHV ();
2595 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0); 2849 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2596 mg->mg_flags |= MGf_DUP; 2850 mg->mg_flags |= MGf_DUP;
2597 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 2851 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2598 2852
2853 if (items > 1)
2854 {
2599 av_extend (coro->args, items - 1); 2855 av_extend (coro->args, items - 1 + ix - 1);
2856
2857 if (ix)
2858 {
2859 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2860 cb = cv_coro_run;
2861 }
2862
2863 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2864
2600 for (i = 1; i < items; i++) 2865 for (i = 2; i < items; i++)
2601 av_push (coro->args, newSVsv (ST (i))); 2866 av_push (coro->args, newSVsv (ST (i)));
2867 }
2602} 2868}
2603 OUTPUT: 2869 OUTPUT:
2604 RETVAL 2870 RETVAL
2605 2871
2606void 2872void
2619void 2885void
2620_exit (int code) 2886_exit (int code)
2621 PROTOTYPE: $ 2887 PROTOTYPE: $
2622 CODE: 2888 CODE:
2623 _exit (code); 2889 _exit (code);
2890
2891SV *
2892clone (Coro::State coro)
2893 CODE:
2894{
2895#if CORO_CLONE
2896 struct coro *ncoro = coro_clone (coro);
2897 MAGIC *mg;
2898 /* TODO: too much duplication */
2899 ncoro->hv = newHV ();
2900 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2901 mg->mg_flags |= MGf_DUP;
2902 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
2903#else
2904 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
2905#endif
2906}
2907 OUTPUT:
2908 RETVAL
2624 2909
2625int 2910int
2626cctx_stacksize (int new_stacksize = 0) 2911cctx_stacksize (int new_stacksize = 0)
2627 PROTOTYPE: ;$ 2912 PROTOTYPE: ;$
2628 CODE: 2913 CODE:
2749 3034
2750SV * 3035SV *
2751has_cctx (Coro::State coro) 3036has_cctx (Coro::State coro)
2752 PROTOTYPE: $ 3037 PROTOTYPE: $
2753 CODE: 3038 CODE:
2754 RETVAL = boolSV (!!coro->cctx); 3039 /* maybe manage the running flag differently */
3040 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2755 OUTPUT: 3041 OUTPUT:
2756 RETVAL 3042 RETVAL
2757 3043
2758int 3044int
2759is_traced (Coro::State coro) 3045is_traced (Coro::State coro)
2779 3065
2780void 3066void
2781force_cctx () 3067force_cctx ()
2782 PROTOTYPE: 3068 PROTOTYPE:
2783 CODE: 3069 CODE:
2784 SvSTATE_current->cctx->idle_sp = 0; 3070 cctx_current->idle_sp = 0;
2785 3071
2786void 3072void
2787swap_defsv (Coro::State self) 3073swap_defsv (Coro::State self)
2788 PROTOTYPE: $ 3074 PROTOTYPE: $
2789 ALIAS: 3075 ALIAS:
2804 3090
2805BOOT: 3091BOOT:
2806{ 3092{
2807 int i; 3093 int i;
2808 3094
2809 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2810 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3095 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2811 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3096 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2812 3097 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD);
3098 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2813 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3099 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2814 SvREADONLY_on (coro_current); 3100 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3101 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3102 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3103
3104 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3105 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3106 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3107 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2815 3108
2816 coro_stash = gv_stashpv ("Coro", TRUE); 3109 coro_stash = gv_stashpv ("Coro", TRUE);
2817 3110
2818 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3111 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
2819 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3112 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
2827 3120
2828 { 3121 {
2829 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3122 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2830 3123
2831 coroapi.schedule = api_schedule; 3124 coroapi.schedule = api_schedule;
3125 coroapi.schedule_to = api_schedule_to;
2832 coroapi.cede = api_cede; 3126 coroapi.cede = api_cede;
2833 coroapi.cede_notself = api_cede_notself; 3127 coroapi.cede_notself = api_cede_notself;
2834 coroapi.ready = api_ready; 3128 coroapi.ready = api_ready;
2835 coroapi.is_ready = api_is_ready; 3129 coroapi.is_ready = api_is_ready;
2836 coroapi.nready = coro_nready; 3130 coroapi.nready = coro_nready;
2841 SvREADONLY_on (sv); 3135 SvREADONLY_on (sv);
2842 } 3136 }
2843} 3137}
2844 3138
2845void 3139void
3140terminate (...)
3141 CODE:
3142 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3143
3144void
2846schedule (...) 3145schedule (...)
2847 CODE: 3146 CODE:
2848 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3147 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3148
3149void
3150schedule_to (...)
3151 CODE:
3152 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3153
3154void
3155cede_to (...)
3156 CODE:
3157 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2849 3158
2850void 3159void
2851cede (...) 3160cede (...)
2852 CODE: 3161 CODE:
2853 CORO_EXECUTE_SLF_XS (slf_init_cede); 3162 CORO_EXECUTE_SLF_XS (slf_init_cede);
2854 3163
2855void 3164void
2856cede_notself (...) 3165cede_notself (...)
2857 CODE: 3166 CODE:
2858 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3167 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3168
3169void
3170_cancel (Coro::State self)
3171 CODE:
3172 coro_state_destroy (aTHX_ self);
3173 coro_call_on_destroy (aTHX_ self);
2859 3174
2860void 3175void
2861_set_current (SV *current) 3176_set_current (SV *current)
2862 PROTOTYPE: $ 3177 PROTOTYPE: $
2863 CODE: 3178 CODE:
2908 CODE: 3223 CODE:
2909 RETVAL = coro_nready; 3224 RETVAL = coro_nready;
2910 OUTPUT: 3225 OUTPUT:
2911 RETVAL 3226 RETVAL
2912 3227
2913# for async_pool speedup
2914void 3228void
2915_pool_1 (SV *cb) 3229_pool_handler (...)
2916 CODE: 3230 CODE:
2917{ 3231 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
2918 HV *hv = (HV *)SvRV (coro_current);
2919 struct coro *coro = SvSTATE_hv ((SV *)hv);
2920 AV *defav = GvAV (PL_defgv);
2921 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2922 AV *invoke_av;
2923 int i, len;
2924 3232
2925 if (!invoke) 3233void
3234async_pool (SV *cv, ...)
3235 PROTOTYPE: &@
3236 PPCODE:
3237{
3238 HV *hv = (HV *)av_pop (av_async_pool);
3239 AV *av = newAV ();
3240 SV *cb = ST (0);
3241 int i;
3242
3243 av_extend (av, items - 2);
3244 for (i = 1; i < items; ++i)
3245 av_push (av, SvREFCNT_inc_NN (ST (i)));
3246
3247 if ((SV *)hv == &PL_sv_undef)
2926 { 3248 {
2927 SV *old = PL_diehook; 3249 PUSHMARK (SP);
2928 PL_diehook = 0; 3250 EXTEND (SP, 2);
2929 SvREFCNT_dec (old); 3251 PUSHs (sv_Coro);
2930 croak ("\3async_pool terminate\2\n"); 3252 PUSHs ((SV *)cv_pool_handler);
3253 PUTBACK;
3254 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3255 SPAGAIN;
3256
3257 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
2931 } 3258 }
2932 3259
2933 SvREFCNT_dec (coro->saved_deffh);
2934 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2935
2936 hv_store (hv, "desc", sizeof ("desc") - 1,
2937 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2938
2939 invoke_av = (AV *)SvRV (invoke);
2940 len = av_len (invoke_av);
2941
2942 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2943
2944 if (len > 0)
2945 { 3260 {
2946 av_fill (defav, len - 1); 3261 struct coro *coro = SvSTATE_hv (hv);
2947 for (i = 0; i < len; ++i) 3262
2948 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3263 assert (!coro->invoke_cb);
3264 assert (!coro->invoke_av);
3265 coro->invoke_cb = SvREFCNT_inc (cb);
3266 coro->invoke_av = av;
2949 } 3267 }
2950}
2951 3268
2952void 3269 api_ready (aTHX_ (SV *)hv);
2953_pool_2 (SV *cb)
2954 CODE:
2955{
2956 HV *hv = (HV *)SvRV (coro_current);
2957 struct coro *coro = SvSTATE_hv ((SV *)hv);
2958 3270
2959 sv_setsv (cb, &PL_sv_undef); 3271 if (GIMME_V != G_VOID)
2960 3272 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
2961 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3273 else
2962 coro->saved_deffh = 0;
2963
2964 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2965 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2966 {
2967 SV *old = PL_diehook;
2968 PL_diehook = 0;
2969 SvREFCNT_dec (old); 3274 SvREFCNT_dec (hv);
2970 croak ("\3async_pool terminate\2\n");
2971 }
2972
2973 av_clear (GvAV (PL_defgv));
2974 hv_store (hv, "desc", sizeof ("desc") - 1,
2975 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2976
2977 coro->prio = 0;
2978
2979 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2980 api_trace (aTHX_ coro_current, 0);
2981
2982 av_push (av_async_pool, newSVsv (coro_current));
2983} 3275}
2984 3276
2985SV * 3277SV *
2986rouse_cb () 3278rouse_cb ()
2987 PROTOTYPE: 3279 PROTOTYPE:
2989 RETVAL = coro_new_rouse_cb (aTHX); 3281 RETVAL = coro_new_rouse_cb (aTHX);
2990 OUTPUT: 3282 OUTPUT:
2991 RETVAL 3283 RETVAL
2992 3284
2993void 3285void
2994rouse_wait (SV *cb = 0) 3286rouse_wait (...)
2995 PROTOTYPE: ;$ 3287 PROTOTYPE: ;$
2996 PPCODE: 3288 PPCODE:
2997 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3289 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
2998 3290
2999 3291
3036 adjust = 1 3328 adjust = 1
3037 CODE: 3329 CODE:
3038 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 3330 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
3039 3331
3040void 3332void
3041down (SV *self) 3333down (...)
3042 CODE: 3334 CODE:
3043 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 3335 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
3044 3336
3045void 3337void
3046wait (SV *self) 3338wait (...)
3047 CODE: 3339 CODE:
3048 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait); 3340 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait);
3049 3341
3050void 3342void
3051try (SV *self) 3343try (SV *self)
3094 ); 3386 );
3095 OUTPUT: 3387 OUTPUT:
3096 RETVAL 3388 RETVAL
3097 3389
3098void 3390void
3099wait (SV *self) 3391wait (...)
3100 CODE: 3392 CODE:
3101 CORO_EXECUTE_SLF_XS (slf_init_signal_wait); 3393 CORO_EXECUTE_SLF_XS (slf_init_signal_wait);
3102 3394
3103void 3395void
3104broadcast (SV *self) 3396broadcast (SV *self)
3161 3453
3162void 3454void
3163_register (char *target, char *proto, SV *req) 3455_register (char *target, char *proto, SV *req)
3164 CODE: 3456 CODE:
3165{ 3457{
3166 HV *st; 3458 CV *req_cv = coro_sv_2cv (aTHX_ req);
3167 GV *gvp;
3168 CV *req_cv = sv_2cv (req, &st, &gvp, 0);
3169 /* newXSproto doesn't return the CV on 5.8 */ 3459 /* newXSproto doesn't return the CV on 5.8 */
3170 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3460 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3171 sv_setpv ((SV *)slf_cv, proto); 3461 sv_setpv ((SV *)slf_cv, proto);
3172 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3462 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3173} 3463}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines