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.469 by root, Fri Jul 14 02:43:50 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#if PERL_VERSION_ATLEAST(5,24,0)
122# define SUB_ARGARRAY PL_curpad[0]
123#else
124# define SUB_ARGARRAY (SV *)cx->blk_sub.argarray
125#endif
126
127/* perl usually suppressed asserts. for debugging, we sometimes force it to be on */
128#if 0
129# undef NDEBUG
130# include <assert.h>
131#endif
132
121static double (*nvtime)(); /* so why doesn't it take void? */ 133static double (*nvtime)(); /* so why doesn't it take void? */
122static void (*u2time)(pTHX_ UV ret[2]); 134static void (*u2time)(pTHX_ UV ret[2]);
123 135
124/* we hijack an hopefully unused CV flag for our purposes */ 136/* we hijack an hopefully unused CV flag for our purposes */
125#define CVf_SLF 0x4000 137#define CVf_SLF 0x4000
… …
140 152
141static GV *irsgv; /* $/ */ 153static GV *irsgv; /* $/ */
142static GV *stdoutgv; /* *STDOUT */ 154static GV *stdoutgv; /* *STDOUT */
143static SV *rv_diehook; 155static SV *rv_diehook;
144static SV *rv_warnhook; 156static SV *rv_warnhook;
145static HV *hv_sig; /* %SIG */
146 157
147/* async_pool helper stuff */ 158/* async_pool helper stuff */
148static SV *sv_pool_rss; 159static SV *sv_pool_rss;
149static SV *sv_pool_size; 160static SV *sv_pool_size;
150static SV *sv_async_pool_idle; /* description string */ 161static SV *sv_async_pool_idle; /* description string */
… …
727#endif 738#endif
728} 739}
729 740
730/* swap sv heads, at least logically */ 741/* swap sv heads, at least logically */
731static void 742static void
732swap_svs (pTHX_ Coro__State c) 743swap_svs_enter (pTHX_ Coro__State c)
733{ 744{
734 int i; 745 int i;
735 746
736 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 747 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
737 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]); 748 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
738} 749}
739 750
751static void
752swap_svs_leave (pTHX_ Coro__State c)
753{
754 int i;
755
756 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
757 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
758}
759
740#define SWAP_SVS(coro) \ 760#define SWAP_SVS_ENTER(coro) \
741 if (ecb_expect_false ((coro)->swap_sv)) \ 761 if (ecb_expect_false ((coro)->swap_sv)) \
742 swap_svs (aTHX_ (coro)) 762 swap_svs_enter (aTHX_ (coro))
763
764#define SWAP_SVS_LEAVE(coro) \
765 if (ecb_expect_false ((coro)->swap_sv)) \
766 swap_svs_leave (aTHX_ (coro))
743 767
744static void 768static void
745on_enterleave_call (pTHX_ SV *cb); 769on_enterleave_call (pTHX_ SV *cb);
746 770
747static void 771static void
… …
800 824
801 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2) 825 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]); 826 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
803 } 827 }
804 828
805 SWAP_SVS (c); 829 SWAP_SVS_ENTER (c);
806} 830}
807 831
808static void 832static void
809save_perl (pTHX_ Coro__State c) 833save_perl (pTHX_ Coro__State c)
810{ 834{
811 SWAP_SVS (c); 835 SWAP_SVS_LEAVE (c);
812 836
813 if (ecb_expect_false (c->on_leave_xs)) 837 if (ecb_expect_false (c->on_leave_xs))
814 { 838 {
815 int i; 839 int i;
816 840
… …
951#endif 975#endif
952 976
953 New(54,PL_savestack,24,ANY); 977 New(54,PL_savestack,24,ANY);
954 PL_savestack_ix = 0; 978 PL_savestack_ix = 0;
955 PL_savestack_max = 24; 979 PL_savestack_max = 24;
980#if PERL_VERSION_ATLEAST (5,24,0)
981 /* perl 5.24 moves SS_MAXPUSH optimisation from */
982 /* the header macros to PL_savestack_max */
983 PL_savestack_max -= SS_MAXPUSH;
984#endif
956 985
957#if !PERL_VERSION_ATLEAST (5,10,0) 986#if !PERL_VERSION_ATLEAST (5,10,0)
958 New(54,PL_retstack,4,OP*); 987 New(54,PL_retstack,4,OP*);
959 PL_retstack_ix = 0; 988 PL_retstack_ix = 0;
960 PL_retstack_max = 4; 989 PL_retstack_max = 4;
… …
1026 } 1055 }
1027 1056
1028 return rss; 1057 return rss;
1029} 1058}
1030 1059
1031/** coroutine stack handling ************************************************/ 1060/** 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 1061
1037/* apparently < 5.8.8 */ 1062/* apparently < 5.8.8 */
1038#ifndef MgPV_nolen_const 1063#ifndef MgPV_nolen_const
1039#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1064#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
1040 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1065 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
1041 (const char*)(mg)->mg_ptr) 1066 (const char*)(mg)->mg_ptr)
1042#endif 1067#endif
1068
1069/* this will be a patched copy of PL_vtbl_sigelem */
1070static MGVTBL coro_sigelem_vtbl;
1071
1072static int ecb_cold
1073coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
1074{
1075 char *key = SvPV_nolen ((SV *)name);
1076
1077 /* do what mg_copy normally does */
1078 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1079 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1080
1081 /* patch sigelem vtbl, but only for __WARN__ and __DIE__ */
1082 if (*key == '_'
1083 && (strEQ (key, "__DIE__")
1084 || strEQ (key, "__WARN__")))
1085 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1086
1087 return 1;
1088}
1089
1090/* perl does not have a %SIG vtbl, we provide one so we can override */
1091/* the magic vtbl for the __DIE__ and __WARN__ members */
1092static const MGVTBL coro_sig_vtbl = {
1093 0, 0, 0, 0, 0,
1094 coro_sig_copy
1095};
1043 1096
1044/* 1097/*
1045 * This overrides the default magic get method of %SIG elements. 1098 * 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 1099 * 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), 1100 * and instead of trying to save and restore the hash elements (extremely slow),
… …
1049 */ 1102 */
1050static int ecb_cold 1103static int ecb_cold
1051coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1104coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
1052{ 1105{
1053 const char *s = MgPV_nolen_const (mg); 1106 const char *s = MgPV_nolen_const (mg);
1107 /* the key must be either __DIE__ or __WARN__ here */
1108 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1054 1109
1055 if (*s == '_') 1110 SV *ssv;
1056 {
1057 SV **svp = 0;
1058 1111
1059 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1060 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1061
1062 if (svp) 1112 if (!*svp)
1063 {
1064 SV *ssv;
1065
1066 if (!*svp)
1067 ssv = &PL_sv_undef; 1113 ssv = &PL_sv_undef;
1068 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */ 1114 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1069 ssv = sv_2mortal (newRV_inc (*svp)); 1115 ssv = sv_2mortal (newRV_inc (*svp));
1070 else 1116 else
1071 ssv = *svp; 1117 ssv = *svp;
1072 1118
1073 sv_setsv (sv, ssv); 1119 sv_setsv (sv, ssv);
1074 return 0; 1120 return 0;
1075 }
1076 }
1077
1078 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
1079} 1121}
1080 1122
1081static int ecb_cold 1123static int ecb_cold
1082coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1124coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
1083{ 1125{
1084 const char *s = MgPV_nolen_const (mg); 1126 const char *s = MgPV_nolen_const (mg);
1127 /* the key must be either __DIE__ or __WARN__ here */
1128 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1085 1129
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; 1130 SV *old = *svp;
1096 *svp = 0; 1131 *svp = 0;
1097 SvREFCNT_dec (old); 1132 SvREFCNT_dec (old);
1098 return 0; 1133 return 0;
1099 }
1100 }
1101
1102 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1103} 1134}
1104 1135
1105static int ecb_cold 1136static int ecb_cold
1106coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1137coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1107{ 1138{
1108 const char *s = MgPV_nolen_const (mg); 1139 const char *s = MgPV_nolen_const (mg);
1140 /* the key must be either __DIE__ or __WARN__ here */
1141 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1109 1142
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; 1143 SV *old = *svp;
1120 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1144 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1121 SvREFCNT_dec (old); 1145 SvREFCNT_dec (old);
1122 return 0; 1146 return 0;
1123 }
1124 }
1125
1126 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1127} 1147}
1128 1148
1129static void 1149static void
1130prepare_nop (pTHX_ struct coro_transfer_args *ta) 1150prepare_nop (pTHX_ struct coro_transfer_args *ta)
1131{ 1151{
… …
1142static int 1162static int
1143slf_check_repeat (pTHX_ struct CoroSLF *frame) 1163slf_check_repeat (pTHX_ struct CoroSLF *frame)
1144{ 1164{
1145 return 1; 1165 return 1;
1146} 1166}
1167
1168/** coroutine stack handling ************************************************/
1147 1169
1148static UNOP init_perl_op; 1170static UNOP init_perl_op;
1149 1171
1150ecb_noinline static void /* noinline to keep it out of the transfer fast path */ 1172ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1151init_perl (pTHX_ struct coro *coro) 1173init_perl (pTHX_ struct coro *coro)
… …
1218 PL_op = (OP *)&init_perl_op; 1240 PL_op = (OP *)&init_perl_op;
1219 1241
1220 /* copy throw, in case it was set before init_perl */ 1242 /* copy throw, in case it was set before init_perl */
1221 CORO_THROW = coro->except; 1243 CORO_THROW = coro->except;
1222 1244
1223 SWAP_SVS (coro); 1245 SWAP_SVS_ENTER (coro);
1224 1246
1225 if (ecb_expect_false (enable_times)) 1247 if (ecb_expect_false (enable_times))
1226 { 1248 {
1227 coro_times_update (); 1249 coro_times_update ();
1228 coro_times_sub (coro); 1250 coro_times_sub (coro);
… …
1266 /* this will cause transfer_check to croak on block*/ 1288 /* this will cause transfer_check to croak on block*/
1267 SvRV_set (coro_current, (SV *)coro->hv); 1289 SvRV_set (coro_current, (SV *)coro->hv);
1268 1290
1269 load_perl (aTHX_ coro); 1291 load_perl (aTHX_ coro);
1270 1292
1293 /* restore swapped sv's */
1294 SWAP_SVS_LEAVE (coro);
1295
1271 coro_unwind_stacks (aTHX); 1296 coro_unwind_stacks (aTHX);
1272
1273 /* restore swapped sv's */
1274 SWAP_SVS (coro);
1275 1297
1276 coro_destruct_stacks (aTHX); 1298 coro_destruct_stacks (aTHX);
1277 1299
1278 /* now save some sv's to be free'd later */ 1300 /* now save some sv's to be free'd later */
1279 svf [0] = GvSV (PL_defgv); 1301 svf [0] = GvSV (PL_defgv);
… …
1394 SAVETMPS; 1416 SAVETMPS;
1395 EXTEND (SP, 3); 1417 EXTEND (SP, 3);
1396 PUSHMARK (SP); 1418 PUSHMARK (SP);
1397 PUSHs (&PL_sv_yes); 1419 PUSHs (&PL_sv_yes);
1398 PUSHs (fullname); 1420 PUSHs (fullname);
1399 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1421 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc (SUB_ARGARRAY)) : &PL_sv_undef);
1400 PUTBACK; 1422 PUTBACK;
1401 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1423 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); 1424 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1403 SPAGAIN; 1425 SPAGAIN;
1404 FREETMPS; 1426 FREETMPS;
… …
1526 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1548 * 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. 1549 * runtime errors here, as this is just a random interpreter, not a thread.
1528 */ 1550 */
1529 1551
1530 /* 1552 /*
1553 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1554 * requires PL_scopestack_ix, so do it here if required.
1555 */
1556 if (!PL_scopestack_ix)
1557 ENTER;
1558
1559 /*
1531 * If perl-run returns we assume exit() was being called or the coro 1560 * 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) 1561 * 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 1562 * reason for perl_run to return. We try to mimic whatever perl is normally
1534 * doing in that case. YMMV. 1563 * doing in that case. YMMV.
1535 */ 1564 */
… …
2414 else 2443 else
2415 { 2444 {
2416 av_clear (GvAV (PL_defgv)); 2445 av_clear (GvAV (PL_defgv));
2417 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2446 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2418 2447
2448 if (ecb_expect_false (coro->swap_sv))
2449 {
2450 SWAP_SVS_LEAVE (coro);
2451 SvREFCNT_dec_NN (coro->swap_sv);
2452 coro->swap_sv = 0;
2453 }
2454
2419 coro->prio = 0; 2455 coro->prio = 0;
2420 2456
2421 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2457 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2422 api_trace (aTHX_ coro_current, 0); 2458 api_trace (aTHX_ coro_current, 0);
2423 2459
2424 frame->prepare = prepare_schedule; 2460 frame->prepare = prepare_schedule;
2425 av_push (av_async_pool, SvREFCNT_inc (hv)); 2461 av_push (av_async_pool, SvREFCNT_inc (hv));
2426 } 2462 }
… …
3555 3591
3556 map_len = load_len + save_len + 16; 3592 map_len = load_len + save_len + 16;
3557 3593
3558 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 3594 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3559 3595
3596 if (map_base == (char *)MAP_FAILED)
3597 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3598
3560 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3599 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3561 3600
3562 load_perl_slots = (load_save_perl_slots_type)map_base; 3601 load_perl_slots = (load_save_perl_slots_type)map_base;
3563 memcpy (map_base, load_ptr, load_len); 3602 memcpy (map_base, load_ptr, load_len);
3564 3603
… …
3600 cctx_current = cctx_new_empty (); 3639 cctx_current = cctx_new_empty ();
3601 3640
3602 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3641 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3603 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3642 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3604 3643
3605 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3644 {
3606 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3645 /*
3607 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3646 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3647 * by coro_sig_vtbl in hash values.
3648 */
3649 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3650
3651 /* this only works if perl doesn't have a vtbl for %SIG */
3652 assert (!mg->mg_virtual);
3653
3654 /*
3655 * The irony is that the perl API itself asserts that mg_virtual
3656 * must be non-const, yet perl5porters insisted on marking their
3657 * vtbls as read-only, just to thwart perl modules from patching
3658 * them.
3659 */
3660 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3661 mg->mg_flags |= MGf_COPY;
3662
3663 coro_sigelem_vtbl = PL_vtbl_sigelem;
3664 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3665 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3666 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3667 }
3608 3668
3609 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3610 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3669 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)); 3670 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3612 3671
3613 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3672 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3614 3673
… …
3920 if (ecb_expect_false (current == self)) 3979 if (ecb_expect_false (current == self))
3921 coro_times_sub (SvSTATE (coro_current)); 3980 coro_times_sub (SvSTATE (coro_current));
3922} 3981}
3923 3982
3924void 3983void
3925swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3984swap_sv (Coro::State coro, SV *sva, SV *svb)
3926 CODE: 3985 CODE:
3927{ 3986{
3928 struct coro *current = SvSTATE_current; 3987 struct coro *current = SvSTATE_current;
3988 AV *swap_sv;
3989 int i;
3990
3991 sva = SvRV (sva);
3992 svb = SvRV (svb);
3929 3993
3930 if (current == coro) 3994 if (current == coro)
3931 SWAP_SVS (current); 3995 SWAP_SVS_LEAVE (current);
3932 3996
3933 if (!coro->swap_sv) 3997 if (!coro->swap_sv)
3934 coro->swap_sv = newAV (); 3998 coro->swap_sv = newAV ();
3935 3999
4000 swap_sv = coro->swap_sv;
4001
4002 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4003 {
4004 SV *a = AvARRAY (swap_sv)[i ];
4005 SV *b = AvARRAY (swap_sv)[i + 1];
4006
4007 if (a == sva && b == svb)
4008 {
4009 SvREFCNT_dec_NN (a);
4010 SvREFCNT_dec_NN (b);
4011
4012 for (; i <= AvFILLp (swap_sv) - 2; i++)
4013 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4014
4015 AvFILLp (swap_sv) -= 2;
4016
4017 goto removed;
4018 }
4019 }
4020
3936 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4021 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3937 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4022 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4023
4024 removed:
3938 4025
3939 if (current == coro) 4026 if (current == coro)
3940 SWAP_SVS (current); 4027 SWAP_SVS_ENTER (current);
3941} 4028}
3942 4029
3943 4030
3944MODULE = Coro::State PACKAGE = Coro 4031MODULE = Coro::State PACKAGE = Coro
3945 4032
… …
4259 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4346 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4260 OUTPUT: 4347 OUTPUT:
4261 RETVAL 4348 RETVAL
4262 4349
4263void 4350void
4264up (SV *self, int adjust = 1) 4351up (SV *self)
4265 ALIAS:
4266 adjust = 1
4267 CODE: 4352 CODE:
4353 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4354
4355void
4356adjust (SV *self, int adjust)
4357 CODE:
4268 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4358 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4269 4359
4270void 4360void
4271down (...) 4361down (...)
4272 CODE: 4362 CODE:
4273 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4363 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);

Diff Legend

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