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.454 by root, Tue Jul 7 00:38:03 2015 UTC vs.
Revision 1.480 by root, Fri Jun 25 01:13:21 2021 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;
… …
727#endif 764#endif
728} 765}
729 766
730/* swap sv heads, at least logically */ 767/* swap sv heads, at least logically */
731static void 768static void
732swap_svs (pTHX_ Coro__State c) 769swap_svs_enter (pTHX_ Coro__State c)
733{ 770{
734 int i; 771 int i;
735 772
736 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 773 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
737 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]);
738} 775}
739 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
740#define SWAP_SVS(coro) \ 786#define SWAP_SVS_ENTER(coro) \
741 if (ecb_expect_false ((coro)->swap_sv)) \ 787 if (ecb_expect_false ((coro)->swap_sv)) \
742 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))
743 793
744static void 794static void
745on_enterleave_call (pTHX_ SV *cb); 795on_enterleave_call (pTHX_ SV *cb);
746 796
747static void 797static void
… …
800 850
801 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2) 851 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
802 ((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]);
803 } 853 }
804 854
805 SWAP_SVS (c); 855 SWAP_SVS_ENTER (c);
806} 856}
807 857
808static void 858static void
809save_perl (pTHX_ Coro__State c) 859save_perl (pTHX_ Coro__State c)
810{ 860{
811 SWAP_SVS (c); 861 SWAP_SVS_LEAVE (c);
812 862
813 if (ecb_expect_false (c->on_leave_xs)) 863 if (ecb_expect_false (c->on_leave_xs))
814 { 864 {
815 int i; 865 int i;
816 866
… …
951#endif 1001#endif
952 1002
953 New(54,PL_savestack,24,ANY); 1003 New(54,PL_savestack,24,ANY);
954 PL_savestack_ix = 0; 1004 PL_savestack_ix = 0;
955 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
956 1011
957#if !PERL_VERSION_ATLEAST (5,10,0) 1012#if !PERL_VERSION_ATLEAST (5,10,0)
958 New(54,PL_retstack,4,OP*); 1013 New(54,PL_retstack,4,OP*);
959 PL_retstack_ix = 0; 1014 PL_retstack_ix = 0;
960 PL_retstack_max = 4; 1015 PL_retstack_max = 4;
… …
1026 } 1081 }
1027 1082
1028 return rss; 1083 return rss;
1029} 1084}
1030 1085
1031/** coroutine stack handling ************************************************/ 1086/** provide custom get/set/clear methods for %SIG elements ******************/
1032
1033static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
1034static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
1035static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
1036 1087
1037/* apparently < 5.8.8 */ 1088/* apparently < 5.8.8 */
1038#ifndef MgPV_nolen_const 1089#ifndef MgPV_nolen_const
1039#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1090#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
1040 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1091 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
1041 (const char*)(mg)->mg_ptr) 1092 (const char*)(mg)->mg_ptr)
1042#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};
1043 1122
1044/* 1123/*
1045 * This overrides the default magic get method of %SIG elements. 1124 * This overrides the default magic get method of %SIG elements.
1046 * 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
1047 * 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),
… …
1049 */ 1128 */
1050static int ecb_cold 1129static int ecb_cold
1051coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
1052{ 1131{
1053 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;
1054 1135
1055 if (*s == '_') 1136 SV *ssv;
1056 {
1057 SV **svp = 0;
1058 1137
1059 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1060 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1061
1062 if (svp) 1138 if (!*svp)
1063 {
1064 SV *ssv;
1065
1066 if (!*svp)
1067 ssv = &PL_sv_undef; 1139 ssv = &PL_sv_undef;
1068 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. */
1069 ssv = sv_2mortal (newRV_inc (*svp)); 1141 ssv = sv_2mortal (newRV_inc (*svp));
1070 else 1142 else
1071 ssv = *svp; 1143 ssv = *svp;
1072 1144
1073 sv_setsv (sv, ssv); 1145 sv_setsv (sv, ssv);
1074 return 0; 1146 return 0;
1075 }
1076 }
1077
1078 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
1079} 1147}
1080 1148
1081static int ecb_cold 1149static int ecb_cold
1082coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1150coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
1083{ 1151{
1084 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;
1085 1155
1086 if (*s == '_')
1087 {
1088 SV **svp = 0;
1089
1090 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1091 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1092
1093 if (svp)
1094 {
1095 SV *old = *svp; 1156 SV *old = *svp;
1096 *svp = 0; 1157 *svp = 0;
1097 SvREFCNT_dec (old); 1158 SvREFCNT_dec (old);
1098 return 0; 1159 return 0;
1099 }
1100 }
1101
1102 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1103} 1160}
1104 1161
1105static int ecb_cold 1162static int ecb_cold
1106coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1163coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1107{ 1164{
1108 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;
1109 1168
1110 if (*s == '_')
1111 {
1112 SV **svp = 0;
1113
1114 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1115 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1116
1117 if (svp)
1118 {
1119 SV *old = *svp; 1169 SV *old = *svp;
1120 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1170 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1121 SvREFCNT_dec (old); 1171 SvREFCNT_dec (old);
1122 return 0; 1172 return 0;
1123 }
1124 }
1125
1126 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1127} 1173}
1128 1174
1129static void 1175static void
1130prepare_nop (pTHX_ struct coro_transfer_args *ta) 1176prepare_nop (pTHX_ struct coro_transfer_args *ta)
1131{ 1177{
… …
1142static int 1188static int
1143slf_check_repeat (pTHX_ struct CoroSLF *frame) 1189slf_check_repeat (pTHX_ struct CoroSLF *frame)
1144{ 1190{
1145 return 1; 1191 return 1;
1146} 1192}
1193
1194/** coroutine stack handling ************************************************/
1147 1195
1148static UNOP init_perl_op; 1196static UNOP init_perl_op;
1149 1197
1150ecb_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 */
1151init_perl (pTHX_ struct coro *coro) 1199init_perl (pTHX_ struct coro *coro)
… …
1194 myop.op_next = Nullop; 1242 myop.op_next = Nullop;
1195 myop.op_type = OP_ENTERSUB; 1243 myop.op_type = OP_ENTERSUB;
1196 myop.op_flags = OPf_WANT_VOID; 1244 myop.op_flags = OPf_WANT_VOID;
1197 1245
1198 PUSHMARK (SP); 1246 PUSHMARK (SP);
1199 PUSHs ((SV *)coro->startcv); 1247 XPUSHs ((SV *)coro->startcv);
1200 PUTBACK; 1248 PUTBACK;
1201 PL_op = (OP *)&myop; 1249 PL_op = (OP *)&myop;
1202 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1250 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1203 } 1251 }
1204 1252
… …
1218 PL_op = (OP *)&init_perl_op; 1266 PL_op = (OP *)&init_perl_op;
1219 1267
1220 /* copy throw, in case it was set before init_perl */ 1268 /* copy throw, in case it was set before init_perl */
1221 CORO_THROW = coro->except; 1269 CORO_THROW = coro->except;
1222 1270
1223 SWAP_SVS (coro); 1271 SWAP_SVS_ENTER (coro);
1224 1272
1225 if (ecb_expect_false (enable_times)) 1273 if (ecb_expect_false (enable_times))
1226 { 1274 {
1227 coro_times_update (); 1275 coro_times_update ();
1228 coro_times_sub (coro); 1276 coro_times_sub (coro);
… …
1261 1309
1262 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1310 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1263 1311
1264 save_perl (aTHX_ current); 1312 save_perl (aTHX_ current);
1265 1313
1266 /* this will cause transfer_check to croak on block*/ 1314 /* this will cause transfer_check to croak on block */
1267 SvRV_set (coro_current, (SV *)coro->hv); 1315 SvRV_set (coro_current, (SV *)coro->hv);
1268 1316
1269 load_perl (aTHX_ coro); 1317 load_perl (aTHX_ coro);
1270 1318
1319 /* restore swapped sv's */
1320 SWAP_SVS_LEAVE (coro);
1321
1271 coro_unwind_stacks (aTHX); 1322 coro_unwind_stacks (aTHX);
1272
1273 /* restore swapped sv's */
1274 SWAP_SVS (coro);
1275 1323
1276 coro_destruct_stacks (aTHX); 1324 coro_destruct_stacks (aTHX);
1277 1325
1278 /* now save some sv's to be free'd later */ 1326 /* now save some sv's to be free'd later */
1279 svf [0] = GvSV (PL_defgv); 1327 svf [0] = GvSV (PL_defgv);
… …
1352 av_push (av, SvREFCNT_inc_NN (*bot++)); 1400 av_push (av, SvREFCNT_inc_NN (*bot++));
1353 1401
1354 PL_runops = RUNOPS_DEFAULT; 1402 PL_runops = RUNOPS_DEFAULT;
1355 ENTER; 1403 ENTER;
1356 SAVETMPS; 1404 SAVETMPS;
1405 PUSHMARK (SP);
1357 EXTEND (SP, 3); 1406 EXTEND (SP, 3);
1358 PUSHMARK (SP);
1359 PUSHs (&PL_sv_no); 1407 PUSHs (&PL_sv_no);
1360 PUSHs (fullname); 1408 PUSHs (fullname);
1361 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 1409 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
1362 PUTBACK; 1410 PUTBACK;
1363 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);
… …
1390 gv_efullname3 (fullname, gv, 0); 1438 gv_efullname3 (fullname, gv, 0);
1391 1439
1392 PL_runops = RUNOPS_DEFAULT; 1440 PL_runops = RUNOPS_DEFAULT;
1393 ENTER; 1441 ENTER;
1394 SAVETMPS; 1442 SAVETMPS;
1443 PUSHMARK (SP);
1395 EXTEND (SP, 3); 1444 EXTEND (SP, 3);
1396 PUSHMARK (SP);
1397 PUSHs (&PL_sv_yes); 1445 PUSHs (&PL_sv_yes);
1398 PUSHs (fullname); 1446 PUSHs (fullname);
1399 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);
1400 PUTBACK; 1448 PUTBACK;
1401 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);
1402 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);
1403 SPAGAIN; 1451 SPAGAIN;
1404 FREETMPS; 1452 FREETMPS;
… …
1414 dSP; 1462 dSP;
1415 1463
1416 PL_runops = RUNOPS_DEFAULT; 1464 PL_runops = RUNOPS_DEFAULT;
1417 ENTER; 1465 ENTER;
1418 SAVETMPS; 1466 SAVETMPS;
1419 EXTEND (SP, 3);
1420 PL_runops = RUNOPS_DEFAULT;
1421 PUSHMARK (SP); 1467 PUSHMARK (SP);
1468 EXTEND (SP, 2);
1422 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 1469 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
1423 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 1470 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
1424 PUTBACK; 1471 PUTBACK;
1425 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);
1426 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);
… …
1526 * 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
1527 * 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.
1528 */ 1575 */
1529 1576
1530 /* 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 /*
1531 * 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
1532 * 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)
1533 * 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
1534 * doing in that case. YMMV. 1588 * doing in that case. YMMV.
1535 */ 1589 */
… …
1790 1844
1791static int 1845static int
1792coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1846coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1793{ 1847{
1794 struct coro *coro = (struct coro *)mg->mg_ptr; 1848 struct coro *coro = (struct coro *)mg->mg_ptr;
1849
1850 coro_state_destroy (aTHX_ coro);
1795 mg->mg_ptr = 0; 1851 mg->mg_ptr = 0;
1796 1852
1797 coro_state_destroy (aTHX_ coro);
1798 SvREFCNT_dec (coro->on_destroy); 1853 SvREFCNT_dec (coro->on_destroy);
1799 SvREFCNT_dec (coro->status); 1854 SvREFCNT_dec (coro->status);
1800 1855
1801 Safefree (coro); 1856 Safefree (coro);
1802 1857
… …
1805 1860
1806static int ecb_cold 1861static int ecb_cold
1807coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1862coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1808{ 1863{
1809 /* called when perl clones the current process the slow way (windows process emulation) */ 1864 /* called when perl clones the current process the slow way (windows process emulation) */
1810 /* WE SIMply nuke the pointers in the copy, causing perl to croak */ 1865 /* we simply nuke the pointers in the copy, causing perl to croak */
1811 mg->mg_ptr = 0; 1866 mg->mg_ptr = 0;
1812 mg->mg_virtual = 0; 1867 mg->mg_virtual = 0;
1813 1868
1814 return 0; 1869 return 0;
1815} 1870}
… …
2337safe_cancel (pTHX_ struct coro *coro, SV **arg, int items) 2392safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2338{ 2393{
2339 if (coro->cctx) 2394 if (coro->cctx)
2340 croak ("coro inside C callback, unable to cancel at this time, caught"); 2395 croak ("coro inside C callback, unable to cancel at this time, caught");
2341 2396
2342 if (coro->flags & CF_NEW) 2397 if (coro->flags & (CF_NEW | CF_ZOMBIE))
2343 { 2398 {
2344 coro_set_status (aTHX_ coro, arg, items); 2399 coro_set_status (aTHX_ coro, arg, items);
2345 coro_state_destroy (aTHX_ coro); 2400 coro_state_destroy (aTHX_ coro);
2346 } 2401 }
2347 else 2402 else
… …
2414 else 2469 else
2415 { 2470 {
2416 av_clear (GvAV (PL_defgv)); 2471 av_clear (GvAV (PL_defgv));
2417 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2472 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2418 2473
2474 if (ecb_expect_false (coro->swap_sv))
2475 {
2476 SWAP_SVS_LEAVE (coro);
2477 SvREFCNT_dec_NN (coro->swap_sv);
2478 coro->swap_sv = 0;
2479 }
2480
2419 coro->prio = 0; 2481 coro->prio = 0;
2420 2482
2421 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2483 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2422 api_trace (aTHX_ coro_current, 0); 2484 api_trace (aTHX_ coro_current, 0);
2423 2485
2424 frame->prepare = prepare_schedule; 2486 frame->prepare = prepare_schedule;
2425 av_push (av_async_pool, SvREFCNT_inc (hv)); 2487 av_push (av_async_pool, SvREFCNT_inc_NN (hv));
2426 } 2488 }
2427 } 2489 }
2428 else 2490 else
2429 { 2491 {
2430 /* first iteration, simply fall through */ 2492 /* first iteration, simply fall through */
… …
2443static void 2505static void
2444coro_rouse_callback (pTHX_ CV *cv) 2506coro_rouse_callback (pTHX_ CV *cv)
2445{ 2507{
2446 dXSARGS; 2508 dXSARGS;
2447 SV *data = (SV *)S_GENSUB_ARG; 2509 SV *data = (SV *)S_GENSUB_ARG;
2510 SV *coro = SvRV (data);
2448 2511
2512 /* data starts being either undef or a coro, and is replaced by the results when done */
2449 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2513 if (SvTYPE (coro) != SVt_PVAV)
2450 { 2514 {
2451 /* first call, set args */ 2515 /* first call, set args */
2452 SV *coro = SvRV (data);
2453 AV *av = newAV ();
2454 2516
2455 SvRV_set (data, (SV *)av); 2517 assert (&ST (0) < &ST (1)); /* ensure the stack is in the order we expect it to be */
2518 SvRV_set (data, (SV *)av_make (items, &ST (0))); /* av_make copies the SVs */
2456 2519
2457 /* better take a full copy of the arguments */ 2520 if (coro != &PL_sv_undef)
2458 while (items--) 2521 {
2459 av_store (av, items, newSVsv (ST (items)));
2460
2461 api_ready (aTHX_ coro); 2522 api_ready (aTHX_ coro);
2462 SvREFCNT_dec (coro); 2523 SvREFCNT_dec_NN (coro);
2524 }
2463 } 2525 }
2464 2526
2465 XSRETURN_EMPTY; 2527 XSRETURN_EMPTY;
2466} 2528}
2467 2529
… …
2484 2546
2485 EXTEND (SP, AvFILLp (av) + 1); 2547 EXTEND (SP, AvFILLp (av) + 1);
2486 for (i = 0; i <= AvFILLp (av); ++i) 2548 for (i = 0; i <= AvFILLp (av); ++i)
2487 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2549 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2488 2550
2489 /* we have stolen the elements, so set length to zero and free */ 2551 /* we have stolen the elements, make it unreal and free */
2490 AvFILLp (av) = -1; 2552 AvREAL_off (av);
2491 av_undef (av); 2553 av_undef (av);
2492 2554
2493 PUTBACK; 2555 PUTBACK;
2494 } 2556 }
2495 2557
… …
2520 croak ("Coro::rouse_wait called with illegal callback argument,"); 2582 croak ("Coro::rouse_wait called with illegal callback argument,");
2521 2583
2522 { 2584 {
2523 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2585 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2524 SV *data = (SV *)S_GENSUB_ARG; 2586 SV *data = (SV *)S_GENSUB_ARG;
2587 int data_ready = SvTYPE (SvRV (data)) == SVt_PVAV;
2588
2589 /* if there is no data, we need to store the current coro in the reference so we can be woken up */
2590 if (!data_ready)
2591 if (SvRV (data) != &PL_sv_undef)
2592 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");
2593 else
2594 SvRV_set (data, SvREFCNT_inc_NN (SvRV (coro_current)));
2525 2595
2526 frame->data = (void *)data; 2596 frame->data = (void *)data;
2527 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2597 frame->prepare = data_ready ? prepare_nop : prepare_schedule;
2528 frame->check = slf_check_rouse_wait; 2598 frame->check = slf_check_rouse_wait;
2529 } 2599 }
2530} 2600}
2531 2601
2532static SV * 2602static SV *
2533coro_new_rouse_cb (pTHX) 2603coro_new_rouse_cb (pTHX)
2534{ 2604{
2535 HV *hv = (HV *)SvRV (coro_current); 2605 HV *hv = (HV *)SvRV (coro_current);
2536 struct coro *coro = SvSTATE_hv (hv); 2606 struct coro *coro = SvSTATE_hv (hv);
2537 SV *data = newRV_inc ((SV *)hv); 2607 SV *data = newRV_noinc (&PL_sv_undef);
2538 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data); 2608 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2539 2609
2540 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2610 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2541 SvREFCNT_dec (data); /* magicext increases the refcount */ 2611 SvREFCNT_dec_NN (data); /* magicext increases the refcount */
2542 2612
2543 SvREFCNT_dec (coro->rouse_cb); 2613 SvREFCNT_dec (coro->rouse_cb);
2544 coro->rouse_cb = SvREFCNT_inc_NN (cb); 2614 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2545 2615
2546 return cb; 2616 return cb;
… …
3555 3625
3556 map_len = load_len + save_len + 16; 3626 map_len = load_len + save_len + 16;
3557 3627
3558 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 3628 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3559 3629
3630 if (map_base == (char *)MAP_FAILED)
3631 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3632
3560 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3633 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3561 3634
3562 load_perl_slots = (load_save_perl_slots_type)map_base; 3635 load_perl_slots = (load_save_perl_slots_type)map_base;
3563 memcpy (map_base, load_ptr, load_len); 3636 memcpy (map_base, load_ptr, load_len);
3564 3637
… …
3600 cctx_current = cctx_new_empty (); 3673 cctx_current = cctx_new_empty ();
3601 3674
3602 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3675 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3603 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3676 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3604 3677
3605 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3678 {
3606 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3679 /*
3607 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3680 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3681 * by coro_sig_vtbl in hash values.
3682 */
3683 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3684
3685 /* this only works if perl doesn't have a vtbl for %SIG */
3686 assert (!mg->mg_virtual);
3687
3688 /*
3689 * The irony is that the perl API itself asserts that mg_virtual
3690 * must be non-const, yet perl5porters insisted on marking their
3691 * vtbls as read-only, just to thwart perl modules from patching
3692 * them.
3693 */
3694 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3695 mg->mg_flags |= MGf_COPY;
3696
3697 coro_sigelem_vtbl = PL_vtbl_sigelem;
3698 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3699 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3700 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3701 }
3608 3702
3609 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3610 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3703 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3611 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3704 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3612 3705
3613 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3706 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3707
3708 newCONSTSUB (coro_state_stash, "BACKEND", newSVpv (CORO_BACKEND, 0)); /* undocumented */
3614 3709
3615 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 3710 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
3616 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 3711 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
3617 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 3712 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
3618 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 3713 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
… …
3743call (Coro::State coro, SV *coderef) 3838call (Coro::State coro, SV *coderef)
3744 ALIAS: 3839 ALIAS:
3745 eval = 1 3840 eval = 1
3746 CODE: 3841 CODE:
3747{ 3842{
3843 struct coro *current = SvSTATE_current;
3844
3748 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3845 if ((coro == current) || (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)))
3749 { 3846 {
3750 struct coro *current = SvSTATE_current;
3751 struct CoroSLF slf_save; 3847 struct CoroSLF slf_save;
3752 3848
3753 if (current != coro) 3849 if (current != coro)
3754 { 3850 {
3755 PUTBACK; 3851 PUTBACK;
… …
3920 if (ecb_expect_false (current == self)) 4016 if (ecb_expect_false (current == self))
3921 coro_times_sub (SvSTATE (coro_current)); 4017 coro_times_sub (SvSTATE (coro_current));
3922} 4018}
3923 4019
3924void 4020void
3925swap_sv (Coro::State coro, SV *sv, SV *swapsv) 4021swap_sv (Coro::State coro, SV *sva, SV *svb)
3926 CODE: 4022 CODE:
3927{ 4023{
3928 struct coro *current = SvSTATE_current; 4024 struct coro *current = SvSTATE_current;
4025 AV *swap_sv;
4026 int i;
4027
4028 sva = SvRV (sva);
4029 svb = SvRV (svb);
3929 4030
3930 if (current == coro) 4031 if (current == coro)
3931 SWAP_SVS (current); 4032 SWAP_SVS_LEAVE (current);
3932 4033
3933 if (!coro->swap_sv) 4034 if (!coro->swap_sv)
3934 coro->swap_sv = newAV (); 4035 coro->swap_sv = newAV ();
3935 4036
4037 swap_sv = coro->swap_sv;
4038
4039 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4040 {
4041 SV *a = AvARRAY (swap_sv)[i ];
4042 SV *b = AvARRAY (swap_sv)[i + 1];
4043
4044 if (a == sva && b == svb)
4045 {
4046 SvREFCNT_dec_NN (a);
4047 SvREFCNT_dec_NN (b);
4048
4049 for (; i <= AvFILLp (swap_sv) - 2; i++)
4050 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4051
4052 AvFILLp (swap_sv) -= 2;
4053
4054 goto removed;
4055 }
4056 }
4057
3936 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4058 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3937 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4059 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4060
4061 removed:
3938 4062
3939 if (current == coro) 4063 if (current == coro)
3940 SWAP_SVS (current); 4064 SWAP_SVS_ENTER (current);
3941} 4065}
3942 4066
3943 4067
3944MODULE = Coro::State PACKAGE = Coro 4068MODULE = Coro::State PACKAGE = Coro
3945 4069
… …
3986 coroapi.enterleave_hook = api_enterleave_hook; 4110 coroapi.enterleave_hook = api_enterleave_hook;
3987 coroapi.enterleave_unhook = api_enterleave_unhook; 4111 coroapi.enterleave_unhook = api_enterleave_unhook;
3988 coroapi.enterleave_scope_hook = api_enterleave_scope_hook; 4112 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
3989 4113
3990 /*GCoroAPI = &coroapi;*/ 4114 /*GCoroAPI = &coroapi;*/
3991 sv_setiv (sv, (IV)&coroapi); 4115 sv_setiv (sv, PTR2IV (&coroapi));
3992 SvREADONLY_on (sv); 4116 SvREADONLY_on (sv);
3993 } 4117 }
3994} 4118}
3995 4119
3996SV * 4120SV *
… …
4259 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4383 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4260 OUTPUT: 4384 OUTPUT:
4261 RETVAL 4385 RETVAL
4262 4386
4263void 4387void
4264up (SV *self, int adjust = 1) 4388up (SV *self)
4265 ALIAS:
4266 adjust = 1
4267 CODE: 4389 CODE:
4390 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4391
4392void
4393adjust (SV *self, int adjust)
4394 CODE:
4268 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4395 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4269 4396
4270void 4397void
4271down (...) 4398down (...)
4272 CODE: 4399 CODE:
4273 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4400 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);

Diff Legend

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