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.471 by root, Fri Jul 14 23:20:07 2017 UTC

… …
116# define CORO_CLOCK_MONOTONIC 1 116# define CORO_CLOCK_MONOTONIC 1
117# define CORO_CLOCK_THREAD_CPUTIME_ID 3 117# define CORO_CLOCK_THREAD_CPUTIME_ID 3
118# endif 118# endif
119#endif 119#endif
120 120
121/* one off bugfix for perl 5.22 */
122#if PERL_VERSION_ATLEAST(5,22,0) && !PERL_VERSION_ATLEAST(5,24,0)
123# undef PadlistNAMES
124# define PadlistNAMES(pl) *((PADNAMELIST **)PadlistARRAY (pl))
125#endif
126
127#if PERL_VERSION_ATLEAST(5,24,0)
128# define SUB_ARGARRAY PL_curpad[0]
129#else
130# define SUB_ARGARRAY (SV *)cx->blk_sub.argarray
131#endif
132
133/* perl usually suppresses asserts. for debugging, we sometimes force it to be on */
134#if 0
135# undef NDEBUG
136# include <assert.h>
137#endif
138
121static double (*nvtime)(); /* so why doesn't it take void? */ 139static double (*nvtime)(); /* so why doesn't it take void? */
122static void (*u2time)(pTHX_ UV ret[2]); 140static void (*u2time)(pTHX_ UV ret[2]);
123 141
124/* we hijack an hopefully unused CV flag for our purposes */ 142/* we hijack an hopefully unused CV flag for our purposes */
125#define CVf_SLF 0x4000 143#define CVf_SLF 0x4000
… …
140 158
141static GV *irsgv; /* $/ */ 159static GV *irsgv; /* $/ */
142static GV *stdoutgv; /* *STDOUT */ 160static GV *stdoutgv; /* *STDOUT */
143static SV *rv_diehook; 161static SV *rv_diehook;
144static SV *rv_warnhook; 162static SV *rv_warnhook;
145static HV *hv_sig; /* %SIG */
146 163
147/* async_pool helper stuff */ 164/* async_pool helper stuff */
148static SV *sv_pool_rss; 165static SV *sv_pool_rss;
149static SV *sv_pool_size; 166static SV *sv_pool_size;
150static SV *sv_async_pool_idle; /* description string */ 167static SV *sv_async_pool_idle; /* description string */
… …
709 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u; 726 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
710 727
711 /* if SvANY points to the head, we need to adjust the pointers, 728 /* 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. 729 * as the pointer for a still points to b, and maybe vice versa.
713 */ 730 */
714 #define svany_in_head(type) \ 731 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))) 732 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
733 svany_in_head_set |= 1 << SVt_NV;
734 #endif
735
736 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
716 737
717 if (svany_in_head (SvTYPE (a))) 738 if (svany_in_head (SvTYPE (a)))
718 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 739 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
719 740
720 if (svany_in_head (SvTYPE (b))) 741 if (svany_in_head (SvTYPE (b)))
… …
723#endif 744#endif
724} 745}
725 746
726/* swap sv heads, at least logically */ 747/* swap sv heads, at least logically */
727static void 748static void
728swap_svs (pTHX_ Coro__State c) 749swap_svs_enter (pTHX_ Coro__State c)
729{ 750{
730 int i; 751 int i;
731 752
732 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 753 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
733 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]); 754 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
734} 755}
735 756
757static void
758swap_svs_leave (pTHX_ Coro__State c)
759{
760 int i;
761
762 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
763 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
764}
765
736#define SWAP_SVS(coro) \ 766#define SWAP_SVS_ENTER(coro) \
737 if (ecb_expect_false ((coro)->swap_sv)) \ 767 if (ecb_expect_false ((coro)->swap_sv)) \
738 swap_svs (aTHX_ (coro)) 768 swap_svs_enter (aTHX_ (coro))
769
770#define SWAP_SVS_LEAVE(coro) \
771 if (ecb_expect_false ((coro)->swap_sv)) \
772 swap_svs_leave (aTHX_ (coro))
739 773
740static void 774static void
741on_enterleave_call (pTHX_ SV *cb); 775on_enterleave_call (pTHX_ SV *cb);
742 776
743static void 777static void
… …
796 830
797 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2) 831 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]); 832 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
799 } 833 }
800 834
801 SWAP_SVS (c); 835 SWAP_SVS_ENTER (c);
802} 836}
803 837
804static void 838static void
805save_perl (pTHX_ Coro__State c) 839save_perl (pTHX_ Coro__State c)
806{ 840{
807 SWAP_SVS (c); 841 SWAP_SVS_LEAVE (c);
808 842
809 if (ecb_expect_false (c->on_leave_xs)) 843 if (ecb_expect_false (c->on_leave_xs))
810 { 844 {
811 int i; 845 int i;
812 846
… …
947#endif 981#endif
948 982
949 New(54,PL_savestack,24,ANY); 983 New(54,PL_savestack,24,ANY);
950 PL_savestack_ix = 0; 984 PL_savestack_ix = 0;
951 PL_savestack_max = 24; 985 PL_savestack_max = 24;
986#if PERL_VERSION_ATLEAST (5,24,0)
987 /* perl 5.24 moves SS_MAXPUSH optimisation from */
988 /* the header macros to PL_savestack_max */
989 PL_savestack_max -= SS_MAXPUSH;
990#endif
952 991
953#if !PERL_VERSION_ATLEAST (5,10,0) 992#if !PERL_VERSION_ATLEAST (5,10,0)
954 New(54,PL_retstack,4,OP*); 993 New(54,PL_retstack,4,OP*);
955 PL_retstack_ix = 0; 994 PL_retstack_ix = 0;
956 PL_retstack_max = 4; 995 PL_retstack_max = 4;
… …
1022 } 1061 }
1023 1062
1024 return rss; 1063 return rss;
1025} 1064}
1026 1065
1027/** coroutine stack handling ************************************************/ 1066/** 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 1067
1033/* apparently < 5.8.8 */ 1068/* apparently < 5.8.8 */
1034#ifndef MgPV_nolen_const 1069#ifndef MgPV_nolen_const
1035#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1070#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
1036 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1071 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
1037 (const char*)(mg)->mg_ptr) 1072 (const char*)(mg)->mg_ptr)
1038#endif 1073#endif
1074
1075/* this will be a patched copy of PL_vtbl_sigelem */
1076static MGVTBL coro_sigelem_vtbl;
1077
1078static int ecb_cold
1079coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
1080{
1081 char *key = SvPV_nolen ((SV *)name);
1082
1083 /* do what mg_copy normally does */
1084 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1085 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1086
1087 /* patch sigelem vtbl, but only for __WARN__ and __DIE__ */
1088 if (*key == '_'
1089 && (strEQ (key, "__DIE__")
1090 || strEQ (key, "__WARN__")))
1091 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1092
1093 return 1;
1094}
1095
1096/* perl does not have a %SIG vtbl, we provide one so we can override */
1097/* the magic vtbl for the __DIE__ and __WARN__ members */
1098static const MGVTBL coro_sig_vtbl = {
1099 0, 0, 0, 0, 0,
1100 coro_sig_copy
1101};
1039 1102
1040/* 1103/*
1041 * This overrides the default magic get method of %SIG elements. 1104 * 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 1105 * 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), 1106 * and instead of trying to save and restore the hash elements (extremely slow),
… …
1045 */ 1108 */
1046static int ecb_cold 1109static int ecb_cold
1047coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1110coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
1048{ 1111{
1049 const char *s = MgPV_nolen_const (mg); 1112 const char *s = MgPV_nolen_const (mg);
1113 /* the key must be either __DIE__ or __WARN__ here */
1114 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1050 1115
1051 if (*s == '_') 1116 SV *ssv;
1052 {
1053 SV **svp = 0;
1054 1117
1055 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1056 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1057
1058 if (svp) 1118 if (!*svp)
1059 {
1060 SV *ssv;
1061
1062 if (!*svp)
1063 ssv = &PL_sv_undef; 1119 ssv = &PL_sv_undef;
1064 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */ 1120 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1065 ssv = sv_2mortal (newRV_inc (*svp)); 1121 ssv = sv_2mortal (newRV_inc (*svp));
1066 else 1122 else
1067 ssv = *svp; 1123 ssv = *svp;
1068 1124
1069 sv_setsv (sv, ssv); 1125 sv_setsv (sv, ssv);
1070 return 0; 1126 return 0;
1071 }
1072 }
1073
1074 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
1075} 1127}
1076 1128
1077static int ecb_cold 1129static int ecb_cold
1078coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
1079{ 1131{
1080 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;
1081 1135
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; 1136 SV *old = *svp;
1092 *svp = 0; 1137 *svp = 0;
1093 SvREFCNT_dec (old); 1138 SvREFCNT_dec (old);
1094 return 0; 1139 return 0;
1095 }
1096 }
1097
1098 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1099} 1140}
1100 1141
1101static int ecb_cold 1142static int ecb_cold
1102coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1143coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1103{ 1144{
1104 const char *s = MgPV_nolen_const (mg); 1145 const char *s = MgPV_nolen_const (mg);
1146 /* the key must be either __DIE__ or __WARN__ here */
1147 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1105 1148
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; 1149 SV *old = *svp;
1116 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1150 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1117 SvREFCNT_dec (old); 1151 SvREFCNT_dec (old);
1118 return 0; 1152 return 0;
1119 }
1120 }
1121
1122 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1123} 1153}
1124 1154
1125static void 1155static void
1126prepare_nop (pTHX_ struct coro_transfer_args *ta) 1156prepare_nop (pTHX_ struct coro_transfer_args *ta)
1127{ 1157{
… …
1138static int 1168static int
1139slf_check_repeat (pTHX_ struct CoroSLF *frame) 1169slf_check_repeat (pTHX_ struct CoroSLF *frame)
1140{ 1170{
1141 return 1; 1171 return 1;
1142} 1172}
1173
1174/** coroutine stack handling ************************************************/
1143 1175
1144static UNOP init_perl_op; 1176static UNOP init_perl_op;
1145 1177
1146ecb_noinline static void /* noinline to keep it out of the transfer fast path */ 1178ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1147init_perl (pTHX_ struct coro *coro) 1179init_perl (pTHX_ struct coro *coro)
… …
1214 PL_op = (OP *)&init_perl_op; 1246 PL_op = (OP *)&init_perl_op;
1215 1247
1216 /* copy throw, in case it was set before init_perl */ 1248 /* copy throw, in case it was set before init_perl */
1217 CORO_THROW = coro->except; 1249 CORO_THROW = coro->except;
1218 1250
1219 SWAP_SVS (coro); 1251 SWAP_SVS_ENTER (coro);
1220 1252
1221 if (ecb_expect_false (enable_times)) 1253 if (ecb_expect_false (enable_times))
1222 { 1254 {
1223 coro_times_update (); 1255 coro_times_update ();
1224 coro_times_sub (coro); 1256 coro_times_sub (coro);
… …
1262 /* this will cause transfer_check to croak on block*/ 1294 /* this will cause transfer_check to croak on block*/
1263 SvRV_set (coro_current, (SV *)coro->hv); 1295 SvRV_set (coro_current, (SV *)coro->hv);
1264 1296
1265 load_perl (aTHX_ coro); 1297 load_perl (aTHX_ coro);
1266 1298
1299 /* restore swapped sv's */
1300 SWAP_SVS_LEAVE (coro);
1301
1267 coro_unwind_stacks (aTHX); 1302 coro_unwind_stacks (aTHX);
1268
1269 /* restore swapped sv's */
1270 SWAP_SVS (coro);
1271 1303
1272 coro_destruct_stacks (aTHX); 1304 coro_destruct_stacks (aTHX);
1273 1305
1274 /* now save some sv's to be free'd later */ 1306 /* now save some sv's to be free'd later */
1275 svf [0] = GvSV (PL_defgv); 1307 svf [0] = GvSV (PL_defgv);
… …
1390 SAVETMPS; 1422 SAVETMPS;
1391 EXTEND (SP, 3); 1423 EXTEND (SP, 3);
1392 PUSHMARK (SP); 1424 PUSHMARK (SP);
1393 PUSHs (&PL_sv_yes); 1425 PUSHs (&PL_sv_yes);
1394 PUSHs (fullname); 1426 PUSHs (fullname);
1395 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1427 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc (SUB_ARGARRAY)) : &PL_sv_undef);
1396 PUTBACK; 1428 PUTBACK;
1397 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1429 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); 1430 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1399 SPAGAIN; 1431 SPAGAIN;
1400 FREETMPS; 1432 FREETMPS;
… …
1522 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1554 * 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. 1555 * runtime errors here, as this is just a random interpreter, not a thread.
1524 */ 1556 */
1525 1557
1526 /* 1558 /*
1559 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1560 * requires PL_scopestack_ix, so do it here if required.
1561 */
1562 if (!PL_scopestack_ix)
1563 ENTER;
1564
1565 /*
1527 * If perl-run returns we assume exit() was being called or the coro 1566 * 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) 1567 * 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 1568 * reason for perl_run to return. We try to mimic whatever perl is normally
1530 * doing in that case. YMMV. 1569 * doing in that case. YMMV.
1531 */ 1570 */
… …
2410 else 2449 else
2411 { 2450 {
2412 av_clear (GvAV (PL_defgv)); 2451 av_clear (GvAV (PL_defgv));
2413 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2452 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2414 2453
2454 if (ecb_expect_false (coro->swap_sv))
2455 {
2456 SWAP_SVS_LEAVE (coro);
2457 SvREFCNT_dec_NN (coro->swap_sv);
2458 coro->swap_sv = 0;
2459 }
2460
2415 coro->prio = 0; 2461 coro->prio = 0;
2416 2462
2417 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2463 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2418 api_trace (aTHX_ coro_current, 0); 2464 api_trace (aTHX_ coro_current, 0);
2419 2465
2420 frame->prepare = prepare_schedule; 2466 frame->prepare = prepare_schedule;
2421 av_push (av_async_pool, SvREFCNT_inc (hv)); 2467 av_push (av_async_pool, SvREFCNT_inc (hv));
2422 } 2468 }
… …
2878 2924
2879 for (i = AvFILLp (av) - 1; i >= 0; i -= 2) 2925 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2880 if (AvARRAY (av)[i] == (SV *)hook) 2926 if (AvARRAY (av)[i] == (SV *)hook)
2881 { 2927 {
2882 if (execute) 2928 if (execute)
2883 hook ((void *)AvARRAY (av)[i + 1]); 2929 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2884 2930
2885 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1); 2931 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2886 av_pop (av); 2932 av_pop (av);
2887 av_pop (av); 2933 av_pop (av);
2888 break; 2934 break;
… …
2900{ 2946{
2901 struct coro *coro = SvSTATE (coro_sv); 2947 struct coro *coro = SvSTATE (coro_sv);
2902 2948
2903 if (SvSTATE_current == coro) 2949 if (SvSTATE_current == coro)
2904 if (enter) 2950 if (enter)
2905 enter (aTHX enter_arg); 2951 enter (aTHX_ enter_arg);
2906 2952
2907 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg); 2953 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); 2954 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2909} 2955}
2910 2956
… …
3551 3597
3552 map_len = load_len + save_len + 16; 3598 map_len = load_len + save_len + 16;
3553 3599
3554 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 3600 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3555 3601
3602 if (map_base == (char *)MAP_FAILED)
3603 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3604
3556 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3605 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3557 3606
3558 load_perl_slots = (load_save_perl_slots_type)map_base; 3607 load_perl_slots = (load_save_perl_slots_type)map_base;
3559 memcpy (map_base, load_ptr, load_len); 3608 memcpy (map_base, load_ptr, load_len);
3560 3609
… …
3596 cctx_current = cctx_new_empty (); 3645 cctx_current = cctx_new_empty ();
3597 3646
3598 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3647 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3599 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3648 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3600 3649
3601 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3650 {
3602 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3651 /*
3603 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3652 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3653 * by coro_sig_vtbl in hash values.
3654 */
3655 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3656
3657 /* this only works if perl doesn't have a vtbl for %SIG */
3658 assert (!mg->mg_virtual);
3659
3660 /*
3661 * The irony is that the perl API itself asserts that mg_virtual
3662 * must be non-const, yet perl5porters insisted on marking their
3663 * vtbls as read-only, just to thwart perl modules from patching
3664 * them.
3665 */
3666 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3667 mg->mg_flags |= MGf_COPY;
3668
3669 coro_sigelem_vtbl = PL_vtbl_sigelem;
3670 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3671 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3672 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3673 }
3604 3674
3605 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3606 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3675 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)); 3676 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3608 3677
3609 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3678 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3610 3679
… …
3916 if (ecb_expect_false (current == self)) 3985 if (ecb_expect_false (current == self))
3917 coro_times_sub (SvSTATE (coro_current)); 3986 coro_times_sub (SvSTATE (coro_current));
3918} 3987}
3919 3988
3920void 3989void
3921swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3990swap_sv (Coro::State coro, SV *sva, SV *svb)
3922 CODE: 3991 CODE:
3923{ 3992{
3924 struct coro *current = SvSTATE_current; 3993 struct coro *current = SvSTATE_current;
3994 AV *swap_sv;
3995 int i;
3996
3997 sva = SvRV (sva);
3998 svb = SvRV (svb);
3925 3999
3926 if (current == coro) 4000 if (current == coro)
3927 SWAP_SVS (current); 4001 SWAP_SVS_LEAVE (current);
3928 4002
3929 if (!coro->swap_sv) 4003 if (!coro->swap_sv)
3930 coro->swap_sv = newAV (); 4004 coro->swap_sv = newAV ();
3931 4005
4006 swap_sv = coro->swap_sv;
4007
4008 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4009 {
4010 SV *a = AvARRAY (swap_sv)[i ];
4011 SV *b = AvARRAY (swap_sv)[i + 1];
4012
4013 if (a == sva && b == svb)
4014 {
4015 SvREFCNT_dec_NN (a);
4016 SvREFCNT_dec_NN (b);
4017
4018 for (; i <= AvFILLp (swap_sv) - 2; i++)
4019 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4020
4021 AvFILLp (swap_sv) -= 2;
4022
4023 goto removed;
4024 }
4025 }
4026
3932 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4027 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3933 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4028 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4029
4030 removed:
3934 4031
3935 if (current == coro) 4032 if (current == coro)
3936 SWAP_SVS (current); 4033 SWAP_SVS_ENTER (current);
3937} 4034}
3938 4035
3939 4036
3940MODULE = Coro::State PACKAGE = Coro 4037MODULE = Coro::State PACKAGE = Coro
3941 4038
3942BOOT: 4039BOOT:
3943{ 4040{
4041 if (SVt_LAST > 32)
4042 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4043
3944 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4044 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3945 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4045 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3946 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4046 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3947 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4047 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); 4048 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3979 coroapi.enterleave_hook = api_enterleave_hook; 4079 coroapi.enterleave_hook = api_enterleave_hook;
3980 coroapi.enterleave_unhook = api_enterleave_unhook; 4080 coroapi.enterleave_unhook = api_enterleave_unhook;
3981 coroapi.enterleave_scope_hook = api_enterleave_scope_hook; 4081 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
3982 4082
3983 /*GCoroAPI = &coroapi;*/ 4083 /*GCoroAPI = &coroapi;*/
3984 sv_setiv (sv, (IV)&coroapi); 4084 sv_setiv (sv, PTR2IV (&coroapi));
3985 SvREADONLY_on (sv); 4085 SvREADONLY_on (sv);
3986 } 4086 }
3987} 4087}
3988 4088
3989SV * 4089SV *
… …
4252 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4352 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4253 OUTPUT: 4353 OUTPUT:
4254 RETVAL 4354 RETVAL
4255 4355
4256void 4356void
4257up (SV *self, int adjust = 1) 4357up (SV *self)
4258 ALIAS:
4259 adjust = 1
4260 CODE: 4358 CODE:
4359 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4360
4361void
4362adjust (SV *self, int adjust)
4363 CODE:
4261 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4364 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4262 4365
4263void 4366void
4264down (...) 4367down (...)
4265 CODE: 4368 CODE:
4266 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4369 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);

Diff Legend

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