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.477 by root, Sat Feb 29 21:40:22 2020 UTC

2#define USE_NO_MINGW_SETJMP_TWO_ARGS 2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3 3
4#define NDEBUG 1 /* perl usually disables NDEBUG later */ 4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5 5
6#include "libcoro/coro.c" 6#include "libcoro/coro.c"
7
8#if CORO_UCONTEXT
9 #define CORO_BACKEND "ucontext"
10#elif CORO_SJLJ
11 #define CORO_BACKEND "sjlj"
12#elif CORO_LINUX
13 #define CORO_BACKEND "linux"
14#elif CORO_LOSER
15 #define CORO_BACKEND "loser"
16#elif CORO_FIBER
17 #define CORO_BACKEND "fiber"
18#elif CORO_IRIX
19 #define CORO_BACKEND "irix"
20#elif CORO_ASM
21 #define CORO_BACKEND "asm"
22#elif CORO_PTHREAD
23 #define CORO_BACKEND "pthread"
24#else
25 #define CORO_BACKEND "unknown"
26#endif
7 27
8#define PERL_NO_GET_CONTEXT 28#define PERL_NO_GET_CONTEXT
9#define PERL_EXT 29#define PERL_EXT
10 30
11#include "EXTERN.h" 31#include "EXTERN.h"
21 41
22#include <stddef.h> 42#include <stddef.h>
23#include <stdio.h> 43#include <stdio.h>
24#include <errno.h> 44#include <errno.h>
25#include <assert.h> 45#include <assert.h>
46
47#ifndef SvREFCNT_dec_NN
48 #define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
49#endif
50
51#ifndef SvREFCNT_inc_NN
52 #define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
53#endif
26 54
27#ifndef SVs_PADSTALE 55#ifndef SVs_PADSTALE
28# define SVs_PADSTALE 0 56# define SVs_PADSTALE 0
29#endif 57#endif
30 58
42# define PadlistNAMES(pl) (*PadlistARRAY (pl)) 70# define PadlistNAMES(pl) (*PadlistARRAY (pl))
43# define PadARRAY AvARRAY 71# define PadARRAY AvARRAY
44# define PadMAX AvFILLp 72# define PadMAX AvFILLp
45# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1)) 73# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
46#endif 74#endif
75#ifndef PadnamelistREFCNT
76# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
77#endif
78#ifndef PadnamelistREFCNT_dec
79# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
80#endif
47 81
48/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */ 82/* 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 */ 83/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
50#if PERL_VERSION_ATLEAST(5,19,0) 84#if PERL_VERSION_ATLEAST(5,19,0)
51# define SVt_BIND SVt_IV 85# define SVt_BIND SVt_IV
102# define CORO_CLOCK_MONOTONIC 1 136# define CORO_CLOCK_MONOTONIC 1
103# define CORO_CLOCK_THREAD_CPUTIME_ID 3 137# define CORO_CLOCK_THREAD_CPUTIME_ID 3
104# endif 138# endif
105#endif 139#endif
106 140
141/* one off bugfix for perl 5.22 */
142#if PERL_VERSION_ATLEAST(5,22,0) && !PERL_VERSION_ATLEAST(5,24,0)
143# undef PadlistNAMES
144# define PadlistNAMES(pl) *((PADNAMELIST **)PadlistARRAY (pl))
145#endif
146
147#if PERL_VERSION_ATLEAST(5,24,0)
148# define SUB_ARGARRAY PL_curpad[0]
149#else
150# define SUB_ARGARRAY (SV *)cx->blk_sub.argarray
151#endif
152
153/* perl usually suppresses asserts. for debugging, we sometimes force it to be on */
154#if 0
155# undef NDEBUG
156# include <assert.h>
157#endif
158
107static double (*nvtime)(); /* so why doesn't it take void? */ 159static double (*nvtime)(); /* so why doesn't it take void? */
108static void (*u2time)(pTHX_ UV ret[2]); 160static void (*u2time)(pTHX_ UV ret[2]);
109 161
110/* we hijack an hopefully unused CV flag for our purposes */ 162/* we hijack an hopefully unused CV flag for our purposes */
111#define CVf_SLF 0x4000 163#define CVf_SLF 0x4000
126 178
127static GV *irsgv; /* $/ */ 179static GV *irsgv; /* $/ */
128static GV *stdoutgv; /* *STDOUT */ 180static GV *stdoutgv; /* *STDOUT */
129static SV *rv_diehook; 181static SV *rv_diehook;
130static SV *rv_warnhook; 182static SV *rv_warnhook;
131static HV *hv_sig; /* %SIG */
132 183
133/* async_pool helper stuff */ 184/* async_pool helper stuff */
134static SV *sv_pool_rss; 185static SV *sv_pool_rss;
135static SV *sv_pool_size; 186static SV *sv_pool_size;
136static SV *sv_async_pool_idle; /* description string */ 187static SV *sv_async_pool_idle; /* description string */
242 SV *saved_deffh; 293 SV *saved_deffh;
243 SV *invoke_cb; 294 SV *invoke_cb;
244 AV *invoke_av; 295 AV *invoke_av;
245 296
246 /* on_enter/on_leave */ 297 /* on_enter/on_leave */
247 AV *on_enter; 298 AV *on_enter; AV *on_enter_xs;
248 AV *on_leave; 299 AV *on_leave; AV *on_leave_xs;
249 300
250 /* swap_sv */ 301 /* swap_sv */
251 AV *swap_sv; 302 AV *swap_sv;
252 303
253 /* times */ 304 /* times */
489 540
490 return 0; 541 return 0;
491} 542}
492 543
493ecb_inline struct coro * 544ecb_inline struct coro *
494SvSTATE_ (pTHX_ SV *coro) 545SvSTATE_ (pTHX_ SV *coro_sv)
495{ 546{
496 MAGIC *mg; 547 MAGIC *mg;
497 548
498 if (SvROK (coro)) 549 if (SvROK (coro_sv))
499 coro = SvRV (coro); 550 coro_sv = SvRV (coro_sv);
500 551
501 mg = SvSTATEhv_p (aTHX_ coro); 552 mg = SvSTATEhv_p (aTHX_ coro_sv);
502 if (!mg) 553 if (!mg)
503 croak ("Coro::State object required"); 554 croak ("Coro::State object required");
504 555
505 return (struct coro *)mg->mg_ptr; 556 return (struct coro *)mg->mg_ptr;
506} 557}
517ecb_inline PADLIST * 568ecb_inline PADLIST *
518coro_derive_padlist (pTHX_ CV *cv) 569coro_derive_padlist (pTHX_ CV *cv)
519{ 570{
520 PADLIST *padlist = CvPADLIST (cv); 571 PADLIST *padlist = CvPADLIST (cv);
521 PADLIST *newpadlist; 572 PADLIST *newpadlist;
573 PADNAMELIST *padnames;
522 PAD *newpad; 574 PAD *newpad;
523 PADOFFSET off = PadlistMAX (padlist) + 1; 575 PADOFFSET off = PadlistMAX (padlist) + 1;
524 576
525#if NEWPADAPI 577#if NEWPADAPI
526 578
553 AvREAL_off (newpadlist); 605 AvREAL_off (newpadlist);
554#endif 606#endif
555 607
556 /* Already extended to 2 elements by newPADLIST. */ 608 /* Already extended to 2 elements by newPADLIST. */
557 PadlistMAX (newpadlist) = 1; 609 PadlistMAX (newpadlist) = 1;
558 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist)); 610
611 padnames = PadlistNAMES (padlist);
612 ++PadnamelistREFCNT (padnames);
613 PadlistNAMES (newpadlist) = padnames;
614
559 PadlistARRAY (newpadlist)[1] = newpad; 615 PadlistARRAY (newpadlist)[1] = newpad;
560 616
561 return newpadlist; 617 return newpadlist;
562} 618}
563 619
584 PadMAX (pad) = -1; 640 PadMAX (pad) = -1;
585 SvREFCNT_dec (pad); 641 SvREFCNT_dec (pad);
586 } 642 }
587 } 643 }
588 644
589 SvREFCNT_dec (PadlistNAMES (padlist)); 645 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
590 646
591#if NEWPADAPI 647#if NEWPADAPI
592 Safefree (PadlistARRAY (padlist)); 648 Safefree (PadlistARRAY (padlist));
593 Safefree (padlist); 649 Safefree (padlist);
594#else 650#else
690 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u; 746 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
691 747
692 /* if SvANY points to the head, we need to adjust the pointers, 748 /* 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. 749 * as the pointer for a still points to b, and maybe vice versa.
694 */ 750 */
695 #define svany_in_head(type) \ 751 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))) 752 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
753 svany_in_head_set |= 1 << SVt_NV;
754 #endif
755
756 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
697 757
698 if (svany_in_head (SvTYPE (a))) 758 if (svany_in_head (SvTYPE (a)))
699 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 759 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
700 760
701 if (svany_in_head (SvTYPE (b))) 761 if (svany_in_head (SvTYPE (b)))
704#endif 764#endif
705} 765}
706 766
707/* swap sv heads, at least logically */ 767/* swap sv heads, at least logically */
708static void 768static void
709swap_svs (pTHX_ Coro__State c) 769swap_svs_enter (pTHX_ Coro__State c)
710{ 770{
711 int i; 771 int i;
712 772
713 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 773 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
714 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]); 774 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
715} 775}
716 776
777static void
778swap_svs_leave (pTHX_ Coro__State c)
779{
780 int i;
781
782 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
783 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
784}
785
717#define SWAP_SVS(coro) \ 786#define SWAP_SVS_ENTER(coro) \
718 if (ecb_expect_false ((coro)->swap_sv)) \ 787 if (ecb_expect_false ((coro)->swap_sv)) \
719 swap_svs (aTHX_ (coro)) 788 swap_svs_enter (aTHX_ (coro))
789
790#define SWAP_SVS_LEAVE(coro) \
791 if (ecb_expect_false ((coro)->swap_sv)) \
792 swap_svs_leave (aTHX_ (coro))
720 793
721static void 794static void
722on_enterleave_call (pTHX_ SV *cb); 795on_enterleave_call (pTHX_ SV *cb);
723 796
724static void 797static void
769 842
770 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 843 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
771 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 844 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
772 } 845 }
773 846
847 if (ecb_expect_false (c->on_enter_xs))
848 {
849 int i;
850
851 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
852 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
853 }
854
774 SWAP_SVS (c); 855 SWAP_SVS_ENTER (c);
775} 856}
776 857
777static void 858static void
778save_perl (pTHX_ Coro__State c) 859save_perl (pTHX_ Coro__State c)
779{ 860{
780 SWAP_SVS (c); 861 SWAP_SVS_LEAVE (c);
862
863 if (ecb_expect_false (c->on_leave_xs))
864 {
865 int i;
866
867 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
868 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
869 }
781 870
782 if (ecb_expect_false (c->on_leave)) 871 if (ecb_expect_false (c->on_leave))
783 { 872 {
784 int i; 873 int i;
785 874
912#endif 1001#endif
913 1002
914 New(54,PL_savestack,24,ANY); 1003 New(54,PL_savestack,24,ANY);
915 PL_savestack_ix = 0; 1004 PL_savestack_ix = 0;
916 PL_savestack_max = 24; 1005 PL_savestack_max = 24;
1006#if PERL_VERSION_ATLEAST (5,24,0)
1007 /* perl 5.24 moves SS_MAXPUSH optimisation from */
1008 /* the header macros to PL_savestack_max */
1009 PL_savestack_max -= SS_MAXPUSH;
1010#endif
917 1011
918#if !PERL_VERSION_ATLEAST (5,10,0) 1012#if !PERL_VERSION_ATLEAST (5,10,0)
919 New(54,PL_retstack,4,OP*); 1013 New(54,PL_retstack,4,OP*);
920 PL_retstack_ix = 0; 1014 PL_retstack_ix = 0;
921 PL_retstack_max = 4; 1015 PL_retstack_max = 4;
987 } 1081 }
988 1082
989 return rss; 1083 return rss;
990} 1084}
991 1085
992/** coroutine stack handling ************************************************/ 1086/** 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 1087
998/* apparently < 5.8.8 */ 1088/* apparently < 5.8.8 */
999#ifndef MgPV_nolen_const 1089#ifndef MgPV_nolen_const
1000#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1090#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
1001 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1091 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
1002 (const char*)(mg)->mg_ptr) 1092 (const char*)(mg)->mg_ptr)
1003#endif 1093#endif
1094
1095/* this will be a patched copy of PL_vtbl_sigelem */
1096static MGVTBL coro_sigelem_vtbl;
1097
1098static int ecb_cold
1099coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
1100{
1101 char *key = SvPV_nolen ((SV *)name);
1102
1103 /* do what mg_copy normally does */
1104 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1105 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1106
1107 /* patch sigelem vtbl, but only for __WARN__ and __DIE__ */
1108 if (*key == '_'
1109 && (strEQ (key, "__DIE__")
1110 || strEQ (key, "__WARN__")))
1111 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1112
1113 return 1;
1114}
1115
1116/* perl does not have a %SIG vtbl, we provide one so we can override */
1117/* the magic vtbl for the __DIE__ and __WARN__ members */
1118static const MGVTBL coro_sig_vtbl = {
1119 0, 0, 0, 0, 0,
1120 coro_sig_copy
1121};
1004 1122
1005/* 1123/*
1006 * This overrides the default magic get method of %SIG elements. 1124 * 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 1125 * 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), 1126 * and instead of trying to save and restore the hash elements (extremely slow),
1010 */ 1128 */
1011static int ecb_cold 1129static int ecb_cold
1012coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
1013{ 1131{
1014 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;
1015 1135
1016 if (*s == '_') 1136 SV *ssv;
1017 {
1018 SV **svp = 0;
1019 1137
1020 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1021 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1022
1023 if (svp) 1138 if (!*svp)
1024 {
1025 SV *ssv;
1026
1027 if (!*svp)
1028 ssv = &PL_sv_undef; 1139 ssv = &PL_sv_undef;
1029 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */ 1140 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1030 ssv = sv_2mortal (newRV_inc (*svp)); 1141 ssv = sv_2mortal (newRV_inc (*svp));
1031 else 1142 else
1032 ssv = *svp; 1143 ssv = *svp;
1033 1144
1034 sv_setsv (sv, ssv); 1145 sv_setsv (sv, ssv);
1035 return 0; 1146 return 0;
1036 }
1037 }
1038
1039 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
1040} 1147}
1041 1148
1042static int ecb_cold 1149static int ecb_cold
1043coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1150coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
1044{ 1151{
1045 const char *s = MgPV_nolen_const (mg); 1152 const char *s = MgPV_nolen_const (mg);
1153 /* the key must be either __DIE__ or __WARN__ here */
1154 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1046 1155
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; 1156 SV *old = *svp;
1057 *svp = 0; 1157 *svp = 0;
1058 SvREFCNT_dec (old); 1158 SvREFCNT_dec (old);
1059 return 0; 1159 return 0;
1060 }
1061 }
1062
1063 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1064} 1160}
1065 1161
1066static int ecb_cold 1162static int ecb_cold
1067coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1163coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1068{ 1164{
1069 const char *s = MgPV_nolen_const (mg); 1165 const char *s = MgPV_nolen_const (mg);
1166 /* the key must be either __DIE__ or __WARN__ here */
1167 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1070 1168
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; 1169 SV *old = *svp;
1081 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1170 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1082 SvREFCNT_dec (old); 1171 SvREFCNT_dec (old);
1083 return 0; 1172 return 0;
1084 }
1085 }
1086
1087 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1088} 1173}
1089 1174
1090static void 1175static void
1091prepare_nop (pTHX_ struct coro_transfer_args *ta) 1176prepare_nop (pTHX_ struct coro_transfer_args *ta)
1092{ 1177{
1103static int 1188static int
1104slf_check_repeat (pTHX_ struct CoroSLF *frame) 1189slf_check_repeat (pTHX_ struct CoroSLF *frame)
1105{ 1190{
1106 return 1; 1191 return 1;
1107} 1192}
1193
1194/** coroutine stack handling ************************************************/
1108 1195
1109static UNOP init_perl_op; 1196static UNOP init_perl_op;
1110 1197
1111ecb_noinline static void /* noinline to keep it out of the transfer fast path */ 1198ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1112init_perl (pTHX_ struct coro *coro) 1199init_perl (pTHX_ struct coro *coro)
1138 1225
1139 GvSV (PL_defgv) = newSV (0); 1226 GvSV (PL_defgv) = newSV (0);
1140 GvAV (PL_defgv) = coro->args; coro->args = 0; 1227 GvAV (PL_defgv) = coro->args; coro->args = 0;
1141 GvSV (PL_errgv) = newSV (0); 1228 GvSV (PL_errgv) = newSV (0);
1142 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1229 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1143 GvHV (PL_hintgv) = 0; 1230 GvHV (PL_hintgv) = newHV ();
1231#if PERL_VERSION_ATLEAST (5,10,0)
1232 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1233#endif
1144 PL_rs = newSVsv (GvSV (irsgv)); 1234 PL_rs = newSVsv (GvSV (irsgv));
1145 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1235 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1146 1236
1147 { 1237 {
1148 dSP; 1238 dSP;
1152 myop.op_next = Nullop; 1242 myop.op_next = Nullop;
1153 myop.op_type = OP_ENTERSUB; 1243 myop.op_type = OP_ENTERSUB;
1154 myop.op_flags = OPf_WANT_VOID; 1244 myop.op_flags = OPf_WANT_VOID;
1155 1245
1156 PUSHMARK (SP); 1246 PUSHMARK (SP);
1157 PUSHs ((SV *)coro->startcv); 1247 XPUSHs ((SV *)coro->startcv);
1158 PUTBACK; 1248 PUTBACK;
1159 PL_op = (OP *)&myop; 1249 PL_op = (OP *)&myop;
1160 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1250 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1161 } 1251 }
1162 1252
1176 PL_op = (OP *)&init_perl_op; 1266 PL_op = (OP *)&init_perl_op;
1177 1267
1178 /* copy throw, in case it was set before init_perl */ 1268 /* copy throw, in case it was set before init_perl */
1179 CORO_THROW = coro->except; 1269 CORO_THROW = coro->except;
1180 1270
1181 SWAP_SVS (coro); 1271 SWAP_SVS_ENTER (coro);
1182 1272
1183 if (ecb_expect_false (enable_times)) 1273 if (ecb_expect_false (enable_times))
1184 { 1274 {
1185 coro_times_update (); 1275 coro_times_update ();
1186 coro_times_sub (coro); 1276 coro_times_sub (coro);
1224 /* this will cause transfer_check to croak on block*/ 1314 /* this will cause transfer_check to croak on block*/
1225 SvRV_set (coro_current, (SV *)coro->hv); 1315 SvRV_set (coro_current, (SV *)coro->hv);
1226 1316
1227 load_perl (aTHX_ coro); 1317 load_perl (aTHX_ coro);
1228 1318
1319 /* restore swapped sv's */
1320 SWAP_SVS_LEAVE (coro);
1321
1229 coro_unwind_stacks (aTHX); 1322 coro_unwind_stacks (aTHX);
1230
1231 /* restore swapped sv's */
1232 SWAP_SVS (coro);
1233 1323
1234 coro_destruct_stacks (aTHX); 1324 coro_destruct_stacks (aTHX);
1235 1325
1236 /* now save some sv's to be free'd later */ 1326 /* now save some sv's to be free'd later */
1237 svf [0] = GvSV (PL_defgv); 1327 svf [0] = GvSV (PL_defgv);
1258 1348
1259 SvREFCNT_dec (coro->saved_deffh); 1349 SvREFCNT_dec (coro->saved_deffh);
1260 SvREFCNT_dec (coro->rouse_cb); 1350 SvREFCNT_dec (coro->rouse_cb);
1261 SvREFCNT_dec (coro->invoke_cb); 1351 SvREFCNT_dec (coro->invoke_cb);
1262 SvREFCNT_dec (coro->invoke_av); 1352 SvREFCNT_dec (coro->invoke_av);
1353 SvREFCNT_dec (coro->on_enter_xs);
1354 SvREFCNT_dec (coro->on_leave_xs);
1263 } 1355 }
1264} 1356}
1265 1357
1266ecb_inline void 1358ecb_inline void
1267free_coro_mortal (pTHX) 1359free_coro_mortal (pTHX)
1308 av_push (av, SvREFCNT_inc_NN (*bot++)); 1400 av_push (av, SvREFCNT_inc_NN (*bot++));
1309 1401
1310 PL_runops = RUNOPS_DEFAULT; 1402 PL_runops = RUNOPS_DEFAULT;
1311 ENTER; 1403 ENTER;
1312 SAVETMPS; 1404 SAVETMPS;
1405 PUSHMARK (SP);
1313 EXTEND (SP, 3); 1406 EXTEND (SP, 3);
1314 PUSHMARK (SP);
1315 PUSHs (&PL_sv_no); 1407 PUSHs (&PL_sv_no);
1316 PUSHs (fullname); 1408 PUSHs (fullname);
1317 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 1409 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
1318 PUTBACK; 1410 PUTBACK;
1319 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1411 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1330 1422
1331 if (PL_curcop != &PL_compiling) 1423 if (PL_curcop != &PL_compiling)
1332 { 1424 {
1333 SV **cb; 1425 SV **cb;
1334 1426
1335 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1427 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1336 { 1428 {
1337 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1429 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1338 1430
1339 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1431 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1340 { 1432 {
1346 gv_efullname3 (fullname, gv, 0); 1438 gv_efullname3 (fullname, gv, 0);
1347 1439
1348 PL_runops = RUNOPS_DEFAULT; 1440 PL_runops = RUNOPS_DEFAULT;
1349 ENTER; 1441 ENTER;
1350 SAVETMPS; 1442 SAVETMPS;
1443 PUSHMARK (SP);
1351 EXTEND (SP, 3); 1444 EXTEND (SP, 3);
1352 PUSHMARK (SP);
1353 PUSHs (&PL_sv_yes); 1445 PUSHs (&PL_sv_yes);
1354 PUSHs (fullname); 1446 PUSHs (fullname);
1355 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1447 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc (SUB_ARGARRAY)) : &PL_sv_undef);
1356 PUTBACK; 1448 PUTBACK;
1357 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1449 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); 1450 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1359 SPAGAIN; 1451 SPAGAIN;
1360 FREETMPS; 1452 FREETMPS;
1370 dSP; 1462 dSP;
1371 1463
1372 PL_runops = RUNOPS_DEFAULT; 1464 PL_runops = RUNOPS_DEFAULT;
1373 ENTER; 1465 ENTER;
1374 SAVETMPS; 1466 SAVETMPS;
1375 EXTEND (SP, 3);
1376 PL_runops = RUNOPS_DEFAULT;
1377 PUSHMARK (SP); 1467 PUSHMARK (SP);
1468 EXTEND (SP, 2);
1378 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 1469 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
1379 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 1470 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
1380 PUTBACK; 1471 PUTBACK;
1381 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0); 1472 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); 1473 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 1573 * 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. 1574 * runtime errors here, as this is just a random interpreter, not a thread.
1484 */ 1575 */
1485 1576
1486 /* 1577 /*
1578 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1579 * requires PL_scopestack_ix, so do it here if required.
1580 */
1581 if (!PL_scopestack_ix)
1582 ENTER;
1583
1584 /*
1487 * If perl-run returns we assume exit() was being called or the coro 1585 * 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) 1586 * 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 1587 * reason for perl_run to return. We try to mimic whatever perl is normally
1490 * doing in that case. YMMV. 1588 * doing in that case. YMMV.
1491 */ 1589 */
1761 1859
1762static int ecb_cold 1860static int ecb_cold
1763coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1861coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1764{ 1862{
1765 /* called when perl clones the current process the slow way (windows process emulation) */ 1863 /* called when perl clones the current process the slow way (windows process emulation) */
1766 /* WE SIMply nuke the pointers in the copy, causing perl to croak */ 1864 /* we simply nuke the pointers in the copy, causing perl to croak */
1767 mg->mg_ptr = 0; 1865 mg->mg_ptr = 0;
1768 mg->mg_virtual = 0; 1866 mg->mg_virtual = 0;
1769 1867
1770 return 0; 1868 return 0;
1771} 1869}
1927 2025
1928 ENTER; 2026 ENTER;
1929 SAVETMPS; 2027 SAVETMPS;
1930 2028
1931 PUSHMARK (SP); 2029 PUSHMARK (SP);
1932 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught", 0))); 2030 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1933 PUTBACK; 2031 PUTBACK;
1934 call_pv ("Carp::confess", G_VOID | G_DISCARD); 2032 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1935 2033
1936 FREETMPS; 2034 FREETMPS;
1937 LEAVE; 2035 LEAVE;
2248 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2346 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2249 } 2347 }
2250 else 2348 else
2251 { 2349 {
2252 struct coro *self = SvSTATE_current; 2350 struct coro *self = SvSTATE_current;
2351
2352 if (!self)
2353 croak ("Coro::cancel called outside of thread content,");
2253 2354
2254 /* otherwise we cancel directly, purely for speed reasons 2355 /* otherwise we cancel directly, purely for speed reasons
2255 * unfortunately, this requires some magic trickery, as 2356 * unfortunately, this requires some magic trickery, as
2256 * somebody else could cancel us, so we have to fight the cancellation. 2357 * somebody else could cancel us, so we have to fight the cancellation.
2257 * this is ugly, and hopefully fully worth the extra speed. 2358 * this is ugly, and hopefully fully worth the extra speed.
2290safe_cancel (pTHX_ struct coro *coro, SV **arg, int items) 2391safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2291{ 2392{
2292 if (coro->cctx) 2393 if (coro->cctx)
2293 croak ("coro inside C callback, unable to cancel at this time, caught"); 2394 croak ("coro inside C callback, unable to cancel at this time, caught");
2294 2395
2295 if (coro->flags & CF_NEW) 2396 if (coro->flags & (CF_NEW | CF_ZOMBIE))
2296 { 2397 {
2297 coro_set_status (aTHX_ coro, arg, items); 2398 coro_set_status (aTHX_ coro, arg, items);
2298 coro_state_destroy (aTHX_ coro); 2399 coro_state_destroy (aTHX_ coro);
2299 } 2400 }
2300 else 2401 else
2367 else 2468 else
2368 { 2469 {
2369 av_clear (GvAV (PL_defgv)); 2470 av_clear (GvAV (PL_defgv));
2370 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2471 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2371 2472
2473 if (ecb_expect_false (coro->swap_sv))
2474 {
2475 SWAP_SVS_LEAVE (coro);
2476 SvREFCNT_dec_NN (coro->swap_sv);
2477 coro->swap_sv = 0;
2478 }
2479
2372 coro->prio = 0; 2480 coro->prio = 0;
2373 2481
2374 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2482 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2375 api_trace (aTHX_ coro_current, 0); 2483 api_trace (aTHX_ coro_current, 0);
2376 2484
2377 frame->prepare = prepare_schedule; 2485 frame->prepare = prepare_schedule;
2378 av_push (av_async_pool, SvREFCNT_inc (hv)); 2486 av_push (av_async_pool, SvREFCNT_inc_NN (hv));
2379 } 2487 }
2380 } 2488 }
2381 else 2489 else
2382 { 2490 {
2383 /* first iteration, simply fall through */ 2491 /* first iteration, simply fall through */
2397coro_rouse_callback (pTHX_ CV *cv) 2505coro_rouse_callback (pTHX_ CV *cv)
2398{ 2506{
2399 dXSARGS; 2507 dXSARGS;
2400 SV *data = (SV *)S_GENSUB_ARG; 2508 SV *data = (SV *)S_GENSUB_ARG;
2401 2509
2510 /* data starts being the coro, and is replaced by the results when done */
2402 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2511 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2403 { 2512 {
2404 /* first call, set args */ 2513 /* first call, set args */
2405 SV *coro = SvRV (data); 2514 SV *coro = SvRV (data);
2406 AV *av = newAV (); 2515 AV *av = newAV ();
2410 /* better take a full copy of the arguments */ 2519 /* better take a full copy of the arguments */
2411 while (items--) 2520 while (items--)
2412 av_store (av, items, newSVsv (ST (items))); 2521 av_store (av, items, newSVsv (ST (items)));
2413 2522
2414 api_ready (aTHX_ coro); 2523 api_ready (aTHX_ coro);
2415 SvREFCNT_dec (coro); 2524 SvREFCNT_dec_NN (coro);
2416 } 2525 }
2417 2526
2418 XSRETURN_EMPTY; 2527 XSRETURN_EMPTY;
2419} 2528}
2420 2529
2489 struct coro *coro = SvSTATE_hv (hv); 2598 struct coro *coro = SvSTATE_hv (hv);
2490 SV *data = newRV_inc ((SV *)hv); 2599 SV *data = newRV_inc ((SV *)hv);
2491 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data); 2600 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2492 2601
2493 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2602 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2494 SvREFCNT_dec (data); /* magicext increases the refcount */ 2603 SvREFCNT_dec_NN (data); /* magicext increases the refcount */
2495 2604
2496 SvREFCNT_dec (coro->rouse_cb); 2605 SvREFCNT_dec (coro->rouse_cb);
2497 coro->rouse_cb = SvREFCNT_inc_NN (cb); 2606 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2498 2607
2499 return cb; 2608 return cb;
2608 * Since by definition the SLF call will not finish when we destroy 2717 * Since by definition the SLF call will not finish when we destroy
2609 * the coro, we will have to force-finish it here, otherwise 2718 * the coro, we will have to force-finish it here, otherwise
2610 * cleanup functions cannot call SLF functions. 2719 * cleanup functions cannot call SLF functions.
2611 */ 2720 */
2612 coro->slf_frame.prepare = 0; 2721 coro->slf_frame.prepare = 0;
2613 coro->slf_frame.destroy = 0;
2614 2722
2615 /* this callback is reserved for slf functions needing to do cleanup */ 2723 /* this callback is reserved for slf functions needing to do cleanup */
2616 if (frame.destroy && frame.prepare && !PL_dirty) 2724 if (frame.destroy && frame.prepare && !PL_dirty)
2617 frame.destroy (aTHX_ &frame); 2725 frame.destroy (aTHX_ &frame);
2618} 2726}
2805static void 2913static void
2806coro_pop_on_leave (pTHX_ void *coro) 2914coro_pop_on_leave (pTHX_ void *coro)
2807{ 2915{
2808 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2916 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2809 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2917 on_enterleave_call (aTHX_ sv_2mortal (cb));
2918}
2919
2920static void
2921enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2922{
2923 if (!hook)
2924 return;
2925
2926 if (!*avp)
2927 {
2928 *avp = newAV ();
2929 AvREAL_off (*avp);
2930 }
2931
2932 av_push (*avp, (SV *)hook);
2933 av_push (*avp, (SV *)arg);
2934}
2935
2936static void
2937enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2938{
2939 AV *av = *avp;
2940 int i;
2941
2942 if (!av)
2943 return;
2944
2945 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2946 if (AvARRAY (av)[i] == (SV *)hook)
2947 {
2948 if (execute)
2949 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2950
2951 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2952 av_pop (av);
2953 av_pop (av);
2954 break;
2955 }
2956
2957 if (AvFILLp (av) >= 0)
2958 {
2959 *avp = 0;
2960 SvREFCNT_dec_NN (av);
2961 }
2962}
2963
2964static void
2965api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2966{
2967 struct coro *coro = SvSTATE (coro_sv);
2968
2969 if (SvSTATE_current == coro)
2970 if (enter)
2971 enter (aTHX_ enter_arg);
2972
2973 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2974 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2975}
2976
2977static void
2978api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2979{
2980 struct coro *coro = SvSTATE (coro_sv);
2981
2982 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2983 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2984}
2985
2986static void
2987savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2988{
2989 struct coro *coro = SvSTATE_current;
2990
2991 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2992}
2993
2994static void
2995savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2996{
2997 struct coro *coro = SvSTATE_current;
2998
2999 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
3000}
3001
3002static void
3003api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
3004{
3005 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
3006
3007 /* this ought to be much cheaper than malloc + a single destructor call */
3008 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
3009 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2810} 3010}
2811 3011
2812/*****************************************************************************/ 3012/*****************************************************************************/
2813/* PerlIO::cede */ 3013/* PerlIO::cede */
2814 3014
2944 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3144 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2945 PUTBACK; 3145 PUTBACK;
2946 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3146 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2947 } 3147 }
2948 3148
2949 SvREFCNT_dec (cb); 3149 SvREFCNT_dec_NN (cb);
2950 } 3150 }
2951} 3151}
2952 3152
2953static void 3153static void
2954coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3154coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2962{ 3162{
2963 AV *av = (AV *)frame->data; 3163 AV *av = (AV *)frame->data;
2964 SV *count_sv = AvARRAY (av)[0]; 3164 SV *count_sv = AvARRAY (av)[0];
2965 SV *coro_hv = SvRV (coro_current); 3165 SV *coro_hv = SvRV (coro_current);
2966 3166
3167 frame->destroy = 0;
3168
2967 /* if we are about to throw, don't actually acquire the lock, just throw */ 3169 /* if we are about to throw, don't actually acquire the lock, just throw */
2968 if (CORO_THROW) 3170 if (ecb_expect_false (CORO_THROW))
3171 {
3172 /* we still might be responsible for the semaphore, so wake up others */
3173 coro_semaphore_adjust (aTHX_ av, 0);
3174
2969 return 0; 3175 return 0;
3176 }
2970 else if (SvIVX (count_sv) > 0) 3177 else if (SvIVX (count_sv) > 0)
2971 { 3178 {
2972 frame->destroy = 0;
2973
2974 if (acquire) 3179 if (acquire)
2975 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3180 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2976 else 3181 else
2977 coro_semaphore_adjust (aTHX_ av, 0); 3182 coro_semaphore_adjust (aTHX_ av, 0);
2978 3183
3089 { 3294 {
3090 api_ready (aTHX_ cb); 3295 api_ready (aTHX_ cb);
3091 sv_setiv (cb, 0); /* signal waiter */ 3296 sv_setiv (cb, 0); /* signal waiter */
3092 } 3297 }
3093 3298
3094 SvREFCNT_dec (cb); 3299 SvREFCNT_dec_NN (cb);
3095 3300
3096 --count; 3301 --count;
3097 } 3302 }
3098} 3303}
3099 3304
3184 } 3389 }
3185 3390
3186 av_push (state, data_sv); 3391 av_push (state, data_sv);
3187 3392
3188 api_ready (aTHX_ coro); 3393 api_ready (aTHX_ coro);
3189 SvREFCNT_dec (coro); 3394 SvREFCNT_dec_NN (coro);
3190 SvREFCNT_dec ((AV *)state); 3395 SvREFCNT_dec_NN ((AV *)state);
3191} 3396}
3192 3397
3193static int 3398static int
3194slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3399slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3195{ 3400{
3213 errno = data->errorno; 3418 errno = data->errorno;
3214 PL_laststype = data->laststype; 3419 PL_laststype = data->laststype;
3215 PL_laststatval = data->laststatval; 3420 PL_laststatval = data->laststatval;
3216 PL_statcache = data->statcache; 3421 PL_statcache = data->statcache;
3217 3422
3218 SvREFCNT_dec (data_sv); 3423 SvREFCNT_dec_NN (data_sv);
3219 } 3424 }
3220 3425
3221 /* push result values */ 3426 /* push result values */
3222 { 3427 {
3223 dSP; 3428 dSP;
3412 3617
3413 map_len = load_len + save_len + 16; 3618 map_len = load_len + save_len + 16;
3414 3619
3415 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 3620 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3416 3621
3622 if (map_base == (char *)MAP_FAILED)
3623 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3624
3417 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3625 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3418 3626
3419 load_perl_slots = (load_save_perl_slots_type)map_base; 3627 load_perl_slots = (load_save_perl_slots_type)map_base;
3420 memcpy (map_base, load_ptr, load_len); 3628 memcpy (map_base, load_ptr, load_len);
3421 3629
3438 3646
3439PROTOTYPES: DISABLE 3647PROTOTYPES: DISABLE
3440 3648
3441BOOT: 3649BOOT:
3442{ 3650{
3651#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3652#include "state.h"
3443#ifdef USE_ITHREADS 3653#ifdef USE_ITHREADS
3444# if CORO_PTHREAD 3654# if CORO_PTHREAD
3445 coro_thx = PERL_GET_CONTEXT; 3655 coro_thx = PERL_GET_CONTEXT;
3446# endif 3656# endif
3447#endif 3657#endif
3455 cctx_current = cctx_new_empty (); 3665 cctx_current = cctx_new_empty ();
3456 3666
3457 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3667 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3458 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3668 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3459 3669
3460 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3670 {
3461 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3671 /*
3462 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3672 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3673 * by coro_sig_vtbl in hash values.
3674 */
3675 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3676
3677 /* this only works if perl doesn't have a vtbl for %SIG */
3678 assert (!mg->mg_virtual);
3679
3680 /*
3681 * The irony is that the perl API itself asserts that mg_virtual
3682 * must be non-const, yet perl5porters insisted on marking their
3683 * vtbls as read-only, just to thwart perl modules from patching
3684 * them.
3685 */
3686 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3687 mg->mg_flags |= MGf_COPY;
3688
3689 coro_sigelem_vtbl = PL_vtbl_sigelem;
3690 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3691 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3692 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3693 }
3463 3694
3464 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3465 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3695 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)); 3696 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3467 3697
3468 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3698 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3699
3700 newCONSTSUB (coro_state_stash, "BACKEND", newSVpv (CORO_BACKEND, 0)); /* undocumented */
3469 3701
3470 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 3702 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
3471 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 3703 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
3472 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 3704 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
3473 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 3705 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
3598call (Coro::State coro, SV *coderef) 3830call (Coro::State coro, SV *coderef)
3599 ALIAS: 3831 ALIAS:
3600 eval = 1 3832 eval = 1
3601 CODE: 3833 CODE:
3602{ 3834{
3835 struct coro *current = SvSTATE_current;
3836
3603 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3837 if ((coro == current) || (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)))
3604 { 3838 {
3605 struct coro *current = SvSTATE_current;
3606 struct CoroSLF slf_save; 3839 struct CoroSLF slf_save;
3607 3840
3608 if (current != coro) 3841 if (current != coro)
3609 { 3842 {
3610 PUTBACK; 3843 PUTBACK;
3775 if (ecb_expect_false (current == self)) 4008 if (ecb_expect_false (current == self))
3776 coro_times_sub (SvSTATE (coro_current)); 4009 coro_times_sub (SvSTATE (coro_current));
3777} 4010}
3778 4011
3779void 4012void
3780swap_sv (Coro::State coro, SV *sv, SV *swapsv) 4013swap_sv (Coro::State coro, SV *sva, SV *svb)
3781 CODE: 4014 CODE:
3782{ 4015{
3783 struct coro *current = SvSTATE_current; 4016 struct coro *current = SvSTATE_current;
4017 AV *swap_sv;
4018 int i;
4019
4020 sva = SvRV (sva);
4021 svb = SvRV (svb);
3784 4022
3785 if (current == coro) 4023 if (current == coro)
3786 SWAP_SVS (current); 4024 SWAP_SVS_LEAVE (current);
3787 4025
3788 if (!coro->swap_sv) 4026 if (!coro->swap_sv)
3789 coro->swap_sv = newAV (); 4027 coro->swap_sv = newAV ();
3790 4028
4029 swap_sv = coro->swap_sv;
4030
4031 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4032 {
4033 SV *a = AvARRAY (swap_sv)[i ];
4034 SV *b = AvARRAY (swap_sv)[i + 1];
4035
4036 if (a == sva && b == svb)
4037 {
4038 SvREFCNT_dec_NN (a);
4039 SvREFCNT_dec_NN (b);
4040
4041 for (; i <= AvFILLp (swap_sv) - 2; i++)
4042 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4043
4044 AvFILLp (swap_sv) -= 2;
4045
4046 goto removed;
4047 }
4048 }
4049
3791 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4050 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3792 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4051 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4052
4053 removed:
3793 4054
3794 if (current == coro) 4055 if (current == coro)
3795 SWAP_SVS (current); 4056 SWAP_SVS_ENTER (current);
3796} 4057}
3797 4058
3798 4059
3799MODULE = Coro::State PACKAGE = Coro 4060MODULE = Coro::State PACKAGE = Coro
3800 4061
3801BOOT: 4062BOOT:
3802{ 4063{
4064 if (SVt_LAST > 32)
4065 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4066
3803 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4067 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3804 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4068 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3805 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4069 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3806 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4070 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); 4071 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3833 coroapi.ready = api_ready; 4097 coroapi.ready = api_ready;
3834 coroapi.is_ready = api_is_ready; 4098 coroapi.is_ready = api_is_ready;
3835 coroapi.nready = coro_nready; 4099 coroapi.nready = coro_nready;
3836 coroapi.current = coro_current; 4100 coroapi.current = coro_current;
3837 4101
4102 coroapi.enterleave_hook = api_enterleave_hook;
4103 coroapi.enterleave_unhook = api_enterleave_unhook;
4104 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4105
3838 /*GCoroAPI = &coroapi;*/ 4106 /*GCoroAPI = &coroapi;*/
3839 sv_setiv (sv, (IV)&coroapi); 4107 sv_setiv (sv, PTR2IV (&coroapi));
3840 SvREADONLY_on (sv); 4108 SvREADONLY_on (sv);
3841 } 4109 }
3842} 4110}
3843 4111
3844SV * 4112SV *
3907 4175
3908void 4176void
3909_set_current (SV *current) 4177_set_current (SV *current)
3910 PROTOTYPE: $ 4178 PROTOTYPE: $
3911 CODE: 4179 CODE:
3912 SvREFCNT_dec (SvRV (coro_current)); 4180 SvREFCNT_dec_NN (SvRV (coro_current));
3913 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4181 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3914 4182
3915void 4183void
3916_set_readyhook (SV *hook) 4184_set_readyhook (SV *hook)
3917 PROTOTYPE: $ 4185 PROTOTYPE: $
4001 4269
4002 if ((SV *)hv == &PL_sv_undef) 4270 if ((SV *)hv == &PL_sv_undef)
4003 { 4271 {
4004 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4272 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
4005 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4273 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4006 SvREFCNT_dec (sv); 4274 SvREFCNT_dec_NN (sv);
4007 } 4275 }
4008 4276
4009 { 4277 {
4010 struct coro *coro = SvSTATE_hv (hv); 4278 struct coro *coro = SvSTATE_hv (hv);
4011 4279
4018 api_ready (aTHX_ (SV *)hv); 4286 api_ready (aTHX_ (SV *)hv);
4019 4287
4020 if (GIMME_V != G_VOID) 4288 if (GIMME_V != G_VOID)
4021 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4289 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4022 else 4290 else
4023 SvREFCNT_dec (hv); 4291 SvREFCNT_dec_NN (hv);
4024} 4292}
4025 4293
4026SV * 4294SV *
4027rouse_cb () 4295rouse_cb ()
4028 PROTOTYPE: 4296 PROTOTYPE:
4107 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4375 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4108 OUTPUT: 4376 OUTPUT:
4109 RETVAL 4377 RETVAL
4110 4378
4111void 4379void
4112up (SV *self, int adjust = 1) 4380up (SV *self)
4113 ALIAS:
4114 adjust = 1
4115 CODE: 4381 CODE:
4382 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4383
4384void
4385adjust (SV *self, int adjust)
4386 CODE:
4116 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4387 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4117 4388
4118void 4389void
4119down (...) 4390down (...)
4120 CODE: 4391 CODE:
4121 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4392 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines