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.311 by root, Thu Nov 20 01:12:08 2008 UTC vs.
Revision 1.330 by root, Wed Nov 26 09:29:06 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 */
180static SV *sv_idle; /* $Coro::idle */
181
172static GV *irsgv; /* $/ */ 182static GV *irsgv; /* $/ */
173static GV *stdoutgv; /* *STDOUT */ 183static GV *stdoutgv; /* *STDOUT */
174static SV *rv_diehook; 184static SV *rv_diehook;
175static SV *rv_warnhook; 185static SV *rv_warnhook;
176static HV *hv_sig; /* %SIG */ 186static HV *hv_sig; /* %SIG */
177 187
178/* async_pool helper stuff */ 188/* async_pool helper stuff */
179static SV *sv_pool_rss; 189static SV *sv_pool_rss;
180static SV *sv_pool_size; 190static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */
181static AV *av_async_pool; 192static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
182 196
183/* Coro::AnyEvent */ 197/* Coro::AnyEvent */
184static SV *sv_activity; 198static SV *sv_activity;
185 199
186static struct coro_cctx *cctx_first; 200static struct coro_cctx *cctx_first;
… …
215 int valgrind_id; 229 int valgrind_id;
216#endif 230#endif
217 unsigned char flags; 231 unsigned char flags;
218} coro_cctx; 232} coro_cctx;
219 233
234coro_cctx *cctx_current; /* the currently running cctx */
235
236/*****************************************************************************/
237
220enum { 238enum {
221 CF_RUNNING = 0x0001, /* coroutine is running */ 239 CF_RUNNING = 0x0001, /* coroutine is running */
222 CF_READY = 0x0002, /* coroutine is ready */ 240 CF_READY = 0x0002, /* coroutine is ready */
223 CF_NEW = 0x0004, /* has never been switched to */ 241 CF_NEW = 0x0004, /* has never been switched to */
224 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
… …
229{ 247{
230 SV *defsv; 248 SV *defsv;
231 AV *defav; 249 AV *defav;
232 SV *errsv; 250 SV *errsv;
233 SV *irsgv; 251 SV *irsgv;
252 HV *hinthv;
234#define VAR(name,type) type name; 253#define VAR(name,type) type name;
235# include "state.h" 254# include "state.h"
236#undef VAR 255#undef VAR
237} perl_slots; 256} perl_slots;
238 257
… …
263 SV *except; /* exception to be thrown */ 282 SV *except; /* exception to be thrown */
264 SV *rouse_cb; 283 SV *rouse_cb;
265 284
266 /* async_pool */ 285 /* async_pool */
267 SV *saved_deffh; 286 SV *saved_deffh;
287 SV *invoke_cb;
288 AV *invoke_av;
268 289
269 /* linked list */ 290 /* linked list */
270 struct coro *next, *prev; 291 struct coro *next, *prev;
271}; 292};
272 293
… …
289 310
290/* for Coro.pm */ 311/* for Coro.pm */
291static SV *coro_current; 312static SV *coro_current;
292static SV *coro_readyhook; 313static SV *coro_readyhook;
293static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 314static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
294static CV *cv_coro_run; 315static CV *cv_coro_run, *cv_coro_terminate;
295static struct coro *coro_first; 316static struct coro *coro_first;
296#define coro_nready coroapi.nready 317#define coro_nready coroapi.nready
297 318
298/** lowlevel stuff **********************************************************/ 319/** lowlevel stuff **********************************************************/
299 320
… …
335 GV *gvp; 356 GV *gvp;
336 return sv_2cv (sv, &st, &gvp, 0); 357 return sv_2cv (sv, &st, &gvp, 0);
337} 358}
338 359
339static AV * 360static AV *
340coro_clone_padlist (pTHX_ CV *cv) 361coro_derive_padlist (pTHX_ CV *cv)
341{ 362{
342 AV *padlist = CvPADLIST (cv); 363 AV *padlist = CvPADLIST (cv);
343 AV *newpadlist, *newpad; 364 AV *newpadlist, *newpad;
344 365
345 newpadlist = newAV (); 366 newpadlist = newAV ();
… …
365 if (SvREFCNT (padlist)) 386 if (SvREFCNT (padlist))
366 { 387 {
367 I32 i = AvFILLp (padlist); 388 I32 i = AvFILLp (padlist);
368 while (i >= 0) 389 while (i >= 0)
369 { 390 {
370 SV **svp = av_fetch (padlist, i--, FALSE); 391 SV **svp = AvARRAY (padlist)[i--];
371 if (svp) 392 if (svp)
372 { 393 {
373 SV *sv; 394 AvREAL_on (*svp);
374 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp)))
375 SvREFCNT_dec (sv); 395 av_undef (*svp);
376
377 SvREFCNT_dec (*svp); 396 SvREFCNT_dec (*svp);
378 } 397 }
379 } 398 }
380 399
381 SvREFCNT_dec ((SV*)padlist); 400 SvREFCNT_dec ((SV*)padlist);
… …
465 CV *cp = Perl_cv_clone (aTHX_ cv); 484 CV *cp = Perl_cv_clone (aTHX_ cv);
466 CvPADLIST (cv) = CvPADLIST (cp); 485 CvPADLIST (cv) = CvPADLIST (cp);
467 CvPADLIST (cp) = 0; 486 CvPADLIST (cp) = 0;
468 SvREFCNT_dec (cp); 487 SvREFCNT_dec (cp);
469#else 488#else
470 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 489 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
471#endif 490#endif
472 } 491 }
473} 492}
474 493
475static void 494static void
… …
482 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 501 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
483 502
484 av = (AV *)mg->mg_obj; 503 av = (AV *)mg->mg_obj;
485 504
486 if (expect_false (AvFILLp (av) >= AvMAX (av))) 505 if (expect_false (AvFILLp (av) >= AvMAX (av)))
487 av_extend (av, AvMAX (av) + 1); 506 av_extend (av, AvFILLp (av) + 1);
488 507
489 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 508 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
490} 509}
491 510
492/** load & save, init *******************************************************/ 511/** load & save, init *******************************************************/
… …
497 perl_slots *slot = c->slot; 516 perl_slots *slot = c->slot;
498 c->slot = 0; 517 c->slot = 0;
499 518
500 PL_mainstack = c->mainstack; 519 PL_mainstack = c->mainstack;
501 520
502 GvSV (PL_defgv) = slot->defsv; 521 GvSV (PL_defgv) = slot->defsv;
503 GvAV (PL_defgv) = slot->defav; 522 GvAV (PL_defgv) = slot->defav;
504 GvSV (PL_errgv) = slot->errsv; 523 GvSV (PL_errgv) = slot->errsv;
505 GvSV (irsgv) = slot->irsgv; 524 GvSV (irsgv) = slot->irsgv;
525 GvHV (PL_hintgv) = slot->hinthv;
506 526
507 #define VAR(name,type) PL_ ## name = slot->name; 527 #define VAR(name,type) PL_ ## name = slot->name;
508 # include "state.h" 528 # include "state.h"
509 #undef VAR 529 #undef VAR
510 530
… …
596 c->mainstack = PL_mainstack; 616 c->mainstack = PL_mainstack;
597 617
598 { 618 {
599 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 619 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
600 620
601 slot->defav = GvAV (PL_defgv); 621 slot->defav = GvAV (PL_defgv);
602 slot->defsv = DEFSV; 622 slot->defsv = DEFSV;
603 slot->errsv = ERRSV; 623 slot->errsv = ERRSV;
604 slot->irsgv = GvSV (irsgv); 624 slot->irsgv = GvSV (irsgv);
625 slot->hinthv = GvHV (PL_hintgv);
605 626
606 #define VAR(name,type) slot->name = PL_ ## name; 627 #define VAR(name,type) slot->name = PL_ ## name;
607 # include "state.h" 628 # include "state.h"
608 #undef VAR 629 #undef VAR
609 } 630 }
… …
687#if !PERL_VERSION_ATLEAST (5,10,0) 708#if !PERL_VERSION_ATLEAST (5,10,0)
688 Safefree (PL_retstack); 709 Safefree (PL_retstack);
689#endif 710#endif
690} 711}
691 712
713#define CORO_RSS \
714 rss += sizeof (SYM (curstackinfo)); \
715 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
716 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
717 rss += SYM (tmps_max) * sizeof (SV *); \
718 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
719 rss += SYM (scopestack_max) * sizeof (I32); \
720 rss += SYM (savestack_max) * sizeof (ANY);
721
692static size_t 722static size_t
693coro_rss (pTHX_ struct coro *coro) 723coro_rss (pTHX_ struct coro *coro)
694{ 724{
695 size_t rss = sizeof (*coro); 725 size_t rss = sizeof (*coro);
696 726
697 if (coro->mainstack) 727 if (coro->mainstack)
698 { 728 {
699 perl_slots tmp_slot;
700 perl_slots *slot;
701
702 if (coro->flags & CF_RUNNING) 729 if (coro->flags & CF_RUNNING)
703 { 730 {
704 slot = &tmp_slot; 731 #define SYM(sym) PL_ ## sym
705 732 CORO_RSS;
706 #define VAR(name,type) slot->name = PL_ ## name;
707 # include "state.h"
708 #undef VAR 733 #undef SYM
709 } 734 }
710 else 735 else
711 slot = coro->slot;
712
713 if (slot)
714 { 736 {
715 rss += sizeof (slot->curstackinfo); 737 #define SYM(sym) coro->slot->sym
716 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 738 CORO_RSS;
717 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 739 #undef SYM
718 rss += slot->tmps_max * sizeof (SV *);
719 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
720 rss += slot->scopestack_max * sizeof (I32);
721 rss += slot->savestack_max * sizeof (ANY);
722
723#if !PERL_VERSION_ATLEAST (5,10,0)
724 rss += slot->retstack_max * sizeof (OP *);
725#endif
726 } 740 }
727 } 741 }
728 742
729 return rss; 743 return rss;
730} 744}
… …
832slf_check_nop (pTHX_ struct CoroSLF *frame) 846slf_check_nop (pTHX_ struct CoroSLF *frame)
833{ 847{
834 return 0; 848 return 0;
835} 849}
836 850
851static int
852slf_check_repeat (pTHX_ struct CoroSLF *frame)
853{
854 return 1;
855}
856
837static UNOP coro_setup_op; 857static UNOP coro_setup_op;
838 858
839static void NOINLINE /* noinline to keep it out of the transfer fast path */ 859static void NOINLINE /* noinline to keep it out of the transfer fast path */
840coro_setup (pTHX_ struct coro *coro) 860coro_setup (pTHX_ struct coro *coro)
841{ 861{
… …
846 866
847 PL_runops = RUNOPS_DEFAULT; 867 PL_runops = RUNOPS_DEFAULT;
848 PL_curcop = &PL_compiling; 868 PL_curcop = &PL_compiling;
849 PL_in_eval = EVAL_NULL; 869 PL_in_eval = EVAL_NULL;
850 PL_comppad = 0; 870 PL_comppad = 0;
871 PL_comppad_name = 0;
872 PL_comppad_name_fill = 0;
873 PL_comppad_name_floor = 0;
851 PL_curpm = 0; 874 PL_curpm = 0;
852 PL_curpad = 0; 875 PL_curpad = 0;
853 PL_localizing = 0; 876 PL_localizing = 0;
854 PL_dirty = 0; 877 PL_dirty = 0;
855 PL_restartop = 0; 878 PL_restartop = 0;
856#if PERL_VERSION_ATLEAST (5,10,0) 879#if PERL_VERSION_ATLEAST (5,10,0)
857 PL_parser = 0; 880 PL_parser = 0;
858#endif 881#endif
882 PL_hints = 0;
859 883
860 /* recreate the die/warn hooks */ 884 /* recreate the die/warn hooks */
861 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 885 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
862 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 886 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
863 887
864 GvSV (PL_defgv) = newSV (0); 888 GvSV (PL_defgv) = newSV (0);
865 GvAV (PL_defgv) = coro->args; coro->args = 0; 889 GvAV (PL_defgv) = coro->args; coro->args = 0;
866 GvSV (PL_errgv) = newSV (0); 890 GvSV (PL_errgv) = newSV (0);
867 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 891 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
892 GvHV (PL_hintgv) = 0;
868 PL_rs = newSVsv (GvSV (irsgv)); 893 PL_rs = newSVsv (GvSV (irsgv));
869 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 894 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
870 895
871 { 896 {
872 dSP; 897 dSP;
… …
890 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 915 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
891 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 916 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
892 917
893 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 918 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
894 coro_setup_op.op_next = PL_op; 919 coro_setup_op.op_next = PL_op;
895 coro_setup_op.op_type = OP_CUSTOM; 920 coro_setup_op.op_type = OP_ENTERSUB;
896 coro_setup_op.op_ppaddr = pp_slf; 921 coro_setup_op.op_ppaddr = pp_slf;
897 /* no flags etc. required, as an init function won't be called */ 922 /* no flags etc. required, as an init function won't be called */
898 923
899 PL_op = (OP *)&coro_setup_op; 924 PL_op = (OP *)&coro_setup_op;
900 925
… …
926 SvREFCNT_dec (GvAV (PL_defgv)); 951 SvREFCNT_dec (GvAV (PL_defgv));
927 SvREFCNT_dec (GvSV (PL_errgv)); 952 SvREFCNT_dec (GvSV (PL_errgv));
928 SvREFCNT_dec (PL_defoutgv); 953 SvREFCNT_dec (PL_defoutgv);
929 SvREFCNT_dec (PL_rs); 954 SvREFCNT_dec (PL_rs);
930 SvREFCNT_dec (GvSV (irsgv)); 955 SvREFCNT_dec (GvSV (irsgv));
956 SvREFCNT_dec (GvHV (PL_hintgv));
931 957
932 SvREFCNT_dec (PL_diehook); 958 SvREFCNT_dec (PL_diehook);
933 SvREFCNT_dec (PL_warnhook); 959 SvREFCNT_dec (PL_warnhook);
934 960
935 SvREFCNT_dec (coro->saved_deffh); 961 SvREFCNT_dec (coro->saved_deffh);
936 SvREFCNT_dec (coro->rouse_cb); 962 SvREFCNT_dec (coro->rouse_cb);
963 SvREFCNT_dec (coro->invoke_cb);
964 SvREFCNT_dec (coro->invoke_av);
937 965
938 coro_destruct_stacks (aTHX); 966 coro_destruct_stacks (aTHX);
939} 967}
940 968
941INLINE void 969INLINE void
… …
951static int 979static int
952runops_trace (pTHX) 980runops_trace (pTHX)
953{ 981{
954 COP *oldcop = 0; 982 COP *oldcop = 0;
955 int oldcxix = -2; 983 int oldcxix = -2;
956 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
957 coro_cctx *cctx = coro->cctx;
958 984
959 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 985 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
960 { 986 {
961 PERL_ASYNC_CHECK (); 987 PERL_ASYNC_CHECK ();
962 988
963 if (cctx->flags & CC_TRACE_ALL) 989 if (cctx_current->flags & CC_TRACE_ALL)
964 { 990 {
965 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 991 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
966 { 992 {
967 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 993 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
968 SV **bot, **top; 994 SV **bot, **top;
969 AV *av = newAV (); /* return values */ 995 AV *av = newAV (); /* return values */
970 SV **cb; 996 SV **cb;
… …
1007 1033
1008 if (PL_curcop != &PL_compiling) 1034 if (PL_curcop != &PL_compiling)
1009 { 1035 {
1010 SV **cb; 1036 SV **cb;
1011 1037
1012 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1038 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1013 { 1039 {
1014 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1040 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1015 1041
1016 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1042 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1017 { 1043 {
1018 runops_proc_t old_runops = PL_runops;
1019 dSP; 1044 dSP;
1020 GV *gv = CvGV (cx->blk_sub.cv); 1045 GV *gv = CvGV (cx->blk_sub.cv);
1021 SV *fullname = sv_2mortal (newSV (0)); 1046 SV *fullname = sv_2mortal (newSV (0));
1022 1047
1023 if (isGV (gv)) 1048 if (isGV (gv))
… …
1041 } 1066 }
1042 1067
1043 oldcxix = cxstack_ix; 1068 oldcxix = cxstack_ix;
1044 } 1069 }
1045 1070
1046 if (cctx->flags & CC_TRACE_LINE) 1071 if (cctx_current->flags & CC_TRACE_LINE)
1047 { 1072 {
1048 dSP; 1073 dSP;
1049 1074
1050 PL_runops = RUNOPS_DEFAULT; 1075 PL_runops = RUNOPS_DEFAULT;
1051 ENTER; 1076 ENTER;
… …
1070 1095
1071 TAINT_NOT; 1096 TAINT_NOT;
1072 return 0; 1097 return 0;
1073} 1098}
1074 1099
1075static struct coro_cctx *cctx_ssl_cctx;
1076static struct CoroSLF cctx_ssl_frame; 1100static struct CoroSLF cctx_ssl_frame;
1077 1101
1078static void 1102static void
1079slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1103slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1080{ 1104{
1081 ta->prev = (struct coro *)cctx_ssl_cctx;
1082 ta->next = 0; 1105 ta->prev = 0;
1083} 1106}
1084 1107
1085static int 1108static int
1086slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1109slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1087{ 1110{
… …
1090 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1113 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1091} 1114}
1092 1115
1093/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1116/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1094static void NOINLINE 1117static void NOINLINE
1095cctx_prepare (pTHX_ coro_cctx *cctx) 1118cctx_prepare (pTHX)
1096{ 1119{
1097 PL_top_env = &PL_start_env; 1120 PL_top_env = &PL_start_env;
1098 1121
1099 if (cctx->flags & CC_TRACE) 1122 if (cctx_current->flags & CC_TRACE)
1100 PL_runops = runops_trace; 1123 PL_runops = runops_trace;
1101 1124
1102 /* we already must be executing an SLF op, there is no other valid way 1125 /* we already must be executing an SLF op, there is no other valid way
1103 * that can lead to creation of a new cctx */ 1126 * that can lead to creation of a new cctx */
1104 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1127 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1105 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1128 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1106 1129
1107 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1130 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1108 cctx_ssl_cctx = cctx;
1109 cctx_ssl_frame = slf_frame; 1131 cctx_ssl_frame = slf_frame;
1110 1132
1111 slf_frame.prepare = slf_prepare_set_stacklevel; 1133 slf_frame.prepare = slf_prepare_set_stacklevel;
1112 slf_frame.check = slf_check_set_stacklevel; 1134 slf_frame.check = slf_check_set_stacklevel;
1113} 1135}
… …
1136 /* normally we would need to skip the entersub here */ 1158 /* normally we would need to skip the entersub here */
1137 /* not doing so will re-execute it, which is exactly what we want */ 1159 /* not doing so will re-execute it, which is exactly what we want */
1138 /* PL_nop = PL_nop->op_next */ 1160 /* PL_nop = PL_nop->op_next */
1139 1161
1140 /* inject a fake subroutine call to cctx_init */ 1162 /* inject a fake subroutine call to cctx_init */
1141 cctx_prepare (aTHX_ (coro_cctx *)arg); 1163 cctx_prepare (aTHX);
1142 1164
1143 /* cctx_run is the alternative tail of transfer() */ 1165 /* cctx_run is the alternative tail of transfer() */
1144 transfer_tail (aTHX); 1166 transfer_tail (aTHX);
1145 1167
1146 /* somebody or something will hit me for both perl_run and PL_restartop */ 1168 /* somebody or something will hit me for both perl_run and PL_restartop */
… …
1154 /* 1176 /*
1155 * If perl-run returns we assume exit() was being called or the coro 1177 * If perl-run returns we assume exit() was being called or the coro
1156 * fell off the end, which seems to be the only valid (non-bug) 1178 * fell off the end, which seems to be the only valid (non-bug)
1157 * reason for perl_run to return. We try to exit by jumping to the 1179 * reason for perl_run to return. We try to exit by jumping to the
1158 * bootstrap-time "top" top_env, as we cannot restore the "main" 1180 * bootstrap-time "top" top_env, as we cannot restore the "main"
1159 * coroutine as Coro has no such concept 1181 * coroutine as Coro has no such concept.
1182 * This actually isn't valid with the pthread backend, but OSes requiring
1183 * that backend are too broken to do it in a standards-compliant way.
1160 */ 1184 */
1161 PL_top_env = main_top_env; 1185 PL_top_env = main_top_env;
1162 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1186 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1163 } 1187 }
1164} 1188}
… …
1241cctx_destroy (coro_cctx *cctx) 1265cctx_destroy (coro_cctx *cctx)
1242{ 1266{
1243 if (!cctx) 1267 if (!cctx)
1244 return; 1268 return;
1245 1269
1270 assert (cctx != cctx_current);//D temporary
1271
1246 --cctx_count; 1272 --cctx_count;
1247 coro_destroy (&cctx->cctx); 1273 coro_destroy (&cctx->cctx);
1248 1274
1249 /* coro_transfer creates new, empty cctx's */ 1275 /* coro_transfer creates new, empty cctx's */
1250 if (cctx->sptr) 1276 if (cctx->sptr)
… …
1313 /* TODO: throwing up here is considered harmful */ 1339 /* TODO: throwing up here is considered harmful */
1314 1340
1315 if (expect_true (prev != next)) 1341 if (expect_true (prev != next))
1316 { 1342 {
1317 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1343 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1318 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1344 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,");
1319 1345
1320 if (expect_false (next->flags & CF_RUNNING)) 1346 if (expect_false (next->flags & CF_RUNNING))
1321 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,"); 1347 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1322 1348
1323 if (expect_false (next->flags & CF_DESTROYED)) 1349 if (expect_false (next->flags & CF_DESTROYED))
… …
1335transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1361transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1336{ 1362{
1337 dSTACKLEVEL; 1363 dSTACKLEVEL;
1338 1364
1339 /* sometimes transfer is only called to set idle_sp */ 1365 /* sometimes transfer is only called to set idle_sp */
1340 if (expect_false (!next)) 1366 if (expect_false (!prev))
1341 { 1367 {
1342 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1368 cctx_current->idle_sp = STACKLEVEL;
1343 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1369 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1344 } 1370 }
1345 else if (expect_true (prev != next)) 1371 else if (expect_true (prev != next))
1346 { 1372 {
1347 coro_cctx *prev__cctx; 1373 coro_cctx *cctx_prev;
1348 1374
1349 if (expect_false (prev->flags & CF_NEW)) 1375 if (expect_false (prev->flags & CF_NEW))
1350 { 1376 {
1351 /* create a new empty/source context */ 1377 /* create a new empty/source context */
1352 prev->cctx = cctx_new_empty ();
1353 prev->flags &= ~CF_NEW; 1378 prev->flags &= ~CF_NEW;
1354 prev->flags |= CF_RUNNING; 1379 prev->flags |= CF_RUNNING;
1355 } 1380 }
1356 1381
1357 prev->flags &= ~CF_RUNNING; 1382 prev->flags &= ~CF_RUNNING;
… …
1368 coro_setup (aTHX_ next); 1393 coro_setup (aTHX_ next);
1369 } 1394 }
1370 else 1395 else
1371 load_perl (aTHX_ next); 1396 load_perl (aTHX_ next);
1372 1397
1373 prev__cctx = prev->cctx; 1398 assert (!prev->cctx);//D temporary
1374 1399
1375 /* possibly untie and reuse the cctx */ 1400 /* possibly untie and reuse the cctx */
1376 if (expect_true ( 1401 if (expect_true (
1377 prev__cctx->idle_sp == STACKLEVEL 1402 cctx_current->idle_sp == STACKLEVEL
1378 && !(prev__cctx->flags & CC_TRACE) 1403 && !(cctx_current->flags & CC_TRACE)
1379 && !force_cctx 1404 && !force_cctx
1380 )) 1405 ))
1381 { 1406 {
1382 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1407 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1383 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1408 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1384 1409
1385 prev->cctx = 0;
1386
1387 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1410 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1388 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1411 /* without this the next cctx_get might destroy the running cctx while still in use */
1389 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1412 if (expect_false (CCTX_EXPIRED (cctx_current)))
1390 if (!next->cctx) 1413 if (expect_true (!next->cctx))
1391 next->cctx = cctx_get (aTHX); 1414 next->cctx = cctx_get (aTHX);
1392 1415
1393 cctx_put (prev__cctx); 1416 cctx_put (cctx_current);
1394 } 1417 }
1418 else
1419 prev->cctx = cctx_current;
1395 1420
1396 ++next->usecount; 1421 ++next->usecount;
1397 1422
1398 if (expect_true (!next->cctx)) 1423 cctx_prev = cctx_current;
1399 next->cctx = cctx_get (aTHX); 1424 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1400 1425
1401 if (expect_false (prev__cctx != next->cctx)) 1426 next->cctx = 0;
1427
1428 if (expect_false (cctx_prev != cctx_current))
1402 { 1429 {
1403 prev__cctx->top_env = PL_top_env; 1430 cctx_prev->top_env = PL_top_env;
1404 PL_top_env = next->cctx->top_env; 1431 PL_top_env = cctx_current->top_env;
1405 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1432 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1406 } 1433 }
1407 1434
1408 transfer_tail (aTHX); 1435 transfer_tail (aTHX);
1409 } 1436 }
1410} 1437}
… …
1565{ 1592{
1566 struct coro *coro; 1593 struct coro *coro;
1567 SV *sv_hook; 1594 SV *sv_hook;
1568 void (*xs_hook)(void); 1595 void (*xs_hook)(void);
1569 1596
1570 if (SvROK (coro_sv))
1571 coro_sv = SvRV (coro_sv);
1572
1573 coro = SvSTATE (coro_sv); 1597 coro = SvSTATE (coro_sv);
1574 1598
1575 if (coro->flags & CF_READY) 1599 if (coro->flags & CF_READY)
1576 return 0; 1600 return 0;
1577 1601
… …
1608api_is_ready (pTHX_ SV *coro_sv) 1632api_is_ready (pTHX_ SV *coro_sv)
1609{ 1633{
1610 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1634 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1611} 1635}
1612 1636
1637/* expects to own a reference to next->hv */
1613INLINE void 1638INLINE void
1614prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1639prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1615{ 1640{
1616 SV *prev_sv, *next_sv;
1617
1618 for (;;)
1619 {
1620 next_sv = coro_deq (aTHX);
1621
1622 /* nothing to schedule: call the idle handler */
1623 if (expect_false (!next_sv))
1624 {
1625 dSP;
1626
1627 ENTER;
1628 SAVETMPS;
1629
1630 PUSHMARK (SP);
1631 PUTBACK;
1632 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1633
1634 FREETMPS;
1635 LEAVE;
1636 continue;
1637 }
1638
1639 ta->next = SvSTATE_hv (next_sv);
1640
1641 /* cannot transfer to destroyed coros, skip and look for next */
1642 if (expect_false (ta->next->flags & CF_DESTROYED))
1643 {
1644 SvREFCNT_dec (next_sv);
1645 /* coro_nready has already been taken care of by destroy */
1646 continue;
1647 }
1648
1649 --coro_nready;
1650 break;
1651 }
1652
1653 /* free this only after the transfer */
1654 prev_sv = SvRV (coro_current); 1641 SV *prev_sv = SvRV (coro_current);
1642
1655 ta->prev = SvSTATE_hv (prev_sv); 1643 ta->prev = SvSTATE_hv (prev_sv);
1644 ta->next = next;
1645
1656 TRANSFER_CHECK (*ta); 1646 TRANSFER_CHECK (*ta);
1657 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1647
1658 ta->next->flags &= ~CF_READY;
1659 SvRV_set (coro_current, next_sv); 1648 SvRV_set (coro_current, (SV *)next->hv);
1660 1649
1661 free_coro_mortal (aTHX); 1650 free_coro_mortal (aTHX);
1662 coro_mortal = prev_sv; 1651 coro_mortal = prev_sv;
1663} 1652}
1664 1653
1654static void
1655prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1656{
1657 for (;;)
1658 {
1659 SV *next_sv = coro_deq (aTHX);
1660
1661 if (expect_true (next_sv))
1662 {
1663 struct coro *next = SvSTATE_hv (next_sv);
1664
1665 /* cannot transfer to destroyed coros, skip and look for next */
1666 if (expect_false (next->flags & CF_DESTROYED))
1667 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */
1668 else
1669 {
1670 next->flags &= ~CF_READY;
1671 --coro_nready;
1672
1673 prepare_schedule_to (aTHX_ ta, next);
1674 break;
1675 }
1676 }
1677 else
1678 {
1679 /* nothing to schedule: call the idle handler */
1680 if (SvROK (sv_idle)
1681 && SvOBJECT (SvRV (sv_idle)))
1682 {
1683 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1684 api_ready (aTHX_ SvRV (sv_idle));
1685 --coro_nready;
1686 }
1687 else
1688 {
1689 dSP;
1690
1691 ENTER;
1692 SAVETMPS;
1693
1694 PUSHMARK (SP);
1695 PUTBACK;
1696 call_sv (sv_idle, G_VOID | G_DISCARD);
1697
1698 FREETMPS;
1699 LEAVE;
1700 }
1701 }
1702 }
1703}
1704
1665INLINE void 1705INLINE void
1666prepare_cede (pTHX_ struct coro_transfer_args *ta) 1706prepare_cede (pTHX_ struct coro_transfer_args *ta)
1667{ 1707{
1668 api_ready (aTHX_ coro_current); 1708 api_ready (aTHX_ coro_current);
1669 prepare_schedule (aTHX_ ta); 1709 prepare_schedule (aTHX_ ta);
… …
1688{ 1728{
1689 struct coro_transfer_args ta; 1729 struct coro_transfer_args ta;
1690 1730
1691 prepare_schedule (aTHX_ &ta); 1731 prepare_schedule (aTHX_ &ta);
1692 TRANSFER (ta, 1); 1732 TRANSFER (ta, 1);
1733}
1734
1735static void
1736api_schedule_to (pTHX_ SV *coro_sv)
1737{
1738 struct coro_transfer_args ta;
1739 struct coro *next = SvSTATE (coro_sv);
1740
1741 SvREFCNT_inc_NN (coro_sv);
1742 prepare_schedule_to (aTHX_ &ta, next);
1693} 1743}
1694 1744
1695static int 1745static int
1696api_cede (pTHX) 1746api_cede (pTHX)
1697{ 1747{
… …
1726static void 1776static void
1727api_trace (pTHX_ SV *coro_sv, int flags) 1777api_trace (pTHX_ SV *coro_sv, int flags)
1728{ 1778{
1729 struct coro *coro = SvSTATE (coro_sv); 1779 struct coro *coro = SvSTATE (coro_sv);
1730 1780
1781 if (coro->flags & CF_RUNNING)
1782 croak ("cannot enable tracing on a running coroutine, caught");
1783
1731 if (flags & CC_TRACE) 1784 if (flags & CC_TRACE)
1732 { 1785 {
1733 if (!coro->cctx) 1786 if (!coro->cctx)
1734 coro->cctx = cctx_new_run (); 1787 coro->cctx = cctx_new_run ();
1735 else if (!(coro->cctx->flags & CC_TRACE)) 1788 else if (!(coro->cctx->flags & CC_TRACE))
1736 croak ("cannot enable tracing on coroutine with custom stack,"); 1789 croak ("cannot enable tracing on coroutine with custom stack, caught");
1737 1790
1738 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1791 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1739 } 1792 }
1740 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1793 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1741 { 1794 {
… …
1746 else 1799 else
1747 coro->slot->runops = RUNOPS_DEFAULT; 1800 coro->slot->runops = RUNOPS_DEFAULT;
1748 } 1801 }
1749} 1802}
1750 1803
1804static void
1805coro_call_on_destroy (pTHX_ struct coro *coro)
1806{
1807 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1808 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1809
1810 if (on_destroyp)
1811 {
1812 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1813
1814 while (AvFILLp (on_destroy) >= 0)
1815 {
1816 dSP; /* don't disturb outer sp */
1817 SV *cb = av_pop (on_destroy);
1818
1819 PUSHMARK (SP);
1820
1821 if (statusp)
1822 {
1823 int i;
1824 AV *status = (AV *)SvRV (*statusp);
1825 EXTEND (SP, AvFILLp (status) + 1);
1826
1827 for (i = 0; i <= AvFILLp (status); ++i)
1828 PUSHs (AvARRAY (status)[i]);
1829 }
1830
1831 PUTBACK;
1832 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1833 }
1834 }
1835}
1836
1837static void
1838slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1839{
1840 int i;
1841 HV *hv = (HV *)SvRV (coro_current);
1842 AV *av = newAV ();
1843
1844 av_extend (av, items - 1);
1845 for (i = 0; i < items; ++i)
1846 av_push (av, SvREFCNT_inc_NN (arg [i]));
1847
1848 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1849
1850 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1851 api_ready (aTHX_ sv_manager);
1852
1853 frame->prepare = prepare_schedule;
1854 frame->check = slf_check_repeat;
1855}
1856
1857/*****************************************************************************/
1858/* async pool handler */
1859
1860static int
1861slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
1862{
1863 HV *hv = (HV *)SvRV (coro_current);
1864 struct coro *coro = (struct coro *)frame->data;
1865
1866 if (!coro->invoke_cb)
1867 return 1; /* loop till we have invoke */
1868 else
1869 {
1870 hv_store (hv, "desc", sizeof ("desc") - 1,
1871 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1872
1873 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1874
1875 {
1876 dSP;
1877 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
1878 PUTBACK;
1879 }
1880
1881 SvREFCNT_dec (GvAV (PL_defgv));
1882 GvAV (PL_defgv) = coro->invoke_av;
1883 coro->invoke_av = 0;
1884
1885 return 0;
1886 }
1887}
1888
1889static void
1890slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1891{
1892 HV *hv = (HV *)SvRV (coro_current);
1893 struct coro *coro = SvSTATE_hv ((SV *)hv);
1894
1895 if (expect_true (coro->saved_deffh))
1896 {
1897 /* subsequent iteration */
1898 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1899 coro->saved_deffh = 0;
1900
1901 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1902 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1903 {
1904 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
1905 coro->invoke_av = newAV ();
1906
1907 frame->prepare = prepare_nop;
1908 }
1909 else
1910 {
1911 av_clear (GvAV (PL_defgv));
1912 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1913
1914 coro->prio = 0;
1915
1916 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1917 api_trace (aTHX_ coro_current, 0);
1918
1919 frame->prepare = prepare_schedule;
1920 av_push (av_async_pool, SvREFCNT_inc (hv));
1921 }
1922 }
1923 else
1924 {
1925 /* first iteration, simply fall through */
1926 frame->prepare = prepare_nop;
1927 }
1928
1929 frame->check = slf_check_pool_handler;
1930 frame->data = (void *)coro;
1931}
1932
1751/*****************************************************************************/ 1933/*****************************************************************************/
1752/* rouse callback */ 1934/* rouse callback */
1753 1935
1754#define CORO_MAGIC_type_rouse PERL_MAGIC_ext 1936#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1755 1937
… …
1760 SV *data = (SV *)GENSUB_ARG; 1942 SV *data = (SV *)GENSUB_ARG;
1761 1943
1762 if (SvTYPE (SvRV (data)) != SVt_PVAV) 1944 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1763 { 1945 {
1764 /* first call, set args */ 1946 /* first call, set args */
1765 int i;
1766 AV *av = newAV (); 1947 AV *av = newAV ();
1767 SV *coro = SvRV (data); 1948 SV *coro = SvRV (data);
1768 1949
1769 SvRV_set (data, (SV *)av); 1950 SvRV_set (data, (SV *)av);
1770 api_ready (aTHX_ coro); 1951 api_ready (aTHX_ coro);
… …
1911static void 2092static void
1912slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2093slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1913{ 2094{
1914 frame->prepare = prepare_schedule; 2095 frame->prepare = prepare_schedule;
1915 frame->check = slf_check_nop; 2096 frame->check = slf_check_nop;
2097}
2098
2099static void
2100slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2101{
2102 struct coro *next = (struct coro *)slf_frame.data;
2103
2104 SvREFCNT_inc_NN (next->hv);
2105 prepare_schedule_to (aTHX_ ta, next);
2106}
2107
2108static void
2109slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2110{
2111 if (!items)
2112 croak ("Coro::schedule_to expects a coroutine argument, caught");
2113
2114 frame->data = (void *)SvSTATE (arg [0]);
2115 frame->prepare = slf_prepare_schedule_to;
2116 frame->check = slf_check_nop;
2117}
2118
2119static void
2120slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2121{
2122 api_ready (aTHX_ SvRV (coro_current));
2123
2124 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1916} 2125}
1917 2126
1918static void 2127static void
1919slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2128slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1920{ 2129{
… …
2066 } 2275 }
2067 else 2276 else
2068 slf_argc = 0; 2277 slf_argc = 0;
2069 2278
2070 PL_op->op_ppaddr = pp_slf; 2279 PL_op->op_ppaddr = pp_slf;
2071 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2280 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2072 2281
2073 PL_op = (OP *)&slf_restore; 2282 PL_op = (OP *)&slf_restore;
2074} 2283}
2075 2284
2076/*****************************************************************************/ 2285/*****************************************************************************/
… …
2159 SV **ary; 2368 SV **ary;
2160 2369
2161 /* unfortunately, building manually saves memory */ 2370 /* unfortunately, building manually saves memory */
2162 Newx (ary, 2, SV *); 2371 Newx (ary, 2, SV *);
2163 AvALLOC (av) = ary; 2372 AvALLOC (av) = ary;
2373#if PERL_VERSION_ATLEAST (5,10,0)
2164 /*AvARRAY (av) = ary;*/ 2374 AvARRAY (av) = ary;
2375#else
2165 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2376 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2377 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2378 SvPVX ((SV *)av) = (char *)ary;
2379#endif
2166 AvMAX (av) = 1; 2380 AvMAX (av) = 1;
2167 AvFILLp (av) = 0; 2381 AvFILLp (av) = 0;
2168 ary [0] = newSViv (count); 2382 ary [0] = newSViv (count);
2169 2383
2170 return newRV_noinc ((SV *)av); 2384 return newRV_noinc ((SV *)av);
… …
2395 dXSARGS; 2609 dXSARGS;
2396 AV *state = (AV *)GENSUB_ARG; 2610 AV *state = (AV *)GENSUB_ARG;
2397 SV *coro = av_pop (state); 2611 SV *coro = av_pop (state);
2398 SV *data_sv = newSV (sizeof (struct io_state)); 2612 SV *data_sv = newSV (sizeof (struct io_state));
2399 2613
2400 av_extend (state, items); 2614 av_extend (state, items - 1);
2401 2615
2402 sv_upgrade (data_sv, SVt_PV); 2616 sv_upgrade (data_sv, SVt_PV);
2403 SvCUR_set (data_sv, sizeof (struct io_state)); 2617 SvCUR_set (data_sv, sizeof (struct io_state));
2404 SvPOK_only (data_sv); 2618 SvPOK_only (data_sv);
2405 2619
… …
2540 XSRETURN_EMPTY; 2754 XSRETURN_EMPTY;
2541} 2755}
2542 2756
2543/*****************************************************************************/ 2757/*****************************************************************************/
2544 2758
2759#if CORO_CLONE
2760# include "clone.c"
2761#endif
2762
2545MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2763MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2546 2764
2547PROTOTYPES: DISABLE 2765PROTOTYPES: DISABLE
2548 2766
2549BOOT: 2767BOOT:
… …
2553 coro_thx = PERL_GET_CONTEXT; 2771 coro_thx = PERL_GET_CONTEXT;
2554# endif 2772# endif
2555#endif 2773#endif
2556 BOOT_PAGESIZE; 2774 BOOT_PAGESIZE;
2557 2775
2776 cctx_current = cctx_new_empty ();
2777
2558 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2778 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2559 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2779 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2560 2780
2561 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2781 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2562 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 2782 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2581 2801
2582 { 2802 {
2583 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 2803 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2584 2804
2585 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 2805 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2586 hv_store_ent (PL_custom_op_names, slf, 2806 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2587 newSVpv ("coro_slf", 0), 0);
2588 2807
2589 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 2808 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2590 hv_store_ent (PL_custom_op_descs, slf, 2809 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2591 newSVpv ("coro schedule like function", 0), 0);
2592 } 2810 }
2593 2811
2594 coroapi.ver = CORO_API_VERSION; 2812 coroapi.ver = CORO_API_VERSION;
2595 coroapi.rev = CORO_API_REVISION; 2813 coroapi.rev = CORO_API_REVISION;
2596 2814
… …
2654 mg->mg_flags |= MGf_DUP; 2872 mg->mg_flags |= MGf_DUP;
2655 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 2873 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2656 2874
2657 if (items > 1) 2875 if (items > 1)
2658 { 2876 {
2659 av_extend (coro->args, items - 1 + ix); 2877 av_extend (coro->args, items - 1 + ix - 1);
2660 2878
2661 if (ix) 2879 if (ix)
2662 { 2880 {
2663 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb)); 2881 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2664 cb = cv_coro_run; 2882 cb = cv_coro_run;
… …
2689void 2907void
2690_exit (int code) 2908_exit (int code)
2691 PROTOTYPE: $ 2909 PROTOTYPE: $
2692 CODE: 2910 CODE:
2693 _exit (code); 2911 _exit (code);
2912
2913SV *
2914clone (Coro::State coro)
2915 CODE:
2916{
2917#if CORO_CLONE
2918 struct coro *ncoro = coro_clone (coro);
2919 MAGIC *mg;
2920 /* TODO: too much duplication */
2921 ncoro->hv = newHV ();
2922 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2923 mg->mg_flags |= MGf_DUP;
2924 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
2925#else
2926 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
2927#endif
2928}
2929 OUTPUT:
2930 RETVAL
2694 2931
2695int 2932int
2696cctx_stacksize (int new_stacksize = 0) 2933cctx_stacksize (int new_stacksize = 0)
2697 PROTOTYPE: ;$ 2934 PROTOTYPE: ;$
2698 CODE: 2935 CODE:
… …
2819 3056
2820SV * 3057SV *
2821has_cctx (Coro::State coro) 3058has_cctx (Coro::State coro)
2822 PROTOTYPE: $ 3059 PROTOTYPE: $
2823 CODE: 3060 CODE:
2824 RETVAL = boolSV (!!coro->cctx); 3061 /* maybe manage the running flag differently */
3062 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2825 OUTPUT: 3063 OUTPUT:
2826 RETVAL 3064 RETVAL
2827 3065
2828int 3066int
2829is_traced (Coro::State coro) 3067is_traced (Coro::State coro)
… …
2849 3087
2850void 3088void
2851force_cctx () 3089force_cctx ()
2852 PROTOTYPE: 3090 PROTOTYPE:
2853 CODE: 3091 CODE:
2854 SvSTATE_current->cctx->idle_sp = 0; 3092 cctx_current->idle_sp = 0;
2855 3093
2856void 3094void
2857swap_defsv (Coro::State self) 3095swap_defsv (Coro::State self)
2858 PROTOTYPE: $ 3096 PROTOTYPE: $
2859 ALIAS: 3097 ALIAS:
… …
2874 3112
2875BOOT: 3113BOOT:
2876{ 3114{
2877 int i; 3115 int i;
2878 3116
2879 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2880 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3117 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2881 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3118 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2882 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3119 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD);
3120 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2883 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); 3121 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2884 SvREADONLY_on (coro_current); 3122 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3123 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3124 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3125 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3126
3127 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3128 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3129 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3130 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2885 3131
2886 coro_stash = gv_stashpv ("Coro", TRUE); 3132 coro_stash = gv_stashpv ("Coro", TRUE);
2887 3133
2888 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3134 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
2889 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3135 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
… …
2897 3143
2898 { 3144 {
2899 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3145 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2900 3146
2901 coroapi.schedule = api_schedule; 3147 coroapi.schedule = api_schedule;
3148 coroapi.schedule_to = api_schedule_to;
2902 coroapi.cede = api_cede; 3149 coroapi.cede = api_cede;
2903 coroapi.cede_notself = api_cede_notself; 3150 coroapi.cede_notself = api_cede_notself;
2904 coroapi.ready = api_ready; 3151 coroapi.ready = api_ready;
2905 coroapi.is_ready = api_is_ready; 3152 coroapi.is_ready = api_is_ready;
2906 coroapi.nready = coro_nready; 3153 coroapi.nready = coro_nready;
… …
2911 SvREADONLY_on (sv); 3158 SvREADONLY_on (sv);
2912 } 3159 }
2913} 3160}
2914 3161
2915void 3162void
3163terminate (...)
3164 CODE:
3165 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3166
3167void
2916schedule (...) 3168schedule (...)
2917 CODE: 3169 CODE:
2918 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3170 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3171
3172void
3173schedule_to (...)
3174 CODE:
3175 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3176
3177void
3178cede_to (...)
3179 CODE:
3180 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2919 3181
2920void 3182void
2921cede (...) 3183cede (...)
2922 CODE: 3184 CODE:
2923 CORO_EXECUTE_SLF_XS (slf_init_cede); 3185 CORO_EXECUTE_SLF_XS (slf_init_cede);
2924 3186
2925void 3187void
2926cede_notself (...) 3188cede_notself (...)
2927 CODE: 3189 CODE:
2928 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3190 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3191
3192void
3193_cancel (Coro::State self)
3194 CODE:
3195 coro_state_destroy (aTHX_ self);
3196 coro_call_on_destroy (aTHX_ self);
2929 3197
2930void 3198void
2931_set_current (SV *current) 3199_set_current (SV *current)
2932 PROTOTYPE: $ 3200 PROTOTYPE: $
2933 CODE: 3201 CODE:
… …
2978 CODE: 3246 CODE:
2979 RETVAL = coro_nready; 3247 RETVAL = coro_nready;
2980 OUTPUT: 3248 OUTPUT:
2981 RETVAL 3249 RETVAL
2982 3250
2983# for async_pool speedup
2984void 3251void
2985_pool_1 (SV *cb) 3252_pool_handler (...)
2986 CODE: 3253 CODE:
2987{ 3254 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
2988 HV *hv = (HV *)SvRV (coro_current);
2989 struct coro *coro = SvSTATE_hv ((SV *)hv);
2990 AV *defav = GvAV (PL_defgv);
2991 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2992 AV *invoke_av;
2993 int i, len;
2994 3255
2995 if (!invoke) 3256void
3257async_pool (SV *cv, ...)
3258 PROTOTYPE: &@
3259 PPCODE:
3260{
3261 HV *hv = (HV *)av_pop (av_async_pool);
3262 AV *av = newAV ();
3263 SV *cb = ST (0);
3264 int i;
3265
3266 av_extend (av, items - 2);
3267 for (i = 1; i < items; ++i)
3268 av_push (av, SvREFCNT_inc_NN (ST (i)));
3269
3270 if ((SV *)hv == &PL_sv_undef)
2996 { 3271 {
2997 SV *old = PL_diehook; 3272 PUSHMARK (SP);
2998 PL_diehook = 0; 3273 EXTEND (SP, 2);
2999 SvREFCNT_dec (old); 3274 PUSHs (sv_Coro);
3000 croak ("\3async_pool terminate\2\n"); 3275 PUSHs ((SV *)cv_pool_handler);
3276 PUTBACK;
3277 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3278 SPAGAIN;
3279
3280 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
3001 } 3281 }
3002 3282
3003 SvREFCNT_dec (coro->saved_deffh);
3004 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
3005
3006 hv_store (hv, "desc", sizeof ("desc") - 1,
3007 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
3008
3009 invoke_av = (AV *)SvRV (invoke);
3010 len = av_len (invoke_av);
3011
3012 sv_setsv (cb, AvARRAY (invoke_av)[0]);
3013
3014 if (len > 0)
3015 { 3283 {
3016 av_fill (defav, len - 1); 3284 struct coro *coro = SvSTATE_hv (hv);
3017 for (i = 0; i < len; ++i) 3285
3018 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3286 assert (!coro->invoke_cb);
3287 assert (!coro->invoke_av);
3288 coro->invoke_cb = SvREFCNT_inc (cb);
3289 coro->invoke_av = av;
3019 } 3290 }
3020}
3021 3291
3022void 3292 api_ready (aTHX_ (SV *)hv);
3023_pool_2 (SV *cb)
3024 CODE:
3025{
3026 HV *hv = (HV *)SvRV (coro_current);
3027 struct coro *coro = SvSTATE_hv ((SV *)hv);
3028 3293
3029 sv_setsv (cb, &PL_sv_undef); 3294 if (GIMME_V != G_VOID)
3030 3295 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3031 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3296 else
3032 coro->saved_deffh = 0;
3033
3034 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
3035 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
3036 {
3037 SV *old = PL_diehook;
3038 PL_diehook = 0;
3039 SvREFCNT_dec (old); 3297 SvREFCNT_dec (hv);
3040 croak ("\3async_pool terminate\2\n");
3041 }
3042
3043 av_clear (GvAV (PL_defgv));
3044 hv_store (hv, "desc", sizeof ("desc") - 1,
3045 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
3046
3047 coro->prio = 0;
3048
3049 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
3050 api_trace (aTHX_ coro_current, 0);
3051
3052 av_push (av_async_pool, newSVsv (coro_current));
3053} 3298}
3054 3299
3055SV * 3300SV *
3056rouse_cb () 3301rouse_cb ()
3057 PROTOTYPE: 3302 PROTOTYPE:

Diff Legend

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