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.453 by root, Tue Jul 7 00:33:25 2015 UTC vs.
Revision 1.472 by root, Thu Aug 31 16:24:19 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 */
… …
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 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV); 731 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
715 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,20,0) 732 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
716 svany_in_head_set |= 1 << SVt_NV; 733 svany_in_head_set |= 1 << SVt_NV;
717 #endif 734 #endif
718 735
719 #define svany_in_head(type) (svany_in_head_set & (1 << (type))) 736 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
720 737
… …
727#endif 744#endif
728} 745}
729 746
730/* swap sv heads, at least logically */ 747/* swap sv heads, at least logically */
731static void 748static void
732swap_svs (pTHX_ Coro__State c) 749swap_svs_enter (pTHX_ Coro__State c)
733{ 750{
734 int i; 751 int i;
735 752
736 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 753 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
737 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]);
738} 755}
739 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
740#define SWAP_SVS(coro) \ 766#define SWAP_SVS_ENTER(coro) \
741 if (ecb_expect_false ((coro)->swap_sv)) \ 767 if (ecb_expect_false ((coro)->swap_sv)) \
742 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))
743 773
744static void 774static void
745on_enterleave_call (pTHX_ SV *cb); 775on_enterleave_call (pTHX_ SV *cb);
746 776
747static void 777static void
… …
800 830
801 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2) 831 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]); 832 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
803 } 833 }
804 834
805 SWAP_SVS (c); 835 SWAP_SVS_ENTER (c);
806} 836}
807 837
808static void 838static void
809save_perl (pTHX_ Coro__State c) 839save_perl (pTHX_ Coro__State c)
810{ 840{
811 SWAP_SVS (c); 841 SWAP_SVS_LEAVE (c);
812 842
813 if (ecb_expect_false (c->on_leave_xs)) 843 if (ecb_expect_false (c->on_leave_xs))
814 { 844 {
815 int i; 845 int i;
816 846
… …
951#endif 981#endif
952 982
953 New(54,PL_savestack,24,ANY); 983 New(54,PL_savestack,24,ANY);
954 PL_savestack_ix = 0; 984 PL_savestack_ix = 0;
955 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
956 991
957#if !PERL_VERSION_ATLEAST (5,10,0) 992#if !PERL_VERSION_ATLEAST (5,10,0)
958 New(54,PL_retstack,4,OP*); 993 New(54,PL_retstack,4,OP*);
959 PL_retstack_ix = 0; 994 PL_retstack_ix = 0;
960 PL_retstack_max = 4; 995 PL_retstack_max = 4;
… …
1026 } 1061 }
1027 1062
1028 return rss; 1063 return rss;
1029} 1064}
1030 1065
1031/** coroutine stack handling ************************************************/ 1066/** 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 1067
1037/* apparently < 5.8.8 */ 1068/* apparently < 5.8.8 */
1038#ifndef MgPV_nolen_const 1069#ifndef MgPV_nolen_const
1039#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1070#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
1040 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1071 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
1041 (const char*)(mg)->mg_ptr) 1072 (const char*)(mg)->mg_ptr)
1042#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};
1043 1102
1044/* 1103/*
1045 * This overrides the default magic get method of %SIG elements. 1104 * 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 1105 * 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), 1106 * and instead of trying to save and restore the hash elements (extremely slow),
… …
1049 */ 1108 */
1050static int ecb_cold 1109static int ecb_cold
1051coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1110coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
1052{ 1111{
1053 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;
1054 1115
1055 if (*s == '_') 1116 SV *ssv;
1056 {
1057 SV **svp = 0;
1058 1117
1059 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1060 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1061
1062 if (svp) 1118 if (!*svp)
1063 {
1064 SV *ssv;
1065
1066 if (!*svp)
1067 ssv = &PL_sv_undef; 1119 ssv = &PL_sv_undef;
1068 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. */
1069 ssv = sv_2mortal (newRV_inc (*svp)); 1121 ssv = sv_2mortal (newRV_inc (*svp));
1070 else 1122 else
1071 ssv = *svp; 1123 ssv = *svp;
1072 1124
1073 sv_setsv (sv, ssv); 1125 sv_setsv (sv, ssv);
1074 return 0; 1126 return 0;
1075 }
1076 }
1077
1078 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
1079} 1127}
1080 1128
1081static int ecb_cold 1129static int ecb_cold
1082coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
1083{ 1131{
1084 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;
1085 1135
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; 1136 SV *old = *svp;
1096 *svp = 0; 1137 *svp = 0;
1097 SvREFCNT_dec (old); 1138 SvREFCNT_dec (old);
1098 return 0; 1139 return 0;
1099 }
1100 }
1101
1102 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1103} 1140}
1104 1141
1105static int ecb_cold 1142static int ecb_cold
1106coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1143coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1107{ 1144{
1108 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;
1109 1148
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; 1149 SV *old = *svp;
1120 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1150 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1121 SvREFCNT_dec (old); 1151 SvREFCNT_dec (old);
1122 return 0; 1152 return 0;
1123 }
1124 }
1125
1126 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1127} 1153}
1128 1154
1129static void 1155static void
1130prepare_nop (pTHX_ struct coro_transfer_args *ta) 1156prepare_nop (pTHX_ struct coro_transfer_args *ta)
1131{ 1157{
… …
1142static int 1168static int
1143slf_check_repeat (pTHX_ struct CoroSLF *frame) 1169slf_check_repeat (pTHX_ struct CoroSLF *frame)
1144{ 1170{
1145 return 1; 1171 return 1;
1146} 1172}
1173
1174/** coroutine stack handling ************************************************/
1147 1175
1148static UNOP init_perl_op; 1176static UNOP init_perl_op;
1149 1177
1150ecb_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 */
1151init_perl (pTHX_ struct coro *coro) 1179init_perl (pTHX_ struct coro *coro)
… …
1218 PL_op = (OP *)&init_perl_op; 1246 PL_op = (OP *)&init_perl_op;
1219 1247
1220 /* copy throw, in case it was set before init_perl */ 1248 /* copy throw, in case it was set before init_perl */
1221 CORO_THROW = coro->except; 1249 CORO_THROW = coro->except;
1222 1250
1223 SWAP_SVS (coro); 1251 SWAP_SVS_ENTER (coro);
1224 1252
1225 if (ecb_expect_false (enable_times)) 1253 if (ecb_expect_false (enable_times))
1226 { 1254 {
1227 coro_times_update (); 1255 coro_times_update ();
1228 coro_times_sub (coro); 1256 coro_times_sub (coro);
… …
1266 /* this will cause transfer_check to croak on block*/ 1294 /* this will cause transfer_check to croak on block*/
1267 SvRV_set (coro_current, (SV *)coro->hv); 1295 SvRV_set (coro_current, (SV *)coro->hv);
1268 1296
1269 load_perl (aTHX_ coro); 1297 load_perl (aTHX_ coro);
1270 1298
1299 /* restore swapped sv's */
1300 SWAP_SVS_LEAVE (coro);
1301
1271 coro_unwind_stacks (aTHX); 1302 coro_unwind_stacks (aTHX);
1272
1273 /* restore swapped sv's */
1274 SWAP_SVS (coro);
1275 1303
1276 coro_destruct_stacks (aTHX); 1304 coro_destruct_stacks (aTHX);
1277 1305
1278 /* now save some sv's to be free'd later */ 1306 /* now save some sv's to be free'd later */
1279 svf [0] = GvSV (PL_defgv); 1307 svf [0] = GvSV (PL_defgv);
… …
1394 SAVETMPS; 1422 SAVETMPS;
1395 EXTEND (SP, 3); 1423 EXTEND (SP, 3);
1396 PUSHMARK (SP); 1424 PUSHMARK (SP);
1397 PUSHs (&PL_sv_yes); 1425 PUSHs (&PL_sv_yes);
1398 PUSHs (fullname); 1426 PUSHs (fullname);
1399 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);
1400 PUTBACK; 1428 PUTBACK;
1401 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);
1402 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);
1403 SPAGAIN; 1431 SPAGAIN;
1404 FREETMPS; 1432 FREETMPS;
… …
1526 * 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
1527 * 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.
1528 */ 1556 */
1529 1557
1530 /* 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 /*
1531 * 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
1532 * 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)
1533 * 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
1534 * doing in that case. YMMV. 1569 * doing in that case. YMMV.
1535 */ 1570 */
… …
2337safe_cancel (pTHX_ struct coro *coro, SV **arg, int items) 2372safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2338{ 2373{
2339 if (coro->cctx) 2374 if (coro->cctx)
2340 croak ("coro inside C callback, unable to cancel at this time, caught"); 2375 croak ("coro inside C callback, unable to cancel at this time, caught");
2341 2376
2342 if (coro->flags & CF_NEW) 2377 if (coro->flags & (CF_NEW | CF_ZOMBIE))
2343 { 2378 {
2344 coro_set_status (aTHX_ coro, arg, items); 2379 coro_set_status (aTHX_ coro, arg, items);
2345 coro_state_destroy (aTHX_ coro); 2380 coro_state_destroy (aTHX_ coro);
2346 } 2381 }
2347 else 2382 else
… …
2414 else 2449 else
2415 { 2450 {
2416 av_clear (GvAV (PL_defgv)); 2451 av_clear (GvAV (PL_defgv));
2417 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);
2418 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
2419 coro->prio = 0; 2461 coro->prio = 0;
2420 2462
2421 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2463 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2422 api_trace (aTHX_ coro_current, 0); 2464 api_trace (aTHX_ coro_current, 0);
2423 2465
2424 frame->prepare = prepare_schedule; 2466 frame->prepare = prepare_schedule;
2425 av_push (av_async_pool, SvREFCNT_inc (hv)); 2467 av_push (av_async_pool, SvREFCNT_inc (hv));
2426 } 2468 }
… …
3555 3597
3556 map_len = load_len + save_len + 16; 3598 map_len = load_len + save_len + 16;
3557 3599
3558 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);
3559 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
3560 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));
3561 3606
3562 load_perl_slots = (load_save_perl_slots_type)map_base; 3607 load_perl_slots = (load_save_perl_slots_type)map_base;
3563 memcpy (map_base, load_ptr, load_len); 3608 memcpy (map_base, load_ptr, load_len);
3564 3609
… …
3600 cctx_current = cctx_new_empty (); 3645 cctx_current = cctx_new_empty ();
3601 3646
3602 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3647 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3603 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3648 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3604 3649
3605 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3650 {
3606 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3651 /*
3607 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 }
3608 3674
3609 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3610 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));
3611 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));
3612 3677
3613 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3678 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3614 3679
… …
3920 if (ecb_expect_false (current == self)) 3985 if (ecb_expect_false (current == self))
3921 coro_times_sub (SvSTATE (coro_current)); 3986 coro_times_sub (SvSTATE (coro_current));
3922} 3987}
3923 3988
3924void 3989void
3925swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3990swap_sv (Coro::State coro, SV *sva, SV *svb)
3926 CODE: 3991 CODE:
3927{ 3992{
3928 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);
3929 3999
3930 if (current == coro) 4000 if (current == coro)
3931 SWAP_SVS (current); 4001 SWAP_SVS_LEAVE (current);
3932 4002
3933 if (!coro->swap_sv) 4003 if (!coro->swap_sv)
3934 coro->swap_sv = newAV (); 4004 coro->swap_sv = newAV ();
3935 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
3936 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4027 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3937 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4028 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4029
4030 removed:
3938 4031
3939 if (current == coro) 4032 if (current == coro)
3940 SWAP_SVS (current); 4033 SWAP_SVS_ENTER (current);
3941} 4034}
3942 4035
3943 4036
3944MODULE = Coro::State PACKAGE = Coro 4037MODULE = Coro::State PACKAGE = Coro
3945 4038
… …
3986 coroapi.enterleave_hook = api_enterleave_hook; 4079 coroapi.enterleave_hook = api_enterleave_hook;
3987 coroapi.enterleave_unhook = api_enterleave_unhook; 4080 coroapi.enterleave_unhook = api_enterleave_unhook;
3988 coroapi.enterleave_scope_hook = api_enterleave_scope_hook; 4081 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
3989 4082
3990 /*GCoroAPI = &coroapi;*/ 4083 /*GCoroAPI = &coroapi;*/
3991 sv_setiv (sv, (IV)&coroapi); 4084 sv_setiv (sv, PTR2IV (&coroapi));
3992 SvREADONLY_on (sv); 4085 SvREADONLY_on (sv);
3993 } 4086 }
3994} 4087}
3995 4088
3996SV * 4089SV *
… …
4259 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4352 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4260 OUTPUT: 4353 OUTPUT:
4261 RETVAL 4354 RETVAL
4262 4355
4263void 4356void
4264up (SV *self, int adjust = 1) 4357up (SV *self)
4265 ALIAS:
4266 adjust = 1
4267 CODE: 4358 CODE:
4359 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4360
4361void
4362adjust (SV *self, int adjust)
4363 CODE:
4268 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4364 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4269 4365
4270void 4366void
4271down (...) 4367down (...)
4272 CODE: 4368 CODE:
4273 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