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.451 by root, Mon Jun 29 23:49:34 2015 UTC vs.
Revision 1.478 by root, Mon Mar 16 11:12:52 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"
… …
116# define CORO_CLOCK_MONOTONIC 1 136# define CORO_CLOCK_MONOTONIC 1
117# define CORO_CLOCK_THREAD_CPUTIME_ID 3 137# define CORO_CLOCK_THREAD_CPUTIME_ID 3
118# endif 138# endif
119#endif 139#endif
120 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
121static double (*nvtime)(); /* so why doesn't it take void? */ 159static double (*nvtime)(); /* so why doesn't it take void? */
122static void (*u2time)(pTHX_ UV ret[2]); 160static void (*u2time)(pTHX_ UV ret[2]);
123 161
124/* we hijack an hopefully unused CV flag for our purposes */ 162/* we hijack an hopefully unused CV flag for our purposes */
125#define CVf_SLF 0x4000 163#define CVf_SLF 0x4000
… …
140 178
141static GV *irsgv; /* $/ */ 179static GV *irsgv; /* $/ */
142static GV *stdoutgv; /* *STDOUT */ 180static GV *stdoutgv; /* *STDOUT */
143static SV *rv_diehook; 181static SV *rv_diehook;
144static SV *rv_warnhook; 182static SV *rv_warnhook;
145static HV *hv_sig; /* %SIG */
146 183
147/* async_pool helper stuff */ 184/* async_pool helper stuff */
148static SV *sv_pool_rss; 185static SV *sv_pool_rss;
149static SV *sv_pool_size; 186static SV *sv_pool_size;
150static SV *sv_async_pool_idle; /* description string */ 187static SV *sv_async_pool_idle; /* description string */
… …
246 int usecount; /* number of transfers to this coro */ 283 int usecount; /* number of transfers to this coro */
247 284
248 /* coro process data */ 285 /* coro process data */
249 int prio; 286 int prio;
250 SV *except; /* exception to be thrown */ 287 SV *except; /* exception to be thrown */
251 SV *rouse_cb; /* last rouse callback */ 288 SV *rouse_cb; /* most recently created rouse callback */
252 AV *on_destroy; /* callbacks or coros to notify on destroy */ 289 AV *on_destroy; /* callbacks or coros to notify on destroy */
253 AV *status; /* the exit status list */ 290 AV *status; /* the exit status list */
254 291
255 /* async_pool */ 292 /* async_pool */
256 SV *saved_deffh; 293 SV *saved_deffh;
… …
709 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;
710 747
711 /* 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,
712 * 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.
713 */ 750 */
714 #define svany_in_head(type) \ 751 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
715 (((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)))
716 757
717 if (svany_in_head (SvTYPE (a))) 758 if (svany_in_head (SvTYPE (a)))
718 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 759 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
719 760
720 if (svany_in_head (SvTYPE (b))) 761 if (svany_in_head (SvTYPE (b)))
… …
723#endif 764#endif
724} 765}
725 766
726/* swap sv heads, at least logically */ 767/* swap sv heads, at least logically */
727static void 768static void
728swap_svs (pTHX_ Coro__State c) 769swap_svs_enter (pTHX_ Coro__State c)
729{ 770{
730 int i; 771 int i;
731 772
732 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 773 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
733 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]);
734} 775}
735 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
736#define SWAP_SVS(coro) \ 786#define SWAP_SVS_ENTER(coro) \
737 if (ecb_expect_false ((coro)->swap_sv)) \ 787 if (ecb_expect_false ((coro)->swap_sv)) \
738 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))
739 793
740static void 794static void
741on_enterleave_call (pTHX_ SV *cb); 795on_enterleave_call (pTHX_ SV *cb);
742 796
743static void 797static void
… …
796 850
797 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2) 851 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
798 ((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]);
799 } 853 }
800 854
801 SWAP_SVS (c); 855 SWAP_SVS_ENTER (c);
802} 856}
803 857
804static void 858static void
805save_perl (pTHX_ Coro__State c) 859save_perl (pTHX_ Coro__State c)
806{ 860{
807 SWAP_SVS (c); 861 SWAP_SVS_LEAVE (c);
808 862
809 if (ecb_expect_false (c->on_leave_xs)) 863 if (ecb_expect_false (c->on_leave_xs))
810 { 864 {
811 int i; 865 int i;
812 866
… …
947#endif 1001#endif
948 1002
949 New(54,PL_savestack,24,ANY); 1003 New(54,PL_savestack,24,ANY);
950 PL_savestack_ix = 0; 1004 PL_savestack_ix = 0;
951 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
952 1011
953#if !PERL_VERSION_ATLEAST (5,10,0) 1012#if !PERL_VERSION_ATLEAST (5,10,0)
954 New(54,PL_retstack,4,OP*); 1013 New(54,PL_retstack,4,OP*);
955 PL_retstack_ix = 0; 1014 PL_retstack_ix = 0;
956 PL_retstack_max = 4; 1015 PL_retstack_max = 4;
… …
1022 } 1081 }
1023 1082
1024 return rss; 1083 return rss;
1025} 1084}
1026 1085
1027/** coroutine stack handling ************************************************/ 1086/** provide custom get/set/clear methods for %SIG elements ******************/
1028
1029static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
1030static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
1031static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
1032 1087
1033/* apparently < 5.8.8 */ 1088/* apparently < 5.8.8 */
1034#ifndef MgPV_nolen_const 1089#ifndef MgPV_nolen_const
1035#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1090#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
1036 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1091 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
1037 (const char*)(mg)->mg_ptr) 1092 (const char*)(mg)->mg_ptr)
1038#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};
1039 1122
1040/* 1123/*
1041 * This overrides the default magic get method of %SIG elements. 1124 * This overrides the default magic get method of %SIG elements.
1042 * 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
1043 * 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),
… …
1045 */ 1128 */
1046static int ecb_cold 1129static int ecb_cold
1047coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
1048{ 1131{
1049 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;
1050 1135
1051 if (*s == '_') 1136 SV *ssv;
1052 {
1053 SV **svp = 0;
1054 1137
1055 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1056 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1057
1058 if (svp) 1138 if (!*svp)
1059 {
1060 SV *ssv;
1061
1062 if (!*svp)
1063 ssv = &PL_sv_undef; 1139 ssv = &PL_sv_undef;
1064 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. */
1065 ssv = sv_2mortal (newRV_inc (*svp)); 1141 ssv = sv_2mortal (newRV_inc (*svp));
1066 else 1142 else
1067 ssv = *svp; 1143 ssv = *svp;
1068 1144
1069 sv_setsv (sv, ssv); 1145 sv_setsv (sv, ssv);
1070 return 0; 1146 return 0;
1071 }
1072 }
1073
1074 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
1075} 1147}
1076 1148
1077static int ecb_cold 1149static int ecb_cold
1078coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1150coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
1079{ 1151{
1080 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;
1081 1155
1082 if (*s == '_')
1083 {
1084 SV **svp = 0;
1085
1086 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1087 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1088
1089 if (svp)
1090 {
1091 SV *old = *svp; 1156 SV *old = *svp;
1092 *svp = 0; 1157 *svp = 0;
1093 SvREFCNT_dec (old); 1158 SvREFCNT_dec (old);
1094 return 0; 1159 return 0;
1095 }
1096 }
1097
1098 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1099} 1160}
1100 1161
1101static int ecb_cold 1162static int ecb_cold
1102coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1163coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1103{ 1164{
1104 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;
1105 1168
1106 if (*s == '_')
1107 {
1108 SV **svp = 0;
1109
1110 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1111 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1112
1113 if (svp)
1114 {
1115 SV *old = *svp; 1169 SV *old = *svp;
1116 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1170 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1117 SvREFCNT_dec (old); 1171 SvREFCNT_dec (old);
1118 return 0; 1172 return 0;
1119 }
1120 }
1121
1122 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1123} 1173}
1124 1174
1125static void 1175static void
1126prepare_nop (pTHX_ struct coro_transfer_args *ta) 1176prepare_nop (pTHX_ struct coro_transfer_args *ta)
1127{ 1177{
… …
1138static int 1188static int
1139slf_check_repeat (pTHX_ struct CoroSLF *frame) 1189slf_check_repeat (pTHX_ struct CoroSLF *frame)
1140{ 1190{
1141 return 1; 1191 return 1;
1142} 1192}
1193
1194/** coroutine stack handling ************************************************/
1143 1195
1144static UNOP init_perl_op; 1196static UNOP init_perl_op;
1145 1197
1146ecb_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 */
1147init_perl (pTHX_ struct coro *coro) 1199init_perl (pTHX_ struct coro *coro)
… …
1190 myop.op_next = Nullop; 1242 myop.op_next = Nullop;
1191 myop.op_type = OP_ENTERSUB; 1243 myop.op_type = OP_ENTERSUB;
1192 myop.op_flags = OPf_WANT_VOID; 1244 myop.op_flags = OPf_WANT_VOID;
1193 1245
1194 PUSHMARK (SP); 1246 PUSHMARK (SP);
1195 PUSHs ((SV *)coro->startcv); 1247 XPUSHs ((SV *)coro->startcv);
1196 PUTBACK; 1248 PUTBACK;
1197 PL_op = (OP *)&myop; 1249 PL_op = (OP *)&myop;
1198 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1250 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1199 } 1251 }
1200 1252
… …
1214 PL_op = (OP *)&init_perl_op; 1266 PL_op = (OP *)&init_perl_op;
1215 1267
1216 /* copy throw, in case it was set before init_perl */ 1268 /* copy throw, in case it was set before init_perl */
1217 CORO_THROW = coro->except; 1269 CORO_THROW = coro->except;
1218 1270
1219 SWAP_SVS (coro); 1271 SWAP_SVS_ENTER (coro);
1220 1272
1221 if (ecb_expect_false (enable_times)) 1273 if (ecb_expect_false (enable_times))
1222 { 1274 {
1223 coro_times_update (); 1275 coro_times_update ();
1224 coro_times_sub (coro); 1276 coro_times_sub (coro);
… …
1262 /* this will cause transfer_check to croak on block*/ 1314 /* this will cause transfer_check to croak on block*/
1263 SvRV_set (coro_current, (SV *)coro->hv); 1315 SvRV_set (coro_current, (SV *)coro->hv);
1264 1316
1265 load_perl (aTHX_ coro); 1317 load_perl (aTHX_ coro);
1266 1318
1319 /* restore swapped sv's */
1320 SWAP_SVS_LEAVE (coro);
1321
1267 coro_unwind_stacks (aTHX); 1322 coro_unwind_stacks (aTHX);
1268
1269 /* restore swapped sv's */
1270 SWAP_SVS (coro);
1271 1323
1272 coro_destruct_stacks (aTHX); 1324 coro_destruct_stacks (aTHX);
1273 1325
1274 /* now save some sv's to be free'd later */ 1326 /* now save some sv's to be free'd later */
1275 svf [0] = GvSV (PL_defgv); 1327 svf [0] = GvSV (PL_defgv);
… …
1348 av_push (av, SvREFCNT_inc_NN (*bot++)); 1400 av_push (av, SvREFCNT_inc_NN (*bot++));
1349 1401
1350 PL_runops = RUNOPS_DEFAULT; 1402 PL_runops = RUNOPS_DEFAULT;
1351 ENTER; 1403 ENTER;
1352 SAVETMPS; 1404 SAVETMPS;
1405 PUSHMARK (SP);
1353 EXTEND (SP, 3); 1406 EXTEND (SP, 3);
1354 PUSHMARK (SP);
1355 PUSHs (&PL_sv_no); 1407 PUSHs (&PL_sv_no);
1356 PUSHs (fullname); 1408 PUSHs (fullname);
1357 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 1409 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
1358 PUTBACK; 1410 PUTBACK;
1359 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);
… …
1386 gv_efullname3 (fullname, gv, 0); 1438 gv_efullname3 (fullname, gv, 0);
1387 1439
1388 PL_runops = RUNOPS_DEFAULT; 1440 PL_runops = RUNOPS_DEFAULT;
1389 ENTER; 1441 ENTER;
1390 SAVETMPS; 1442 SAVETMPS;
1443 PUSHMARK (SP);
1391 EXTEND (SP, 3); 1444 EXTEND (SP, 3);
1392 PUSHMARK (SP);
1393 PUSHs (&PL_sv_yes); 1445 PUSHs (&PL_sv_yes);
1394 PUSHs (fullname); 1446 PUSHs (fullname);
1395 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);
1396 PUTBACK; 1448 PUTBACK;
1397 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);
1398 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);
1399 SPAGAIN; 1451 SPAGAIN;
1400 FREETMPS; 1452 FREETMPS;
… …
1410 dSP; 1462 dSP;
1411 1463
1412 PL_runops = RUNOPS_DEFAULT; 1464 PL_runops = RUNOPS_DEFAULT;
1413 ENTER; 1465 ENTER;
1414 SAVETMPS; 1466 SAVETMPS;
1415 EXTEND (SP, 3);
1416 PL_runops = RUNOPS_DEFAULT;
1417 PUSHMARK (SP); 1467 PUSHMARK (SP);
1468 EXTEND (SP, 2);
1418 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 1469 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
1419 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 1470 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
1420 PUTBACK; 1471 PUTBACK;
1421 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);
1422 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);
… …
1522 * 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
1523 * 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.
1524 */ 1575 */
1525 1576
1526 /* 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 /*
1527 * 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
1528 * 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)
1529 * 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
1530 * doing in that case. YMMV. 1588 * doing in that case. YMMV.
1531 */ 1589 */
… …
1801 1859
1802static int ecb_cold 1860static int ecb_cold
1803coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1861coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1804{ 1862{
1805 /* 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) */
1806 /* 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 */
1807 mg->mg_ptr = 0; 1865 mg->mg_ptr = 0;
1808 mg->mg_virtual = 0; 1866 mg->mg_virtual = 0;
1809 1867
1810 return 0; 1868 return 0;
1811} 1869}
… …
2333safe_cancel (pTHX_ struct coro *coro, SV **arg, int items) 2391safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2334{ 2392{
2335 if (coro->cctx) 2393 if (coro->cctx)
2336 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");
2337 2395
2338 if (coro->flags & CF_NEW) 2396 if (coro->flags & (CF_NEW | CF_ZOMBIE))
2339 { 2397 {
2340 coro_set_status (aTHX_ coro, arg, items); 2398 coro_set_status (aTHX_ coro, arg, items);
2341 coro_state_destroy (aTHX_ coro); 2399 coro_state_destroy (aTHX_ coro);
2342 } 2400 }
2343 else 2401 else
… …
2410 else 2468 else
2411 { 2469 {
2412 av_clear (GvAV (PL_defgv)); 2470 av_clear (GvAV (PL_defgv));
2413 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);
2414 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
2415 coro->prio = 0; 2480 coro->prio = 0;
2416 2481
2417 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2482 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2418 api_trace (aTHX_ coro_current, 0); 2483 api_trace (aTHX_ coro_current, 0);
2419 2484
2420 frame->prepare = prepare_schedule; 2485 frame->prepare = prepare_schedule;
2421 av_push (av_async_pool, SvREFCNT_inc (hv)); 2486 av_push (av_async_pool, SvREFCNT_inc_NN (hv));
2422 } 2487 }
2423 } 2488 }
2424 else 2489 else
2425 { 2490 {
2426 /* first iteration, simply fall through */ 2491 /* first iteration, simply fall through */
… …
2439static void 2504static void
2440coro_rouse_callback (pTHX_ CV *cv) 2505coro_rouse_callback (pTHX_ CV *cv)
2441{ 2506{
2442 dXSARGS; 2507 dXSARGS;
2443 SV *data = (SV *)S_GENSUB_ARG; 2508 SV *data = (SV *)S_GENSUB_ARG;
2509 SV *coro = SvRV (data);
2444 2510
2511 /* data starts being either undef or a coro, and is replaced by the results when done */
2445 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2512 if (SvTYPE (coro) != SVt_PVAV)
2446 { 2513 {
2447 /* first call, set args */ 2514 /* first call, set args */
2448 SV *coro = SvRV (data);
2449 AV *av = newAV ();
2450 2515
2451 SvRV_set (data, (SV *)av); 2516 assert (&ST (0) < &ST (1)); /* ensure the stack is in the order we expect it to be */
2517 SvRV_set (data, (SV *)av_make (items, &ST (0))); /* av_make copies the SVs */
2452 2518
2453 /* better take a full copy of the arguments */ 2519 if (coro != &PL_sv_undef)
2454 while (items--) 2520 {
2455 av_store (av, items, newSVsv (ST (items)));
2456
2457 api_ready (aTHX_ coro); 2521 api_ready (aTHX_ coro);
2458 SvREFCNT_dec (coro); 2522 SvREFCNT_dec_NN (coro);
2523 }
2459 } 2524 }
2460 2525
2461 XSRETURN_EMPTY; 2526 XSRETURN_EMPTY;
2462} 2527}
2463 2528
… …
2480 2545
2481 EXTEND (SP, AvFILLp (av) + 1); 2546 EXTEND (SP, AvFILLp (av) + 1);
2482 for (i = 0; i <= AvFILLp (av); ++i) 2547 for (i = 0; i <= AvFILLp (av); ++i)
2483 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2548 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2484 2549
2485 /* we have stolen the elements, so set length to zero and free */ 2550 /* we have stolen the elements, make it unreal and free */
2486 AvFILLp (av) = -1; 2551 AvREAL_off (av);
2487 av_undef (av); 2552 av_undef (av);
2488 2553
2489 PUTBACK; 2554 PUTBACK;
2490 } 2555 }
2491 2556
… …
2516 croak ("Coro::rouse_wait called with illegal callback argument,"); 2581 croak ("Coro::rouse_wait called with illegal callback argument,");
2517 2582
2518 { 2583 {
2519 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2584 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2520 SV *data = (SV *)S_GENSUB_ARG; 2585 SV *data = (SV *)S_GENSUB_ARG;
2586 int data_ready = SvTYPE (SvRV (data)) == SVt_PVAV;
2587
2588 /* if there is no data, we need to store the current coro in the reference so we can be woken up */
2589 if (!data_ready)
2590 if (SvRV (data) != &PL_sv_undef)
2591 croak ("Coro::rouse_wait was called on a calback that is already being waited for - only one thread can wait for a rouse callback, caught");
2592 else
2593 SvRV_set (data, SvREFCNT_inc_NN (SvRV (coro_current)));
2521 2594
2522 frame->data = (void *)data; 2595 frame->data = (void *)data;
2523 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2596 frame->prepare = data_ready ? prepare_nop : prepare_schedule;
2524 frame->check = slf_check_rouse_wait; 2597 frame->check = slf_check_rouse_wait;
2525 } 2598 }
2526} 2599}
2527 2600
2528static SV * 2601static SV *
2529coro_new_rouse_cb (pTHX) 2602coro_new_rouse_cb (pTHX)
2530{ 2603{
2531 HV *hv = (HV *)SvRV (coro_current); 2604 HV *hv = (HV *)SvRV (coro_current);
2532 struct coro *coro = SvSTATE_hv (hv); 2605 struct coro *coro = SvSTATE_hv (hv);
2533 SV *data = newRV_inc ((SV *)hv); 2606 SV *data = newRV_noinc (&PL_sv_undef);
2534 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data); 2607 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2535 2608
2536 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2609 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2537 SvREFCNT_dec (data); /* magicext increases the refcount */ 2610 SvREFCNT_dec_NN (data); /* magicext increases the refcount */
2538 2611
2539 SvREFCNT_dec (coro->rouse_cb); 2612 SvREFCNT_dec (coro->rouse_cb);
2540 coro->rouse_cb = SvREFCNT_inc_NN (cb); 2613 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2541 2614
2542 return cb; 2615 return cb;
… …
2878 2951
2879 for (i = AvFILLp (av) - 1; i >= 0; i -= 2) 2952 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2880 if (AvARRAY (av)[i] == (SV *)hook) 2953 if (AvARRAY (av)[i] == (SV *)hook)
2881 { 2954 {
2882 if (execute) 2955 if (execute)
2883 hook ((void *)AvARRAY (av)[i + 1]); 2956 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2884 2957
2885 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1); 2958 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2886 av_pop (av); 2959 av_pop (av);
2887 av_pop (av); 2960 av_pop (av);
2888 break; 2961 break;
… …
2900{ 2973{
2901 struct coro *coro = SvSTATE (coro_sv); 2974 struct coro *coro = SvSTATE (coro_sv);
2902 2975
2903 if (SvSTATE_current == coro) 2976 if (SvSTATE_current == coro)
2904 if (enter) 2977 if (enter)
2905 enter (aTHX enter_arg); 2978 enter (aTHX_ enter_arg);
2906 2979
2907 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg); 2980 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2908 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg); 2981 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2909} 2982}
2910 2983
… …
3551 3624
3552 map_len = load_len + save_len + 16; 3625 map_len = load_len + save_len + 16;
3553 3626
3554 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 3627 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3555 3628
3629 if (map_base == (char *)MAP_FAILED)
3630 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3631
3556 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3632 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3557 3633
3558 load_perl_slots = (load_save_perl_slots_type)map_base; 3634 load_perl_slots = (load_save_perl_slots_type)map_base;
3559 memcpy (map_base, load_ptr, load_len); 3635 memcpy (map_base, load_ptr, load_len);
3560 3636
… …
3596 cctx_current = cctx_new_empty (); 3672 cctx_current = cctx_new_empty ();
3597 3673
3598 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3674 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3599 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3675 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3600 3676
3601 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3677 {
3602 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3678 /*
3603 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3679 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3680 * by coro_sig_vtbl in hash values.
3681 */
3682 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3683
3684 /* this only works if perl doesn't have a vtbl for %SIG */
3685 assert (!mg->mg_virtual);
3686
3687 /*
3688 * The irony is that the perl API itself asserts that mg_virtual
3689 * must be non-const, yet perl5porters insisted on marking their
3690 * vtbls as read-only, just to thwart perl modules from patching
3691 * them.
3692 */
3693 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3694 mg->mg_flags |= MGf_COPY;
3695
3696 coro_sigelem_vtbl = PL_vtbl_sigelem;
3697 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3698 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3699 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3700 }
3604 3701
3605 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3606 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3702 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3607 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3703 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3608 3704
3609 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3705 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3706
3707 newCONSTSUB (coro_state_stash, "BACKEND", newSVpv (CORO_BACKEND, 0)); /* undocumented */
3610 3708
3611 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 3709 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
3612 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 3710 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
3613 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 3711 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
3614 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 3712 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
… …
3739call (Coro::State coro, SV *coderef) 3837call (Coro::State coro, SV *coderef)
3740 ALIAS: 3838 ALIAS:
3741 eval = 1 3839 eval = 1
3742 CODE: 3840 CODE:
3743{ 3841{
3842 struct coro *current = SvSTATE_current;
3843
3744 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3844 if ((coro == current) || (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)))
3745 { 3845 {
3746 struct coro *current = SvSTATE_current;
3747 struct CoroSLF slf_save; 3846 struct CoroSLF slf_save;
3748 3847
3749 if (current != coro) 3848 if (current != coro)
3750 { 3849 {
3751 PUTBACK; 3850 PUTBACK;
… …
3916 if (ecb_expect_false (current == self)) 4015 if (ecb_expect_false (current == self))
3917 coro_times_sub (SvSTATE (coro_current)); 4016 coro_times_sub (SvSTATE (coro_current));
3918} 4017}
3919 4018
3920void 4019void
3921swap_sv (Coro::State coro, SV *sv, SV *swapsv) 4020swap_sv (Coro::State coro, SV *sva, SV *svb)
3922 CODE: 4021 CODE:
3923{ 4022{
3924 struct coro *current = SvSTATE_current; 4023 struct coro *current = SvSTATE_current;
4024 AV *swap_sv;
4025 int i;
4026
4027 sva = SvRV (sva);
4028 svb = SvRV (svb);
3925 4029
3926 if (current == coro) 4030 if (current == coro)
3927 SWAP_SVS (current); 4031 SWAP_SVS_LEAVE (current);
3928 4032
3929 if (!coro->swap_sv) 4033 if (!coro->swap_sv)
3930 coro->swap_sv = newAV (); 4034 coro->swap_sv = newAV ();
3931 4035
4036 swap_sv = coro->swap_sv;
4037
4038 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4039 {
4040 SV *a = AvARRAY (swap_sv)[i ];
4041 SV *b = AvARRAY (swap_sv)[i + 1];
4042
4043 if (a == sva && b == svb)
4044 {
4045 SvREFCNT_dec_NN (a);
4046 SvREFCNT_dec_NN (b);
4047
4048 for (; i <= AvFILLp (swap_sv) - 2; i++)
4049 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4050
4051 AvFILLp (swap_sv) -= 2;
4052
4053 goto removed;
4054 }
4055 }
4056
3932 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4057 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3933 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4058 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4059
4060 removed:
3934 4061
3935 if (current == coro) 4062 if (current == coro)
3936 SWAP_SVS (current); 4063 SWAP_SVS_ENTER (current);
3937} 4064}
3938 4065
3939 4066
3940MODULE = Coro::State PACKAGE = Coro 4067MODULE = Coro::State PACKAGE = Coro
3941 4068
3942BOOT: 4069BOOT:
3943{ 4070{
4071 if (SVt_LAST > 32)
4072 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4073
3944 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4074 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3945 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4075 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3946 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4076 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3947 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4077 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3948 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4078 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3979 coroapi.enterleave_hook = api_enterleave_hook; 4109 coroapi.enterleave_hook = api_enterleave_hook;
3980 coroapi.enterleave_unhook = api_enterleave_unhook; 4110 coroapi.enterleave_unhook = api_enterleave_unhook;
3981 coroapi.enterleave_scope_hook = api_enterleave_scope_hook; 4111 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
3982 4112
3983 /*GCoroAPI = &coroapi;*/ 4113 /*GCoroAPI = &coroapi;*/
3984 sv_setiv (sv, (IV)&coroapi); 4114 sv_setiv (sv, PTR2IV (&coroapi));
3985 SvREADONLY_on (sv); 4115 SvREADONLY_on (sv);
3986 } 4116 }
3987} 4117}
3988 4118
3989SV * 4119SV *
… …
4252 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4382 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4253 OUTPUT: 4383 OUTPUT:
4254 RETVAL 4384 RETVAL
4255 4385
4256void 4386void
4257up (SV *self, int adjust = 1) 4387up (SV *self)
4258 ALIAS:
4259 adjust = 1
4260 CODE: 4388 CODE:
4389 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4390
4391void
4392adjust (SV *self, int adjust)
4393 CODE:
4261 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4394 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4262 4395
4263void 4396void
4264down (...) 4397down (...)
4265 CODE: 4398 CODE:
4266 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4399 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines