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.441 by root, Tue Mar 4 05:07:44 2014 UTC vs.
Revision 1.469 by root, Fri Jul 14 02:43:50 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#if PERL_VERSION_ATLEAST(5,24,0)
122# define SUB_ARGARRAY PL_curpad[0]
123#else
124# define SUB_ARGARRAY (SV *)cx->blk_sub.argarray
125#endif
126
127/* perl usually suppressed asserts. for debugging, we sometimes force it to be on */
128#if 0
129# undef NDEBUG
130# include <assert.h>
131#endif
132
107static double (*nvtime)(); /* so why doesn't it take void? */ 133static double (*nvtime)(); /* so why doesn't it take void? */
108static void (*u2time)(pTHX_ UV ret[2]); 134static void (*u2time)(pTHX_ UV ret[2]);
109 135
110/* we hijack an hopefully unused CV flag for our purposes */ 136/* we hijack an hopefully unused CV flag for our purposes */
111#define CVf_SLF 0x4000 137#define CVf_SLF 0x4000
126 152
127static GV *irsgv; /* $/ */ 153static GV *irsgv; /* $/ */
128static GV *stdoutgv; /* *STDOUT */ 154static GV *stdoutgv; /* *STDOUT */
129static SV *rv_diehook; 155static SV *rv_diehook;
130static SV *rv_warnhook; 156static SV *rv_warnhook;
131static HV *hv_sig; /* %SIG */
132 157
133/* async_pool helper stuff */ 158/* async_pool helper stuff */
134static SV *sv_pool_rss; 159static SV *sv_pool_rss;
135static SV *sv_pool_size; 160static SV *sv_pool_size;
136static SV *sv_async_pool_idle; /* description string */ 161static SV *sv_async_pool_idle; /* description string */
242 SV *saved_deffh; 267 SV *saved_deffh;
243 SV *invoke_cb; 268 SV *invoke_cb;
244 AV *invoke_av; 269 AV *invoke_av;
245 270
246 /* on_enter/on_leave */ 271 /* on_enter/on_leave */
247 AV *on_enter; 272 AV *on_enter; AV *on_enter_xs;
248 AV *on_leave; 273 AV *on_leave; AV *on_leave_xs;
249 274
250 /* swap_sv */ 275 /* swap_sv */
251 AV *swap_sv; 276 AV *swap_sv;
252 277
253 /* times */ 278 /* times */
489 514
490 return 0; 515 return 0;
491} 516}
492 517
493ecb_inline struct coro * 518ecb_inline struct coro *
494SvSTATE_ (pTHX_ SV *coro) 519SvSTATE_ (pTHX_ SV *coro_sv)
495{ 520{
496 MAGIC *mg; 521 MAGIC *mg;
497 522
498 if (SvROK (coro)) 523 if (SvROK (coro_sv))
499 coro = SvRV (coro); 524 coro_sv = SvRV (coro_sv);
500 525
501 mg = SvSTATEhv_p (aTHX_ coro); 526 mg = SvSTATEhv_p (aTHX_ coro_sv);
502 if (!mg) 527 if (!mg)
503 croak ("Coro::State object required"); 528 croak ("Coro::State object required");
504 529
505 return (struct coro *)mg->mg_ptr; 530 return (struct coro *)mg->mg_ptr;
506} 531}
517ecb_inline PADLIST * 542ecb_inline PADLIST *
518coro_derive_padlist (pTHX_ CV *cv) 543coro_derive_padlist (pTHX_ CV *cv)
519{ 544{
520 PADLIST *padlist = CvPADLIST (cv); 545 PADLIST *padlist = CvPADLIST (cv);
521 PADLIST *newpadlist; 546 PADLIST *newpadlist;
547 PADNAMELIST *padnames;
522 PAD *newpad; 548 PAD *newpad;
523 PADOFFSET off = PadlistMAX (padlist) + 1; 549 PADOFFSET off = PadlistMAX (padlist) + 1;
524 550
525#if NEWPADAPI 551#if NEWPADAPI
526 552
553 AvREAL_off (newpadlist); 579 AvREAL_off (newpadlist);
554#endif 580#endif
555 581
556 /* Already extended to 2 elements by newPADLIST. */ 582 /* Already extended to 2 elements by newPADLIST. */
557 PadlistMAX (newpadlist) = 1; 583 PadlistMAX (newpadlist) = 1;
558 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist)); 584
585 padnames = PadlistNAMES (padlist);
586 ++PadnamelistREFCNT (padnames);
587 PadlistNAMES (newpadlist) = padnames;
588
559 PadlistARRAY (newpadlist)[1] = newpad; 589 PadlistARRAY (newpadlist)[1] = newpad;
560 590
561 return newpadlist; 591 return newpadlist;
562} 592}
563 593
584 PadMAX (pad) = -1; 614 PadMAX (pad) = -1;
585 SvREFCNT_dec (pad); 615 SvREFCNT_dec (pad);
586 } 616 }
587 } 617 }
588 618
589 SvREFCNT_dec (PadlistNAMES (padlist)); 619 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
590 620
591#if NEWPADAPI 621#if NEWPADAPI
592 Safefree (PadlistARRAY (padlist)); 622 Safefree (PadlistARRAY (padlist));
593 Safefree (padlist); 623 Safefree (padlist);
594#else 624#else
690 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u; 720 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
691 721
692 /* if SvANY points to the head, we need to adjust the pointers, 722 /* 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. 723 * as the pointer for a still points to b, and maybe vice versa.
694 */ 724 */
695 #define svany_in_head(type) \ 725 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))) 726 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
727 svany_in_head_set |= 1 << SVt_NV;
728 #endif
729
730 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
697 731
698 if (svany_in_head (SvTYPE (a))) 732 if (svany_in_head (SvTYPE (a)))
699 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 733 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
700 734
701 if (svany_in_head (SvTYPE (b))) 735 if (svany_in_head (SvTYPE (b)))
704#endif 738#endif
705} 739}
706 740
707/* swap sv heads, at least logically */ 741/* swap sv heads, at least logically */
708static void 742static void
709swap_svs (pTHX_ Coro__State c) 743swap_svs_enter (pTHX_ Coro__State c)
710{ 744{
711 int i; 745 int i;
712 746
713 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 747 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
714 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]); 748 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
715} 749}
716 750
751static void
752swap_svs_leave (pTHX_ Coro__State c)
753{
754 int i;
755
756 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
757 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
758}
759
717#define SWAP_SVS(coro) \ 760#define SWAP_SVS_ENTER(coro) \
718 if (ecb_expect_false ((coro)->swap_sv)) \ 761 if (ecb_expect_false ((coro)->swap_sv)) \
719 swap_svs (aTHX_ (coro)) 762 swap_svs_enter (aTHX_ (coro))
763
764#define SWAP_SVS_LEAVE(coro) \
765 if (ecb_expect_false ((coro)->swap_sv)) \
766 swap_svs_leave (aTHX_ (coro))
720 767
721static void 768static void
722on_enterleave_call (pTHX_ SV *cb); 769on_enterleave_call (pTHX_ SV *cb);
723 770
724static void 771static void
769 816
770 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 817 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
771 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 818 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
772 } 819 }
773 820
821 if (ecb_expect_false (c->on_enter_xs))
822 {
823 int i;
824
825 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
826 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
827 }
828
774 SWAP_SVS (c); 829 SWAP_SVS_ENTER (c);
775} 830}
776 831
777static void 832static void
778save_perl (pTHX_ Coro__State c) 833save_perl (pTHX_ Coro__State c)
779{ 834{
780 SWAP_SVS (c); 835 SWAP_SVS_LEAVE (c);
836
837 if (ecb_expect_false (c->on_leave_xs))
838 {
839 int i;
840
841 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
842 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
843 }
781 844
782 if (ecb_expect_false (c->on_leave)) 845 if (ecb_expect_false (c->on_leave))
783 { 846 {
784 int i; 847 int i;
785 848
912#endif 975#endif
913 976
914 New(54,PL_savestack,24,ANY); 977 New(54,PL_savestack,24,ANY);
915 PL_savestack_ix = 0; 978 PL_savestack_ix = 0;
916 PL_savestack_max = 24; 979 PL_savestack_max = 24;
980#if PERL_VERSION_ATLEAST (5,24,0)
981 /* perl 5.24 moves SS_MAXPUSH optimisation from */
982 /* the header macros to PL_savestack_max */
983 PL_savestack_max -= SS_MAXPUSH;
984#endif
917 985
918#if !PERL_VERSION_ATLEAST (5,10,0) 986#if !PERL_VERSION_ATLEAST (5,10,0)
919 New(54,PL_retstack,4,OP*); 987 New(54,PL_retstack,4,OP*);
920 PL_retstack_ix = 0; 988 PL_retstack_ix = 0;
921 PL_retstack_max = 4; 989 PL_retstack_max = 4;
987 } 1055 }
988 1056
989 return rss; 1057 return rss;
990} 1058}
991 1059
992/** coroutine stack handling ************************************************/ 1060/** 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 1061
998/* apparently < 5.8.8 */ 1062/* apparently < 5.8.8 */
999#ifndef MgPV_nolen_const 1063#ifndef MgPV_nolen_const
1000#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1064#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
1001 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1065 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
1002 (const char*)(mg)->mg_ptr) 1066 (const char*)(mg)->mg_ptr)
1003#endif 1067#endif
1068
1069/* this will be a patched copy of PL_vtbl_sigelem */
1070static MGVTBL coro_sigelem_vtbl;
1071
1072static int ecb_cold
1073coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
1074{
1075 char *key = SvPV_nolen ((SV *)name);
1076
1077 /* do what mg_copy normally does */
1078 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1079 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1080
1081 /* patch sigelem vtbl, but only for __WARN__ and __DIE__ */
1082 if (*key == '_'
1083 && (strEQ (key, "__DIE__")
1084 || strEQ (key, "__WARN__")))
1085 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1086
1087 return 1;
1088}
1089
1090/* perl does not have a %SIG vtbl, we provide one so we can override */
1091/* the magic vtbl for the __DIE__ and __WARN__ members */
1092static const MGVTBL coro_sig_vtbl = {
1093 0, 0, 0, 0, 0,
1094 coro_sig_copy
1095};
1004 1096
1005/* 1097/*
1006 * This overrides the default magic get method of %SIG elements. 1098 * 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 1099 * 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), 1100 * and instead of trying to save and restore the hash elements (extremely slow),
1010 */ 1102 */
1011static int ecb_cold 1103static int ecb_cold
1012coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1104coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
1013{ 1105{
1014 const char *s = MgPV_nolen_const (mg); 1106 const char *s = MgPV_nolen_const (mg);
1107 /* the key must be either __DIE__ or __WARN__ here */
1108 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1015 1109
1016 if (*s == '_') 1110 SV *ssv;
1017 {
1018 SV **svp = 0;
1019 1111
1020 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1021 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1022
1023 if (svp) 1112 if (!*svp)
1024 {
1025 SV *ssv;
1026
1027 if (!*svp)
1028 ssv = &PL_sv_undef; 1113 ssv = &PL_sv_undef;
1029 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */ 1114 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1030 ssv = sv_2mortal (newRV_inc (*svp)); 1115 ssv = sv_2mortal (newRV_inc (*svp));
1031 else 1116 else
1032 ssv = *svp; 1117 ssv = *svp;
1033 1118
1034 sv_setsv (sv, ssv); 1119 sv_setsv (sv, ssv);
1035 return 0; 1120 return 0;
1036 }
1037 }
1038
1039 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
1040} 1121}
1041 1122
1042static int ecb_cold 1123static int ecb_cold
1043coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1124coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
1044{ 1125{
1045 const char *s = MgPV_nolen_const (mg); 1126 const char *s = MgPV_nolen_const (mg);
1127 /* the key must be either __DIE__ or __WARN__ here */
1128 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1046 1129
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; 1130 SV *old = *svp;
1057 *svp = 0; 1131 *svp = 0;
1058 SvREFCNT_dec (old); 1132 SvREFCNT_dec (old);
1059 return 0; 1133 return 0;
1060 }
1061 }
1062
1063 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1064} 1134}
1065 1135
1066static int ecb_cold 1136static int ecb_cold
1067coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1137coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1068{ 1138{
1069 const char *s = MgPV_nolen_const (mg); 1139 const char *s = MgPV_nolen_const (mg);
1140 /* the key must be either __DIE__ or __WARN__ here */
1141 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1070 1142
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; 1143 SV *old = *svp;
1081 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1144 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1082 SvREFCNT_dec (old); 1145 SvREFCNT_dec (old);
1083 return 0; 1146 return 0;
1084 }
1085 }
1086
1087 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1088} 1147}
1089 1148
1090static void 1149static void
1091prepare_nop (pTHX_ struct coro_transfer_args *ta) 1150prepare_nop (pTHX_ struct coro_transfer_args *ta)
1092{ 1151{
1103static int 1162static int
1104slf_check_repeat (pTHX_ struct CoroSLF *frame) 1163slf_check_repeat (pTHX_ struct CoroSLF *frame)
1105{ 1164{
1106 return 1; 1165 return 1;
1107} 1166}
1167
1168/** coroutine stack handling ************************************************/
1108 1169
1109static UNOP init_perl_op; 1170static UNOP init_perl_op;
1110 1171
1111ecb_noinline static void /* noinline to keep it out of the transfer fast path */ 1172ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1112init_perl (pTHX_ struct coro *coro) 1173init_perl (pTHX_ struct coro *coro)
1138 1199
1139 GvSV (PL_defgv) = newSV (0); 1200 GvSV (PL_defgv) = newSV (0);
1140 GvAV (PL_defgv) = coro->args; coro->args = 0; 1201 GvAV (PL_defgv) = coro->args; coro->args = 0;
1141 GvSV (PL_errgv) = newSV (0); 1202 GvSV (PL_errgv) = newSV (0);
1142 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1203 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1143 GvHV (PL_hintgv) = 0; 1204 GvHV (PL_hintgv) = newHV ();
1205#if PERL_VERSION_ATLEAST (5,10,0)
1206 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1207#endif
1144 PL_rs = newSVsv (GvSV (irsgv)); 1208 PL_rs = newSVsv (GvSV (irsgv));
1145 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1209 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1146 1210
1147 { 1211 {
1148 dSP; 1212 dSP;
1176 PL_op = (OP *)&init_perl_op; 1240 PL_op = (OP *)&init_perl_op;
1177 1241
1178 /* copy throw, in case it was set before init_perl */ 1242 /* copy throw, in case it was set before init_perl */
1179 CORO_THROW = coro->except; 1243 CORO_THROW = coro->except;
1180 1244
1181 SWAP_SVS (coro); 1245 SWAP_SVS_ENTER (coro);
1182 1246
1183 if (ecb_expect_false (enable_times)) 1247 if (ecb_expect_false (enable_times))
1184 { 1248 {
1185 coro_times_update (); 1249 coro_times_update ();
1186 coro_times_sub (coro); 1250 coro_times_sub (coro);
1224 /* this will cause transfer_check to croak on block*/ 1288 /* this will cause transfer_check to croak on block*/
1225 SvRV_set (coro_current, (SV *)coro->hv); 1289 SvRV_set (coro_current, (SV *)coro->hv);
1226 1290
1227 load_perl (aTHX_ coro); 1291 load_perl (aTHX_ coro);
1228 1292
1293 /* restore swapped sv's */
1294 SWAP_SVS_LEAVE (coro);
1295
1229 coro_unwind_stacks (aTHX); 1296 coro_unwind_stacks (aTHX);
1230
1231 /* restore swapped sv's */
1232 SWAP_SVS (coro);
1233 1297
1234 coro_destruct_stacks (aTHX); 1298 coro_destruct_stacks (aTHX);
1235 1299
1236 /* now save some sv's to be free'd later */ 1300 /* now save some sv's to be free'd later */
1237 svf [0] = GvSV (PL_defgv); 1301 svf [0] = GvSV (PL_defgv);
1258 1322
1259 SvREFCNT_dec (coro->saved_deffh); 1323 SvREFCNT_dec (coro->saved_deffh);
1260 SvREFCNT_dec (coro->rouse_cb); 1324 SvREFCNT_dec (coro->rouse_cb);
1261 SvREFCNT_dec (coro->invoke_cb); 1325 SvREFCNT_dec (coro->invoke_cb);
1262 SvREFCNT_dec (coro->invoke_av); 1326 SvREFCNT_dec (coro->invoke_av);
1327 SvREFCNT_dec (coro->on_enter_xs);
1328 SvREFCNT_dec (coro->on_leave_xs);
1263 } 1329 }
1264} 1330}
1265 1331
1266ecb_inline void 1332ecb_inline void
1267free_coro_mortal (pTHX) 1333free_coro_mortal (pTHX)
1330 1396
1331 if (PL_curcop != &PL_compiling) 1397 if (PL_curcop != &PL_compiling)
1332 { 1398 {
1333 SV **cb; 1399 SV **cb;
1334 1400
1335 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1401 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1336 { 1402 {
1337 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1403 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1338 1404
1339 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1405 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1340 { 1406 {
1350 SAVETMPS; 1416 SAVETMPS;
1351 EXTEND (SP, 3); 1417 EXTEND (SP, 3);
1352 PUSHMARK (SP); 1418 PUSHMARK (SP);
1353 PUSHs (&PL_sv_yes); 1419 PUSHs (&PL_sv_yes);
1354 PUSHs (fullname); 1420 PUSHs (fullname);
1355 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1421 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc (SUB_ARGARRAY)) : &PL_sv_undef);
1356 PUTBACK; 1422 PUTBACK;
1357 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1423 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); 1424 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1359 SPAGAIN; 1425 SPAGAIN;
1360 FREETMPS; 1426 FREETMPS;
1482 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1548 * 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. 1549 * runtime errors here, as this is just a random interpreter, not a thread.
1484 */ 1550 */
1485 1551
1486 /* 1552 /*
1553 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1554 * requires PL_scopestack_ix, so do it here if required.
1555 */
1556 if (!PL_scopestack_ix)
1557 ENTER;
1558
1559 /*
1487 * If perl-run returns we assume exit() was being called or the coro 1560 * 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) 1561 * 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 1562 * reason for perl_run to return. We try to mimic whatever perl is normally
1490 * doing in that case. YMMV. 1563 * doing in that case. YMMV.
1491 */ 1564 */
1927 2000
1928 ENTER; 2001 ENTER;
1929 SAVETMPS; 2002 SAVETMPS;
1930 2003
1931 PUSHMARK (SP); 2004 PUSHMARK (SP);
1932 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught", 0))); 2005 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1933 PUTBACK; 2006 PUTBACK;
1934 call_pv ("Carp::confess", G_VOID | G_DISCARD); 2007 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1935 2008
1936 FREETMPS; 2009 FREETMPS;
1937 LEAVE; 2010 LEAVE;
2248 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2321 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2249 } 2322 }
2250 else 2323 else
2251 { 2324 {
2252 struct coro *self = SvSTATE_current; 2325 struct coro *self = SvSTATE_current;
2326
2327 if (!self)
2328 croak ("Coro::cancel called outside of thread content,");
2253 2329
2254 /* otherwise we cancel directly, purely for speed reasons 2330 /* otherwise we cancel directly, purely for speed reasons
2255 * unfortunately, this requires some magic trickery, as 2331 * unfortunately, this requires some magic trickery, as
2256 * somebody else could cancel us, so we have to fight the cancellation. 2332 * somebody else could cancel us, so we have to fight the cancellation.
2257 * this is ugly, and hopefully fully worth the extra speed. 2333 * this is ugly, and hopefully fully worth the extra speed.
2367 else 2443 else
2368 { 2444 {
2369 av_clear (GvAV (PL_defgv)); 2445 av_clear (GvAV (PL_defgv));
2370 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2446 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2371 2447
2448 if (ecb_expect_false (coro->swap_sv))
2449 {
2450 SWAP_SVS_LEAVE (coro);
2451 SvREFCNT_dec_NN (coro->swap_sv);
2452 coro->swap_sv = 0;
2453 }
2454
2372 coro->prio = 0; 2455 coro->prio = 0;
2373 2456
2374 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2457 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2375 api_trace (aTHX_ coro_current, 0); 2458 api_trace (aTHX_ coro_current, 0);
2376 2459
2377 frame->prepare = prepare_schedule; 2460 frame->prepare = prepare_schedule;
2378 av_push (av_async_pool, SvREFCNT_inc (hv)); 2461 av_push (av_async_pool, SvREFCNT_inc (hv));
2379 } 2462 }
2608 * Since by definition the SLF call will not finish when we destroy 2691 * Since by definition the SLF call will not finish when we destroy
2609 * the coro, we will have to force-finish it here, otherwise 2692 * the coro, we will have to force-finish it here, otherwise
2610 * cleanup functions cannot call SLF functions. 2693 * cleanup functions cannot call SLF functions.
2611 */ 2694 */
2612 coro->slf_frame.prepare = 0; 2695 coro->slf_frame.prepare = 0;
2613 coro->slf_frame.destroy = 0;
2614 2696
2615 /* this callback is reserved for slf functions needing to do cleanup */ 2697 /* this callback is reserved for slf functions needing to do cleanup */
2616 if (frame.destroy && frame.prepare && !PL_dirty) 2698 if (frame.destroy && frame.prepare && !PL_dirty)
2617 frame.destroy (aTHX_ &frame); 2699 frame.destroy (aTHX_ &frame);
2618} 2700}
2805static void 2887static void
2806coro_pop_on_leave (pTHX_ void *coro) 2888coro_pop_on_leave (pTHX_ void *coro)
2807{ 2889{
2808 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2890 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2809 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2891 on_enterleave_call (aTHX_ sv_2mortal (cb));
2892}
2893
2894static void
2895enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2896{
2897 if (!hook)
2898 return;
2899
2900 if (!*avp)
2901 {
2902 *avp = newAV ();
2903 AvREAL_off (*avp);
2904 }
2905
2906 av_push (*avp, (SV *)hook);
2907 av_push (*avp, (SV *)arg);
2908}
2909
2910static void
2911enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2912{
2913 AV *av = *avp;
2914 int i;
2915
2916 if (!av)
2917 return;
2918
2919 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2920 if (AvARRAY (av)[i] == (SV *)hook)
2921 {
2922 if (execute)
2923 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2924
2925 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2926 av_pop (av);
2927 av_pop (av);
2928 break;
2929 }
2930
2931 if (AvFILLp (av) >= 0)
2932 {
2933 *avp = 0;
2934 SvREFCNT_dec_NN (av);
2935 }
2936}
2937
2938static void
2939api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2940{
2941 struct coro *coro = SvSTATE (coro_sv);
2942
2943 if (SvSTATE_current == coro)
2944 if (enter)
2945 enter (aTHX_ enter_arg);
2946
2947 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2948 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2949}
2950
2951static void
2952api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2953{
2954 struct coro *coro = SvSTATE (coro_sv);
2955
2956 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2957 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2958}
2959
2960static void
2961savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2962{
2963 struct coro *coro = SvSTATE_current;
2964
2965 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2966}
2967
2968static void
2969savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2970{
2971 struct coro *coro = SvSTATE_current;
2972
2973 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2974}
2975
2976static void
2977api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2978{
2979 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2980
2981 /* this ought to be much cheaper than malloc + a single destructor call */
2982 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2983 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2810} 2984}
2811 2985
2812/*****************************************************************************/ 2986/*****************************************************************************/
2813/* PerlIO::cede */ 2987/* PerlIO::cede */
2814 2988
2944 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3118 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2945 PUTBACK; 3119 PUTBACK;
2946 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3120 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2947 } 3121 }
2948 3122
2949 SvREFCNT_dec (cb); 3123 SvREFCNT_dec_NN (cb);
2950 } 3124 }
2951} 3125}
2952 3126
2953static void 3127static void
2954coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3128coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2962{ 3136{
2963 AV *av = (AV *)frame->data; 3137 AV *av = (AV *)frame->data;
2964 SV *count_sv = AvARRAY (av)[0]; 3138 SV *count_sv = AvARRAY (av)[0];
2965 SV *coro_hv = SvRV (coro_current); 3139 SV *coro_hv = SvRV (coro_current);
2966 3140
3141 frame->destroy = 0;
3142
2967 /* if we are about to throw, don't actually acquire the lock, just throw */ 3143 /* if we are about to throw, don't actually acquire the lock, just throw */
2968 if (CORO_THROW) 3144 if (ecb_expect_false (CORO_THROW))
3145 {
3146 /* we still might be responsible for the semaphore, so wake up others */
3147 coro_semaphore_adjust (aTHX_ av, 0);
3148
2969 return 0; 3149 return 0;
3150 }
2970 else if (SvIVX (count_sv) > 0) 3151 else if (SvIVX (count_sv) > 0)
2971 { 3152 {
2972 frame->destroy = 0;
2973
2974 if (acquire) 3153 if (acquire)
2975 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3154 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2976 else 3155 else
2977 coro_semaphore_adjust (aTHX_ av, 0); 3156 coro_semaphore_adjust (aTHX_ av, 0);
2978 3157
3089 { 3268 {
3090 api_ready (aTHX_ cb); 3269 api_ready (aTHX_ cb);
3091 sv_setiv (cb, 0); /* signal waiter */ 3270 sv_setiv (cb, 0); /* signal waiter */
3092 } 3271 }
3093 3272
3094 SvREFCNT_dec (cb); 3273 SvREFCNT_dec_NN (cb);
3095 3274
3096 --count; 3275 --count;
3097 } 3276 }
3098} 3277}
3099 3278
3184 } 3363 }
3185 3364
3186 av_push (state, data_sv); 3365 av_push (state, data_sv);
3187 3366
3188 api_ready (aTHX_ coro); 3367 api_ready (aTHX_ coro);
3189 SvREFCNT_dec (coro); 3368 SvREFCNT_dec_NN (coro);
3190 SvREFCNT_dec ((AV *)state); 3369 SvREFCNT_dec_NN ((AV *)state);
3191} 3370}
3192 3371
3193static int 3372static int
3194slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3373slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3195{ 3374{
3213 errno = data->errorno; 3392 errno = data->errorno;
3214 PL_laststype = data->laststype; 3393 PL_laststype = data->laststype;
3215 PL_laststatval = data->laststatval; 3394 PL_laststatval = data->laststatval;
3216 PL_statcache = data->statcache; 3395 PL_statcache = data->statcache;
3217 3396
3218 SvREFCNT_dec (data_sv); 3397 SvREFCNT_dec_NN (data_sv);
3219 } 3398 }
3220 3399
3221 /* push result values */ 3400 /* push result values */
3222 { 3401 {
3223 dSP; 3402 dSP;
3412 3591
3413 map_len = load_len + save_len + 16; 3592 map_len = load_len + save_len + 16;
3414 3593
3415 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 3594 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3416 3595
3596 if (map_base == (char *)MAP_FAILED)
3597 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3598
3417 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3599 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3418 3600
3419 load_perl_slots = (load_save_perl_slots_type)map_base; 3601 load_perl_slots = (load_save_perl_slots_type)map_base;
3420 memcpy (map_base, load_ptr, load_len); 3602 memcpy (map_base, load_ptr, load_len);
3421 3603
3438 3620
3439PROTOTYPES: DISABLE 3621PROTOTYPES: DISABLE
3440 3622
3441BOOT: 3623BOOT:
3442{ 3624{
3625#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3626#include "state.h"
3443#ifdef USE_ITHREADS 3627#ifdef USE_ITHREADS
3444# if CORO_PTHREAD 3628# if CORO_PTHREAD
3445 coro_thx = PERL_GET_CONTEXT; 3629 coro_thx = PERL_GET_CONTEXT;
3446# endif 3630# endif
3447#endif 3631#endif
3455 cctx_current = cctx_new_empty (); 3639 cctx_current = cctx_new_empty ();
3456 3640
3457 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3641 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3458 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3642 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3459 3643
3460 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3644 {
3461 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3645 /*
3462 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3646 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3647 * by coro_sig_vtbl in hash values.
3648 */
3649 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3650
3651 /* this only works if perl doesn't have a vtbl for %SIG */
3652 assert (!mg->mg_virtual);
3653
3654 /*
3655 * The irony is that the perl API itself asserts that mg_virtual
3656 * must be non-const, yet perl5porters insisted on marking their
3657 * vtbls as read-only, just to thwart perl modules from patching
3658 * them.
3659 */
3660 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3661 mg->mg_flags |= MGf_COPY;
3662
3663 coro_sigelem_vtbl = PL_vtbl_sigelem;
3664 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3665 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3666 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3667 }
3463 3668
3464 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3465 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3669 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3466 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3670 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3467 3671
3468 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3672 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3469 3673
3775 if (ecb_expect_false (current == self)) 3979 if (ecb_expect_false (current == self))
3776 coro_times_sub (SvSTATE (coro_current)); 3980 coro_times_sub (SvSTATE (coro_current));
3777} 3981}
3778 3982
3779void 3983void
3780swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3984swap_sv (Coro::State coro, SV *sva, SV *svb)
3781 CODE: 3985 CODE:
3782{ 3986{
3783 struct coro *current = SvSTATE_current; 3987 struct coro *current = SvSTATE_current;
3988 AV *swap_sv;
3989 int i;
3990
3991 sva = SvRV (sva);
3992 svb = SvRV (svb);
3784 3993
3785 if (current == coro) 3994 if (current == coro)
3786 SWAP_SVS (current); 3995 SWAP_SVS_LEAVE (current);
3787 3996
3788 if (!coro->swap_sv) 3997 if (!coro->swap_sv)
3789 coro->swap_sv = newAV (); 3998 coro->swap_sv = newAV ();
3790 3999
4000 swap_sv = coro->swap_sv;
4001
4002 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4003 {
4004 SV *a = AvARRAY (swap_sv)[i ];
4005 SV *b = AvARRAY (swap_sv)[i + 1];
4006
4007 if (a == sva && b == svb)
4008 {
4009 SvREFCNT_dec_NN (a);
4010 SvREFCNT_dec_NN (b);
4011
4012 for (; i <= AvFILLp (swap_sv) - 2; i++)
4013 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4014
4015 AvFILLp (swap_sv) -= 2;
4016
4017 goto removed;
4018 }
4019 }
4020
3791 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4021 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3792 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4022 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4023
4024 removed:
3793 4025
3794 if (current == coro) 4026 if (current == coro)
3795 SWAP_SVS (current); 4027 SWAP_SVS_ENTER (current);
3796} 4028}
3797 4029
3798 4030
3799MODULE = Coro::State PACKAGE = Coro 4031MODULE = Coro::State PACKAGE = Coro
3800 4032
3801BOOT: 4033BOOT:
3802{ 4034{
4035 if (SVt_LAST > 32)
4036 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4037
3803 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4038 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3804 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4039 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3805 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4040 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3806 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4041 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3807 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4042 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3833 coroapi.ready = api_ready; 4068 coroapi.ready = api_ready;
3834 coroapi.is_ready = api_is_ready; 4069 coroapi.is_ready = api_is_ready;
3835 coroapi.nready = coro_nready; 4070 coroapi.nready = coro_nready;
3836 coroapi.current = coro_current; 4071 coroapi.current = coro_current;
3837 4072
4073 coroapi.enterleave_hook = api_enterleave_hook;
4074 coroapi.enterleave_unhook = api_enterleave_unhook;
4075 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4076
3838 /*GCoroAPI = &coroapi;*/ 4077 /*GCoroAPI = &coroapi;*/
3839 sv_setiv (sv, (IV)&coroapi); 4078 sv_setiv (sv, (IV)&coroapi);
3840 SvREADONLY_on (sv); 4079 SvREADONLY_on (sv);
3841 } 4080 }
3842} 4081}
3907 4146
3908void 4147void
3909_set_current (SV *current) 4148_set_current (SV *current)
3910 PROTOTYPE: $ 4149 PROTOTYPE: $
3911 CODE: 4150 CODE:
3912 SvREFCNT_dec (SvRV (coro_current)); 4151 SvREFCNT_dec_NN (SvRV (coro_current));
3913 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4152 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3914 4153
3915void 4154void
3916_set_readyhook (SV *hook) 4155_set_readyhook (SV *hook)
3917 PROTOTYPE: $ 4156 PROTOTYPE: $
4001 4240
4002 if ((SV *)hv == &PL_sv_undef) 4241 if ((SV *)hv == &PL_sv_undef)
4003 { 4242 {
4004 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4243 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
4005 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4244 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4006 SvREFCNT_dec (sv); 4245 SvREFCNT_dec_NN (sv);
4007 } 4246 }
4008 4247
4009 { 4248 {
4010 struct coro *coro = SvSTATE_hv (hv); 4249 struct coro *coro = SvSTATE_hv (hv);
4011 4250
4018 api_ready (aTHX_ (SV *)hv); 4257 api_ready (aTHX_ (SV *)hv);
4019 4258
4020 if (GIMME_V != G_VOID) 4259 if (GIMME_V != G_VOID)
4021 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4260 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4022 else 4261 else
4023 SvREFCNT_dec (hv); 4262 SvREFCNT_dec_NN (hv);
4024} 4263}
4025 4264
4026SV * 4265SV *
4027rouse_cb () 4266rouse_cb ()
4028 PROTOTYPE: 4267 PROTOTYPE:
4107 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4346 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4108 OUTPUT: 4347 OUTPUT:
4109 RETVAL 4348 RETVAL
4110 4349
4111void 4350void
4112up (SV *self, int adjust = 1) 4351up (SV *self)
4113 ALIAS:
4114 adjust = 1
4115 CODE: 4352 CODE:
4353 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4354
4355void
4356adjust (SV *self, int adjust)
4357 CODE:
4116 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4358 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4117 4359
4118void 4360void
4119down (...) 4361down (...)
4120 CODE: 4362 CODE:
4121 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4363 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines