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.331 by root, Thu Nov 27 12:00:59 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
… …
127#else 133#else
128# define dSTACKLEVEL volatile void *stacklevel 134# define dSTACKLEVEL volatile void *stacklevel
129# define STACKLEVEL ((void *)&stacklevel) 135# define STACKLEVEL ((void *)&stacklevel)
130#endif 136#endif
131 137
132#define IN_DESTRUCT (PL_main_cv == Nullcv) 138#define IN_DESTRUCT PL_dirty
133 139
134#if __GNUC__ >= 3 140#if __GNUC__ >= 3
135# define attribute(x) __attribute__(x) 141# define attribute(x) __attribute__(x)
136# define expect(expr,value) __builtin_expect ((expr),(value)) 142# define expect(expr,value) __builtin_expect ((expr),(value))
137# define INLINE static inline 143# define INLINE static inline
… …
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 ();
… …
360 381
361static void 382static void
362free_padlist (pTHX_ AV *padlist) 383free_padlist (pTHX_ AV *padlist)
363{ 384{
364 /* may be during global destruction */ 385 /* may be during global destruction */
365 if (SvREFCNT (padlist)) 386 if (!IN_DESTRUCT)
366 { 387 {
367 I32 i = AvFILLp (padlist); 388 I32 i = AvFILLp (padlist);
389
368 while (i >= 0) 390 while (i >= 0)
369 { 391 {
370 SV **svp = av_fetch (padlist, i--, FALSE); 392 /* we try to be extra-careful here */
371 if (svp) 393 AV *av = (AV *)AvARRAY (padlist)[i--];
372 { 394
373 SV *sv; 395 I32 i = AvFILLp (av);
374 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 396
397 while (i >= 0)
398 SvREFCNT_dec (AvARRAY (av)[i--]);
399
400 AvFILLp (av) = -1;
375 SvREFCNT_dec (sv); 401 SvREFCNT_dec (av);
376
377 SvREFCNT_dec (*svp);
378 }
379 } 402 }
380 403
404 AvFILLp (padlist) = -1;
381 SvREFCNT_dec ((SV*)padlist); 405 SvREFCNT_dec ((SV*)padlist);
382 } 406 }
383} 407}
384 408
385static int 409static int
… …
465 CV *cp = Perl_cv_clone (aTHX_ cv); 489 CV *cp = Perl_cv_clone (aTHX_ cv);
466 CvPADLIST (cv) = CvPADLIST (cp); 490 CvPADLIST (cv) = CvPADLIST (cp);
467 CvPADLIST (cp) = 0; 491 CvPADLIST (cp) = 0;
468 SvREFCNT_dec (cp); 492 SvREFCNT_dec (cp);
469#else 493#else
470 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 494 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
471#endif 495#endif
472 } 496 }
473} 497}
474 498
475static void 499static void
… …
482 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 506 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
483 507
484 av = (AV *)mg->mg_obj; 508 av = (AV *)mg->mg_obj;
485 509
486 if (expect_false (AvFILLp (av) >= AvMAX (av))) 510 if (expect_false (AvFILLp (av) >= AvMAX (av)))
487 av_extend (av, AvMAX (av) + 1); 511 av_extend (av, AvFILLp (av) + 1);
488 512
489 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 513 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
490} 514}
491 515
492/** load & save, init *******************************************************/ 516/** load & save, init *******************************************************/
… …
497 perl_slots *slot = c->slot; 521 perl_slots *slot = c->slot;
498 c->slot = 0; 522 c->slot = 0;
499 523
500 PL_mainstack = c->mainstack; 524 PL_mainstack = c->mainstack;
501 525
502 GvSV (PL_defgv) = slot->defsv; 526 GvSV (PL_defgv) = slot->defsv;
503 GvAV (PL_defgv) = slot->defav; 527 GvAV (PL_defgv) = slot->defav;
504 GvSV (PL_errgv) = slot->errsv; 528 GvSV (PL_errgv) = slot->errsv;
505 GvSV (irsgv) = slot->irsgv; 529 GvSV (irsgv) = slot->irsgv;
530 GvHV (PL_hintgv) = slot->hinthv;
506 531
507 #define VAR(name,type) PL_ ## name = slot->name; 532 #define VAR(name,type) PL_ ## name = slot->name;
508 # include "state.h" 533 # include "state.h"
509 #undef VAR 534 #undef VAR
510 535
… …
596 c->mainstack = PL_mainstack; 621 c->mainstack = PL_mainstack;
597 622
598 { 623 {
599 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 624 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
600 625
601 slot->defav = GvAV (PL_defgv); 626 slot->defav = GvAV (PL_defgv);
602 slot->defsv = DEFSV; 627 slot->defsv = DEFSV;
603 slot->errsv = ERRSV; 628 slot->errsv = ERRSV;
604 slot->irsgv = GvSV (irsgv); 629 slot->irsgv = GvSV (irsgv);
630 slot->hinthv = GvHV (PL_hintgv);
605 631
606 #define VAR(name,type) slot->name = PL_ ## name; 632 #define VAR(name,type) slot->name = PL_ ## name;
607 # include "state.h" 633 # include "state.h"
608 #undef VAR 634 #undef VAR
609 } 635 }
… …
687#if !PERL_VERSION_ATLEAST (5,10,0) 713#if !PERL_VERSION_ATLEAST (5,10,0)
688 Safefree (PL_retstack); 714 Safefree (PL_retstack);
689#endif 715#endif
690} 716}
691 717
718#define CORO_RSS \
719 rss += sizeof (SYM (curstackinfo)); \
720 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
721 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
722 rss += SYM (tmps_max) * sizeof (SV *); \
723 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
724 rss += SYM (scopestack_max) * sizeof (I32); \
725 rss += SYM (savestack_max) * sizeof (ANY);
726
692static size_t 727static size_t
693coro_rss (pTHX_ struct coro *coro) 728coro_rss (pTHX_ struct coro *coro)
694{ 729{
695 size_t rss = sizeof (*coro); 730 size_t rss = sizeof (*coro);
696 731
697 if (coro->mainstack) 732 if (coro->mainstack)
698 { 733 {
699 perl_slots tmp_slot;
700 perl_slots *slot;
701
702 if (coro->flags & CF_RUNNING) 734 if (coro->flags & CF_RUNNING)
703 { 735 {
704 slot = &tmp_slot; 736 #define SYM(sym) PL_ ## sym
705 737 CORO_RSS;
706 #define VAR(name,type) slot->name = PL_ ## name;
707 # include "state.h"
708 #undef VAR 738 #undef SYM
709 } 739 }
710 else 740 else
711 slot = coro->slot;
712
713 if (slot)
714 { 741 {
715 rss += sizeof (slot->curstackinfo); 742 #define SYM(sym) coro->slot->sym
716 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 743 CORO_RSS;
717 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 744 #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 } 745 }
727 } 746 }
728 747
729 return rss; 748 return rss;
730} 749}
… …
832slf_check_nop (pTHX_ struct CoroSLF *frame) 851slf_check_nop (pTHX_ struct CoroSLF *frame)
833{ 852{
834 return 0; 853 return 0;
835} 854}
836 855
856static int
857slf_check_repeat (pTHX_ struct CoroSLF *frame)
858{
859 return 1;
860}
861
837static UNOP coro_setup_op; 862static UNOP coro_setup_op;
838 863
839static void NOINLINE /* noinline to keep it out of the transfer fast path */ 864static void NOINLINE /* noinline to keep it out of the transfer fast path */
840coro_setup (pTHX_ struct coro *coro) 865coro_setup (pTHX_ struct coro *coro)
841{ 866{
… …
846 871
847 PL_runops = RUNOPS_DEFAULT; 872 PL_runops = RUNOPS_DEFAULT;
848 PL_curcop = &PL_compiling; 873 PL_curcop = &PL_compiling;
849 PL_in_eval = EVAL_NULL; 874 PL_in_eval = EVAL_NULL;
850 PL_comppad = 0; 875 PL_comppad = 0;
876 PL_comppad_name = 0;
877 PL_comppad_name_fill = 0;
878 PL_comppad_name_floor = 0;
851 PL_curpm = 0; 879 PL_curpm = 0;
852 PL_curpad = 0; 880 PL_curpad = 0;
853 PL_localizing = 0; 881 PL_localizing = 0;
854 PL_dirty = 0; 882 PL_dirty = 0;
855 PL_restartop = 0; 883 PL_restartop = 0;
856#if PERL_VERSION_ATLEAST (5,10,0) 884#if PERL_VERSION_ATLEAST (5,10,0)
857 PL_parser = 0; 885 PL_parser = 0;
858#endif 886#endif
887 PL_hints = 0;
859 888
860 /* recreate the die/warn hooks */ 889 /* recreate the die/warn hooks */
861 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 890 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); 891 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
863 892
864 GvSV (PL_defgv) = newSV (0); 893 GvSV (PL_defgv) = newSV (0);
865 GvAV (PL_defgv) = coro->args; coro->args = 0; 894 GvAV (PL_defgv) = coro->args; coro->args = 0;
866 GvSV (PL_errgv) = newSV (0); 895 GvSV (PL_errgv) = newSV (0);
867 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 896 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
897 GvHV (PL_hintgv) = 0;
868 PL_rs = newSVsv (GvSV (irsgv)); 898 PL_rs = newSVsv (GvSV (irsgv));
869 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 899 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
870 900
871 { 901 {
872 dSP; 902 dSP;
… …
890 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 920 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 */ 921 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
892 922
893 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 923 /* 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; 924 coro_setup_op.op_next = PL_op;
895 coro_setup_op.op_type = OP_CUSTOM; 925 coro_setup_op.op_type = OP_ENTERSUB;
896 coro_setup_op.op_ppaddr = pp_slf; 926 coro_setup_op.op_ppaddr = pp_slf;
897 /* no flags etc. required, as an init function won't be called */ 927 /* no flags etc. required, as an init function won't be called */
898 928
899 PL_op = (OP *)&coro_setup_op; 929 PL_op = (OP *)&coro_setup_op;
900 930
… …
926 SvREFCNT_dec (GvAV (PL_defgv)); 956 SvREFCNT_dec (GvAV (PL_defgv));
927 SvREFCNT_dec (GvSV (PL_errgv)); 957 SvREFCNT_dec (GvSV (PL_errgv));
928 SvREFCNT_dec (PL_defoutgv); 958 SvREFCNT_dec (PL_defoutgv);
929 SvREFCNT_dec (PL_rs); 959 SvREFCNT_dec (PL_rs);
930 SvREFCNT_dec (GvSV (irsgv)); 960 SvREFCNT_dec (GvSV (irsgv));
961 SvREFCNT_dec (GvHV (PL_hintgv));
931 962
932 SvREFCNT_dec (PL_diehook); 963 SvREFCNT_dec (PL_diehook);
933 SvREFCNT_dec (PL_warnhook); 964 SvREFCNT_dec (PL_warnhook);
934 965
935 SvREFCNT_dec (coro->saved_deffh); 966 SvREFCNT_dec (coro->saved_deffh);
936 SvREFCNT_dec (coro->rouse_cb); 967 SvREFCNT_dec (coro->rouse_cb);
968 SvREFCNT_dec (coro->invoke_cb);
969 SvREFCNT_dec (coro->invoke_av);
937 970
938 coro_destruct_stacks (aTHX); 971 coro_destruct_stacks (aTHX);
939} 972}
940 973
941INLINE void 974INLINE void
… …
951static int 984static int
952runops_trace (pTHX) 985runops_trace (pTHX)
953{ 986{
954 COP *oldcop = 0; 987 COP *oldcop = 0;
955 int oldcxix = -2; 988 int oldcxix = -2;
956 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
957 coro_cctx *cctx = coro->cctx;
958 989
959 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 990 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
960 { 991 {
961 PERL_ASYNC_CHECK (); 992 PERL_ASYNC_CHECK ();
962 993
963 if (cctx->flags & CC_TRACE_ALL) 994 if (cctx_current->flags & CC_TRACE_ALL)
964 { 995 {
965 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 996 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
966 { 997 {
967 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 998 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
968 SV **bot, **top; 999 SV **bot, **top;
969 AV *av = newAV (); /* return values */ 1000 AV *av = newAV (); /* return values */
970 SV **cb; 1001 SV **cb;
… …
1007 1038
1008 if (PL_curcop != &PL_compiling) 1039 if (PL_curcop != &PL_compiling)
1009 { 1040 {
1010 SV **cb; 1041 SV **cb;
1011 1042
1012 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1043 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1013 { 1044 {
1014 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1045 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1015 1046
1016 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1047 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1017 { 1048 {
1018 runops_proc_t old_runops = PL_runops;
1019 dSP; 1049 dSP;
1020 GV *gv = CvGV (cx->blk_sub.cv); 1050 GV *gv = CvGV (cx->blk_sub.cv);
1021 SV *fullname = sv_2mortal (newSV (0)); 1051 SV *fullname = sv_2mortal (newSV (0));
1022 1052
1023 if (isGV (gv)) 1053 if (isGV (gv))
… …
1041 } 1071 }
1042 1072
1043 oldcxix = cxstack_ix; 1073 oldcxix = cxstack_ix;
1044 } 1074 }
1045 1075
1046 if (cctx->flags & CC_TRACE_LINE) 1076 if (cctx_current->flags & CC_TRACE_LINE)
1047 { 1077 {
1048 dSP; 1078 dSP;
1049 1079
1050 PL_runops = RUNOPS_DEFAULT; 1080 PL_runops = RUNOPS_DEFAULT;
1051 ENTER; 1081 ENTER;
… …
1070 1100
1071 TAINT_NOT; 1101 TAINT_NOT;
1072 return 0; 1102 return 0;
1073} 1103}
1074 1104
1075static struct coro_cctx *cctx_ssl_cctx;
1076static struct CoroSLF cctx_ssl_frame; 1105static struct CoroSLF cctx_ssl_frame;
1077 1106
1078static void 1107static void
1079slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1108slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1080{ 1109{
1081 ta->prev = (struct coro *)cctx_ssl_cctx;
1082 ta->next = 0; 1110 ta->prev = 0;
1083} 1111}
1084 1112
1085static int 1113static int
1086slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1114slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1087{ 1115{
… …
1090 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1118 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1091} 1119}
1092 1120
1093/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1121/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1094static void NOINLINE 1122static void NOINLINE
1095cctx_prepare (pTHX_ coro_cctx *cctx) 1123cctx_prepare (pTHX)
1096{ 1124{
1097 PL_top_env = &PL_start_env; 1125 PL_top_env = &PL_start_env;
1098 1126
1099 if (cctx->flags & CC_TRACE) 1127 if (cctx_current->flags & CC_TRACE)
1100 PL_runops = runops_trace; 1128 PL_runops = runops_trace;
1101 1129
1102 /* we already must be executing an SLF op, there is no other valid way 1130 /* we already must be executing an SLF op, there is no other valid way
1103 * that can lead to creation of a new cctx */ 1131 * that can lead to creation of a new cctx */
1104 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1132 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1105 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1133 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1106 1134
1107 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1135 /* 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; 1136 cctx_ssl_frame = slf_frame;
1110 1137
1111 slf_frame.prepare = slf_prepare_set_stacklevel; 1138 slf_frame.prepare = slf_prepare_set_stacklevel;
1112 slf_frame.check = slf_check_set_stacklevel; 1139 slf_frame.check = slf_check_set_stacklevel;
1113} 1140}
… …
1136 /* normally we would need to skip the entersub here */ 1163 /* normally we would need to skip the entersub here */
1137 /* not doing so will re-execute it, which is exactly what we want */ 1164 /* not doing so will re-execute it, which is exactly what we want */
1138 /* PL_nop = PL_nop->op_next */ 1165 /* PL_nop = PL_nop->op_next */
1139 1166
1140 /* inject a fake subroutine call to cctx_init */ 1167 /* inject a fake subroutine call to cctx_init */
1141 cctx_prepare (aTHX_ (coro_cctx *)arg); 1168 cctx_prepare (aTHX);
1142 1169
1143 /* cctx_run is the alternative tail of transfer() */ 1170 /* cctx_run is the alternative tail of transfer() */
1144 transfer_tail (aTHX); 1171 transfer_tail (aTHX);
1145 1172
1146 /* somebody or something will hit me for both perl_run and PL_restartop */ 1173 /* somebody or something will hit me for both perl_run and PL_restartop */
… …
1154 /* 1181 /*
1155 * If perl-run returns we assume exit() was being called or the coro 1182 * 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) 1183 * 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 1184 * 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" 1185 * bootstrap-time "top" top_env, as we cannot restore the "main"
1159 * coroutine as Coro has no such concept 1186 * coroutine as Coro has no such concept.
1187 * This actually isn't valid with the pthread backend, but OSes requiring
1188 * that backend are too broken to do it in a standards-compliant way.
1160 */ 1189 */
1161 PL_top_env = main_top_env; 1190 PL_top_env = main_top_env;
1162 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1191 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1163 } 1192 }
1164} 1193}
… …
1241cctx_destroy (coro_cctx *cctx) 1270cctx_destroy (coro_cctx *cctx)
1242{ 1271{
1243 if (!cctx) 1272 if (!cctx)
1244 return; 1273 return;
1245 1274
1275 assert (cctx != cctx_current);//D temporary
1276
1246 --cctx_count; 1277 --cctx_count;
1247 coro_destroy (&cctx->cctx); 1278 coro_destroy (&cctx->cctx);
1248 1279
1249 /* coro_transfer creates new, empty cctx's */ 1280 /* coro_transfer creates new, empty cctx's */
1250 if (cctx->sptr) 1281 if (cctx->sptr)
… …
1313 /* TODO: throwing up here is considered harmful */ 1344 /* TODO: throwing up here is considered harmful */
1314 1345
1315 if (expect_true (prev != next)) 1346 if (expect_true (prev != next))
1316 { 1347 {
1317 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1348 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,"); 1349 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,");
1319 1350
1320 if (expect_false (next->flags & CF_RUNNING)) 1351 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,"); 1352 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1322 1353
1323 if (expect_false (next->flags & CF_DESTROYED)) 1354 if (expect_false (next->flags & CF_DESTROYED))
… …
1335transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1366transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1336{ 1367{
1337 dSTACKLEVEL; 1368 dSTACKLEVEL;
1338 1369
1339 /* sometimes transfer is only called to set idle_sp */ 1370 /* sometimes transfer is only called to set idle_sp */
1340 if (expect_false (!next)) 1371 if (expect_false (!prev))
1341 { 1372 {
1342 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1373 cctx_current->idle_sp = STACKLEVEL;
1343 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1374 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1344 } 1375 }
1345 else if (expect_true (prev != next)) 1376 else if (expect_true (prev != next))
1346 { 1377 {
1347 coro_cctx *prev__cctx; 1378 coro_cctx *cctx_prev;
1348 1379
1349 if (expect_false (prev->flags & CF_NEW)) 1380 if (expect_false (prev->flags & CF_NEW))
1350 { 1381 {
1351 /* create a new empty/source context */ 1382 /* create a new empty/source context */
1352 prev->cctx = cctx_new_empty ();
1353 prev->flags &= ~CF_NEW; 1383 prev->flags &= ~CF_NEW;
1354 prev->flags |= CF_RUNNING; 1384 prev->flags |= CF_RUNNING;
1355 } 1385 }
1356 1386
1357 prev->flags &= ~CF_RUNNING; 1387 prev->flags &= ~CF_RUNNING;
… …
1368 coro_setup (aTHX_ next); 1398 coro_setup (aTHX_ next);
1369 } 1399 }
1370 else 1400 else
1371 load_perl (aTHX_ next); 1401 load_perl (aTHX_ next);
1372 1402
1373 prev__cctx = prev->cctx; 1403 assert (!prev->cctx);//D temporary
1374 1404
1375 /* possibly untie and reuse the cctx */ 1405 /* possibly untie and reuse the cctx */
1376 if (expect_true ( 1406 if (expect_true (
1377 prev__cctx->idle_sp == STACKLEVEL 1407 cctx_current->idle_sp == STACKLEVEL
1378 && !(prev__cctx->flags & CC_TRACE) 1408 && !(cctx_current->flags & CC_TRACE)
1379 && !force_cctx 1409 && !force_cctx
1380 )) 1410 ))
1381 { 1411 {
1382 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1412 /* 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)); 1413 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1384 1414
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 */ 1415 /* 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 */ 1416 /* without this the next cctx_get might destroy the running cctx while still in use */
1389 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1417 if (expect_false (CCTX_EXPIRED (cctx_current)))
1390 if (!next->cctx) 1418 if (expect_true (!next->cctx))
1391 next->cctx = cctx_get (aTHX); 1419 next->cctx = cctx_get (aTHX);
1392 1420
1393 cctx_put (prev__cctx); 1421 cctx_put (cctx_current);
1394 } 1422 }
1423 else
1424 prev->cctx = cctx_current;
1395 1425
1396 ++next->usecount; 1426 ++next->usecount;
1397 1427
1398 if (expect_true (!next->cctx)) 1428 cctx_prev = cctx_current;
1399 next->cctx = cctx_get (aTHX); 1429 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1400 1430
1401 if (expect_false (prev__cctx != next->cctx)) 1431 next->cctx = 0;
1432
1433 if (expect_false (cctx_prev != cctx_current))
1402 { 1434 {
1403 prev__cctx->top_env = PL_top_env; 1435 cctx_prev->top_env = PL_top_env;
1404 PL_top_env = next->cctx->top_env; 1436 PL_top_env = cctx_current->top_env;
1405 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1437 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1406 } 1438 }
1407 1439
1408 transfer_tail (aTHX); 1440 transfer_tail (aTHX);
1409 } 1441 }
1410} 1442}
… …
1565{ 1597{
1566 struct coro *coro; 1598 struct coro *coro;
1567 SV *sv_hook; 1599 SV *sv_hook;
1568 void (*xs_hook)(void); 1600 void (*xs_hook)(void);
1569 1601
1570 if (SvROK (coro_sv))
1571 coro_sv = SvRV (coro_sv);
1572
1573 coro = SvSTATE (coro_sv); 1602 coro = SvSTATE (coro_sv);
1574 1603
1575 if (coro->flags & CF_READY) 1604 if (coro->flags & CF_READY)
1576 return 0; 1605 return 0;
1577 1606
… …
1608api_is_ready (pTHX_ SV *coro_sv) 1637api_is_ready (pTHX_ SV *coro_sv)
1609{ 1638{
1610 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1639 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1611} 1640}
1612 1641
1642/* expects to own a reference to next->hv */
1613INLINE void 1643INLINE void
1614prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1644prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1615{ 1645{
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); 1646 SV *prev_sv = SvRV (coro_current);
1647
1655 ta->prev = SvSTATE_hv (prev_sv); 1648 ta->prev = SvSTATE_hv (prev_sv);
1649 ta->next = next;
1650
1656 TRANSFER_CHECK (*ta); 1651 TRANSFER_CHECK (*ta);
1657 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1652
1658 ta->next->flags &= ~CF_READY;
1659 SvRV_set (coro_current, next_sv); 1653 SvRV_set (coro_current, (SV *)next->hv);
1660 1654
1661 free_coro_mortal (aTHX); 1655 free_coro_mortal (aTHX);
1662 coro_mortal = prev_sv; 1656 coro_mortal = prev_sv;
1663} 1657}
1664 1658
1659static void
1660prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1661{
1662 for (;;)
1663 {
1664 SV *next_sv = coro_deq (aTHX);
1665
1666 if (expect_true (next_sv))
1667 {
1668 struct coro *next = SvSTATE_hv (next_sv);
1669
1670 /* cannot transfer to destroyed coros, skip and look for next */
1671 if (expect_false (next->flags & CF_DESTROYED))
1672 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */
1673 else
1674 {
1675 next->flags &= ~CF_READY;
1676 --coro_nready;
1677
1678 prepare_schedule_to (aTHX_ ta, next);
1679 break;
1680 }
1681 }
1682 else
1683 {
1684 /* nothing to schedule: call the idle handler */
1685 if (SvROK (sv_idle)
1686 && SvOBJECT (SvRV (sv_idle)))
1687 {
1688 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1689 api_ready (aTHX_ SvRV (sv_idle));
1690 --coro_nready;
1691 }
1692 else
1693 {
1694 dSP;
1695
1696 ENTER;
1697 SAVETMPS;
1698
1699 PUSHMARK (SP);
1700 PUTBACK;
1701 call_sv (sv_idle, G_VOID | G_DISCARD);
1702
1703 FREETMPS;
1704 LEAVE;
1705 }
1706 }
1707 }
1708}
1709
1665INLINE void 1710INLINE void
1666prepare_cede (pTHX_ struct coro_transfer_args *ta) 1711prepare_cede (pTHX_ struct coro_transfer_args *ta)
1667{ 1712{
1668 api_ready (aTHX_ coro_current); 1713 api_ready (aTHX_ coro_current);
1669 prepare_schedule (aTHX_ ta); 1714 prepare_schedule (aTHX_ ta);
… …
1688{ 1733{
1689 struct coro_transfer_args ta; 1734 struct coro_transfer_args ta;
1690 1735
1691 prepare_schedule (aTHX_ &ta); 1736 prepare_schedule (aTHX_ &ta);
1692 TRANSFER (ta, 1); 1737 TRANSFER (ta, 1);
1738}
1739
1740static void
1741api_schedule_to (pTHX_ SV *coro_sv)
1742{
1743 struct coro_transfer_args ta;
1744 struct coro *next = SvSTATE (coro_sv);
1745
1746 SvREFCNT_inc_NN (coro_sv);
1747 prepare_schedule_to (aTHX_ &ta, next);
1693} 1748}
1694 1749
1695static int 1750static int
1696api_cede (pTHX) 1751api_cede (pTHX)
1697{ 1752{
… …
1726static void 1781static void
1727api_trace (pTHX_ SV *coro_sv, int flags) 1782api_trace (pTHX_ SV *coro_sv, int flags)
1728{ 1783{
1729 struct coro *coro = SvSTATE (coro_sv); 1784 struct coro *coro = SvSTATE (coro_sv);
1730 1785
1786 if (coro->flags & CF_RUNNING)
1787 croak ("cannot enable tracing on a running coroutine, caught");
1788
1731 if (flags & CC_TRACE) 1789 if (flags & CC_TRACE)
1732 { 1790 {
1733 if (!coro->cctx) 1791 if (!coro->cctx)
1734 coro->cctx = cctx_new_run (); 1792 coro->cctx = cctx_new_run ();
1735 else if (!(coro->cctx->flags & CC_TRACE)) 1793 else if (!(coro->cctx->flags & CC_TRACE))
1736 croak ("cannot enable tracing on coroutine with custom stack,"); 1794 croak ("cannot enable tracing on coroutine with custom stack, caught");
1737 1795
1738 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1796 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1739 } 1797 }
1740 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1798 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1741 { 1799 {
… …
1746 else 1804 else
1747 coro->slot->runops = RUNOPS_DEFAULT; 1805 coro->slot->runops = RUNOPS_DEFAULT;
1748 } 1806 }
1749} 1807}
1750 1808
1809static void
1810coro_call_on_destroy (pTHX_ struct coro *coro)
1811{
1812 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1813 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1814
1815 if (on_destroyp)
1816 {
1817 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1818
1819 while (AvFILLp (on_destroy) >= 0)
1820 {
1821 dSP; /* don't disturb outer sp */
1822 SV *cb = av_pop (on_destroy);
1823
1824 PUSHMARK (SP);
1825
1826 if (statusp)
1827 {
1828 int i;
1829 AV *status = (AV *)SvRV (*statusp);
1830 EXTEND (SP, AvFILLp (status) + 1);
1831
1832 for (i = 0; i <= AvFILLp (status); ++i)
1833 PUSHs (AvARRAY (status)[i]);
1834 }
1835
1836 PUTBACK;
1837 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1838 }
1839 }
1840}
1841
1842static void
1843slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1844{
1845 int i;
1846 HV *hv = (HV *)SvRV (coro_current);
1847 AV *av = newAV ();
1848
1849 av_extend (av, items - 1);
1850 for (i = 0; i < items; ++i)
1851 av_push (av, SvREFCNT_inc_NN (arg [i]));
1852
1853 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1854
1855 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1856 api_ready (aTHX_ sv_manager);
1857
1858 frame->prepare = prepare_schedule;
1859 frame->check = slf_check_repeat;
1860}
1861
1862/*****************************************************************************/
1863/* async pool handler */
1864
1865static int
1866slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
1867{
1868 HV *hv = (HV *)SvRV (coro_current);
1869 struct coro *coro = (struct coro *)frame->data;
1870
1871 if (!coro->invoke_cb)
1872 return 1; /* loop till we have invoke */
1873 else
1874 {
1875 hv_store (hv, "desc", sizeof ("desc") - 1,
1876 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1877
1878 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1879
1880 {
1881 dSP;
1882 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
1883 PUTBACK;
1884 }
1885
1886 SvREFCNT_dec (GvAV (PL_defgv));
1887 GvAV (PL_defgv) = coro->invoke_av;
1888 coro->invoke_av = 0;
1889
1890 return 0;
1891 }
1892}
1893
1894static void
1895slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1896{
1897 HV *hv = (HV *)SvRV (coro_current);
1898 struct coro *coro = SvSTATE_hv ((SV *)hv);
1899
1900 if (expect_true (coro->saved_deffh))
1901 {
1902 /* subsequent iteration */
1903 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1904 coro->saved_deffh = 0;
1905
1906 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1907 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1908 {
1909 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
1910 coro->invoke_av = newAV ();
1911
1912 frame->prepare = prepare_nop;
1913 }
1914 else
1915 {
1916 av_clear (GvAV (PL_defgv));
1917 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1918
1919 coro->prio = 0;
1920
1921 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1922 api_trace (aTHX_ coro_current, 0);
1923
1924 frame->prepare = prepare_schedule;
1925 av_push (av_async_pool, SvREFCNT_inc (hv));
1926 }
1927 }
1928 else
1929 {
1930 /* first iteration, simply fall through */
1931 frame->prepare = prepare_nop;
1932 }
1933
1934 frame->check = slf_check_pool_handler;
1935 frame->data = (void *)coro;
1936}
1937
1751/*****************************************************************************/ 1938/*****************************************************************************/
1752/* rouse callback */ 1939/* rouse callback */
1753 1940
1754#define CORO_MAGIC_type_rouse PERL_MAGIC_ext 1941#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1755 1942
… …
1760 SV *data = (SV *)GENSUB_ARG; 1947 SV *data = (SV *)GENSUB_ARG;
1761 1948
1762 if (SvTYPE (SvRV (data)) != SVt_PVAV) 1949 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1763 { 1950 {
1764 /* first call, set args */ 1951 /* first call, set args */
1765 int i;
1766 AV *av = newAV (); 1952 AV *av = newAV ();
1767 SV *coro = SvRV (data); 1953 SV *coro = SvRV (data);
1768 1954
1769 SvRV_set (data, (SV *)av); 1955 SvRV_set (data, (SV *)av);
1770 api_ready (aTHX_ coro); 1956 api_ready (aTHX_ coro);
… …
1911static void 2097static void
1912slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2098slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1913{ 2099{
1914 frame->prepare = prepare_schedule; 2100 frame->prepare = prepare_schedule;
1915 frame->check = slf_check_nop; 2101 frame->check = slf_check_nop;
2102}
2103
2104static void
2105slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2106{
2107 struct coro *next = (struct coro *)slf_frame.data;
2108
2109 SvREFCNT_inc_NN (next->hv);
2110 prepare_schedule_to (aTHX_ ta, next);
2111}
2112
2113static void
2114slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2115{
2116 if (!items)
2117 croak ("Coro::schedule_to expects a coroutine argument, caught");
2118
2119 frame->data = (void *)SvSTATE (arg [0]);
2120 frame->prepare = slf_prepare_schedule_to;
2121 frame->check = slf_check_nop;
2122}
2123
2124static void
2125slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2126{
2127 api_ready (aTHX_ SvRV (coro_current));
2128
2129 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1916} 2130}
1917 2131
1918static void 2132static void
1919slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2133slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1920{ 2134{
… …
2066 } 2280 }
2067 else 2281 else
2068 slf_argc = 0; 2282 slf_argc = 0;
2069 2283
2070 PL_op->op_ppaddr = pp_slf; 2284 PL_op->op_ppaddr = pp_slf;
2071 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2285 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2072 2286
2073 PL_op = (OP *)&slf_restore; 2287 PL_op = (OP *)&slf_restore;
2074} 2288}
2075 2289
2076/*****************************************************************************/ 2290/*****************************************************************************/
… …
2159 SV **ary; 2373 SV **ary;
2160 2374
2161 /* unfortunately, building manually saves memory */ 2375 /* unfortunately, building manually saves memory */
2162 Newx (ary, 2, SV *); 2376 Newx (ary, 2, SV *);
2163 AvALLOC (av) = ary; 2377 AvALLOC (av) = ary;
2378#if PERL_VERSION_ATLEAST (5,10,0)
2164 /*AvARRAY (av) = ary;*/ 2379 AvARRAY (av) = ary;
2380#else
2165 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2381 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2382 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2383 SvPVX ((SV *)av) = (char *)ary;
2384#endif
2166 AvMAX (av) = 1; 2385 AvMAX (av) = 1;
2167 AvFILLp (av) = 0; 2386 AvFILLp (av) = 0;
2168 ary [0] = newSViv (count); 2387 ary [0] = newSViv (count);
2169 2388
2170 return newRV_noinc ((SV *)av); 2389 return newRV_noinc ((SV *)av);
… …
2395 dXSARGS; 2614 dXSARGS;
2396 AV *state = (AV *)GENSUB_ARG; 2615 AV *state = (AV *)GENSUB_ARG;
2397 SV *coro = av_pop (state); 2616 SV *coro = av_pop (state);
2398 SV *data_sv = newSV (sizeof (struct io_state)); 2617 SV *data_sv = newSV (sizeof (struct io_state));
2399 2618
2400 av_extend (state, items); 2619 av_extend (state, items - 1);
2401 2620
2402 sv_upgrade (data_sv, SVt_PV); 2621 sv_upgrade (data_sv, SVt_PV);
2403 SvCUR_set (data_sv, sizeof (struct io_state)); 2622 SvCUR_set (data_sv, sizeof (struct io_state));
2404 SvPOK_only (data_sv); 2623 SvPOK_only (data_sv);
2405 2624
… …
2540 XSRETURN_EMPTY; 2759 XSRETURN_EMPTY;
2541} 2760}
2542 2761
2543/*****************************************************************************/ 2762/*****************************************************************************/
2544 2763
2764#if CORO_CLONE
2765# include "clone.c"
2766#endif
2767
2545MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2768MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2546 2769
2547PROTOTYPES: DISABLE 2770PROTOTYPES: DISABLE
2548 2771
2549BOOT: 2772BOOT:
… …
2553 coro_thx = PERL_GET_CONTEXT; 2776 coro_thx = PERL_GET_CONTEXT;
2554# endif 2777# endif
2555#endif 2778#endif
2556 BOOT_PAGESIZE; 2779 BOOT_PAGESIZE;
2557 2780
2781 cctx_current = cctx_new_empty ();
2782
2558 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2783 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2559 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2784 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2560 2785
2561 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2786 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; 2787 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2581 2806
2582 { 2807 {
2583 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 2808 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2584 2809
2585 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 2810 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2586 hv_store_ent (PL_custom_op_names, slf, 2811 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2587 newSVpv ("coro_slf", 0), 0);
2588 2812
2589 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 2813 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2590 hv_store_ent (PL_custom_op_descs, slf, 2814 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2591 newSVpv ("coro schedule like function", 0), 0);
2592 } 2815 }
2593 2816
2594 coroapi.ver = CORO_API_VERSION; 2817 coroapi.ver = CORO_API_VERSION;
2595 coroapi.rev = CORO_API_REVISION; 2818 coroapi.rev = CORO_API_REVISION;
2596 2819
… …
2654 mg->mg_flags |= MGf_DUP; 2877 mg->mg_flags |= MGf_DUP;
2655 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 2878 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2656 2879
2657 if (items > 1) 2880 if (items > 1)
2658 { 2881 {
2659 av_extend (coro->args, items - 1 + ix); 2882 av_extend (coro->args, items - 1 + ix - 1);
2660 2883
2661 if (ix) 2884 if (ix)
2662 { 2885 {
2663 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb)); 2886 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2664 cb = cv_coro_run; 2887 cb = cv_coro_run;
… …
2689void 2912void
2690_exit (int code) 2913_exit (int code)
2691 PROTOTYPE: $ 2914 PROTOTYPE: $
2692 CODE: 2915 CODE:
2693 _exit (code); 2916 _exit (code);
2917
2918SV *
2919clone (Coro::State coro)
2920 CODE:
2921{
2922#if CORO_CLONE
2923 struct coro *ncoro = coro_clone (coro);
2924 MAGIC *mg;
2925 /* TODO: too much duplication */
2926 ncoro->hv = newHV ();
2927 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2928 mg->mg_flags |= MGf_DUP;
2929 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
2930#else
2931 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
2932#endif
2933}
2934 OUTPUT:
2935 RETVAL
2694 2936
2695int 2937int
2696cctx_stacksize (int new_stacksize = 0) 2938cctx_stacksize (int new_stacksize = 0)
2697 PROTOTYPE: ;$ 2939 PROTOTYPE: ;$
2698 CODE: 2940 CODE:
… …
2819 3061
2820SV * 3062SV *
2821has_cctx (Coro::State coro) 3063has_cctx (Coro::State coro)
2822 PROTOTYPE: $ 3064 PROTOTYPE: $
2823 CODE: 3065 CODE:
2824 RETVAL = boolSV (!!coro->cctx); 3066 /* maybe manage the running flag differently */
3067 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2825 OUTPUT: 3068 OUTPUT:
2826 RETVAL 3069 RETVAL
2827 3070
2828int 3071int
2829is_traced (Coro::State coro) 3072is_traced (Coro::State coro)
… …
2849 3092
2850void 3093void
2851force_cctx () 3094force_cctx ()
2852 PROTOTYPE: 3095 PROTOTYPE:
2853 CODE: 3096 CODE:
2854 SvSTATE_current->cctx->idle_sp = 0; 3097 cctx_current->idle_sp = 0;
2855 3098
2856void 3099void
2857swap_defsv (Coro::State self) 3100swap_defsv (Coro::State self)
2858 PROTOTYPE: $ 3101 PROTOTYPE: $
2859 ALIAS: 3102 ALIAS:
… …
2874 3117
2875BOOT: 3118BOOT:
2876{ 3119{
2877 int i; 3120 int i;
2878 3121
2879 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2880 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3122 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2881 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3123 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2882 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3124 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD);
3125 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2883 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); 3126 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2884 SvREADONLY_on (coro_current); 3127 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3128 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3129 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3130 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3131
3132 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3133 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3134 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3135 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2885 3136
2886 coro_stash = gv_stashpv ("Coro", TRUE); 3137 coro_stash = gv_stashpv ("Coro", TRUE);
2887 3138
2888 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3139 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
2889 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3140 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
… …
2897 3148
2898 { 3149 {
2899 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3150 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2900 3151
2901 coroapi.schedule = api_schedule; 3152 coroapi.schedule = api_schedule;
3153 coroapi.schedule_to = api_schedule_to;
2902 coroapi.cede = api_cede; 3154 coroapi.cede = api_cede;
2903 coroapi.cede_notself = api_cede_notself; 3155 coroapi.cede_notself = api_cede_notself;
2904 coroapi.ready = api_ready; 3156 coroapi.ready = api_ready;
2905 coroapi.is_ready = api_is_ready; 3157 coroapi.is_ready = api_is_ready;
2906 coroapi.nready = coro_nready; 3158 coroapi.nready = coro_nready;
… …
2911 SvREADONLY_on (sv); 3163 SvREADONLY_on (sv);
2912 } 3164 }
2913} 3165}
2914 3166
2915void 3167void
3168terminate (...)
3169 CODE:
3170 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3171
3172void
2916schedule (...) 3173schedule (...)
2917 CODE: 3174 CODE:
2918 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3175 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3176
3177void
3178schedule_to (...)
3179 CODE:
3180 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3181
3182void
3183cede_to (...)
3184 CODE:
3185 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2919 3186
2920void 3187void
2921cede (...) 3188cede (...)
2922 CODE: 3189 CODE:
2923 CORO_EXECUTE_SLF_XS (slf_init_cede); 3190 CORO_EXECUTE_SLF_XS (slf_init_cede);
2924 3191
2925void 3192void
2926cede_notself (...) 3193cede_notself (...)
2927 CODE: 3194 CODE:
2928 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3195 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3196
3197void
3198_cancel (Coro::State self)
3199 CODE:
3200 coro_state_destroy (aTHX_ self);
3201 coro_call_on_destroy (aTHX_ self);
2929 3202
2930void 3203void
2931_set_current (SV *current) 3204_set_current (SV *current)
2932 PROTOTYPE: $ 3205 PROTOTYPE: $
2933 CODE: 3206 CODE:
… …
2978 CODE: 3251 CODE:
2979 RETVAL = coro_nready; 3252 RETVAL = coro_nready;
2980 OUTPUT: 3253 OUTPUT:
2981 RETVAL 3254 RETVAL
2982 3255
2983# for async_pool speedup
2984void 3256void
2985_pool_1 (SV *cb) 3257_pool_handler (...)
2986 CODE: 3258 CODE:
2987{ 3259 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 3260
2995 if (!invoke) 3261void
3262async_pool (SV *cv, ...)
3263 PROTOTYPE: &@
3264 PPCODE:
3265{
3266 HV *hv = (HV *)av_pop (av_async_pool);
3267 AV *av = newAV ();
3268 SV *cb = ST (0);
3269 int i;
3270
3271 av_extend (av, items - 2);
3272 for (i = 1; i < items; ++i)
3273 av_push (av, SvREFCNT_inc_NN (ST (i)));
3274
3275 if ((SV *)hv == &PL_sv_undef)
2996 { 3276 {
2997 SV *old = PL_diehook; 3277 PUSHMARK (SP);
2998 PL_diehook = 0; 3278 EXTEND (SP, 2);
2999 SvREFCNT_dec (old); 3279 PUSHs (sv_Coro);
3000 croak ("\3async_pool terminate\2\n"); 3280 PUSHs ((SV *)cv_pool_handler);
3281 PUTBACK;
3282 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3283 SPAGAIN;
3284
3285 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
3001 } 3286 }
3002 3287
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 { 3288 {
3016 av_fill (defav, len - 1); 3289 struct coro *coro = SvSTATE_hv (hv);
3017 for (i = 0; i < len; ++i) 3290
3018 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3291 assert (!coro->invoke_cb);
3292 assert (!coro->invoke_av);
3293 coro->invoke_cb = SvREFCNT_inc (cb);
3294 coro->invoke_av = av;
3019 } 3295 }
3020}
3021 3296
3022void 3297 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 3298
3029 sv_setsv (cb, &PL_sv_undef); 3299 if (GIMME_V != G_VOID)
3030 3300 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3031 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3301 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); 3302 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} 3303}
3054 3304
3055SV * 3305SV *
3056rouse_cb () 3306rouse_cb ()
3057 PROTOTYPE: 3307 PROTOTYPE:

Diff Legend

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