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.442 by root, Tue Mar 4 06:13:24 2014 UTC vs.
Revision 1.473 by root, Sun Sep 3 23:36:01 2017 UTC

21 21
22#include <stddef.h> 22#include <stddef.h>
23#include <stdio.h> 23#include <stdio.h>
24#include <errno.h> 24#include <errno.h>
25#include <assert.h> 25#include <assert.h>
26
27#ifndef SvREFCNT_dec_NN
28 #define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
29#endif
30
31#ifndef SvREFCNT_inc_NN
32 #define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
33#endif
26 34
27#ifndef SVs_PADSTALE 35#ifndef SVs_PADSTALE
28# define SVs_PADSTALE 0 36# define SVs_PADSTALE 0
29#endif 37#endif
30 38
42# define PadlistNAMES(pl) (*PadlistARRAY (pl)) 50# define PadlistNAMES(pl) (*PadlistARRAY (pl))
43# define PadARRAY AvARRAY 51# define PadARRAY AvARRAY
44# define PadMAX AvFILLp 52# define PadMAX AvFILLp
45# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1)) 53# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
46#endif 54#endif
55#ifndef PadnamelistREFCNT
56# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
57#endif
58#ifndef PadnamelistREFCNT_dec
59# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
60#endif
47 61
48/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */ 62/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
49/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */ 63/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
50#if PERL_VERSION_ATLEAST(5,19,0) 64#if PERL_VERSION_ATLEAST(5,19,0)
51# define SVt_BIND SVt_IV 65# define SVt_BIND SVt_IV
102# define CORO_CLOCK_MONOTONIC 1 116# define CORO_CLOCK_MONOTONIC 1
103# define CORO_CLOCK_THREAD_CPUTIME_ID 3 117# define CORO_CLOCK_THREAD_CPUTIME_ID 3
104# endif 118# endif
105#endif 119#endif
106 120
121/* one off bugfix for perl 5.22 */
122#if PERL_VERSION_ATLEAST(5,22,0) && !PERL_VERSION_ATLEAST(5,24,0)
123# undef PadlistNAMES
124# define PadlistNAMES(pl) *((PADNAMELIST **)PadlistARRAY (pl))
125#endif
126
127#if PERL_VERSION_ATLEAST(5,24,0)
128# define SUB_ARGARRAY PL_curpad[0]
129#else
130# define SUB_ARGARRAY (SV *)cx->blk_sub.argarray
131#endif
132
133/* perl usually suppresses asserts. for debugging, we sometimes force it to be on */
134#if 0
135# undef NDEBUG
136# include <assert.h>
137#endif
138
107static double (*nvtime)(); /* so why doesn't it take void? */ 139static double (*nvtime)(); /* so why doesn't it take void? */
108static void (*u2time)(pTHX_ UV ret[2]); 140static void (*u2time)(pTHX_ UV ret[2]);
109 141
110/* we hijack an hopefully unused CV flag for our purposes */ 142/* we hijack an hopefully unused CV flag for our purposes */
111#define CVf_SLF 0x4000 143#define CVf_SLF 0x4000
126 158
127static GV *irsgv; /* $/ */ 159static GV *irsgv; /* $/ */
128static GV *stdoutgv; /* *STDOUT */ 160static GV *stdoutgv; /* *STDOUT */
129static SV *rv_diehook; 161static SV *rv_diehook;
130static SV *rv_warnhook; 162static SV *rv_warnhook;
131static HV *hv_sig; /* %SIG */
132 163
133/* async_pool helper stuff */ 164/* async_pool helper stuff */
134static SV *sv_pool_rss; 165static SV *sv_pool_rss;
135static SV *sv_pool_size; 166static SV *sv_pool_size;
136static SV *sv_async_pool_idle; /* description string */ 167static SV *sv_async_pool_idle; /* description string */
242 SV *saved_deffh; 273 SV *saved_deffh;
243 SV *invoke_cb; 274 SV *invoke_cb;
244 AV *invoke_av; 275 AV *invoke_av;
245 276
246 /* on_enter/on_leave */ 277 /* on_enter/on_leave */
247 AV *on_enter; 278 AV *on_enter; AV *on_enter_xs;
248 AV *on_leave; 279 AV *on_leave; AV *on_leave_xs;
249 280
250 /* swap_sv */ 281 /* swap_sv */
251 AV *swap_sv; 282 AV *swap_sv;
252 283
253 /* times */ 284 /* times */
489 520
490 return 0; 521 return 0;
491} 522}
492 523
493ecb_inline struct coro * 524ecb_inline struct coro *
494SvSTATE_ (pTHX_ SV *coro) 525SvSTATE_ (pTHX_ SV *coro_sv)
495{ 526{
496 MAGIC *mg; 527 MAGIC *mg;
497 528
498 if (SvROK (coro)) 529 if (SvROK (coro_sv))
499 coro = SvRV (coro); 530 coro_sv = SvRV (coro_sv);
500 531
501 mg = SvSTATEhv_p (aTHX_ coro); 532 mg = SvSTATEhv_p (aTHX_ coro_sv);
502 if (!mg) 533 if (!mg)
503 croak ("Coro::State object required"); 534 croak ("Coro::State object required");
504 535
505 return (struct coro *)mg->mg_ptr; 536 return (struct coro *)mg->mg_ptr;
506} 537}
517ecb_inline PADLIST * 548ecb_inline PADLIST *
518coro_derive_padlist (pTHX_ CV *cv) 549coro_derive_padlist (pTHX_ CV *cv)
519{ 550{
520 PADLIST *padlist = CvPADLIST (cv); 551 PADLIST *padlist = CvPADLIST (cv);
521 PADLIST *newpadlist; 552 PADLIST *newpadlist;
553 PADNAMELIST *padnames;
522 PAD *newpad; 554 PAD *newpad;
523 PADOFFSET off = PadlistMAX (padlist) + 1; 555 PADOFFSET off = PadlistMAX (padlist) + 1;
524 556
525#if NEWPADAPI 557#if NEWPADAPI
526 558
553 AvREAL_off (newpadlist); 585 AvREAL_off (newpadlist);
554#endif 586#endif
555 587
556 /* Already extended to 2 elements by newPADLIST. */ 588 /* Already extended to 2 elements by newPADLIST. */
557 PadlistMAX (newpadlist) = 1; 589 PadlistMAX (newpadlist) = 1;
558 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist)); 590
591 padnames = PadlistNAMES (padlist);
592 ++PadnamelistREFCNT (padnames);
593 PadlistNAMES (newpadlist) = padnames;
594
559 PadlistARRAY (newpadlist)[1] = newpad; 595 PadlistARRAY (newpadlist)[1] = newpad;
560 596
561 return newpadlist; 597 return newpadlist;
562} 598}
563 599
584 PadMAX (pad) = -1; 620 PadMAX (pad) = -1;
585 SvREFCNT_dec (pad); 621 SvREFCNT_dec (pad);
586 } 622 }
587 } 623 }
588 624
589 SvREFCNT_dec (PadlistNAMES (padlist)); 625 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
590 626
591#if NEWPADAPI 627#if NEWPADAPI
592 Safefree (PadlistARRAY (padlist)); 628 Safefree (PadlistARRAY (padlist));
593 Safefree (padlist); 629 Safefree (padlist);
594#else 630#else
690 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u; 726 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
691 727
692 /* if SvANY points to the head, we need to adjust the pointers, 728 /* if SvANY points to the head, we need to adjust the pointers,
693 * as the pointer for a still points to b, and maybe vice versa. 729 * as the pointer for a still points to b, and maybe vice versa.
694 */ 730 */
695 #define svany_in_head(type) \ 731 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
696 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type))) 732 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
733 svany_in_head_set |= 1 << SVt_NV;
734 #endif
735
736 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
697 737
698 if (svany_in_head (SvTYPE (a))) 738 if (svany_in_head (SvTYPE (a)))
699 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 739 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
700 740
701 if (svany_in_head (SvTYPE (b))) 741 if (svany_in_head (SvTYPE (b)))
704#endif 744#endif
705} 745}
706 746
707/* swap sv heads, at least logically */ 747/* swap sv heads, at least logically */
708static void 748static void
709swap_svs (pTHX_ Coro__State c) 749swap_svs_enter (pTHX_ Coro__State c)
710{ 750{
711 int i; 751 int i;
712 752
713 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 753 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
714 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]); 754 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
715} 755}
716 756
757static void
758swap_svs_leave (pTHX_ Coro__State c)
759{
760 int i;
761
762 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
763 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
764}
765
717#define SWAP_SVS(coro) \ 766#define SWAP_SVS_ENTER(coro) \
718 if (ecb_expect_false ((coro)->swap_sv)) \ 767 if (ecb_expect_false ((coro)->swap_sv)) \
719 swap_svs (aTHX_ (coro)) 768 swap_svs_enter (aTHX_ (coro))
769
770#define SWAP_SVS_LEAVE(coro) \
771 if (ecb_expect_false ((coro)->swap_sv)) \
772 swap_svs_leave (aTHX_ (coro))
720 773
721static void 774static void
722on_enterleave_call (pTHX_ SV *cb); 775on_enterleave_call (pTHX_ SV *cb);
723 776
724static void 777static void
769 822
770 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 823 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
771 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 824 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
772 } 825 }
773 826
827 if (ecb_expect_false (c->on_enter_xs))
828 {
829 int i;
830
831 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
832 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
833 }
834
774 SWAP_SVS (c); 835 SWAP_SVS_ENTER (c);
775} 836}
776 837
777static void 838static void
778save_perl (pTHX_ Coro__State c) 839save_perl (pTHX_ Coro__State c)
779{ 840{
780 SWAP_SVS (c); 841 SWAP_SVS_LEAVE (c);
842
843 if (ecb_expect_false (c->on_leave_xs))
844 {
845 int i;
846
847 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
848 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
849 }
781 850
782 if (ecb_expect_false (c->on_leave)) 851 if (ecb_expect_false (c->on_leave))
783 { 852 {
784 int i; 853 int i;
785 854
912#endif 981#endif
913 982
914 New(54,PL_savestack,24,ANY); 983 New(54,PL_savestack,24,ANY);
915 PL_savestack_ix = 0; 984 PL_savestack_ix = 0;
916 PL_savestack_max = 24; 985 PL_savestack_max = 24;
986#if PERL_VERSION_ATLEAST (5,24,0)
987 /* perl 5.24 moves SS_MAXPUSH optimisation from */
988 /* the header macros to PL_savestack_max */
989 PL_savestack_max -= SS_MAXPUSH;
990#endif
917 991
918#if !PERL_VERSION_ATLEAST (5,10,0) 992#if !PERL_VERSION_ATLEAST (5,10,0)
919 New(54,PL_retstack,4,OP*); 993 New(54,PL_retstack,4,OP*);
920 PL_retstack_ix = 0; 994 PL_retstack_ix = 0;
921 PL_retstack_max = 4; 995 PL_retstack_max = 4;
987 } 1061 }
988 1062
989 return rss; 1063 return rss;
990} 1064}
991 1065
992/** coroutine stack handling ************************************************/ 1066/** provide custom get/set/clear methods for %SIG elements ******************/
993
994static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
995static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
996static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
997 1067
998/* apparently < 5.8.8 */ 1068/* apparently < 5.8.8 */
999#ifndef MgPV_nolen_const 1069#ifndef MgPV_nolen_const
1000#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1070#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
1001 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1071 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
1002 (const char*)(mg)->mg_ptr) 1072 (const char*)(mg)->mg_ptr)
1003#endif 1073#endif
1074
1075/* this will be a patched copy of PL_vtbl_sigelem */
1076static MGVTBL coro_sigelem_vtbl;
1077
1078static int ecb_cold
1079coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
1080{
1081 char *key = SvPV_nolen ((SV *)name);
1082
1083 /* do what mg_copy normally does */
1084 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1085 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1086
1087 /* patch sigelem vtbl, but only for __WARN__ and __DIE__ */
1088 if (*key == '_'
1089 && (strEQ (key, "__DIE__")
1090 || strEQ (key, "__WARN__")))
1091 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1092
1093 return 1;
1094}
1095
1096/* perl does not have a %SIG vtbl, we provide one so we can override */
1097/* the magic vtbl for the __DIE__ and __WARN__ members */
1098static const MGVTBL coro_sig_vtbl = {
1099 0, 0, 0, 0, 0,
1100 coro_sig_copy
1101};
1004 1102
1005/* 1103/*
1006 * This overrides the default magic get method of %SIG elements. 1104 * This overrides the default magic get method of %SIG elements.
1007 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1105 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
1008 * and instead of trying to save and restore the hash elements (extremely slow), 1106 * and instead of trying to save and restore the hash elements (extremely slow),
1010 */ 1108 */
1011static int ecb_cold 1109static int ecb_cold
1012coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1110coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
1013{ 1111{
1014 const char *s = MgPV_nolen_const (mg); 1112 const char *s = MgPV_nolen_const (mg);
1113 /* the key must be either __DIE__ or __WARN__ here */
1114 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1015 1115
1016 if (*s == '_') 1116 SV *ssv;
1017 {
1018 SV **svp = 0;
1019 1117
1020 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1021 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1022
1023 if (svp) 1118 if (!*svp)
1024 {
1025 SV *ssv;
1026
1027 if (!*svp)
1028 ssv = &PL_sv_undef; 1119 ssv = &PL_sv_undef;
1029 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */ 1120 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1030 ssv = sv_2mortal (newRV_inc (*svp)); 1121 ssv = sv_2mortal (newRV_inc (*svp));
1031 else 1122 else
1032 ssv = *svp; 1123 ssv = *svp;
1033 1124
1034 sv_setsv (sv, ssv); 1125 sv_setsv (sv, ssv);
1035 return 0; 1126 return 0;
1036 }
1037 }
1038
1039 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
1040} 1127}
1041 1128
1042static int ecb_cold 1129static int ecb_cold
1043coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
1044{ 1131{
1045 const char *s = MgPV_nolen_const (mg); 1132 const char *s = MgPV_nolen_const (mg);
1133 /* the key must be either __DIE__ or __WARN__ here */
1134 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1046 1135
1047 if (*s == '_')
1048 {
1049 SV **svp = 0;
1050
1051 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1052 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1053
1054 if (svp)
1055 {
1056 SV *old = *svp; 1136 SV *old = *svp;
1057 *svp = 0; 1137 *svp = 0;
1058 SvREFCNT_dec (old); 1138 SvREFCNT_dec (old);
1059 return 0; 1139 return 0;
1060 }
1061 }
1062
1063 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1064} 1140}
1065 1141
1066static int ecb_cold 1142static int ecb_cold
1067coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1143coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1068{ 1144{
1069 const char *s = MgPV_nolen_const (mg); 1145 const char *s = MgPV_nolen_const (mg);
1146 /* the key must be either __DIE__ or __WARN__ here */
1147 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1070 1148
1071 if (*s == '_')
1072 {
1073 SV **svp = 0;
1074
1075 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1076 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1077
1078 if (svp)
1079 {
1080 SV *old = *svp; 1149 SV *old = *svp;
1081 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1150 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1082 SvREFCNT_dec (old); 1151 SvREFCNT_dec (old);
1083 return 0; 1152 return 0;
1084 }
1085 }
1086
1087 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1088} 1153}
1089 1154
1090static void 1155static void
1091prepare_nop (pTHX_ struct coro_transfer_args *ta) 1156prepare_nop (pTHX_ struct coro_transfer_args *ta)
1092{ 1157{
1103static int 1168static int
1104slf_check_repeat (pTHX_ struct CoroSLF *frame) 1169slf_check_repeat (pTHX_ struct CoroSLF *frame)
1105{ 1170{
1106 return 1; 1171 return 1;
1107} 1172}
1173
1174/** coroutine stack handling ************************************************/
1108 1175
1109static UNOP init_perl_op; 1176static UNOP init_perl_op;
1110 1177
1111ecb_noinline static void /* noinline to keep it out of the transfer fast path */ 1178ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1112init_perl (pTHX_ struct coro *coro) 1179init_perl (pTHX_ struct coro *coro)
1138 1205
1139 GvSV (PL_defgv) = newSV (0); 1206 GvSV (PL_defgv) = newSV (0);
1140 GvAV (PL_defgv) = coro->args; coro->args = 0; 1207 GvAV (PL_defgv) = coro->args; coro->args = 0;
1141 GvSV (PL_errgv) = newSV (0); 1208 GvSV (PL_errgv) = newSV (0);
1142 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1209 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1143 GvHV (PL_hintgv) = 0; 1210 GvHV (PL_hintgv) = newHV ();
1211#if PERL_VERSION_ATLEAST (5,10,0)
1212 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1213#endif
1144 PL_rs = newSVsv (GvSV (irsgv)); 1214 PL_rs = newSVsv (GvSV (irsgv));
1145 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1215 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1146 1216
1147 { 1217 {
1148 dSP; 1218 dSP;
1152 myop.op_next = Nullop; 1222 myop.op_next = Nullop;
1153 myop.op_type = OP_ENTERSUB; 1223 myop.op_type = OP_ENTERSUB;
1154 myop.op_flags = OPf_WANT_VOID; 1224 myop.op_flags = OPf_WANT_VOID;
1155 1225
1156 PUSHMARK (SP); 1226 PUSHMARK (SP);
1157 PUSHs ((SV *)coro->startcv); 1227 XPUSHs ((SV *)coro->startcv);
1158 PUTBACK; 1228 PUTBACK;
1159 PL_op = (OP *)&myop; 1229 PL_op = (OP *)&myop;
1160 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1230 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1161 } 1231 }
1162 1232
1176 PL_op = (OP *)&init_perl_op; 1246 PL_op = (OP *)&init_perl_op;
1177 1247
1178 /* copy throw, in case it was set before init_perl */ 1248 /* copy throw, in case it was set before init_perl */
1179 CORO_THROW = coro->except; 1249 CORO_THROW = coro->except;
1180 1250
1181 SWAP_SVS (coro); 1251 SWAP_SVS_ENTER (coro);
1182 1252
1183 if (ecb_expect_false (enable_times)) 1253 if (ecb_expect_false (enable_times))
1184 { 1254 {
1185 coro_times_update (); 1255 coro_times_update ();
1186 coro_times_sub (coro); 1256 coro_times_sub (coro);
1224 /* this will cause transfer_check to croak on block*/ 1294 /* this will cause transfer_check to croak on block*/
1225 SvRV_set (coro_current, (SV *)coro->hv); 1295 SvRV_set (coro_current, (SV *)coro->hv);
1226 1296
1227 load_perl (aTHX_ coro); 1297 load_perl (aTHX_ coro);
1228 1298
1299 /* restore swapped sv's */
1300 SWAP_SVS_LEAVE (coro);
1301
1229 coro_unwind_stacks (aTHX); 1302 coro_unwind_stacks (aTHX);
1230
1231 /* restore swapped sv's */
1232 SWAP_SVS (coro);
1233 1303
1234 coro_destruct_stacks (aTHX); 1304 coro_destruct_stacks (aTHX);
1235 1305
1236 /* now save some sv's to be free'd later */ 1306 /* now save some sv's to be free'd later */
1237 svf [0] = GvSV (PL_defgv); 1307 svf [0] = GvSV (PL_defgv);
1258 1328
1259 SvREFCNT_dec (coro->saved_deffh); 1329 SvREFCNT_dec (coro->saved_deffh);
1260 SvREFCNT_dec (coro->rouse_cb); 1330 SvREFCNT_dec (coro->rouse_cb);
1261 SvREFCNT_dec (coro->invoke_cb); 1331 SvREFCNT_dec (coro->invoke_cb);
1262 SvREFCNT_dec (coro->invoke_av); 1332 SvREFCNT_dec (coro->invoke_av);
1333 SvREFCNT_dec (coro->on_enter_xs);
1334 SvREFCNT_dec (coro->on_leave_xs);
1263 } 1335 }
1264} 1336}
1265 1337
1266ecb_inline void 1338ecb_inline void
1267free_coro_mortal (pTHX) 1339free_coro_mortal (pTHX)
1308 av_push (av, SvREFCNT_inc_NN (*bot++)); 1380 av_push (av, SvREFCNT_inc_NN (*bot++));
1309 1381
1310 PL_runops = RUNOPS_DEFAULT; 1382 PL_runops = RUNOPS_DEFAULT;
1311 ENTER; 1383 ENTER;
1312 SAVETMPS; 1384 SAVETMPS;
1385 PUSHMARK (SP);
1313 EXTEND (SP, 3); 1386 EXTEND (SP, 3);
1314 PUSHMARK (SP);
1315 PUSHs (&PL_sv_no); 1387 PUSHs (&PL_sv_no);
1316 PUSHs (fullname); 1388 PUSHs (fullname);
1317 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 1389 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
1318 PUTBACK; 1390 PUTBACK;
1319 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1391 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1330 1402
1331 if (PL_curcop != &PL_compiling) 1403 if (PL_curcop != &PL_compiling)
1332 { 1404 {
1333 SV **cb; 1405 SV **cb;
1334 1406
1335 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1407 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1336 { 1408 {
1337 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1409 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1338 1410
1339 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1411 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1340 { 1412 {
1346 gv_efullname3 (fullname, gv, 0); 1418 gv_efullname3 (fullname, gv, 0);
1347 1419
1348 PL_runops = RUNOPS_DEFAULT; 1420 PL_runops = RUNOPS_DEFAULT;
1349 ENTER; 1421 ENTER;
1350 SAVETMPS; 1422 SAVETMPS;
1423 PUSHMARK (SP);
1351 EXTEND (SP, 3); 1424 EXTEND (SP, 3);
1352 PUSHMARK (SP);
1353 PUSHs (&PL_sv_yes); 1425 PUSHs (&PL_sv_yes);
1354 PUSHs (fullname); 1426 PUSHs (fullname);
1355 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1427 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc (SUB_ARGARRAY)) : &PL_sv_undef);
1356 PUTBACK; 1428 PUTBACK;
1357 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1429 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1358 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1430 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1359 SPAGAIN; 1431 SPAGAIN;
1360 FREETMPS; 1432 FREETMPS;
1370 dSP; 1442 dSP;
1371 1443
1372 PL_runops = RUNOPS_DEFAULT; 1444 PL_runops = RUNOPS_DEFAULT;
1373 ENTER; 1445 ENTER;
1374 SAVETMPS; 1446 SAVETMPS;
1375 EXTEND (SP, 3);
1376 PL_runops = RUNOPS_DEFAULT;
1377 PUSHMARK (SP); 1447 PUSHMARK (SP);
1448 EXTEND (SP, 2);
1378 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 1449 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
1379 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 1450 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
1380 PUTBACK; 1451 PUTBACK;
1381 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0); 1452 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
1382 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1453 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1482 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1553 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1483 * runtime errors here, as this is just a random interpreter, not a thread. 1554 * runtime errors here, as this is just a random interpreter, not a thread.
1484 */ 1555 */
1485 1556
1486 /* 1557 /*
1558 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1559 * requires PL_scopestack_ix, so do it here if required.
1560 */
1561 if (!PL_scopestack_ix)
1562 ENTER;
1563
1564 /*
1487 * If perl-run returns we assume exit() was being called or the coro 1565 * If perl-run returns we assume exit() was being called or the coro
1488 * fell off the end, which seems to be the only valid (non-bug) 1566 * fell off the end, which seems to be the only valid (non-bug)
1489 * reason for perl_run to return. We try to mimic whatever perl is normally 1567 * reason for perl_run to return. We try to mimic whatever perl is normally
1490 * doing in that case. YMMV. 1568 * doing in that case. YMMV.
1491 */ 1569 */
1927 2005
1928 ENTER; 2006 ENTER;
1929 SAVETMPS; 2007 SAVETMPS;
1930 2008
1931 PUSHMARK (SP); 2009 PUSHMARK (SP);
1932 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught", 0))); 2010 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1933 PUTBACK; 2011 PUTBACK;
1934 call_pv ("Carp::confess", G_VOID | G_DISCARD); 2012 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1935 2013
1936 FREETMPS; 2014 FREETMPS;
1937 LEAVE; 2015 LEAVE;
2248 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2326 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2249 } 2327 }
2250 else 2328 else
2251 { 2329 {
2252 struct coro *self = SvSTATE_current; 2330 struct coro *self = SvSTATE_current;
2331
2332 if (!self)
2333 croak ("Coro::cancel called outside of thread content,");
2253 2334
2254 /* otherwise we cancel directly, purely for speed reasons 2335 /* otherwise we cancel directly, purely for speed reasons
2255 * unfortunately, this requires some magic trickery, as 2336 * unfortunately, this requires some magic trickery, as
2256 * somebody else could cancel us, so we have to fight the cancellation. 2337 * somebody else could cancel us, so we have to fight the cancellation.
2257 * this is ugly, and hopefully fully worth the extra speed. 2338 * this is ugly, and hopefully fully worth the extra speed.
2290safe_cancel (pTHX_ struct coro *coro, SV **arg, int items) 2371safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2291{ 2372{
2292 if (coro->cctx) 2373 if (coro->cctx)
2293 croak ("coro inside C callback, unable to cancel at this time, caught"); 2374 croak ("coro inside C callback, unable to cancel at this time, caught");
2294 2375
2295 if (coro->flags & CF_NEW) 2376 if (coro->flags & (CF_NEW | CF_ZOMBIE))
2296 { 2377 {
2297 coro_set_status (aTHX_ coro, arg, items); 2378 coro_set_status (aTHX_ coro, arg, items);
2298 coro_state_destroy (aTHX_ coro); 2379 coro_state_destroy (aTHX_ coro);
2299 } 2380 }
2300 else 2381 else
2367 else 2448 else
2368 { 2449 {
2369 av_clear (GvAV (PL_defgv)); 2450 av_clear (GvAV (PL_defgv));
2370 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2451 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2371 2452
2453 if (ecb_expect_false (coro->swap_sv))
2454 {
2455 SWAP_SVS_LEAVE (coro);
2456 SvREFCNT_dec_NN (coro->swap_sv);
2457 coro->swap_sv = 0;
2458 }
2459
2372 coro->prio = 0; 2460 coro->prio = 0;
2373 2461
2374 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2462 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2375 api_trace (aTHX_ coro_current, 0); 2463 api_trace (aTHX_ coro_current, 0);
2376 2464
2377 frame->prepare = prepare_schedule; 2465 frame->prepare = prepare_schedule;
2378 av_push (av_async_pool, SvREFCNT_inc (hv)); 2466 av_push (av_async_pool, SvREFCNT_inc (hv));
2379 } 2467 }
2804static void 2892static void
2805coro_pop_on_leave (pTHX_ void *coro) 2893coro_pop_on_leave (pTHX_ void *coro)
2806{ 2894{
2807 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2895 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2808 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2896 on_enterleave_call (aTHX_ sv_2mortal (cb));
2897}
2898
2899static void
2900enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2901{
2902 if (!hook)
2903 return;
2904
2905 if (!*avp)
2906 {
2907 *avp = newAV ();
2908 AvREAL_off (*avp);
2909 }
2910
2911 av_push (*avp, (SV *)hook);
2912 av_push (*avp, (SV *)arg);
2913}
2914
2915static void
2916enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2917{
2918 AV *av = *avp;
2919 int i;
2920
2921 if (!av)
2922 return;
2923
2924 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2925 if (AvARRAY (av)[i] == (SV *)hook)
2926 {
2927 if (execute)
2928 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2929
2930 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2931 av_pop (av);
2932 av_pop (av);
2933 break;
2934 }
2935
2936 if (AvFILLp (av) >= 0)
2937 {
2938 *avp = 0;
2939 SvREFCNT_dec_NN (av);
2940 }
2941}
2942
2943static void
2944api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2945{
2946 struct coro *coro = SvSTATE (coro_sv);
2947
2948 if (SvSTATE_current == coro)
2949 if (enter)
2950 enter (aTHX_ enter_arg);
2951
2952 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2953 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2954}
2955
2956static void
2957api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2958{
2959 struct coro *coro = SvSTATE (coro_sv);
2960
2961 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2962 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2963}
2964
2965static void
2966savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2967{
2968 struct coro *coro = SvSTATE_current;
2969
2970 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2971}
2972
2973static void
2974savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2975{
2976 struct coro *coro = SvSTATE_current;
2977
2978 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2979}
2980
2981static void
2982api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2983{
2984 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2985
2986 /* this ought to be much cheaper than malloc + a single destructor call */
2987 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2988 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2809} 2989}
2810 2990
2811/*****************************************************************************/ 2991/*****************************************************************************/
2812/* PerlIO::cede */ 2992/* PerlIO::cede */
2813 2993
2943 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3123 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2944 PUTBACK; 3124 PUTBACK;
2945 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3125 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2946 } 3126 }
2947 3127
2948 SvREFCNT_dec (cb); 3128 SvREFCNT_dec_NN (cb);
2949 } 3129 }
2950} 3130}
2951 3131
2952static void 3132static void
2953coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3133coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
3093 { 3273 {
3094 api_ready (aTHX_ cb); 3274 api_ready (aTHX_ cb);
3095 sv_setiv (cb, 0); /* signal waiter */ 3275 sv_setiv (cb, 0); /* signal waiter */
3096 } 3276 }
3097 3277
3098 SvREFCNT_dec (cb); 3278 SvREFCNT_dec_NN (cb);
3099 3279
3100 --count; 3280 --count;
3101 } 3281 }
3102} 3282}
3103 3283
3188 } 3368 }
3189 3369
3190 av_push (state, data_sv); 3370 av_push (state, data_sv);
3191 3371
3192 api_ready (aTHX_ coro); 3372 api_ready (aTHX_ coro);
3193 SvREFCNT_dec (coro); 3373 SvREFCNT_dec_NN (coro);
3194 SvREFCNT_dec ((AV *)state); 3374 SvREFCNT_dec_NN ((AV *)state);
3195} 3375}
3196 3376
3197static int 3377static int
3198slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3378slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3199{ 3379{
3217 errno = data->errorno; 3397 errno = data->errorno;
3218 PL_laststype = data->laststype; 3398 PL_laststype = data->laststype;
3219 PL_laststatval = data->laststatval; 3399 PL_laststatval = data->laststatval;
3220 PL_statcache = data->statcache; 3400 PL_statcache = data->statcache;
3221 3401
3222 SvREFCNT_dec (data_sv); 3402 SvREFCNT_dec_NN (data_sv);
3223 } 3403 }
3224 3404
3225 /* push result values */ 3405 /* push result values */
3226 { 3406 {
3227 dSP; 3407 dSP;
3416 3596
3417 map_len = load_len + save_len + 16; 3597 map_len = load_len + save_len + 16;
3418 3598
3419 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 3599 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3420 3600
3601 if (map_base == (char *)MAP_FAILED)
3602 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3603
3421 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3604 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3422 3605
3423 load_perl_slots = (load_save_perl_slots_type)map_base; 3606 load_perl_slots = (load_save_perl_slots_type)map_base;
3424 memcpy (map_base, load_ptr, load_len); 3607 memcpy (map_base, load_ptr, load_len);
3425 3608
3442 3625
3443PROTOTYPES: DISABLE 3626PROTOTYPES: DISABLE
3444 3627
3445BOOT: 3628BOOT:
3446{ 3629{
3630#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3631#include "state.h"
3447#ifdef USE_ITHREADS 3632#ifdef USE_ITHREADS
3448# if CORO_PTHREAD 3633# if CORO_PTHREAD
3449 coro_thx = PERL_GET_CONTEXT; 3634 coro_thx = PERL_GET_CONTEXT;
3450# endif 3635# endif
3451#endif 3636#endif
3459 cctx_current = cctx_new_empty (); 3644 cctx_current = cctx_new_empty ();
3460 3645
3461 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3646 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3462 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3647 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3463 3648
3464 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3649 {
3465 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3650 /*
3466 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3651 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3652 * by coro_sig_vtbl in hash values.
3653 */
3654 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3655
3656 /* this only works if perl doesn't have a vtbl for %SIG */
3657 assert (!mg->mg_virtual);
3658
3659 /*
3660 * The irony is that the perl API itself asserts that mg_virtual
3661 * must be non-const, yet perl5porters insisted on marking their
3662 * vtbls as read-only, just to thwart perl modules from patching
3663 * them.
3664 */
3665 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3666 mg->mg_flags |= MGf_COPY;
3667
3668 coro_sigelem_vtbl = PL_vtbl_sigelem;
3669 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3670 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3671 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3672 }
3467 3673
3468 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3469 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3674 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3470 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3675 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3471 3676
3472 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3677 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3473 3678
3779 if (ecb_expect_false (current == self)) 3984 if (ecb_expect_false (current == self))
3780 coro_times_sub (SvSTATE (coro_current)); 3985 coro_times_sub (SvSTATE (coro_current));
3781} 3986}
3782 3987
3783void 3988void
3784swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3989swap_sv (Coro::State coro, SV *sva, SV *svb)
3785 CODE: 3990 CODE:
3786{ 3991{
3787 struct coro *current = SvSTATE_current; 3992 struct coro *current = SvSTATE_current;
3993 AV *swap_sv;
3994 int i;
3995
3996 sva = SvRV (sva);
3997 svb = SvRV (svb);
3788 3998
3789 if (current == coro) 3999 if (current == coro)
3790 SWAP_SVS (current); 4000 SWAP_SVS_LEAVE (current);
3791 4001
3792 if (!coro->swap_sv) 4002 if (!coro->swap_sv)
3793 coro->swap_sv = newAV (); 4003 coro->swap_sv = newAV ();
3794 4004
4005 swap_sv = coro->swap_sv;
4006
4007 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4008 {
4009 SV *a = AvARRAY (swap_sv)[i ];
4010 SV *b = AvARRAY (swap_sv)[i + 1];
4011
4012 if (a == sva && b == svb)
4013 {
4014 SvREFCNT_dec_NN (a);
4015 SvREFCNT_dec_NN (b);
4016
4017 for (; i <= AvFILLp (swap_sv) - 2; i++)
4018 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4019
4020 AvFILLp (swap_sv) -= 2;
4021
4022 goto removed;
4023 }
4024 }
4025
3795 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4026 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3796 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4027 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4028
4029 removed:
3797 4030
3798 if (current == coro) 4031 if (current == coro)
3799 SWAP_SVS (current); 4032 SWAP_SVS_ENTER (current);
3800} 4033}
3801 4034
3802 4035
3803MODULE = Coro::State PACKAGE = Coro 4036MODULE = Coro::State PACKAGE = Coro
3804 4037
3805BOOT: 4038BOOT:
3806{ 4039{
4040 if (SVt_LAST > 32)
4041 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4042
3807 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4043 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3808 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4044 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3809 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4045 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3810 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4046 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3811 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4047 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3837 coroapi.ready = api_ready; 4073 coroapi.ready = api_ready;
3838 coroapi.is_ready = api_is_ready; 4074 coroapi.is_ready = api_is_ready;
3839 coroapi.nready = coro_nready; 4075 coroapi.nready = coro_nready;
3840 coroapi.current = coro_current; 4076 coroapi.current = coro_current;
3841 4077
4078 coroapi.enterleave_hook = api_enterleave_hook;
4079 coroapi.enterleave_unhook = api_enterleave_unhook;
4080 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4081
3842 /*GCoroAPI = &coroapi;*/ 4082 /*GCoroAPI = &coroapi;*/
3843 sv_setiv (sv, (IV)&coroapi); 4083 sv_setiv (sv, PTR2IV (&coroapi));
3844 SvREADONLY_on (sv); 4084 SvREADONLY_on (sv);
3845 } 4085 }
3846} 4086}
3847 4087
3848SV * 4088SV *
3911 4151
3912void 4152void
3913_set_current (SV *current) 4153_set_current (SV *current)
3914 PROTOTYPE: $ 4154 PROTOTYPE: $
3915 CODE: 4155 CODE:
3916 SvREFCNT_dec (SvRV (coro_current)); 4156 SvREFCNT_dec_NN (SvRV (coro_current));
3917 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4157 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3918 4158
3919void 4159void
3920_set_readyhook (SV *hook) 4160_set_readyhook (SV *hook)
3921 PROTOTYPE: $ 4161 PROTOTYPE: $
4005 4245
4006 if ((SV *)hv == &PL_sv_undef) 4246 if ((SV *)hv == &PL_sv_undef)
4007 { 4247 {
4008 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4248 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
4009 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4249 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4010 SvREFCNT_dec (sv); 4250 SvREFCNT_dec_NN (sv);
4011 } 4251 }
4012 4252
4013 { 4253 {
4014 struct coro *coro = SvSTATE_hv (hv); 4254 struct coro *coro = SvSTATE_hv (hv);
4015 4255
4022 api_ready (aTHX_ (SV *)hv); 4262 api_ready (aTHX_ (SV *)hv);
4023 4263
4024 if (GIMME_V != G_VOID) 4264 if (GIMME_V != G_VOID)
4025 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4265 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4026 else 4266 else
4027 SvREFCNT_dec (hv); 4267 SvREFCNT_dec_NN (hv);
4028} 4268}
4029 4269
4030SV * 4270SV *
4031rouse_cb () 4271rouse_cb ()
4032 PROTOTYPE: 4272 PROTOTYPE:
4111 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4351 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4112 OUTPUT: 4352 OUTPUT:
4113 RETVAL 4353 RETVAL
4114 4354
4115void 4355void
4116up (SV *self, int adjust = 1) 4356up (SV *self)
4117 ALIAS:
4118 adjust = 1
4119 CODE: 4357 CODE:
4358 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4359
4360void
4361adjust (SV *self, int adjust)
4362 CODE:
4120 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4363 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4121 4364
4122void 4365void
4123down (...) 4366down (...)
4124 CODE: 4367 CODE:
4125 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4368 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines