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.444 by root, Thu May 1 08:09:18 2014 UTC vs.
Revision 1.467 by root, Sun Jun 26 21:46:03 2016 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/* perl usually suppressed asserts. for debugging, we sometimes force it to be on */
122#if 0
123# undef NDEBUG
124# include <assert.h>
125#endif
126
107static double (*nvtime)(); /* so why doesn't it take void? */ 127static double (*nvtime)(); /* so why doesn't it take void? */
108static void (*u2time)(pTHX_ UV ret[2]); 128static void (*u2time)(pTHX_ UV ret[2]);
109 129
110/* we hijack an hopefully unused CV flag for our purposes */ 130/* we hijack an hopefully unused CV flag for our purposes */
111#define CVf_SLF 0x4000 131#define CVf_SLF 0x4000
126 146
127static GV *irsgv; /* $/ */ 147static GV *irsgv; /* $/ */
128static GV *stdoutgv; /* *STDOUT */ 148static GV *stdoutgv; /* *STDOUT */
129static SV *rv_diehook; 149static SV *rv_diehook;
130static SV *rv_warnhook; 150static SV *rv_warnhook;
131static HV *hv_sig; /* %SIG */
132 151
133/* async_pool helper stuff */ 152/* async_pool helper stuff */
134static SV *sv_pool_rss; 153static SV *sv_pool_rss;
135static SV *sv_pool_size; 154static SV *sv_pool_size;
136static SV *sv_async_pool_idle; /* description string */ 155static SV *sv_async_pool_idle; /* description string */
242 SV *saved_deffh; 261 SV *saved_deffh;
243 SV *invoke_cb; 262 SV *invoke_cb;
244 AV *invoke_av; 263 AV *invoke_av;
245 264
246 /* on_enter/on_leave */ 265 /* on_enter/on_leave */
247 AV *on_enter; 266 AV *on_enter; AV *on_enter_xs;
248 AV *on_leave; 267 AV *on_leave; AV *on_leave_xs;
249 268
250 /* swap_sv */ 269 /* swap_sv */
251 AV *swap_sv; 270 AV *swap_sv;
252 271
253 /* times */ 272 /* times */
489 508
490 return 0; 509 return 0;
491} 510}
492 511
493ecb_inline struct coro * 512ecb_inline struct coro *
494SvSTATE_ (pTHX_ SV *coro) 513SvSTATE_ (pTHX_ SV *coro_sv)
495{ 514{
496 MAGIC *mg; 515 MAGIC *mg;
497 516
498 if (SvROK (coro)) 517 if (SvROK (coro_sv))
499 coro = SvRV (coro); 518 coro_sv = SvRV (coro_sv);
500 519
501 mg = SvSTATEhv_p (aTHX_ coro); 520 mg = SvSTATEhv_p (aTHX_ coro_sv);
502 if (!mg) 521 if (!mg)
503 croak ("Coro::State object required"); 522 croak ("Coro::State object required");
504 523
505 return (struct coro *)mg->mg_ptr; 524 return (struct coro *)mg->mg_ptr;
506} 525}
517ecb_inline PADLIST * 536ecb_inline PADLIST *
518coro_derive_padlist (pTHX_ CV *cv) 537coro_derive_padlist (pTHX_ CV *cv)
519{ 538{
520 PADLIST *padlist = CvPADLIST (cv); 539 PADLIST *padlist = CvPADLIST (cv);
521 PADLIST *newpadlist; 540 PADLIST *newpadlist;
541 PADNAMELIST *padnames;
522 PAD *newpad; 542 PAD *newpad;
523 PADOFFSET off = PadlistMAX (padlist) + 1; 543 PADOFFSET off = PadlistMAX (padlist) + 1;
524 544
525#if NEWPADAPI 545#if NEWPADAPI
526 546
553 AvREAL_off (newpadlist); 573 AvREAL_off (newpadlist);
554#endif 574#endif
555 575
556 /* Already extended to 2 elements by newPADLIST. */ 576 /* Already extended to 2 elements by newPADLIST. */
557 PadlistMAX (newpadlist) = 1; 577 PadlistMAX (newpadlist) = 1;
558 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist)); 578
579 padnames = PadlistNAMES (padlist);
580 ++PadnamelistREFCNT (padnames);
581 PadlistNAMES (newpadlist) = padnames;
582
559 PadlistARRAY (newpadlist)[1] = newpad; 583 PadlistARRAY (newpadlist)[1] = newpad;
560 584
561 return newpadlist; 585 return newpadlist;
562} 586}
563 587
584 PadMAX (pad) = -1; 608 PadMAX (pad) = -1;
585 SvREFCNT_dec (pad); 609 SvREFCNT_dec (pad);
586 } 610 }
587 } 611 }
588 612
589 SvREFCNT_dec (PadlistNAMES (padlist)); 613 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
590 614
591#if NEWPADAPI 615#if NEWPADAPI
592 Safefree (PadlistARRAY (padlist)); 616 Safefree (PadlistARRAY (padlist));
593 Safefree (padlist); 617 Safefree (padlist);
594#else 618#else
690 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u; 714 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
691 715
692 /* if SvANY points to the head, we need to adjust the pointers, 716 /* 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. 717 * as the pointer for a still points to b, and maybe vice versa.
694 */ 718 */
695 #define svany_in_head(type) \ 719 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))) 720 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
721 svany_in_head_set |= 1 << SVt_NV;
722 #endif
723
724 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
697 725
698 if (svany_in_head (SvTYPE (a))) 726 if (svany_in_head (SvTYPE (a)))
699 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 727 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
700 728
701 if (svany_in_head (SvTYPE (b))) 729 if (svany_in_head (SvTYPE (b)))
704#endif 732#endif
705} 733}
706 734
707/* swap sv heads, at least logically */ 735/* swap sv heads, at least logically */
708static void 736static void
709swap_svs (pTHX_ Coro__State c) 737swap_svs_enter (pTHX_ Coro__State c)
710{ 738{
711 int i; 739 int i;
712 740
713 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 741 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
714 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]); 742 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
715} 743}
716 744
745static void
746swap_svs_leave (pTHX_ Coro__State c)
747{
748 int i;
749
750 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
751 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
752}
753
717#define SWAP_SVS(coro) \ 754#define SWAP_SVS_ENTER(coro) \
718 if (ecb_expect_false ((coro)->swap_sv)) \ 755 if (ecb_expect_false ((coro)->swap_sv)) \
719 swap_svs (aTHX_ (coro)) 756 swap_svs_enter (aTHX_ (coro))
757
758#define SWAP_SVS_LEAVE(coro) \
759 if (ecb_expect_false ((coro)->swap_sv)) \
760 swap_svs_leave (aTHX_ (coro))
720 761
721static void 762static void
722on_enterleave_call (pTHX_ SV *cb); 763on_enterleave_call (pTHX_ SV *cb);
723 764
724static void 765static void
769 810
770 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 811 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
771 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 812 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
772 } 813 }
773 814
815 if (ecb_expect_false (c->on_enter_xs))
816 {
817 int i;
818
819 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
820 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
821 }
822
774 SWAP_SVS (c); 823 SWAP_SVS_ENTER (c);
775} 824}
776 825
777static void 826static void
778save_perl (pTHX_ Coro__State c) 827save_perl (pTHX_ Coro__State c)
779{ 828{
780 SWAP_SVS (c); 829 SWAP_SVS_LEAVE (c);
830
831 if (ecb_expect_false (c->on_leave_xs))
832 {
833 int i;
834
835 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
836 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
837 }
781 838
782 if (ecb_expect_false (c->on_leave)) 839 if (ecb_expect_false (c->on_leave))
783 { 840 {
784 int i; 841 int i;
785 842
912#endif 969#endif
913 970
914 New(54,PL_savestack,24,ANY); 971 New(54,PL_savestack,24,ANY);
915 PL_savestack_ix = 0; 972 PL_savestack_ix = 0;
916 PL_savestack_max = 24; 973 PL_savestack_max = 24;
974#if PERL_VERSION_ATLEAST (5,24,0)
975 /* perl 5.24 moves SS_MAXPUSH optimisation from */
976 /* the header macros to PL_savestack_max */
977 PL_savestack_max -= SS_MAXPUSH;
978#endif
917 979
918#if !PERL_VERSION_ATLEAST (5,10,0) 980#if !PERL_VERSION_ATLEAST (5,10,0)
919 New(54,PL_retstack,4,OP*); 981 New(54,PL_retstack,4,OP*);
920 PL_retstack_ix = 0; 982 PL_retstack_ix = 0;
921 PL_retstack_max = 4; 983 PL_retstack_max = 4;
987 } 1049 }
988 1050
989 return rss; 1051 return rss;
990} 1052}
991 1053
992/** coroutine stack handling ************************************************/ 1054/** 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 1055
998/* apparently < 5.8.8 */ 1056/* apparently < 5.8.8 */
999#ifndef MgPV_nolen_const 1057#ifndef MgPV_nolen_const
1000#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1058#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
1001 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1059 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
1002 (const char*)(mg)->mg_ptr) 1060 (const char*)(mg)->mg_ptr)
1003#endif 1061#endif
1062
1063/* this will be a patched copy of PL_vtbl_sigelem */
1064static MGVTBL coro_sigelem_vtbl;
1065
1066static int ecb_cold
1067coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
1068{
1069 char *key = SvPV_nolen ((SV *)name);
1070
1071 /* do what mg_copy normally does */
1072 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1073 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1074
1075 /* patch sigelem vtbl, but only for __WARN__ and __DIE__ */
1076 if (*key == '_'
1077 && (strEQ (key, "__DIE__")
1078 || strEQ (key, "__WARN__")))
1079 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1080
1081 return 1;
1082}
1083
1084/* perl does not have a %SIG vtbl, we provide one so we can override */
1085/* the magic vtbl for the __DIE__ and __WARN__ members */
1086static const MGVTBL coro_sig_vtbl = {
1087 0, 0, 0, 0, 0,
1088 coro_sig_copy
1089};
1004 1090
1005/* 1091/*
1006 * This overrides the default magic get method of %SIG elements. 1092 * 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 1093 * 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), 1094 * and instead of trying to save and restore the hash elements (extremely slow),
1010 */ 1096 */
1011static int ecb_cold 1097static int ecb_cold
1012coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1098coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
1013{ 1099{
1014 const char *s = MgPV_nolen_const (mg); 1100 const char *s = MgPV_nolen_const (mg);
1101 /* the key must be either __DIE__ or __WARN__ here */
1102 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1015 1103
1016 if (*s == '_') 1104 SV *ssv;
1017 {
1018 SV **svp = 0;
1019 1105
1020 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1021 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1022
1023 if (svp) 1106 if (!*svp)
1024 {
1025 SV *ssv;
1026
1027 if (!*svp)
1028 ssv = &PL_sv_undef; 1107 ssv = &PL_sv_undef;
1029 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */ 1108 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1030 ssv = sv_2mortal (newRV_inc (*svp)); 1109 ssv = sv_2mortal (newRV_inc (*svp));
1031 else 1110 else
1032 ssv = *svp; 1111 ssv = *svp;
1033 1112
1034 sv_setsv (sv, ssv); 1113 sv_setsv (sv, ssv);
1035 return 0; 1114 return 0;
1036 }
1037 }
1038
1039 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
1040} 1115}
1041 1116
1042static int ecb_cold 1117static int ecb_cold
1043coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1118coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
1044{ 1119{
1045 const char *s = MgPV_nolen_const (mg); 1120 const char *s = MgPV_nolen_const (mg);
1121 /* the key must be either __DIE__ or __WARN__ here */
1122 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1046 1123
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; 1124 SV *old = *svp;
1057 *svp = 0; 1125 *svp = 0;
1058 SvREFCNT_dec (old); 1126 SvREFCNT_dec (old);
1059 return 0; 1127 return 0;
1060 }
1061 }
1062
1063 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1064} 1128}
1065 1129
1066static int ecb_cold 1130static int ecb_cold
1067coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1131coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1068{ 1132{
1069 const char *s = MgPV_nolen_const (mg); 1133 const char *s = MgPV_nolen_const (mg);
1134 /* the key must be either __DIE__ or __WARN__ here */
1135 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1070 1136
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; 1137 SV *old = *svp;
1081 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1138 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1082 SvREFCNT_dec (old); 1139 SvREFCNT_dec (old);
1083 return 0; 1140 return 0;
1084 }
1085 }
1086
1087 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1088} 1141}
1089 1142
1090static void 1143static void
1091prepare_nop (pTHX_ struct coro_transfer_args *ta) 1144prepare_nop (pTHX_ struct coro_transfer_args *ta)
1092{ 1145{
1103static int 1156static int
1104slf_check_repeat (pTHX_ struct CoroSLF *frame) 1157slf_check_repeat (pTHX_ struct CoroSLF *frame)
1105{ 1158{
1106 return 1; 1159 return 1;
1107} 1160}
1161
1162/** coroutine stack handling ************************************************/
1108 1163
1109static UNOP init_perl_op; 1164static UNOP init_perl_op;
1110 1165
1111ecb_noinline static void /* noinline to keep it out of the transfer fast path */ 1166ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1112init_perl (pTHX_ struct coro *coro) 1167init_perl (pTHX_ struct coro *coro)
1138 1193
1139 GvSV (PL_defgv) = newSV (0); 1194 GvSV (PL_defgv) = newSV (0);
1140 GvAV (PL_defgv) = coro->args; coro->args = 0; 1195 GvAV (PL_defgv) = coro->args; coro->args = 0;
1141 GvSV (PL_errgv) = newSV (0); 1196 GvSV (PL_errgv) = newSV (0);
1142 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1197 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1143 GvHV (PL_hintgv) = 0; 1198 GvHV (PL_hintgv) = newHV ();
1199#if PERL_VERSION_ATLEAST (5,10,0)
1200 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1201#endif
1144 PL_rs = newSVsv (GvSV (irsgv)); 1202 PL_rs = newSVsv (GvSV (irsgv));
1145 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1203 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1146 1204
1147 { 1205 {
1148 dSP; 1206 dSP;
1176 PL_op = (OP *)&init_perl_op; 1234 PL_op = (OP *)&init_perl_op;
1177 1235
1178 /* copy throw, in case it was set before init_perl */ 1236 /* copy throw, in case it was set before init_perl */
1179 CORO_THROW = coro->except; 1237 CORO_THROW = coro->except;
1180 1238
1181 SWAP_SVS (coro); 1239 SWAP_SVS_ENTER (coro);
1182 1240
1183 if (ecb_expect_false (enable_times)) 1241 if (ecb_expect_false (enable_times))
1184 { 1242 {
1185 coro_times_update (); 1243 coro_times_update ();
1186 coro_times_sub (coro); 1244 coro_times_sub (coro);
1224 /* this will cause transfer_check to croak on block*/ 1282 /* this will cause transfer_check to croak on block*/
1225 SvRV_set (coro_current, (SV *)coro->hv); 1283 SvRV_set (coro_current, (SV *)coro->hv);
1226 1284
1227 load_perl (aTHX_ coro); 1285 load_perl (aTHX_ coro);
1228 1286
1287 /* restore swapped sv's */
1288 SWAP_SVS_LEAVE (coro);
1289
1229 coro_unwind_stacks (aTHX); 1290 coro_unwind_stacks (aTHX);
1230
1231 /* restore swapped sv's */
1232 SWAP_SVS (coro);
1233 1291
1234 coro_destruct_stacks (aTHX); 1292 coro_destruct_stacks (aTHX);
1235 1293
1236 /* now save some sv's to be free'd later */ 1294 /* now save some sv's to be free'd later */
1237 svf [0] = GvSV (PL_defgv); 1295 svf [0] = GvSV (PL_defgv);
1258 1316
1259 SvREFCNT_dec (coro->saved_deffh); 1317 SvREFCNT_dec (coro->saved_deffh);
1260 SvREFCNT_dec (coro->rouse_cb); 1318 SvREFCNT_dec (coro->rouse_cb);
1261 SvREFCNT_dec (coro->invoke_cb); 1319 SvREFCNT_dec (coro->invoke_cb);
1262 SvREFCNT_dec (coro->invoke_av); 1320 SvREFCNT_dec (coro->invoke_av);
1321 SvREFCNT_dec (coro->on_enter_xs);
1322 SvREFCNT_dec (coro->on_leave_xs);
1263 } 1323 }
1264} 1324}
1265 1325
1266ecb_inline void 1326ecb_inline void
1267free_coro_mortal (pTHX) 1327free_coro_mortal (pTHX)
1330 1390
1331 if (PL_curcop != &PL_compiling) 1391 if (PL_curcop != &PL_compiling)
1332 { 1392 {
1333 SV **cb; 1393 SV **cb;
1334 1394
1335 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1395 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1336 { 1396 {
1337 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1397 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1338 1398
1339 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1399 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1340 { 1400 {
1482 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1542 * 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. 1543 * runtime errors here, as this is just a random interpreter, not a thread.
1484 */ 1544 */
1485 1545
1486 /* 1546 /*
1547 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1548 * requires PL_scopestack_ix, so do it here if required.
1549 */
1550 if (!PL_scopestack_ix)
1551 ENTER;
1552
1553 /*
1487 * If perl-run returns we assume exit() was being called or the coro 1554 * 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) 1555 * 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 1556 * reason for perl_run to return. We try to mimic whatever perl is normally
1490 * doing in that case. YMMV. 1557 * doing in that case. YMMV.
1491 */ 1558 */
1927 1994
1928 ENTER; 1995 ENTER;
1929 SAVETMPS; 1996 SAVETMPS;
1930 1997
1931 PUSHMARK (SP); 1998 PUSHMARK (SP);
1932 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught", 0))); 1999 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1933 PUTBACK; 2000 PUTBACK;
1934 call_pv ("Carp::confess", G_VOID | G_DISCARD); 2001 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1935 2002
1936 FREETMPS; 2003 FREETMPS;
1937 LEAVE; 2004 LEAVE;
2370 else 2437 else
2371 { 2438 {
2372 av_clear (GvAV (PL_defgv)); 2439 av_clear (GvAV (PL_defgv));
2373 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2440 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2374 2441
2442 if (ecb_expect_false (coro->swap_sv))
2443 {
2444 SWAP_SVS_LEAVE (coro);
2445 SvREFCNT_dec_NN (coro->swap_sv);
2446 coro->swap_sv = 0;
2447 }
2448
2375 coro->prio = 0; 2449 coro->prio = 0;
2376 2450
2377 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2451 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2378 api_trace (aTHX_ coro_current, 0); 2452 api_trace (aTHX_ coro_current, 0);
2379 2453
2380 frame->prepare = prepare_schedule; 2454 frame->prepare = prepare_schedule;
2381 av_push (av_async_pool, SvREFCNT_inc (hv)); 2455 av_push (av_async_pool, SvREFCNT_inc (hv));
2382 } 2456 }
2807static void 2881static void
2808coro_pop_on_leave (pTHX_ void *coro) 2882coro_pop_on_leave (pTHX_ void *coro)
2809{ 2883{
2810 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2884 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2811 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2885 on_enterleave_call (aTHX_ sv_2mortal (cb));
2886}
2887
2888static void
2889enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2890{
2891 if (!hook)
2892 return;
2893
2894 if (!*avp)
2895 {
2896 *avp = newAV ();
2897 AvREAL_off (*avp);
2898 }
2899
2900 av_push (*avp, (SV *)hook);
2901 av_push (*avp, (SV *)arg);
2902}
2903
2904static void
2905enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2906{
2907 AV *av = *avp;
2908 int i;
2909
2910 if (!av)
2911 return;
2912
2913 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2914 if (AvARRAY (av)[i] == (SV *)hook)
2915 {
2916 if (execute)
2917 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2918
2919 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2920 av_pop (av);
2921 av_pop (av);
2922 break;
2923 }
2924
2925 if (AvFILLp (av) >= 0)
2926 {
2927 *avp = 0;
2928 SvREFCNT_dec_NN (av);
2929 }
2930}
2931
2932static void
2933api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2934{
2935 struct coro *coro = SvSTATE (coro_sv);
2936
2937 if (SvSTATE_current == coro)
2938 if (enter)
2939 enter (aTHX_ enter_arg);
2940
2941 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2942 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2943}
2944
2945static void
2946api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2947{
2948 struct coro *coro = SvSTATE (coro_sv);
2949
2950 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2951 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2952}
2953
2954static void
2955savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2956{
2957 struct coro *coro = SvSTATE_current;
2958
2959 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2960}
2961
2962static void
2963savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2964{
2965 struct coro *coro = SvSTATE_current;
2966
2967 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2968}
2969
2970static void
2971api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2972{
2973 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2974
2975 /* this ought to be much cheaper than malloc + a single destructor call */
2976 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2977 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2812} 2978}
2813 2979
2814/*****************************************************************************/ 2980/*****************************************************************************/
2815/* PerlIO::cede */ 2981/* PerlIO::cede */
2816 2982
2946 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3112 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2947 PUTBACK; 3113 PUTBACK;
2948 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3114 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2949 } 3115 }
2950 3116
2951 SvREFCNT_dec (cb); 3117 SvREFCNT_dec_NN (cb);
2952 } 3118 }
2953} 3119}
2954 3120
2955static void 3121static void
2956coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3122coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
3096 { 3262 {
3097 api_ready (aTHX_ cb); 3263 api_ready (aTHX_ cb);
3098 sv_setiv (cb, 0); /* signal waiter */ 3264 sv_setiv (cb, 0); /* signal waiter */
3099 } 3265 }
3100 3266
3101 SvREFCNT_dec (cb); 3267 SvREFCNT_dec_NN (cb);
3102 3268
3103 --count; 3269 --count;
3104 } 3270 }
3105} 3271}
3106 3272
3191 } 3357 }
3192 3358
3193 av_push (state, data_sv); 3359 av_push (state, data_sv);
3194 3360
3195 api_ready (aTHX_ coro); 3361 api_ready (aTHX_ coro);
3196 SvREFCNT_dec (coro); 3362 SvREFCNT_dec_NN (coro);
3197 SvREFCNT_dec ((AV *)state); 3363 SvREFCNT_dec_NN ((AV *)state);
3198} 3364}
3199 3365
3200static int 3366static int
3201slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3367slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3202{ 3368{
3220 errno = data->errorno; 3386 errno = data->errorno;
3221 PL_laststype = data->laststype; 3387 PL_laststype = data->laststype;
3222 PL_laststatval = data->laststatval; 3388 PL_laststatval = data->laststatval;
3223 PL_statcache = data->statcache; 3389 PL_statcache = data->statcache;
3224 3390
3225 SvREFCNT_dec (data_sv); 3391 SvREFCNT_dec_NN (data_sv);
3226 } 3392 }
3227 3393
3228 /* push result values */ 3394 /* push result values */
3229 { 3395 {
3230 dSP; 3396 dSP;
3445 3611
3446PROTOTYPES: DISABLE 3612PROTOTYPES: DISABLE
3447 3613
3448BOOT: 3614BOOT:
3449{ 3615{
3450#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl"); 3616#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3451#include "state.h" 3617#include "state.h"
3452#ifdef USE_ITHREADS 3618#ifdef USE_ITHREADS
3453# if CORO_PTHREAD 3619# if CORO_PTHREAD
3454 coro_thx = PERL_GET_CONTEXT; 3620 coro_thx = PERL_GET_CONTEXT;
3455# endif 3621# endif
3464 cctx_current = cctx_new_empty (); 3630 cctx_current = cctx_new_empty ();
3465 3631
3466 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3632 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3467 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3633 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3468 3634
3469 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3635 {
3470 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3636 /*
3471 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3637 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3638 * by coro_sig_vtbl in hash values.
3639 */
3640 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3641
3642 /* this only works if perl doesn't have a vtbl for %SIG */
3643 assert (!mg->mg_virtual);
3644
3645 /*
3646 * The irony is that the perl API itself asserts that mg_virtual
3647 * must be non-const, yet perl5porters insisted on marking their
3648 * vtbls as read-only, just to thwart perl modules from patching
3649 * them.
3650 */
3651 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3652 mg->mg_flags |= MGf_COPY;
3653
3654 coro_sigelem_vtbl = PL_vtbl_sigelem;
3655 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3656 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3657 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3658 }
3472 3659
3473 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3474 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3660 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3475 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3661 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3476 3662
3477 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3663 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3478 3664
3784 if (ecb_expect_false (current == self)) 3970 if (ecb_expect_false (current == self))
3785 coro_times_sub (SvSTATE (coro_current)); 3971 coro_times_sub (SvSTATE (coro_current));
3786} 3972}
3787 3973
3788void 3974void
3789swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3975swap_sv (Coro::State coro, SV *sva, SV *svb)
3790 CODE: 3976 CODE:
3791{ 3977{
3792 struct coro *current = SvSTATE_current; 3978 struct coro *current = SvSTATE_current;
3979 AV *swap_sv;
3980 int i;
3981
3982 sva = SvRV (sva);
3983 svb = SvRV (svb);
3793 3984
3794 if (current == coro) 3985 if (current == coro)
3795 SWAP_SVS (current); 3986 SWAP_SVS_LEAVE (current);
3796 3987
3797 if (!coro->swap_sv) 3988 if (!coro->swap_sv)
3798 coro->swap_sv = newAV (); 3989 coro->swap_sv = newAV ();
3799 3990
3991 swap_sv = coro->swap_sv;
3992
3993 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
3994 {
3995 SV *a = AvARRAY (swap_sv)[i ];
3996 SV *b = AvARRAY (swap_sv)[i + 1];
3997
3998 if (a == sva && b == svb)
3999 {
4000 SvREFCNT_dec_NN (a);
4001 SvREFCNT_dec_NN (b);
4002
4003 for (; i <= AvFILLp (swap_sv) - 2; i++)
4004 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4005
4006 AvFILLp (swap_sv) -= 2;
4007
4008 goto removed;
4009 }
4010 }
4011
3800 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4012 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3801 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4013 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4014
4015 removed:
3802 4016
3803 if (current == coro) 4017 if (current == coro)
3804 SWAP_SVS (current); 4018 SWAP_SVS_ENTER (current);
3805} 4019}
3806 4020
3807 4021
3808MODULE = Coro::State PACKAGE = Coro 4022MODULE = Coro::State PACKAGE = Coro
3809 4023
3810BOOT: 4024BOOT:
3811{ 4025{
4026 if (SVt_LAST > 32)
4027 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4028
3812 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4029 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3813 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4030 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3814 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4031 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3815 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4032 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3816 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4033 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3842 coroapi.ready = api_ready; 4059 coroapi.ready = api_ready;
3843 coroapi.is_ready = api_is_ready; 4060 coroapi.is_ready = api_is_ready;
3844 coroapi.nready = coro_nready; 4061 coroapi.nready = coro_nready;
3845 coroapi.current = coro_current; 4062 coroapi.current = coro_current;
3846 4063
4064 coroapi.enterleave_hook = api_enterleave_hook;
4065 coroapi.enterleave_unhook = api_enterleave_unhook;
4066 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4067
3847 /*GCoroAPI = &coroapi;*/ 4068 /*GCoroAPI = &coroapi;*/
3848 sv_setiv (sv, (IV)&coroapi); 4069 sv_setiv (sv, (IV)&coroapi);
3849 SvREADONLY_on (sv); 4070 SvREADONLY_on (sv);
3850 } 4071 }
3851} 4072}
3916 4137
3917void 4138void
3918_set_current (SV *current) 4139_set_current (SV *current)
3919 PROTOTYPE: $ 4140 PROTOTYPE: $
3920 CODE: 4141 CODE:
3921 SvREFCNT_dec (SvRV (coro_current)); 4142 SvREFCNT_dec_NN (SvRV (coro_current));
3922 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4143 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3923 4144
3924void 4145void
3925_set_readyhook (SV *hook) 4146_set_readyhook (SV *hook)
3926 PROTOTYPE: $ 4147 PROTOTYPE: $
4010 4231
4011 if ((SV *)hv == &PL_sv_undef) 4232 if ((SV *)hv == &PL_sv_undef)
4012 { 4233 {
4013 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4234 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
4014 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4235 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4015 SvREFCNT_dec (sv); 4236 SvREFCNT_dec_NN (sv);
4016 } 4237 }
4017 4238
4018 { 4239 {
4019 struct coro *coro = SvSTATE_hv (hv); 4240 struct coro *coro = SvSTATE_hv (hv);
4020 4241
4027 api_ready (aTHX_ (SV *)hv); 4248 api_ready (aTHX_ (SV *)hv);
4028 4249
4029 if (GIMME_V != G_VOID) 4250 if (GIMME_V != G_VOID)
4030 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4251 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4031 else 4252 else
4032 SvREFCNT_dec (hv); 4253 SvREFCNT_dec_NN (hv);
4033} 4254}
4034 4255
4035SV * 4256SV *
4036rouse_cb () 4257rouse_cb ()
4037 PROTOTYPE: 4258 PROTOTYPE:
4116 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4337 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4117 OUTPUT: 4338 OUTPUT:
4118 RETVAL 4339 RETVAL
4119 4340
4120void 4341void
4121up (SV *self, int adjust = 1) 4342up (SV *self)
4122 ALIAS:
4123 adjust = 1
4124 CODE: 4343 CODE:
4344 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4345
4346void
4347adjust (SV *self, int adjust)
4348 CODE:
4125 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4349 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4126 4350
4127void 4351void
4128down (...) 4352down (...)
4129 CODE: 4353 CODE:
4130 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4354 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines