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.304 by root, Wed Nov 19 08:22:48 2008 UTC vs.
Revision 1.322 by root, Sat Nov 22 05:13:34 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
1003 { 1033 {
1004 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1034 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1005 1035
1006 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1036 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1007 { 1037 {
1008 runops_proc_t old_runops = PL_runops;
1009 dSP; 1038 dSP;
1010 GV *gv = CvGV (cx->blk_sub.cv); 1039 GV *gv = CvGV (cx->blk_sub.cv);
1011 SV *fullname = sv_2mortal (newSV (0)); 1040 SV *fullname = sv_2mortal (newSV (0));
1012 1041
1013 if (isGV (gv)) 1042 if (isGV (gv))
1018 SAVETMPS; 1047 SAVETMPS;
1019 EXTEND (SP, 3); 1048 EXTEND (SP, 3);
1020 PUSHMARK (SP); 1049 PUSHMARK (SP);
1021 PUSHs (&PL_sv_yes); 1050 PUSHs (&PL_sv_yes);
1022 PUSHs (fullname); 1051 PUSHs (fullname);
1023 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1052 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
1024 PUTBACK; 1053 PUTBACK;
1025 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1054 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); 1055 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1027 SPAGAIN; 1056 SPAGAIN;
1028 FREETMPS; 1057 FREETMPS;
1060 1089
1061 TAINT_NOT; 1090 TAINT_NOT;
1062 return 0; 1091 return 0;
1063} 1092}
1064 1093
1065static struct coro_cctx *cctx_ssl_cctx;
1066static struct CoroSLF cctx_ssl_frame; 1094static struct CoroSLF cctx_ssl_frame;
1067 1095
1068static void 1096static void
1069slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1097slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1070{ 1098{
1071 ta->prev = (struct coro *)cctx_ssl_cctx;
1072 ta->next = 0; 1099 ta->prev = 0;
1073} 1100}
1074 1101
1075static int 1102static int
1076slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1103slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1077{ 1104{
1080 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1107 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1081} 1108}
1082 1109
1083/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1110/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1084static void NOINLINE 1111static void NOINLINE
1085cctx_prepare (pTHX_ coro_cctx *cctx) 1112cctx_prepare (pTHX)
1086{ 1113{
1087 PL_top_env = &PL_start_env; 1114 PL_top_env = &PL_start_env;
1088 1115
1089 if (cctx->flags & CC_TRACE) 1116 if (cctx_current->flags & CC_TRACE)
1090 PL_runops = runops_trace; 1117 PL_runops = runops_trace;
1091 1118
1092 /* we already must be executing an SLF op, there is no other valid way 1119 /* we already must be executing an SLF op, there is no other valid way
1093 * that can lead to creation of a new cctx */ 1120 * that can lead to creation of a new cctx */
1094 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1121 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1095 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1122 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1096 1123
1097 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1124 /* 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; 1125 cctx_ssl_frame = slf_frame;
1100 1126
1101 slf_frame.prepare = slf_prepare_set_stacklevel; 1127 slf_frame.prepare = slf_prepare_set_stacklevel;
1102 slf_frame.check = slf_check_set_stacklevel; 1128 slf_frame.check = slf_check_set_stacklevel;
1103} 1129}
1126 /* normally we would need to skip the entersub here */ 1152 /* normally we would need to skip the entersub here */
1127 /* not doing so will re-execute it, which is exactly what we want */ 1153 /* not doing so will re-execute it, which is exactly what we want */
1128 /* PL_nop = PL_nop->op_next */ 1154 /* PL_nop = PL_nop->op_next */
1129 1155
1130 /* inject a fake subroutine call to cctx_init */ 1156 /* inject a fake subroutine call to cctx_init */
1131 cctx_prepare (aTHX_ (coro_cctx *)arg); 1157 cctx_prepare (aTHX);
1132 1158
1133 /* cctx_run is the alternative tail of transfer() */ 1159 /* cctx_run is the alternative tail of transfer() */
1134 transfer_tail (aTHX); 1160 transfer_tail (aTHX);
1135 1161
1136 /* somebody or something will hit me for both perl_run and PL_restartop */ 1162 /* somebody or something will hit me for both perl_run and PL_restartop */
1137 PL_restartop = PL_op; 1163 PL_restartop = PL_op;
1138 perl_run (PL_curinterp); 1164 perl_run (PL_curinterp);
1165 /*
1166 * Unfortunately, there is no way to get at the return values of the
1167 * coro body here, as perl_run destroys these
1168 */
1139 1169
1140 /* 1170 /*
1141 * If perl-run returns we assume exit() was being called or the coro 1171 * 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) 1172 * 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 1173 * reason for perl_run to return. We try to exit by jumping to the
1227cctx_destroy (coro_cctx *cctx) 1257cctx_destroy (coro_cctx *cctx)
1228{ 1258{
1229 if (!cctx) 1259 if (!cctx)
1230 return; 1260 return;
1231 1261
1262 assert (cctx != cctx_current);//D temporary
1263
1232 --cctx_count; 1264 --cctx_count;
1233 coro_destroy (&cctx->cctx); 1265 coro_destroy (&cctx->cctx);
1234 1266
1235 /* coro_transfer creates new, empty cctx's */ 1267 /* coro_transfer creates new, empty cctx's */
1236 if (cctx->sptr) 1268 if (cctx->sptr)
1321transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1353transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1322{ 1354{
1323 dSTACKLEVEL; 1355 dSTACKLEVEL;
1324 1356
1325 /* sometimes transfer is only called to set idle_sp */ 1357 /* sometimes transfer is only called to set idle_sp */
1326 if (expect_false (!next)) 1358 if (expect_false (!prev))
1327 { 1359 {
1328 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1360 cctx_current->idle_sp = STACKLEVEL;
1329 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1361 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1330 } 1362 }
1331 else if (expect_true (prev != next)) 1363 else if (expect_true (prev != next))
1332 { 1364 {
1333 coro_cctx *prev__cctx; 1365 coro_cctx *cctx_prev;
1334 1366
1335 if (expect_false (prev->flags & CF_NEW)) 1367 if (expect_false (prev->flags & CF_NEW))
1336 { 1368 {
1337 /* create a new empty/source context */ 1369 /* create a new empty/source context */
1338 prev->cctx = cctx_new_empty ();
1339 prev->flags &= ~CF_NEW; 1370 prev->flags &= ~CF_NEW;
1340 prev->flags |= CF_RUNNING; 1371 prev->flags |= CF_RUNNING;
1341 } 1372 }
1342 1373
1343 prev->flags &= ~CF_RUNNING; 1374 prev->flags &= ~CF_RUNNING;
1354 coro_setup (aTHX_ next); 1385 coro_setup (aTHX_ next);
1355 } 1386 }
1356 else 1387 else
1357 load_perl (aTHX_ next); 1388 load_perl (aTHX_ next);
1358 1389
1359 prev__cctx = prev->cctx;
1360
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
1371 prev->cctx = 0;
1372 1399
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 prev__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 (!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);
1407 assert (!prev->cctx);//D temporary
1380 } 1408 }
1409 else
1410 prev->cctx = cctx_current;
1381 1411
1382 ++next->usecount; 1412 ++next->usecount;
1383 1413
1384 if (expect_true (!next->cctx)) 1414 cctx_prev = cctx_current;
1385 next->cctx = cctx_get (aTHX); 1415 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1386 1416
1387 if (expect_false (prev__cctx != next->cctx)) 1417 next->cctx = 0;
1418
1419 if (expect_false (cctx_prev != cctx_current))
1388 { 1420 {
1389 prev__cctx->top_env = PL_top_env; 1421 cctx_prev->top_env = PL_top_env;
1390 PL_top_env = next->cctx->top_env; 1422 PL_top_env = cctx_current->top_env;
1391 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1423 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1392 } 1424 }
1393 1425
1394 transfer_tail (aTHX); 1426 transfer_tail (aTHX);
1395 } 1427 }
1396} 1428}
1435 1467
1436 coro->slot = 0; 1468 coro->slot = 0;
1437 } 1469 }
1438 1470
1439 cctx_destroy (coro->cctx); 1471 cctx_destroy (coro->cctx);
1472 SvREFCNT_dec (coro->startcv);
1440 SvREFCNT_dec (coro->args); 1473 SvREFCNT_dec (coro->args);
1474 SvREFCNT_dec (CORO_THROW);
1441 1475
1442 if (coro->next) coro->next->prev = coro->prev; 1476 if (coro->next) coro->next->prev = coro->prev;
1443 if (coro->prev) coro->prev->next = coro->next; 1477 if (coro->prev) coro->prev->next = coro->next;
1444 if (coro == coro_first) coro_first = coro->next; 1478 if (coro == coro_first) coro_first = coro->next;
1445 1479
1592api_is_ready (pTHX_ SV *coro_sv) 1626api_is_ready (pTHX_ SV *coro_sv)
1593{ 1627{
1594 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1628 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1595} 1629}
1596 1630
1631/* expects to own a reference to next->hv */
1597INLINE void 1632INLINE void
1633prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1634{
1635 SV *prev_sv = SvRV (coro_current);
1636
1637 ta->prev = SvSTATE_hv (prev_sv);
1638 ta->next = next;
1639
1640 TRANSFER_CHECK (*ta);
1641
1642 SvRV_set (coro_current, (SV *)next->hv);
1643
1644 free_coro_mortal (aTHX);
1645 coro_mortal = prev_sv;
1646}
1647
1648static void
1598prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1649prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1599{ 1650{
1600 SV *prev_sv, *next_sv;
1601
1602 for (;;) 1651 for (;;)
1603 { 1652 {
1604 next_sv = coro_deq (aTHX); 1653 SV *next_sv = coro_deq (aTHX);
1605 1654
1606 /* nothing to schedule: call the idle handler */
1607 if (expect_false (!next_sv)) 1655 if (expect_true (next_sv))
1608 { 1656 {
1657 struct coro *next = SvSTATE_hv (next_sv);
1658
1659 /* cannot transfer to destroyed coros, skip and look for next */
1660 if (expect_false (next->flags & CF_DESTROYED))
1661 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */
1662 else
1663 {
1664 next->flags &= ~CF_READY;
1665 --coro_nready;
1666
1667 prepare_schedule_to (aTHX_ ta, next);
1668 break;
1669 }
1670 }
1671 else
1672 {
1673 /* nothing to schedule: call the idle handler */
1609 dSP; 1674 dSP;
1610 1675
1611 ENTER; 1676 ENTER;
1612 SAVETMPS; 1677 SAVETMPS;
1613 1678
1615 PUTBACK; 1680 PUTBACK;
1616 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD); 1681 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1617 1682
1618 FREETMPS; 1683 FREETMPS;
1619 LEAVE; 1684 LEAVE;
1620 continue;
1621 } 1685 }
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 } 1686 }
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} 1687}
1648 1688
1649INLINE void 1689INLINE void
1650prepare_cede (pTHX_ struct coro_transfer_args *ta) 1690prepare_cede (pTHX_ struct coro_transfer_args *ta)
1651{ 1691{
1672{ 1712{
1673 struct coro_transfer_args ta; 1713 struct coro_transfer_args ta;
1674 1714
1675 prepare_schedule (aTHX_ &ta); 1715 prepare_schedule (aTHX_ &ta);
1676 TRANSFER (ta, 1); 1716 TRANSFER (ta, 1);
1717}
1718
1719static void
1720api_schedule_to (pTHX_ SV *coro_sv)
1721{
1722 struct coro_transfer_args ta;
1723 struct coro *next = SvSTATE (coro_sv);
1724
1725 SvREFCNT_inc_NN (coro_sv);
1726 prepare_schedule_to (aTHX_ &ta, next);
1677} 1727}
1678 1728
1679static int 1729static int
1680api_cede (pTHX) 1730api_cede (pTHX)
1681{ 1731{
1730 else 1780 else
1731 coro->slot->runops = RUNOPS_DEFAULT; 1781 coro->slot->runops = RUNOPS_DEFAULT;
1732 } 1782 }
1733} 1783}
1734 1784
1785static void
1786coro_call_on_destroy (pTHX_ struct coro *coro)
1787{
1788 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1789 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1790
1791 if (on_destroyp)
1792 {
1793 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1794
1795 while (AvFILLp (on_destroy) >= 0)
1796 {
1797 dSP; /* don't disturb outer sp */
1798 SV *cb = av_pop (on_destroy);
1799
1800 PUSHMARK (SP);
1801
1802 if (statusp)
1803 {
1804 int i;
1805 AV *status = (AV *)SvRV (*statusp);
1806 EXTEND (SP, AvFILLp (status) + 1);
1807
1808 for (i = 0; i <= AvFILLp (status); ++i)
1809 PUSHs (AvARRAY (status)[i]);
1810 }
1811
1812 PUTBACK;
1813 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1814 }
1815 }
1816}
1817
1818static void
1819slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1820{
1821 int i;
1822 HV *hv = (HV *)SvRV (coro_current);
1823 AV *av = newAV ();
1824
1825 av_extend (av, items - 1);
1826 for (i = 0; i < items; ++i)
1827 av_push (av, SvREFCNT_inc_NN (arg [i]));
1828
1829 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1830
1831 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1832 api_ready (aTHX_ sv_manager);
1833
1834 frame->prepare = prepare_schedule;
1835 frame->check = slf_check_repeat;
1836}
1837
1838/*****************************************************************************/
1839/* async pool handler */
1840
1841static int
1842slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
1843{
1844 HV *hv = (HV *)SvRV (coro_current);
1845 struct coro *coro = (struct coro *)frame->data;
1846
1847 if (!coro->invoke_cb)
1848 return 1; /* loop till we have invoke */
1849 else
1850 {
1851 hv_store (hv, "desc", sizeof ("desc") - 1,
1852 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1853
1854 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1855
1856 {
1857 dSP;
1858 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
1859 PUTBACK;
1860 }
1861
1862 SvREFCNT_dec (GvAV (PL_defgv));
1863 GvAV (PL_defgv) = coro->invoke_av;
1864 coro->invoke_av = 0;
1865
1866 return 0;
1867 }
1868}
1869
1870static void
1871slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1872{
1873 HV *hv = (HV *)SvRV (coro_current);
1874 struct coro *coro = SvSTATE_hv ((SV *)hv);
1875
1876 if (expect_true (coro->saved_deffh))
1877 {
1878 /* subsequent iteration */
1879 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1880 coro->saved_deffh = 0;
1881
1882 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1883 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1884 {
1885 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
1886 coro->invoke_av = newAV ();
1887
1888 frame->prepare = prepare_nop;
1889 }
1890 else
1891 {
1892 av_clear (GvAV (PL_defgv));
1893 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1894
1895 coro->prio = 0;
1896
1897 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1898 api_trace (aTHX_ coro_current, 0);
1899
1900 frame->prepare = prepare_schedule;
1901 av_push (av_async_pool, SvREFCNT_inc (hv));
1902 }
1903 }
1904 else
1905 {
1906 /* first iteration, simply fall through */
1907 frame->prepare = prepare_nop;
1908 }
1909
1910 frame->check = slf_check_pool_handler;
1911 frame->data = (void *)coro;
1912}
1913
1735/*****************************************************************************/ 1914/*****************************************************************************/
1736/* rouse callback */ 1915/* rouse callback */
1737 1916
1738#define CORO_MAGIC_type_rouse PERL_MAGIC_ext 1917#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1739 1918
1744 SV *data = (SV *)GENSUB_ARG; 1923 SV *data = (SV *)GENSUB_ARG;
1745 1924
1746 if (SvTYPE (SvRV (data)) != SVt_PVAV) 1925 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1747 { 1926 {
1748 /* first call, set args */ 1927 /* first call, set args */
1749 int i;
1750 AV *av = newAV (); 1928 AV *av = newAV ();
1751 SV *coro = SvRV (data); 1929 SV *coro = SvRV (data);
1752 1930
1753 SvRV_set (data, (SV *)av); 1931 SvRV_set (data, (SV *)av);
1754 api_ready (aTHX_ coro); 1932 api_ready (aTHX_ coro);
1895static void 2073static void
1896slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2074slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1897{ 2075{
1898 frame->prepare = prepare_schedule; 2076 frame->prepare = prepare_schedule;
1899 frame->check = slf_check_nop; 2077 frame->check = slf_check_nop;
2078}
2079
2080static void
2081slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2082{
2083 struct coro *next = (struct coro *)slf_frame.data;
2084
2085 SvREFCNT_inc_NN (next->hv);
2086 prepare_schedule_to (aTHX_ ta, next);
2087}
2088
2089static void
2090slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2091{
2092 if (!items)
2093 croak ("Coro::schedule_to expects a coroutine argument, caught");
2094
2095 frame->data = (void *)SvSTATE (arg [0]);
2096 frame->prepare = slf_prepare_schedule_to;
2097 frame->check = slf_check_nop;
2098}
2099
2100static void
2101slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2102{
2103 api_ready (aTHX_ SvRV (coro_current));
2104
2105 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1900} 2106}
1901 2107
1902static void 2108static void
1903slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2109slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1904{ 2110{
2050 } 2256 }
2051 else 2257 else
2052 slf_argc = 0; 2258 slf_argc = 0;
2053 2259
2054 PL_op->op_ppaddr = pp_slf; 2260 PL_op->op_ppaddr = pp_slf;
2055 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2261 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2056 2262
2057 PL_op = (OP *)&slf_restore; 2263 PL_op = (OP *)&slf_restore;
2058} 2264}
2059 2265
2060/*****************************************************************************/ 2266/*****************************************************************************/
2143 SV **ary; 2349 SV **ary;
2144 2350
2145 /* unfortunately, building manually saves memory */ 2351 /* unfortunately, building manually saves memory */
2146 Newx (ary, 2, SV *); 2352 Newx (ary, 2, SV *);
2147 AvALLOC (av) = ary; 2353 AvALLOC (av) = ary;
2354 /*AvARRAY (av) = ary;*/
2148 SvPV_set ((SV *)av, (char *)ary); /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2355 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */
2149 AvMAX (av) = 1; 2356 AvMAX (av) = 1;
2150 AvFILLp (av) = 0; 2357 AvFILLp (av) = 0;
2151 ary [0] = newSViv (count); 2358 ary [0] = newSViv (count);
2152 2359
2153 return newRV_noinc ((SV *)av); 2360 return newRV_noinc ((SV *)av);
2173 AvARRAY (av)[0] = AvARRAY (av)[1]; 2380 AvARRAY (av)[0] = AvARRAY (av)[1];
2174 AvARRAY (av)[1] = count_sv; 2381 AvARRAY (av)[1] = count_sv;
2175 cb = av_shift (av); 2382 cb = av_shift (av);
2176 2383
2177 if (SvOBJECT (cb)) 2384 if (SvOBJECT (cb))
2385 {
2178 api_ready (aTHX_ cb); 2386 api_ready (aTHX_ cb);
2179 else 2387 --count;
2180 croak ("callbacks not yet supported"); 2388 }
2389 else if (SvTYPE (cb) == SVt_PVCV)
2390 {
2391 dSP;
2392 PUSHMARK (SP);
2393 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2394 PUTBACK;
2395 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2396 }
2181 2397
2182 SvREFCNT_dec (cb); 2398 SvREFCNT_dec (cb);
2183
2184 --count;
2185 } 2399 }
2186} 2400}
2187 2401
2188static void 2402static void
2189coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2403coro_semaphore_on_destroy (pTHX_ struct coro *coro)
2271} 2485}
2272 2486
2273static void 2487static void
2274slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2488slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2275{ 2489{
2490 if (items >= 2)
2491 {
2492 /* callback form */
2493 AV *av = (AV *)SvRV (arg [0]);
2494 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2495
2496 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv));
2497
2498 if (SvIVX (AvARRAY (av)[0]) > 0)
2499 coro_semaphore_adjust (aTHX_ av, 0);
2500
2501 frame->prepare = prepare_nop;
2502 frame->check = slf_check_nop;
2503 }
2504 else
2505 {
2276 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items); 2506 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2277 frame->check = slf_check_semaphore_wait; 2507 frame->check = slf_check_semaphore_wait;
2508 }
2278} 2509}
2279 2510
2280/* signal */ 2511/* signal */
2281 2512
2282static void 2513static void
2354 dXSARGS; 2585 dXSARGS;
2355 AV *state = (AV *)GENSUB_ARG; 2586 AV *state = (AV *)GENSUB_ARG;
2356 SV *coro = av_pop (state); 2587 SV *coro = av_pop (state);
2357 SV *data_sv = newSV (sizeof (struct io_state)); 2588 SV *data_sv = newSV (sizeof (struct io_state));
2358 2589
2359 av_extend (state, items); 2590 av_extend (state, items - 1);
2360 2591
2361 sv_upgrade (data_sv, SVt_PV); 2592 sv_upgrade (data_sv, SVt_PV);
2362 SvCUR_set (data_sv, sizeof (struct io_state)); 2593 SvCUR_set (data_sv, sizeof (struct io_state));
2363 SvPOK_only (data_sv); 2594 SvPOK_only (data_sv);
2364 2595
2499 XSRETURN_EMPTY; 2730 XSRETURN_EMPTY;
2500} 2731}
2501 2732
2502/*****************************************************************************/ 2733/*****************************************************************************/
2503 2734
2735#if CORO_CLONE
2736# include "clone.c"
2737#endif
2738
2504MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2739MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2505 2740
2506PROTOTYPES: DISABLE 2741PROTOTYPES: DISABLE
2507 2742
2508BOOT: 2743BOOT:
2512 coro_thx = PERL_GET_CONTEXT; 2747 coro_thx = PERL_GET_CONTEXT;
2513# endif 2748# endif
2514#endif 2749#endif
2515 BOOT_PAGESIZE; 2750 BOOT_PAGESIZE;
2516 2751
2752 cctx_current = cctx_new_empty ();
2753
2517 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2754 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2518 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2755 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2519 2756
2520 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2757 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; 2758 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
2540 2777
2541 { 2778 {
2542 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 2779 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2543 2780
2544 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 2781 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2545 hv_store_ent (PL_custom_op_names, slf, 2782 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2546 newSVpv ("coro_slf", 0), 0);
2547 2783
2548 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 2784 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2549 hv_store_ent (PL_custom_op_descs, slf, 2785 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2550 newSVpv ("coro schedule like function", 0), 0);
2551 } 2786 }
2552 2787
2553 coroapi.ver = CORO_API_VERSION; 2788 coroapi.ver = CORO_API_VERSION;
2554 coroapi.rev = CORO_API_REVISION; 2789 coroapi.rev = CORO_API_REVISION;
2555 2790
2574 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2809 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
2575} 2810}
2576 2811
2577SV * 2812SV *
2578new (char *klass, ...) 2813new (char *klass, ...)
2814 ALIAS:
2815 Coro::new = 1
2579 CODE: 2816 CODE:
2580{ 2817{
2581 struct coro *coro; 2818 struct coro *coro;
2582 MAGIC *mg; 2819 MAGIC *mg;
2583 HV *hv; 2820 HV *hv;
2821 CV *cb;
2584 int i; 2822 int i;
2823
2824 if (items > 1)
2825 {
2826 cb = coro_sv_2cv (aTHX_ ST (1));
2827
2828 if (!ix)
2829 {
2830 if (CvISXSUB (cb))
2831 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2832
2833 if (!CvROOT (cb))
2834 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2835 }
2836 }
2585 2837
2586 Newz (0, coro, 1, struct coro); 2838 Newz (0, coro, 1, struct coro);
2587 coro->args = newAV (); 2839 coro->args = newAV ();
2588 coro->flags = CF_NEW; 2840 coro->flags = CF_NEW;
2589 2841
2594 coro->hv = hv = newHV (); 2846 coro->hv = hv = newHV ();
2595 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0); 2847 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2596 mg->mg_flags |= MGf_DUP; 2848 mg->mg_flags |= MGf_DUP;
2597 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 2849 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2598 2850
2851 if (items > 1)
2852 {
2599 av_extend (coro->args, items - 1); 2853 av_extend (coro->args, items - 1 + ix - 1);
2854
2855 if (ix)
2856 {
2857 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2858 cb = cv_coro_run;
2859 }
2860
2861 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2862
2600 for (i = 1; i < items; i++) 2863 for (i = 2; i < items; i++)
2601 av_push (coro->args, newSVsv (ST (i))); 2864 av_push (coro->args, newSVsv (ST (i)));
2865 }
2602} 2866}
2603 OUTPUT: 2867 OUTPUT:
2604 RETVAL 2868 RETVAL
2605 2869
2606void 2870void
2619void 2883void
2620_exit (int code) 2884_exit (int code)
2621 PROTOTYPE: $ 2885 PROTOTYPE: $
2622 CODE: 2886 CODE:
2623 _exit (code); 2887 _exit (code);
2888
2889SV *
2890clone (Coro::State coro)
2891 CODE:
2892{
2893#if CORO_CLONE
2894 struct coro *ncoro = coro_clone (coro);
2895 MAGIC *mg;
2896 /* TODO: too much duplication */
2897 ncoro->hv = newHV ();
2898 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2899 mg->mg_flags |= MGf_DUP;
2900 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
2901#else
2902 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
2903#endif
2904}
2905 OUTPUT:
2906 RETVAL
2624 2907
2625int 2908int
2626cctx_stacksize (int new_stacksize = 0) 2909cctx_stacksize (int new_stacksize = 0)
2627 PROTOTYPE: ;$ 2910 PROTOTYPE: ;$
2628 CODE: 2911 CODE:
2804 3087
2805BOOT: 3088BOOT:
2806{ 3089{
2807 int i; 3090 int i;
2808 3091
2809 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2810 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3092 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2811 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3093 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2812 3094 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD);
3095 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2813 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3096 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2814 SvREADONLY_on (coro_current); 3097 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3098 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3099 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3100
3101 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3102 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3103 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3104 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2815 3105
2816 coro_stash = gv_stashpv ("Coro", TRUE); 3106 coro_stash = gv_stashpv ("Coro", TRUE);
2817 3107
2818 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3108 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
2819 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3109 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
2827 3117
2828 { 3118 {
2829 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3119 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2830 3120
2831 coroapi.schedule = api_schedule; 3121 coroapi.schedule = api_schedule;
3122 coroapi.schedule_to = api_schedule_to;
2832 coroapi.cede = api_cede; 3123 coroapi.cede = api_cede;
2833 coroapi.cede_notself = api_cede_notself; 3124 coroapi.cede_notself = api_cede_notself;
2834 coroapi.ready = api_ready; 3125 coroapi.ready = api_ready;
2835 coroapi.is_ready = api_is_ready; 3126 coroapi.is_ready = api_is_ready;
2836 coroapi.nready = coro_nready; 3127 coroapi.nready = coro_nready;
2841 SvREADONLY_on (sv); 3132 SvREADONLY_on (sv);
2842 } 3133 }
2843} 3134}
2844 3135
2845void 3136void
3137terminate (...)
3138 CODE:
3139 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3140
3141void
2846schedule (...) 3142schedule (...)
2847 CODE: 3143 CODE:
2848 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3144 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3145
3146void
3147schedule_to (...)
3148 CODE:
3149 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3150
3151void
3152cede_to (...)
3153 CODE:
3154 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2849 3155
2850void 3156void
2851cede (...) 3157cede (...)
2852 CODE: 3158 CODE:
2853 CORO_EXECUTE_SLF_XS (slf_init_cede); 3159 CORO_EXECUTE_SLF_XS (slf_init_cede);
2854 3160
2855void 3161void
2856cede_notself (...) 3162cede_notself (...)
2857 CODE: 3163 CODE:
2858 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3164 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3165
3166void
3167_cancel (Coro::State self)
3168 CODE:
3169 coro_state_destroy (aTHX_ self);
3170 coro_call_on_destroy (aTHX_ self);
2859 3171
2860void 3172void
2861_set_current (SV *current) 3173_set_current (SV *current)
2862 PROTOTYPE: $ 3174 PROTOTYPE: $
2863 CODE: 3175 CODE:
2908 CODE: 3220 CODE:
2909 RETVAL = coro_nready; 3221 RETVAL = coro_nready;
2910 OUTPUT: 3222 OUTPUT:
2911 RETVAL 3223 RETVAL
2912 3224
2913# for async_pool speedup
2914void 3225void
2915_pool_1 (SV *cb) 3226_pool_handler (...)
2916 CODE: 3227 CODE:
2917{ 3228 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 3229
2925 if (!invoke) 3230void
3231async_pool (SV *cv, ...)
3232 PROTOTYPE: &@
3233 PPCODE:
3234{
3235 HV *hv = (HV *)av_pop (av_async_pool);
3236 AV *av = newAV ();
3237 SV *cb = ST (0);
3238 int i;
3239
3240 av_extend (av, items - 2);
3241 for (i = 1; i < items; ++i)
3242 av_push (av, SvREFCNT_inc_NN (ST (i)));
3243
3244 if ((SV *)hv == &PL_sv_undef)
2926 { 3245 {
2927 SV *old = PL_diehook; 3246 PUSHMARK (SP);
2928 PL_diehook = 0; 3247 EXTEND (SP, 2);
2929 SvREFCNT_dec (old); 3248 PUSHs (sv_Coro);
2930 croak ("\3async_pool terminate\2\n"); 3249 PUSHs ((SV *)cv_pool_handler);
3250 PUTBACK;
3251 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3252 SPAGAIN;
3253
3254 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
2931 } 3255 }
2932 3256
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 { 3257 {
2946 av_fill (defav, len - 1); 3258 struct coro *coro = SvSTATE_hv (hv);
2947 for (i = 0; i < len; ++i) 3259
2948 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3260 assert (!coro->invoke_cb);
3261 assert (!coro->invoke_av);
3262 coro->invoke_cb = SvREFCNT_inc (cb);
3263 coro->invoke_av = av;
2949 } 3264 }
2950}
2951 3265
2952void 3266 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 3267
2959 sv_setsv (cb, &PL_sv_undef); 3268 if (GIMME_V != G_VOID)
2960 3269 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
2961 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3270 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); 3271 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} 3272}
2984 3273
2985SV * 3274SV *
2986rouse_cb () 3275rouse_cb ()
2987 PROTOTYPE: 3276 PROTOTYPE:
2989 RETVAL = coro_new_rouse_cb (aTHX); 3278 RETVAL = coro_new_rouse_cb (aTHX);
2990 OUTPUT: 3279 OUTPUT:
2991 RETVAL 3280 RETVAL
2992 3281
2993void 3282void
2994rouse_wait (SV *cb = 0) 3283rouse_wait (...)
2995 PROTOTYPE: ;$ 3284 PROTOTYPE: ;$
2996 PPCODE: 3285 PPCODE:
2997 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3286 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
2998 3287
2999 3288
3036 adjust = 1 3325 adjust = 1
3037 CODE: 3326 CODE:
3038 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 3327 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
3039 3328
3040void 3329void
3041down (SV *self) 3330down (...)
3042 CODE: 3331 CODE:
3043 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 3332 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
3044 3333
3045void 3334void
3046wait (SV *self) 3335wait (...)
3047 CODE: 3336 CODE:
3048 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait); 3337 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait);
3049 3338
3050void 3339void
3051try (SV *self) 3340try (SV *self)
3094 ); 3383 );
3095 OUTPUT: 3384 OUTPUT:
3096 RETVAL 3385 RETVAL
3097 3386
3098void 3387void
3099wait (SV *self) 3388wait (...)
3100 CODE: 3389 CODE:
3101 CORO_EXECUTE_SLF_XS (slf_init_signal_wait); 3390 CORO_EXECUTE_SLF_XS (slf_init_signal_wait);
3102 3391
3103void 3392void
3104broadcast (SV *self) 3393broadcast (SV *self)
3161 3450
3162void 3451void
3163_register (char *target, char *proto, SV *req) 3452_register (char *target, char *proto, SV *req)
3164 CODE: 3453 CODE:
3165{ 3454{
3166 HV *st; 3455 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 */ 3456 /* newXSproto doesn't return the CV on 5.8 */
3170 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3457 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3171 sv_setpv ((SV *)slf_cv, proto); 3458 sv_setpv ((SV *)slf_cv, proto);
3172 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3459 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3173} 3460}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines