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.319 by root, Thu Nov 20 07:25:01 2008 UTC vs.
Revision 1.334 by root, Fri Nov 28 23:30:55 2008 UTC

… …
101# define CvISXSUB_on(cv) (void)cv 101# define CvISXSUB_on(cv) (void)cv
102#endif 102#endif
103#ifndef CvISXSUB 103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE) 104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif 105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
106 109
107/* 5.8.7 */ 110/* 5.8.7 */
108#ifndef SvRV_set 111#ifndef SvRV_set
109# define SvRV_set(s,v) SvRV(s) = (v) 112# define SvRV_set(s,v) SvRV(s) = (v)
110#endif 113#endif
… …
130#else 133#else
131# define dSTACKLEVEL volatile void *stacklevel 134# define dSTACKLEVEL volatile void *stacklevel
132# define STACKLEVEL ((void *)&stacklevel) 135# define STACKLEVEL ((void *)&stacklevel)
133#endif 136#endif
134 137
135#define IN_DESTRUCT (PL_main_cv == Nullcv) 138#define IN_DESTRUCT PL_dirty
136 139
137#if __GNUC__ >= 3 140#if __GNUC__ >= 3
138# define attribute(x) __attribute__(x) 141# define attribute(x) __attribute__(x)
139# define expect(expr,value) __builtin_expect ((expr),(value)) 142# define expect(expr,value) __builtin_expect ((expr),(value))
140# define INLINE static inline 143# define INLINE static inline
… …
172static HV *coro_state_stash, *coro_stash; 175static HV *coro_state_stash, *coro_stash;
173static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 176static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
174 177
175static AV *av_destroy; /* destruction queue */ 178static AV *av_destroy; /* destruction queue */
176static SV *sv_manager; /* the manager coro */ 179static SV *sv_manager; /* the manager coro */
180static SV *sv_idle; /* $Coro::idle */
177 181
178static GV *irsgv; /* $/ */ 182static GV *irsgv; /* $/ */
179static GV *stdoutgv; /* *STDOUT */ 183static GV *stdoutgv; /* *STDOUT */
180static SV *rv_diehook; 184static SV *rv_diehook;
181static SV *rv_warnhook; 185static SV *rv_warnhook;
… …
225 int valgrind_id; 229 int valgrind_id;
226#endif 230#endif
227 unsigned char flags; 231 unsigned char flags;
228} coro_cctx; 232} coro_cctx;
229 233
234coro_cctx *cctx_current; /* the currently running cctx */
235
236/*****************************************************************************/
237
230enum { 238enum {
231 CF_RUNNING = 0x0001, /* coroutine is running */ 239 CF_RUNNING = 0x0001, /* coroutine is running */
232 CF_READY = 0x0002, /* coroutine is ready */ 240 CF_READY = 0x0002, /* coroutine is ready */
233 CF_NEW = 0x0004, /* has never been switched to */ 241 CF_NEW = 0x0004, /* has never been switched to */
234 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
… …
239{ 247{
240 SV *defsv; 248 SV *defsv;
241 AV *defav; 249 AV *defav;
242 SV *errsv; 250 SV *errsv;
243 SV *irsgv; 251 SV *irsgv;
252 HV *hinthv;
244#define VAR(name,type) type name; 253#define VAR(name,type) type name;
245# include "state.h" 254# include "state.h"
246#undef VAR 255#undef VAR
247} perl_slots; 256} perl_slots;
248 257
… …
346 HV *st; 355 HV *st;
347 GV *gvp; 356 GV *gvp;
348 return sv_2cv (sv, &st, &gvp, 0); 357 return sv_2cv (sv, &st, &gvp, 0);
349} 358}
350 359
360/*****************************************************************************/
361/* magic glue */
362
363#define CORO_MAGIC_type_cv 26
364#define CORO_MAGIC_type_state PERL_MAGIC_ext
365
366#define CORO_MAGIC_NN(sv, type) \
367 (expect_true (SvMAGIC (sv)->mg_type == type) \
368 ? SvMAGIC (sv) \
369 : mg_find (sv, type))
370
371#define CORO_MAGIC(sv, type) \
372 (expect_true (SvMAGIC (sv)) \
373 ? CORO_MAGIC_NN (sv, type) \
374 : 0)
375
376#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
377#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
378
379INLINE struct coro *
380SvSTATE_ (pTHX_ SV *coro)
381{
382 HV *stash;
383 MAGIC *mg;
384
385 if (SvROK (coro))
386 coro = SvRV (coro);
387
388 if (expect_false (SvTYPE (coro) != SVt_PVHV))
389 croak ("Coro::State object required");
390
391 stash = SvSTASH (coro);
392 if (expect_false (stash != coro_stash && stash != coro_state_stash))
393 {
394 /* very slow, but rare, check */
395 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
396 croak ("Coro::State object required");
397 }
398
399 mg = CORO_MAGIC_state (coro);
400 return (struct coro *)mg->mg_ptr;
401}
402
403#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
404
405/* faster than SvSTATE, but expects a coroutine hv */
406#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
407#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
408
409/*****************************************************************************/
410/* padlist management and caching */
411
351static AV * 412static AV *
352coro_clone_padlist (pTHX_ CV *cv) 413coro_derive_padlist (pTHX_ CV *cv)
353{ 414{
354 AV *padlist = CvPADLIST (cv); 415 AV *padlist = CvPADLIST (cv);
355 AV *newpadlist, *newpad; 416 AV *newpadlist, *newpad;
356 417
357 newpadlist = newAV (); 418 newpadlist = newAV ();
… …
362 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 423 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
363#endif 424#endif
364 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 425 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
365 --AvFILLp (padlist); 426 --AvFILLp (padlist);
366 427
367 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 428 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
368 av_store (newpadlist, 1, (SV *)newpad); 429 av_store (newpadlist, 1, (SV *)newpad);
369 430
370 return newpadlist; 431 return newpadlist;
371} 432}
372 433
373static void 434static void
374free_padlist (pTHX_ AV *padlist) 435free_padlist (pTHX_ AV *padlist)
375{ 436{
376 /* may be during global destruction */ 437 /* may be during global destruction */
377 if (SvREFCNT (padlist)) 438 if (!IN_DESTRUCT)
378 { 439 {
379 I32 i = AvFILLp (padlist); 440 I32 i = AvFILLp (padlist);
380 while (i >= 0) 441
442 while (i > 0) /* special-case index 0 */
381 { 443 {
382 SV **svp = av_fetch (padlist, i--, FALSE); 444 /* we try to be extra-careful here */
383 if (svp) 445 AV *av = (AV *)AvARRAY (padlist)[i--];
384 { 446 I32 j = AvFILLp (av);
385 SV *sv; 447
386 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 448 while (j >= 0)
449 SvREFCNT_dec (AvARRAY (av)[j--]);
450
451 AvFILLp (av) = -1;
387 SvREFCNT_dec (sv); 452 SvREFCNT_dec (av);
388
389 SvREFCNT_dec (*svp);
390 }
391 } 453 }
392 454
455 SvREFCNT_dec (AvARRAY (padlist)[0]);
456
457 AvFILLp (padlist) = -1;
393 SvREFCNT_dec ((SV*)padlist); 458 SvREFCNT_dec ((SV*)padlist);
394 } 459 }
395} 460}
396 461
397static int 462static int
… …
406 471
407 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 472 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
408 473
409 return 0; 474 return 0;
410} 475}
411
412#define CORO_MAGIC_type_cv 26
413#define CORO_MAGIC_type_state PERL_MAGIC_ext
414 476
415static MGVTBL coro_cv_vtbl = { 477static MGVTBL coro_cv_vtbl = {
416 0, 0, 0, 0, 478 0, 0, 0, 0,
417 coro_cv_free 479 coro_cv_free
418}; 480};
419
420#define CORO_MAGIC_NN(sv, type) \
421 (expect_true (SvMAGIC (sv)->mg_type == type) \
422 ? SvMAGIC (sv) \
423 : mg_find (sv, type))
424
425#define CORO_MAGIC(sv, type) \
426 (expect_true (SvMAGIC (sv)) \
427 ? CORO_MAGIC_NN (sv, type) \
428 : 0)
429
430#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
431#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
432
433INLINE struct coro *
434SvSTATE_ (pTHX_ SV *coro)
435{
436 HV *stash;
437 MAGIC *mg;
438
439 if (SvROK (coro))
440 coro = SvRV (coro);
441
442 if (expect_false (SvTYPE (coro) != SVt_PVHV))
443 croak ("Coro::State object required");
444
445 stash = SvSTASH (coro);
446 if (expect_false (stash != coro_stash && stash != coro_state_stash))
447 {
448 /* very slow, but rare, check */
449 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
450 croak ("Coro::State object required");
451 }
452
453 mg = CORO_MAGIC_state (coro);
454 return (struct coro *)mg->mg_ptr;
455}
456
457#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
458
459/* faster than SvSTATE, but expects a coroutine hv */
460#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
461#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
462 481
463/* the next two functions merely cache the padlists */ 482/* the next two functions merely cache the padlists */
464static void 483static void
465get_padlist (pTHX_ CV *cv) 484get_padlist (pTHX_ CV *cv)
466{ 485{
… …
477 CV *cp = Perl_cv_clone (aTHX_ cv); 496 CV *cp = Perl_cv_clone (aTHX_ cv);
478 CvPADLIST (cv) = CvPADLIST (cp); 497 CvPADLIST (cv) = CvPADLIST (cp);
479 CvPADLIST (cp) = 0; 498 CvPADLIST (cp) = 0;
480 SvREFCNT_dec (cp); 499 SvREFCNT_dec (cp);
481#else 500#else
482 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 501 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
483#endif 502#endif
484 } 503 }
485} 504}
486 505
487static void 506static void
… …
494 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 513 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
495 514
496 av = (AV *)mg->mg_obj; 515 av = (AV *)mg->mg_obj;
497 516
498 if (expect_false (AvFILLp (av) >= AvMAX (av))) 517 if (expect_false (AvFILLp (av) >= AvMAX (av)))
499 av_extend (av, AvMAX (av) + 1); 518 av_extend (av, AvFILLp (av) + 1);
500 519
501 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 520 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
502} 521}
503 522
504/** load & save, init *******************************************************/ 523/** load & save, init *******************************************************/
… …
509 perl_slots *slot = c->slot; 528 perl_slots *slot = c->slot;
510 c->slot = 0; 529 c->slot = 0;
511 530
512 PL_mainstack = c->mainstack; 531 PL_mainstack = c->mainstack;
513 532
514 GvSV (PL_defgv) = slot->defsv; 533 GvSV (PL_defgv) = slot->defsv;
515 GvAV (PL_defgv) = slot->defav; 534 GvAV (PL_defgv) = slot->defav;
516 GvSV (PL_errgv) = slot->errsv; 535 GvSV (PL_errgv) = slot->errsv;
517 GvSV (irsgv) = slot->irsgv; 536 GvSV (irsgv) = slot->irsgv;
537 GvHV (PL_hintgv) = slot->hinthv;
518 538
519 #define VAR(name,type) PL_ ## name = slot->name; 539 #define VAR(name,type) PL_ ## name = slot->name;
520 # include "state.h" 540 # include "state.h"
521 #undef VAR 541 #undef VAR
522 542
… …
608 c->mainstack = PL_mainstack; 628 c->mainstack = PL_mainstack;
609 629
610 { 630 {
611 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 631 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
612 632
613 slot->defav = GvAV (PL_defgv); 633 slot->defav = GvAV (PL_defgv);
614 slot->defsv = DEFSV; 634 slot->defsv = DEFSV;
615 slot->errsv = ERRSV; 635 slot->errsv = ERRSV;
616 slot->irsgv = GvSV (irsgv); 636 slot->irsgv = GvSV (irsgv);
637 slot->hinthv = GvHV (PL_hintgv);
617 638
618 #define VAR(name,type) slot->name = PL_ ## name; 639 #define VAR(name,type) slot->name = PL_ ## name;
619 # include "state.h" 640 # include "state.h"
620 #undef VAR 641 #undef VAR
621 } 642 }
… …
857 878
858 PL_runops = RUNOPS_DEFAULT; 879 PL_runops = RUNOPS_DEFAULT;
859 PL_curcop = &PL_compiling; 880 PL_curcop = &PL_compiling;
860 PL_in_eval = EVAL_NULL; 881 PL_in_eval = EVAL_NULL;
861 PL_comppad = 0; 882 PL_comppad = 0;
883 PL_comppad_name = 0;
884 PL_comppad_name_fill = 0;
885 PL_comppad_name_floor = 0;
862 PL_curpm = 0; 886 PL_curpm = 0;
863 PL_curpad = 0; 887 PL_curpad = 0;
864 PL_localizing = 0; 888 PL_localizing = 0;
865 PL_dirty = 0; 889 PL_dirty = 0;
866 PL_restartop = 0; 890 PL_restartop = 0;
867#if PERL_VERSION_ATLEAST (5,10,0) 891#if PERL_VERSION_ATLEAST (5,10,0)
868 PL_parser = 0; 892 PL_parser = 0;
869#endif 893#endif
894 PL_hints = 0;
870 895
871 /* recreate the die/warn hooks */ 896 /* recreate the die/warn hooks */
872 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 897 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
873 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 898 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
874 899
875 GvSV (PL_defgv) = newSV (0); 900 GvSV (PL_defgv) = newSV (0);
876 GvAV (PL_defgv) = coro->args; coro->args = 0; 901 GvAV (PL_defgv) = coro->args; coro->args = 0;
877 GvSV (PL_errgv) = newSV (0); 902 GvSV (PL_errgv) = newSV (0);
878 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 903 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
904 GvHV (PL_hintgv) = 0;
879 PL_rs = newSVsv (GvSV (irsgv)); 905 PL_rs = newSVsv (GvSV (irsgv));
880 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 906 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
881 907
882 { 908 {
883 dSP; 909 dSP;
… …
901 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 927 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
902 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 928 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
903 929
904 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 930 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
905 coro_setup_op.op_next = PL_op; 931 coro_setup_op.op_next = PL_op;
906 coro_setup_op.op_type = OP_CUSTOM; 932 coro_setup_op.op_type = OP_ENTERSUB;
907 coro_setup_op.op_ppaddr = pp_slf; 933 coro_setup_op.op_ppaddr = pp_slf;
908 /* no flags etc. required, as an init function won't be called */ 934 /* no flags etc. required, as an init function won't be called */
909 935
910 PL_op = (OP *)&coro_setup_op; 936 PL_op = (OP *)&coro_setup_op;
911 937
912 /* copy throw, in case it was set before coro_setup */ 938 /* copy throw, in case it was set before coro_setup */
913 CORO_THROW = coro->except; 939 CORO_THROW = coro->except;
914} 940}
915 941
916static void 942static void
917coro_destruct (pTHX_ struct coro *coro) 943coro_destruct_perl (pTHX_ struct coro *coro)
918{ 944{
919 if (!IN_DESTRUCT) 945 if (!IN_DESTRUCT)
920 { 946 {
921 /* restore all saved variables and stuff */ 947 /* restore all saved variables and stuff */
922 LEAVE_SCOPE (0); 948 LEAVE_SCOPE (0);
… …
937 SvREFCNT_dec (GvAV (PL_defgv)); 963 SvREFCNT_dec (GvAV (PL_defgv));
938 SvREFCNT_dec (GvSV (PL_errgv)); 964 SvREFCNT_dec (GvSV (PL_errgv));
939 SvREFCNT_dec (PL_defoutgv); 965 SvREFCNT_dec (PL_defoutgv);
940 SvREFCNT_dec (PL_rs); 966 SvREFCNT_dec (PL_rs);
941 SvREFCNT_dec (GvSV (irsgv)); 967 SvREFCNT_dec (GvSV (irsgv));
968 SvREFCNT_dec (GvHV (PL_hintgv));
942 969
943 SvREFCNT_dec (PL_diehook); 970 SvREFCNT_dec (PL_diehook);
944 SvREFCNT_dec (PL_warnhook); 971 SvREFCNT_dec (PL_warnhook);
945 972
946 SvREFCNT_dec (coro->saved_deffh); 973 SvREFCNT_dec (coro->saved_deffh);
… …
964static int 991static int
965runops_trace (pTHX) 992runops_trace (pTHX)
966{ 993{
967 COP *oldcop = 0; 994 COP *oldcop = 0;
968 int oldcxix = -2; 995 int oldcxix = -2;
969 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
970 coro_cctx *cctx = coro->cctx;
971 996
972 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 997 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
973 { 998 {
974 PERL_ASYNC_CHECK (); 999 PERL_ASYNC_CHECK ();
975 1000
976 if (cctx->flags & CC_TRACE_ALL) 1001 if (cctx_current->flags & CC_TRACE_ALL)
977 { 1002 {
978 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1003 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
979 { 1004 {
980 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1005 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
981 SV **bot, **top; 1006 SV **bot, **top;
982 AV *av = newAV (); /* return values */ 1007 AV *av = newAV (); /* return values */
983 SV **cb; 1008 SV **cb;
… …
1020 1045
1021 if (PL_curcop != &PL_compiling) 1046 if (PL_curcop != &PL_compiling)
1022 { 1047 {
1023 SV **cb; 1048 SV **cb;
1024 1049
1025 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1050 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1026 { 1051 {
1027 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1052 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1028 1053
1029 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1054 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1030 { 1055 {
… …
1053 } 1078 }
1054 1079
1055 oldcxix = cxstack_ix; 1080 oldcxix = cxstack_ix;
1056 } 1081 }
1057 1082
1058 if (cctx->flags & CC_TRACE_LINE) 1083 if (cctx_current->flags & CC_TRACE_LINE)
1059 { 1084 {
1060 dSP; 1085 dSP;
1061 1086
1062 PL_runops = RUNOPS_DEFAULT; 1087 PL_runops = RUNOPS_DEFAULT;
1063 ENTER; 1088 ENTER;
… …
1082 1107
1083 TAINT_NOT; 1108 TAINT_NOT;
1084 return 0; 1109 return 0;
1085} 1110}
1086 1111
1087static struct coro_cctx *cctx_ssl_cctx;
1088static struct CoroSLF cctx_ssl_frame; 1112static struct CoroSLF cctx_ssl_frame;
1089 1113
1090static void 1114static void
1091slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1115slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1092{ 1116{
1093 ta->prev = (struct coro *)cctx_ssl_cctx;
1094 ta->next = 0; 1117 ta->prev = 0;
1095} 1118}
1096 1119
1097static int 1120static int
1098slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1121slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1099{ 1122{
… …
1102 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1125 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1103} 1126}
1104 1127
1105/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1128/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1106static void NOINLINE 1129static void NOINLINE
1107cctx_prepare (pTHX_ coro_cctx *cctx) 1130cctx_prepare (pTHX)
1108{ 1131{
1109 PL_top_env = &PL_start_env; 1132 PL_top_env = &PL_start_env;
1110 1133
1111 if (cctx->flags & CC_TRACE) 1134 if (cctx_current->flags & CC_TRACE)
1112 PL_runops = runops_trace; 1135 PL_runops = runops_trace;
1113 1136
1114 /* we already must be executing an SLF op, there is no other valid way 1137 /* we already must be executing an SLF op, there is no other valid way
1115 * that can lead to creation of a new cctx */ 1138 * that can lead to creation of a new cctx */
1116 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1139 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1117 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1140 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1118 1141
1119 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1142 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1120 cctx_ssl_cctx = cctx;
1121 cctx_ssl_frame = slf_frame; 1143 cctx_ssl_frame = slf_frame;
1122 1144
1123 slf_frame.prepare = slf_prepare_set_stacklevel; 1145 slf_frame.prepare = slf_prepare_set_stacklevel;
1124 slf_frame.check = slf_check_set_stacklevel; 1146 slf_frame.check = slf_check_set_stacklevel;
1125} 1147}
… …
1148 /* normally we would need to skip the entersub here */ 1170 /* normally we would need to skip the entersub here */
1149 /* not doing so will re-execute it, which is exactly what we want */ 1171 /* not doing so will re-execute it, which is exactly what we want */
1150 /* PL_nop = PL_nop->op_next */ 1172 /* PL_nop = PL_nop->op_next */
1151 1173
1152 /* inject a fake subroutine call to cctx_init */ 1174 /* inject a fake subroutine call to cctx_init */
1153 cctx_prepare (aTHX_ (coro_cctx *)arg); 1175 cctx_prepare (aTHX);
1154 1176
1155 /* cctx_run is the alternative tail of transfer() */ 1177 /* cctx_run is the alternative tail of transfer() */
1156 transfer_tail (aTHX); 1178 transfer_tail (aTHX);
1157 1179
1158 /* somebody or something will hit me for both perl_run and PL_restartop */ 1180 /* somebody or something will hit me for both perl_run and PL_restartop */
… …
1166 /* 1188 /*
1167 * If perl-run returns we assume exit() was being called or the coro 1189 * If perl-run returns we assume exit() was being called or the coro
1168 * fell off the end, which seems to be the only valid (non-bug) 1190 * fell off the end, which seems to be the only valid (non-bug)
1169 * reason for perl_run to return. We try to exit by jumping to the 1191 * reason for perl_run to return. We try to exit by jumping to the
1170 * bootstrap-time "top" top_env, as we cannot restore the "main" 1192 * bootstrap-time "top" top_env, as we cannot restore the "main"
1171 * coroutine as Coro has no such concept 1193 * coroutine as Coro has no such concept.
1194 * This actually isn't valid with the pthread backend, but OSes requiring
1195 * that backend are too broken to do it in a standards-compliant way.
1172 */ 1196 */
1173 PL_top_env = main_top_env; 1197 PL_top_env = main_top_env;
1174 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1198 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1175 } 1199 }
1176} 1200}
… …
1253cctx_destroy (coro_cctx *cctx) 1277cctx_destroy (coro_cctx *cctx)
1254{ 1278{
1255 if (!cctx) 1279 if (!cctx)
1256 return; 1280 return;
1257 1281
1282 assert (cctx != cctx_current);//D temporary
1283
1258 --cctx_count; 1284 --cctx_count;
1259 coro_destroy (&cctx->cctx); 1285 coro_destroy (&cctx->cctx);
1260 1286
1261 /* coro_transfer creates new, empty cctx's */ 1287 /* coro_transfer creates new, empty cctx's */
1262 if (cctx->sptr) 1288 if (cctx->sptr)
… …
1325 /* TODO: throwing up here is considered harmful */ 1351 /* TODO: throwing up here is considered harmful */
1326 1352
1327 if (expect_true (prev != next)) 1353 if (expect_true (prev != next))
1328 { 1354 {
1329 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1355 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1330 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1356 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,");
1331 1357
1332 if (expect_false (next->flags & CF_RUNNING)) 1358 if (expect_false (next->flags & CF_RUNNING))
1333 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,"); 1359 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1334 1360
1335 if (expect_false (next->flags & CF_DESTROYED)) 1361 if (expect_false (next->flags & CF_DESTROYED))
… …
1347transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1373transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1348{ 1374{
1349 dSTACKLEVEL; 1375 dSTACKLEVEL;
1350 1376
1351 /* sometimes transfer is only called to set idle_sp */ 1377 /* sometimes transfer is only called to set idle_sp */
1352 if (expect_false (!next)) 1378 if (expect_false (!prev))
1353 { 1379 {
1354 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1380 cctx_current->idle_sp = STACKLEVEL;
1355 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1381 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1356 } 1382 }
1357 else if (expect_true (prev != next)) 1383 else if (expect_true (prev != next))
1358 { 1384 {
1359 coro_cctx *prev__cctx; 1385 coro_cctx *cctx_prev;
1360 1386
1361 if (expect_false (prev->flags & CF_NEW)) 1387 if (expect_false (prev->flags & CF_NEW))
1362 { 1388 {
1363 /* create a new empty/source context */ 1389 /* create a new empty/source context */
1364 prev->cctx = cctx_new_empty ();
1365 prev->flags &= ~CF_NEW; 1390 prev->flags &= ~CF_NEW;
1366 prev->flags |= CF_RUNNING; 1391 prev->flags |= CF_RUNNING;
1367 } 1392 }
1368 1393
1369 prev->flags &= ~CF_RUNNING; 1394 prev->flags &= ~CF_RUNNING;
… …
1380 coro_setup (aTHX_ next); 1405 coro_setup (aTHX_ next);
1381 } 1406 }
1382 else 1407 else
1383 load_perl (aTHX_ next); 1408 load_perl (aTHX_ next);
1384 1409
1385 prev__cctx = prev->cctx; 1410 assert (!prev->cctx);//D temporary
1386 1411
1387 /* possibly untie and reuse the cctx */ 1412 /* possibly untie and reuse the cctx */
1388 if (expect_true ( 1413 if (expect_true (
1389 prev__cctx->idle_sp == STACKLEVEL 1414 cctx_current->idle_sp == STACKLEVEL
1390 && !(prev__cctx->flags & CC_TRACE) 1415 && !(cctx_current->flags & CC_TRACE)
1391 && !force_cctx 1416 && !force_cctx
1392 )) 1417 ))
1393 { 1418 {
1394 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1419 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1395 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1420 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1396 1421
1397 prev->cctx = 0;
1398
1399 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1422 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1400 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1423 /* without this the next cctx_get might destroy the running cctx while still in use */
1401 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1424 if (expect_false (CCTX_EXPIRED (cctx_current)))
1402 if (!next->cctx) 1425 if (expect_true (!next->cctx))
1403 next->cctx = cctx_get (aTHX); 1426 next->cctx = cctx_get (aTHX);
1404 1427
1405 cctx_put (prev__cctx); 1428 cctx_put (cctx_current);
1406 } 1429 }
1430 else
1431 prev->cctx = cctx_current;
1407 1432
1408 ++next->usecount; 1433 ++next->usecount;
1409 1434
1410 if (expect_true (!next->cctx)) 1435 cctx_prev = cctx_current;
1411 next->cctx = cctx_get (aTHX); 1436 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1412 1437
1413 if (expect_false (prev__cctx != next->cctx)) 1438 next->cctx = 0;
1439
1440 if (expect_false (cctx_prev != cctx_current))
1414 { 1441 {
1415 prev__cctx->top_env = PL_top_env; 1442 cctx_prev->top_env = PL_top_env;
1416 PL_top_env = next->cctx->top_env; 1443 PL_top_env = cctx_current->top_env;
1417 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1444 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1418 } 1445 }
1419 1446
1420 transfer_tail (aTHX); 1447 transfer_tail (aTHX);
1421 } 1448 }
1422} 1449}
… …
1444 --coro_nready; 1471 --coro_nready;
1445 } 1472 }
1446 else 1473 else
1447 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1474 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1448 1475
1449 if (coro->mainstack && coro->mainstack != main_mainstack) 1476 if (coro->mainstack
1477 && coro->mainstack != main_mainstack
1478 && !PL_dirty)
1450 { 1479 {
1451 struct coro temp; 1480 struct coro temp;
1452 1481
1453 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1482 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1454 1483
1455 save_perl (aTHX_ &temp); 1484 save_perl (aTHX_ &temp);
1456 load_perl (aTHX_ coro); 1485 load_perl (aTHX_ coro);
1457 1486
1458 coro_destruct (aTHX_ coro); 1487 coro_destruct_perl (aTHX_ coro);
1459 1488
1460 load_perl (aTHX_ &temp); 1489 load_perl (aTHX_ &temp);
1461 1490
1462 coro->slot = 0; 1491 coro->slot = 0;
1463 } 1492 }
… …
1577{ 1606{
1578 struct coro *coro; 1607 struct coro *coro;
1579 SV *sv_hook; 1608 SV *sv_hook;
1580 void (*xs_hook)(void); 1609 void (*xs_hook)(void);
1581 1610
1582 if (SvROK (coro_sv))
1583 coro_sv = SvRV (coro_sv);
1584
1585 coro = SvSTATE (coro_sv); 1611 coro = SvSTATE (coro_sv);
1586 1612
1587 if (coro->flags & CF_READY) 1613 if (coro->flags & CF_READY)
1588 return 0; 1614 return 0;
1589 1615
… …
1663 } 1689 }
1664 } 1690 }
1665 else 1691 else
1666 { 1692 {
1667 /* nothing to schedule: call the idle handler */ 1693 /* nothing to schedule: call the idle handler */
1694 if (SvROK (sv_idle)
1695 && SvOBJECT (SvRV (sv_idle)))
1696 {
1697 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1698 api_ready (aTHX_ SvRV (sv_idle));
1699 --coro_nready;
1700 }
1701 else
1702 {
1668 dSP; 1703 dSP;
1669 1704
1670 ENTER; 1705 ENTER;
1671 SAVETMPS; 1706 SAVETMPS;
1672 1707
1673 PUSHMARK (SP); 1708 PUSHMARK (SP);
1674 PUTBACK; 1709 PUTBACK;
1675 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD); 1710 call_sv (sv_idle, G_VOID | G_DISCARD);
1676 1711
1677 FREETMPS; 1712 FREETMPS;
1678 LEAVE; 1713 LEAVE;
1714 }
1679 } 1715 }
1680 } 1716 }
1681} 1717}
1682 1718
1683INLINE void 1719INLINE void
… …
1754static void 1790static void
1755api_trace (pTHX_ SV *coro_sv, int flags) 1791api_trace (pTHX_ SV *coro_sv, int flags)
1756{ 1792{
1757 struct coro *coro = SvSTATE (coro_sv); 1793 struct coro *coro = SvSTATE (coro_sv);
1758 1794
1795 if (coro->flags & CF_RUNNING)
1796 croak ("cannot enable tracing on a running coroutine, caught");
1797
1759 if (flags & CC_TRACE) 1798 if (flags & CC_TRACE)
1760 { 1799 {
1761 if (!coro->cctx) 1800 if (!coro->cctx)
1762 coro->cctx = cctx_new_run (); 1801 coro->cctx = cctx_new_run ();
1763 else if (!(coro->cctx->flags & CC_TRACE)) 1802 else if (!(coro->cctx->flags & CC_TRACE))
1764 croak ("cannot enable tracing on coroutine with custom stack,"); 1803 croak ("cannot enable tracing on coroutine with custom stack, caught");
1765 1804
1766 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1805 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1767 } 1806 }
1768 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1807 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1769 { 1808 {
… …
2250 } 2289 }
2251 else 2290 else
2252 slf_argc = 0; 2291 slf_argc = 0;
2253 2292
2254 PL_op->op_ppaddr = pp_slf; 2293 PL_op->op_ppaddr = pp_slf;
2255 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2294 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2256 2295
2257 PL_op = (OP *)&slf_restore; 2296 PL_op = (OP *)&slf_restore;
2258} 2297}
2259 2298
2260/*****************************************************************************/ 2299/*****************************************************************************/
… …
2343 SV **ary; 2382 SV **ary;
2344 2383
2345 /* unfortunately, building manually saves memory */ 2384 /* unfortunately, building manually saves memory */
2346 Newx (ary, 2, SV *); 2385 Newx (ary, 2, SV *);
2347 AvALLOC (av) = ary; 2386 AvALLOC (av) = ary;
2387#if PERL_VERSION_ATLEAST (5,10,0)
2348 /*AvARRAY (av) = ary;*/ 2388 AvARRAY (av) = ary;
2389#else
2349 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2390 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2391 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2392 SvPVX ((SV *)av) = (char *)ary;
2393#endif
2350 AvMAX (av) = 1; 2394 AvMAX (av) = 1;
2351 AvFILLp (av) = 0; 2395 AvFILLp (av) = 0;
2352 ary [0] = newSViv (count); 2396 ary [0] = newSViv (count);
2353 2397
2354 return newRV_noinc ((SV *)av); 2398 return newRV_noinc ((SV *)av);
… …
2724 XSRETURN_EMPTY; 2768 XSRETURN_EMPTY;
2725} 2769}
2726 2770
2727/*****************************************************************************/ 2771/*****************************************************************************/
2728 2772
2773#if CORO_CLONE
2774# include "clone.c"
2775#endif
2776
2729MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2777MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2730 2778
2731PROTOTYPES: DISABLE 2779PROTOTYPES: DISABLE
2732 2780
2733BOOT: 2781BOOT:
… …
2736# if CORO_PTHREAD 2784# if CORO_PTHREAD
2737 coro_thx = PERL_GET_CONTEXT; 2785 coro_thx = PERL_GET_CONTEXT;
2738# endif 2786# endif
2739#endif 2787#endif
2740 BOOT_PAGESIZE; 2788 BOOT_PAGESIZE;
2789
2790 cctx_current = cctx_new_empty ();
2741 2791
2742 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2792 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2743 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2793 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2744 2794
2745 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2795 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
… …
2871void 2921void
2872_exit (int code) 2922_exit (int code)
2873 PROTOTYPE: $ 2923 PROTOTYPE: $
2874 CODE: 2924 CODE:
2875 _exit (code); 2925 _exit (code);
2926
2927SV *
2928clone (Coro::State coro)
2929 CODE:
2930{
2931#if CORO_CLONE
2932 struct coro *ncoro = coro_clone (aTHX_ coro);
2933 MAGIC *mg;
2934 /* TODO: too much duplication */
2935 ncoro->hv = newHV ();
2936 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2937 mg->mg_flags |= MGf_DUP;
2938 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
2939#else
2940 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
2941#endif
2942}
2943 OUTPUT:
2944 RETVAL
2876 2945
2877int 2946int
2878cctx_stacksize (int new_stacksize = 0) 2947cctx_stacksize (int new_stacksize = 0)
2879 PROTOTYPE: ;$ 2948 PROTOTYPE: ;$
2880 CODE: 2949 CODE:
… …
3001 3070
3002SV * 3071SV *
3003has_cctx (Coro::State coro) 3072has_cctx (Coro::State coro)
3004 PROTOTYPE: $ 3073 PROTOTYPE: $
3005 CODE: 3074 CODE:
3006 RETVAL = boolSV (!!coro->cctx); 3075 /* maybe manage the running flag differently */
3076 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
3007 OUTPUT: 3077 OUTPUT:
3008 RETVAL 3078 RETVAL
3009 3079
3010int 3080int
3011is_traced (Coro::State coro) 3081is_traced (Coro::State coro)
… …
3031 3101
3032void 3102void
3033force_cctx () 3103force_cctx ()
3034 PROTOTYPE: 3104 PROTOTYPE:
3035 CODE: 3105 CODE:
3036 SvSTATE_current->cctx->idle_sp = 0; 3106 cctx_current->idle_sp = 0;
3037 3107
3038void 3108void
3039swap_defsv (Coro::State self) 3109swap_defsv (Coro::State self)
3040 PROTOTYPE: $ 3110 PROTOTYPE: $
3041 ALIAS: 3111 ALIAS:
… …
3064 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3134 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3065 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3135 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3066 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3136 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3067 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3137 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3068 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3138 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3139 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3069 3140
3070 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3141 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3071 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3142 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3072 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3143 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3073 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3144 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);

Diff Legend

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