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.450 by root, Sun Jun 28 22:31:03 2015 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
… …
108# define CORO_CLOCK_MONOTONIC 1 136# define CORO_CLOCK_MONOTONIC 1
109# define CORO_CLOCK_THREAD_CPUTIME_ID 3 137# define CORO_CLOCK_THREAD_CPUTIME_ID 3
110# endif 138# endif
111#endif 139#endif
112 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
113static double (*nvtime)(); /* so why doesn't it take void? */ 159static double (*nvtime)(); /* so why doesn't it take void? */
114static void (*u2time)(pTHX_ UV ret[2]); 160static void (*u2time)(pTHX_ UV ret[2]);
115 161
116/* we hijack an hopefully unused CV flag for our purposes */ 162/* we hijack an hopefully unused CV flag for our purposes */
117#define CVf_SLF 0x4000 163#define CVf_SLF 0x4000
… …
132 178
133static GV *irsgv; /* $/ */ 179static GV *irsgv; /* $/ */
134static GV *stdoutgv; /* *STDOUT */ 180static GV *stdoutgv; /* *STDOUT */
135static SV *rv_diehook; 181static SV *rv_diehook;
136static SV *rv_warnhook; 182static SV *rv_warnhook;
137static HV *hv_sig; /* %SIG */
138 183
139/* async_pool helper stuff */ 184/* async_pool helper stuff */
140static SV *sv_pool_rss; 185static SV *sv_pool_rss;
141static SV *sv_pool_size; 186static SV *sv_pool_size;
142static SV *sv_async_pool_idle; /* description string */ 187static SV *sv_async_pool_idle; /* description string */
… …
701 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;
702 747
703 /* 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,
704 * 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.
705 */ 750 */
706 #define svany_in_head(type) \ 751 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
707 (((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)))
708 757
709 if (svany_in_head (SvTYPE (a))) 758 if (svany_in_head (SvTYPE (a)))
710 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 759 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
711 760
712 if (svany_in_head (SvTYPE (b))) 761 if (svany_in_head (SvTYPE (b)))
… …
715#endif 764#endif
716} 765}
717 766
718/* swap sv heads, at least logically */ 767/* swap sv heads, at least logically */
719static void 768static void
720swap_svs (pTHX_ Coro__State c) 769swap_svs_enter (pTHX_ Coro__State c)
721{ 770{
722 int i; 771 int i;
723 772
724 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 773 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
725 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]);
726} 775}
727 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
728#define SWAP_SVS(coro) \ 786#define SWAP_SVS_ENTER(coro) \
729 if (ecb_expect_false ((coro)->swap_sv)) \ 787 if (ecb_expect_false ((coro)->swap_sv)) \
730 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))
731 793
732static void 794static void
733on_enterleave_call (pTHX_ SV *cb); 795on_enterleave_call (pTHX_ SV *cb);
734 796
735static void 797static void
… …
788 850
789 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2) 851 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
790 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]); 852 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
791 } 853 }
792 854
793 SWAP_SVS (c); 855 SWAP_SVS_ENTER (c);
794} 856}
795 857
796static void 858static void
797save_perl (pTHX_ Coro__State c) 859save_perl (pTHX_ Coro__State c)
798{ 860{
799 SWAP_SVS (c); 861 SWAP_SVS_LEAVE (c);
800 862
801 if (ecb_expect_false (c->on_leave_xs)) 863 if (ecb_expect_false (c->on_leave_xs))
802 { 864 {
803 int i; 865 int i;
804 866
… …
939#endif 1001#endif
940 1002
941 New(54,PL_savestack,24,ANY); 1003 New(54,PL_savestack,24,ANY);
942 PL_savestack_ix = 0; 1004 PL_savestack_ix = 0;
943 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
944 1011
945#if !PERL_VERSION_ATLEAST (5,10,0) 1012#if !PERL_VERSION_ATLEAST (5,10,0)
946 New(54,PL_retstack,4,OP*); 1013 New(54,PL_retstack,4,OP*);
947 PL_retstack_ix = 0; 1014 PL_retstack_ix = 0;
948 PL_retstack_max = 4; 1015 PL_retstack_max = 4;
… …
1014 } 1081 }
1015 1082
1016 return rss; 1083 return rss;
1017} 1084}
1018 1085
1019/** coroutine stack handling ************************************************/ 1086/** provide custom get/set/clear methods for %SIG elements ******************/
1020
1021static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
1022static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
1023static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
1024 1087
1025/* apparently < 5.8.8 */ 1088/* apparently < 5.8.8 */
1026#ifndef MgPV_nolen_const 1089#ifndef MgPV_nolen_const
1027#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1090#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
1028 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1091 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
1029 (const char*)(mg)->mg_ptr) 1092 (const char*)(mg)->mg_ptr)
1030#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};
1031 1122
1032/* 1123/*
1033 * This overrides the default magic get method of %SIG elements. 1124 * This overrides the default magic get method of %SIG elements.
1034 * 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
1035 * 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),
… …
1037 */ 1128 */
1038static int ecb_cold 1129static int ecb_cold
1039coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
1040{ 1131{
1041 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;
1042 1135
1043 if (*s == '_') 1136 SV *ssv;
1044 {
1045 SV **svp = 0;
1046 1137
1047 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1048 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1049
1050 if (svp) 1138 if (!*svp)
1051 {
1052 SV *ssv;
1053
1054 if (!*svp)
1055 ssv = &PL_sv_undef; 1139 ssv = &PL_sv_undef;
1056 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. */
1057 ssv = sv_2mortal (newRV_inc (*svp)); 1141 ssv = sv_2mortal (newRV_inc (*svp));
1058 else 1142 else
1059 ssv = *svp; 1143 ssv = *svp;
1060 1144
1061 sv_setsv (sv, ssv); 1145 sv_setsv (sv, ssv);
1062 return 0; 1146 return 0;
1063 }
1064 }
1065
1066 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
1067} 1147}
1068 1148
1069static int ecb_cold 1149static int ecb_cold
1070coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1150coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
1071{ 1151{
1072 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;
1073 1155
1074 if (*s == '_')
1075 {
1076 SV **svp = 0;
1077
1078 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1079 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1080
1081 if (svp)
1082 {
1083 SV *old = *svp; 1156 SV *old = *svp;
1084 *svp = 0; 1157 *svp = 0;
1085 SvREFCNT_dec (old); 1158 SvREFCNT_dec (old);
1086 return 0; 1159 return 0;
1087 }
1088 }
1089
1090 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1091} 1160}
1092 1161
1093static int ecb_cold 1162static int ecb_cold
1094coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1163coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1095{ 1164{
1096 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;
1097 1168
1098 if (*s == '_')
1099 {
1100 SV **svp = 0;
1101
1102 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1103 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1104
1105 if (svp)
1106 {
1107 SV *old = *svp; 1169 SV *old = *svp;
1108 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1170 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1109 SvREFCNT_dec (old); 1171 SvREFCNT_dec (old);
1110 return 0; 1172 return 0;
1111 }
1112 }
1113
1114 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1115} 1173}
1116 1174
1117static void 1175static void
1118prepare_nop (pTHX_ struct coro_transfer_args *ta) 1176prepare_nop (pTHX_ struct coro_transfer_args *ta)
1119{ 1177{
… …
1130static int 1188static int
1131slf_check_repeat (pTHX_ struct CoroSLF *frame) 1189slf_check_repeat (pTHX_ struct CoroSLF *frame)
1132{ 1190{
1133 return 1; 1191 return 1;
1134} 1192}
1193
1194/** coroutine stack handling ************************************************/
1135 1195
1136static UNOP init_perl_op; 1196static UNOP init_perl_op;
1137 1197
1138ecb_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 */
1139init_perl (pTHX_ struct coro *coro) 1199init_perl (pTHX_ struct coro *coro)
… …
1182 myop.op_next = Nullop; 1242 myop.op_next = Nullop;
1183 myop.op_type = OP_ENTERSUB; 1243 myop.op_type = OP_ENTERSUB;
1184 myop.op_flags = OPf_WANT_VOID; 1244 myop.op_flags = OPf_WANT_VOID;
1185 1245
1186 PUSHMARK (SP); 1246 PUSHMARK (SP);
1187 PUSHs ((SV *)coro->startcv); 1247 XPUSHs ((SV *)coro->startcv);
1188 PUTBACK; 1248 PUTBACK;
1189 PL_op = (OP *)&myop; 1249 PL_op = (OP *)&myop;
1190 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1250 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1191 } 1251 }
1192 1252
… …
1206 PL_op = (OP *)&init_perl_op; 1266 PL_op = (OP *)&init_perl_op;
1207 1267
1208 /* copy throw, in case it was set before init_perl */ 1268 /* copy throw, in case it was set before init_perl */
1209 CORO_THROW = coro->except; 1269 CORO_THROW = coro->except;
1210 1270
1211 SWAP_SVS (coro); 1271 SWAP_SVS_ENTER (coro);
1212 1272
1213 if (ecb_expect_false (enable_times)) 1273 if (ecb_expect_false (enable_times))
1214 { 1274 {
1215 coro_times_update (); 1275 coro_times_update ();
1216 coro_times_sub (coro); 1276 coro_times_sub (coro);
… …
1254 /* this will cause transfer_check to croak on block*/ 1314 /* this will cause transfer_check to croak on block*/
1255 SvRV_set (coro_current, (SV *)coro->hv); 1315 SvRV_set (coro_current, (SV *)coro->hv);
1256 1316
1257 load_perl (aTHX_ coro); 1317 load_perl (aTHX_ coro);
1258 1318
1319 /* restore swapped sv's */
1320 SWAP_SVS_LEAVE (coro);
1321
1259 coro_unwind_stacks (aTHX); 1322 coro_unwind_stacks (aTHX);
1260
1261 /* restore swapped sv's */
1262 SWAP_SVS (coro);
1263 1323
1264 coro_destruct_stacks (aTHX); 1324 coro_destruct_stacks (aTHX);
1265 1325
1266 /* now save some sv's to be free'd later */ 1326 /* now save some sv's to be free'd later */
1267 svf [0] = GvSV (PL_defgv); 1327 svf [0] = GvSV (PL_defgv);
… …
1340 av_push (av, SvREFCNT_inc_NN (*bot++)); 1400 av_push (av, SvREFCNT_inc_NN (*bot++));
1341 1401
1342 PL_runops = RUNOPS_DEFAULT; 1402 PL_runops = RUNOPS_DEFAULT;
1343 ENTER; 1403 ENTER;
1344 SAVETMPS; 1404 SAVETMPS;
1405 PUSHMARK (SP);
1345 EXTEND (SP, 3); 1406 EXTEND (SP, 3);
1346 PUSHMARK (SP);
1347 PUSHs (&PL_sv_no); 1407 PUSHs (&PL_sv_no);
1348 PUSHs (fullname); 1408 PUSHs (fullname);
1349 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 1409 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
1350 PUTBACK; 1410 PUTBACK;
1351 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);
… …
1378 gv_efullname3 (fullname, gv, 0); 1438 gv_efullname3 (fullname, gv, 0);
1379 1439
1380 PL_runops = RUNOPS_DEFAULT; 1440 PL_runops = RUNOPS_DEFAULT;
1381 ENTER; 1441 ENTER;
1382 SAVETMPS; 1442 SAVETMPS;
1443 PUSHMARK (SP);
1383 EXTEND (SP, 3); 1444 EXTEND (SP, 3);
1384 PUSHMARK (SP);
1385 PUSHs (&PL_sv_yes); 1445 PUSHs (&PL_sv_yes);
1386 PUSHs (fullname); 1446 PUSHs (fullname);
1387 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);
1388 PUTBACK; 1448 PUTBACK;
1389 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);
1390 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);
1391 SPAGAIN; 1451 SPAGAIN;
1392 FREETMPS; 1452 FREETMPS;
… …
1402 dSP; 1462 dSP;
1403 1463
1404 PL_runops = RUNOPS_DEFAULT; 1464 PL_runops = RUNOPS_DEFAULT;
1405 ENTER; 1465 ENTER;
1406 SAVETMPS; 1466 SAVETMPS;
1407 EXTEND (SP, 3);
1408 PL_runops = RUNOPS_DEFAULT;
1409 PUSHMARK (SP); 1467 PUSHMARK (SP);
1468 EXTEND (SP, 2);
1410 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 1469 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
1411 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 1470 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
1412 PUTBACK; 1471 PUTBACK;
1413 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);
1414 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);
… …
1514 * 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
1515 * 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.
1516 */ 1575 */
1517 1576
1518 /* 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 /*
1519 * 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
1520 * 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)
1521 * 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
1522 * doing in that case. YMMV. 1588 * doing in that case. YMMV.
1523 */ 1589 */
… …
1793 1859
1794static int ecb_cold 1860static int ecb_cold
1795coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1861coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1796{ 1862{
1797 /* 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) */
1798 /* 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 */
1799 mg->mg_ptr = 0; 1865 mg->mg_ptr = 0;
1800 mg->mg_virtual = 0; 1866 mg->mg_virtual = 0;
1801 1867
1802 return 0; 1868 return 0;
1803} 1869}
… …
2325safe_cancel (pTHX_ struct coro *coro, SV **arg, int items) 2391safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2326{ 2392{
2327 if (coro->cctx) 2393 if (coro->cctx)
2328 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");
2329 2395
2330 if (coro->flags & CF_NEW) 2396 if (coro->flags & (CF_NEW | CF_ZOMBIE))
2331 { 2397 {
2332 coro_set_status (aTHX_ coro, arg, items); 2398 coro_set_status (aTHX_ coro, arg, items);
2333 coro_state_destroy (aTHX_ coro); 2399 coro_state_destroy (aTHX_ coro);
2334 } 2400 }
2335 else 2401 else
… …
2402 else 2468 else
2403 { 2469 {
2404 av_clear (GvAV (PL_defgv)); 2470 av_clear (GvAV (PL_defgv));
2405 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);
2406 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
2407 coro->prio = 0; 2480 coro->prio = 0;
2408 2481
2409 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2482 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2410 api_trace (aTHX_ coro_current, 0); 2483 api_trace (aTHX_ coro_current, 0);
2411 2484
2412 frame->prepare = prepare_schedule; 2485 frame->prepare = prepare_schedule;
2413 av_push (av_async_pool, SvREFCNT_inc (hv)); 2486 av_push (av_async_pool, SvREFCNT_inc_NN (hv));
2414 } 2487 }
2415 } 2488 }
2416 else 2489 else
2417 { 2490 {
2418 /* first iteration, simply fall through */ 2491 /* first iteration, simply fall through */
… …
2432coro_rouse_callback (pTHX_ CV *cv) 2505coro_rouse_callback (pTHX_ CV *cv)
2433{ 2506{
2434 dXSARGS; 2507 dXSARGS;
2435 SV *data = (SV *)S_GENSUB_ARG; 2508 SV *data = (SV *)S_GENSUB_ARG;
2436 2509
2510 /* data starts being the coro, and is replaced by the results when done */
2437 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2511 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2438 { 2512 {
2439 /* first call, set args */ 2513 /* first call, set args */
2440 SV *coro = SvRV (data); 2514 SV *coro = SvRV (data);
2441 AV *av = newAV (); 2515 AV *av = newAV ();
… …
2445 /* better take a full copy of the arguments */ 2519 /* better take a full copy of the arguments */
2446 while (items--) 2520 while (items--)
2447 av_store (av, items, newSVsv (ST (items))); 2521 av_store (av, items, newSVsv (ST (items)));
2448 2522
2449 api_ready (aTHX_ coro); 2523 api_ready (aTHX_ coro);
2450 SvREFCNT_dec (coro); 2524 SvREFCNT_dec_NN (coro);
2451 } 2525 }
2452 2526
2453 XSRETURN_EMPTY; 2527 XSRETURN_EMPTY;
2454} 2528}
2455 2529
… …
2524 struct coro *coro = SvSTATE_hv (hv); 2598 struct coro *coro = SvSTATE_hv (hv);
2525 SV *data = newRV_inc ((SV *)hv); 2599 SV *data = newRV_inc ((SV *)hv);
2526 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data); 2600 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2527 2601
2528 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);
2529 SvREFCNT_dec (data); /* magicext increases the refcount */ 2603 SvREFCNT_dec_NN (data); /* magicext increases the refcount */
2530 2604
2531 SvREFCNT_dec (coro->rouse_cb); 2605 SvREFCNT_dec (coro->rouse_cb);
2532 coro->rouse_cb = SvREFCNT_inc_NN (cb); 2606 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2533 2607
2534 return cb; 2608 return cb;
… …
2870 2944
2871 for (i = AvFILLp (av) - 1; i >= 0; i -= 2) 2945 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2872 if (AvARRAY (av)[i] == (SV *)hook) 2946 if (AvARRAY (av)[i] == (SV *)hook)
2873 { 2947 {
2874 if (execute) 2948 if (execute)
2875 hook ((void *)AvARRAY (av)[i + 1]); 2949 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2876 2950
2877 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1); 2951 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2878 av_pop (av); 2952 av_pop (av);
2879 av_pop (av); 2953 av_pop (av);
2880 break; 2954 break;
… …
2892{ 2966{
2893 struct coro *coro = SvSTATE (coro_sv); 2967 struct coro *coro = SvSTATE (coro_sv);
2894 2968
2895 if (SvSTATE_current == coro) 2969 if (SvSTATE_current == coro)
2896 if (enter) 2970 if (enter)
2897 enter (aTHX enter_arg); 2971 enter (aTHX_ enter_arg);
2898 2972
2899 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg); 2973 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2900 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg); 2974 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2901} 2975}
2902 2976
… …
3543 3617
3544 map_len = load_len + save_len + 16; 3618 map_len = load_len + save_len + 16;
3545 3619
3546 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);
3547 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
3548 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));
3549 3626
3550 load_perl_slots = (load_save_perl_slots_type)map_base; 3627 load_perl_slots = (load_save_perl_slots_type)map_base;
3551 memcpy (map_base, load_ptr, load_len); 3628 memcpy (map_base, load_ptr, load_len);
3552 3629
… …
3588 cctx_current = cctx_new_empty (); 3665 cctx_current = cctx_new_empty ();
3589 3666
3590 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3667 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3591 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3668 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3592 3669
3593 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3670 {
3594 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3671 /*
3595 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 }
3596 3694
3597 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3598 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));
3599 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));
3600 3697
3601 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 */
3602 3701
3603 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 3702 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
3604 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 3703 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
3605 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 3704 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
3606 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 3705 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
… …
3731call (Coro::State coro, SV *coderef) 3830call (Coro::State coro, SV *coderef)
3732 ALIAS: 3831 ALIAS:
3733 eval = 1 3832 eval = 1
3734 CODE: 3833 CODE:
3735{ 3834{
3835 struct coro *current = SvSTATE_current;
3836
3736 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3837 if ((coro == current) || (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)))
3737 { 3838 {
3738 struct coro *current = SvSTATE_current;
3739 struct CoroSLF slf_save; 3839 struct CoroSLF slf_save;
3740 3840
3741 if (current != coro) 3841 if (current != coro)
3742 { 3842 {
3743 PUTBACK; 3843 PUTBACK;
… …
3908 if (ecb_expect_false (current == self)) 4008 if (ecb_expect_false (current == self))
3909 coro_times_sub (SvSTATE (coro_current)); 4009 coro_times_sub (SvSTATE (coro_current));
3910} 4010}
3911 4011
3912void 4012void
3913swap_sv (Coro::State coro, SV *sv, SV *swapsv) 4013swap_sv (Coro::State coro, SV *sva, SV *svb)
3914 CODE: 4014 CODE:
3915{ 4015{
3916 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);
3917 4022
3918 if (current == coro) 4023 if (current == coro)
3919 SWAP_SVS (current); 4024 SWAP_SVS_LEAVE (current);
3920 4025
3921 if (!coro->swap_sv) 4026 if (!coro->swap_sv)
3922 coro->swap_sv = newAV (); 4027 coro->swap_sv = newAV ();
3923 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
3924 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4050 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3925 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4051 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4052
4053 removed:
3926 4054
3927 if (current == coro) 4055 if (current == coro)
3928 SWAP_SVS (current); 4056 SWAP_SVS_ENTER (current);
3929} 4057}
3930 4058
3931 4059
3932MODULE = Coro::State PACKAGE = Coro 4060MODULE = Coro::State PACKAGE = Coro
3933 4061
3934BOOT: 4062BOOT:
3935{ 4063{
4064 if (SVt_LAST > 32)
4065 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4066
3936 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4067 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3937 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4068 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3938 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4069 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3939 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);
3940 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4071 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3971 coroapi.enterleave_hook = api_enterleave_hook; 4102 coroapi.enterleave_hook = api_enterleave_hook;
3972 coroapi.enterleave_unhook = api_enterleave_unhook; 4103 coroapi.enterleave_unhook = api_enterleave_unhook;
3973 coroapi.enterleave_scope_hook = api_enterleave_scope_hook; 4104 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
3974 4105
3975 /*GCoroAPI = &coroapi;*/ 4106 /*GCoroAPI = &coroapi;*/
3976 sv_setiv (sv, (IV)&coroapi); 4107 sv_setiv (sv, PTR2IV (&coroapi));
3977 SvREADONLY_on (sv); 4108 SvREADONLY_on (sv);
3978 } 4109 }
3979} 4110}
3980 4111
3981SV * 4112SV *
… …
4244 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4375 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4245 OUTPUT: 4376 OUTPUT:
4246 RETVAL 4377 RETVAL
4247 4378
4248void 4379void
4249up (SV *self, int adjust = 1) 4380up (SV *self)
4250 ALIAS:
4251 adjust = 1
4252 CODE: 4381 CODE:
4382 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4383
4384void
4385adjust (SV *self, int adjust)
4386 CODE:
4253 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4387 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4254 4388
4255void 4389void
4256down (...) 4390down (...)
4257 CODE: 4391 CODE:
4258 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