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.450 by root, Sun Jun 28 22:31:03 2015 UTC vs.
Revision 1.469 by root, Fri Jul 14 02:43:50 2017 UTC

… …
21 21
22#include <stddef.h> 22#include <stddef.h>
23#include <stdio.h> 23#include <stdio.h>
24#include <errno.h> 24#include <errno.h>
25#include <assert.h> 25#include <assert.h>
26
27#ifndef SvREFCNT_dec_NN
28 #define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
29#endif
30
31#ifndef SvREFCNT_inc_NN
32 #define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
33#endif
26 34
27#ifndef SVs_PADSTALE 35#ifndef SVs_PADSTALE
28# define SVs_PADSTALE 0 36# define SVs_PADSTALE 0
29#endif 37#endif
30 38
… …
108# define CORO_CLOCK_MONOTONIC 1 116# define CORO_CLOCK_MONOTONIC 1
109# define CORO_CLOCK_THREAD_CPUTIME_ID 3 117# define CORO_CLOCK_THREAD_CPUTIME_ID 3
110# endif 118# endif
111#endif 119#endif
112 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
113static double (*nvtime)(); /* so why doesn't it take void? */ 133static double (*nvtime)(); /* so why doesn't it take void? */
114static void (*u2time)(pTHX_ UV ret[2]); 134static void (*u2time)(pTHX_ UV ret[2]);
115 135
116/* we hijack an hopefully unused CV flag for our purposes */ 136/* we hijack an hopefully unused CV flag for our purposes */
117#define CVf_SLF 0x4000 137#define CVf_SLF 0x4000
… …
132 152
133static GV *irsgv; /* $/ */ 153static GV *irsgv; /* $/ */
134static GV *stdoutgv; /* *STDOUT */ 154static GV *stdoutgv; /* *STDOUT */
135static SV *rv_diehook; 155static SV *rv_diehook;
136static SV *rv_warnhook; 156static SV *rv_warnhook;
137static HV *hv_sig; /* %SIG */
138 157
139/* async_pool helper stuff */ 158/* async_pool helper stuff */
140static SV *sv_pool_rss; 159static SV *sv_pool_rss;
141static SV *sv_pool_size; 160static SV *sv_pool_size;
142static SV *sv_async_pool_idle; /* description string */ 161static SV *sv_async_pool_idle; /* description string */
… …
701 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u; 720 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
702 721
703 /* if SvANY points to the head, we need to adjust the pointers, 722 /* if SvANY points to the head, we need to adjust the pointers,
704 * as the pointer for a still points to b, and maybe vice versa. 723 * as the pointer for a still points to b, and maybe vice versa.
705 */ 724 */
706 #define svany_in_head(type) \ 725 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
707 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type))) 726 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
727 svany_in_head_set |= 1 << SVt_NV;
728 #endif
729
730 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
708 731
709 if (svany_in_head (SvTYPE (a))) 732 if (svany_in_head (SvTYPE (a)))
710 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 733 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
711 734
712 if (svany_in_head (SvTYPE (b))) 735 if (svany_in_head (SvTYPE (b)))
… …
715#endif 738#endif
716} 739}
717 740
718/* swap sv heads, at least logically */ 741/* swap sv heads, at least logically */
719static void 742static void
720swap_svs (pTHX_ Coro__State c) 743swap_svs_enter (pTHX_ Coro__State c)
721{ 744{
722 int i; 745 int i;
723 746
724 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 747 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
725 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]);
726} 749}
727 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
728#define SWAP_SVS(coro) \ 760#define SWAP_SVS_ENTER(coro) \
729 if (ecb_expect_false ((coro)->swap_sv)) \ 761 if (ecb_expect_false ((coro)->swap_sv)) \
730 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))
731 767
732static void 768static void
733on_enterleave_call (pTHX_ SV *cb); 769on_enterleave_call (pTHX_ SV *cb);
734 770
735static void 771static void
… …
788 824
789 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2) 825 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
790 ((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]);
791 } 827 }
792 828
793 SWAP_SVS (c); 829 SWAP_SVS_ENTER (c);
794} 830}
795 831
796static void 832static void
797save_perl (pTHX_ Coro__State c) 833save_perl (pTHX_ Coro__State c)
798{ 834{
799 SWAP_SVS (c); 835 SWAP_SVS_LEAVE (c);
800 836
801 if (ecb_expect_false (c->on_leave_xs)) 837 if (ecb_expect_false (c->on_leave_xs))
802 { 838 {
803 int i; 839 int i;
804 840
… …
939#endif 975#endif
940 976
941 New(54,PL_savestack,24,ANY); 977 New(54,PL_savestack,24,ANY);
942 PL_savestack_ix = 0; 978 PL_savestack_ix = 0;
943 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
944 985
945#if !PERL_VERSION_ATLEAST (5,10,0) 986#if !PERL_VERSION_ATLEAST (5,10,0)
946 New(54,PL_retstack,4,OP*); 987 New(54,PL_retstack,4,OP*);
947 PL_retstack_ix = 0; 988 PL_retstack_ix = 0;
948 PL_retstack_max = 4; 989 PL_retstack_max = 4;
… …
1014 } 1055 }
1015 1056
1016 return rss; 1057 return rss;
1017} 1058}
1018 1059
1019/** coroutine stack handling ************************************************/ 1060/** provide custom get/set/clear methods for %SIG elements ******************/
1020
1021static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
1022static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
1023static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
1024 1061
1025/* apparently < 5.8.8 */ 1062/* apparently < 5.8.8 */
1026#ifndef MgPV_nolen_const 1063#ifndef MgPV_nolen_const
1027#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1064#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
1028 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1065 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
1029 (const char*)(mg)->mg_ptr) 1066 (const char*)(mg)->mg_ptr)
1030#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};
1031 1096
1032/* 1097/*
1033 * This overrides the default magic get method of %SIG elements. 1098 * This overrides the default magic get method of %SIG elements.
1034 * 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
1035 * 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),
… …
1037 */ 1102 */
1038static int ecb_cold 1103static int ecb_cold
1039coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1104coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
1040{ 1105{
1041 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;
1042 1109
1043 if (*s == '_') 1110 SV *ssv;
1044 {
1045 SV **svp = 0;
1046 1111
1047 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1048 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1049
1050 if (svp) 1112 if (!*svp)
1051 {
1052 SV *ssv;
1053
1054 if (!*svp)
1055 ssv = &PL_sv_undef; 1113 ssv = &PL_sv_undef;
1056 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. */
1057 ssv = sv_2mortal (newRV_inc (*svp)); 1115 ssv = sv_2mortal (newRV_inc (*svp));
1058 else 1116 else
1059 ssv = *svp; 1117 ssv = *svp;
1060 1118
1061 sv_setsv (sv, ssv); 1119 sv_setsv (sv, ssv);
1062 return 0; 1120 return 0;
1063 }
1064 }
1065
1066 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
1067} 1121}
1068 1122
1069static int ecb_cold 1123static int ecb_cold
1070coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1124coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
1071{ 1125{
1072 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;
1073 1129
1074 if (*s == '_')
1075 {
1076 SV **svp = 0;
1077
1078 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1079 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1080
1081 if (svp)
1082 {
1083 SV *old = *svp; 1130 SV *old = *svp;
1084 *svp = 0; 1131 *svp = 0;
1085 SvREFCNT_dec (old); 1132 SvREFCNT_dec (old);
1086 return 0; 1133 return 0;
1087 }
1088 }
1089
1090 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1091} 1134}
1092 1135
1093static int ecb_cold 1136static int ecb_cold
1094coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1137coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1095{ 1138{
1096 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;
1097 1142
1098 if (*s == '_')
1099 {
1100 SV **svp = 0;
1101
1102 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1103 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1104
1105 if (svp)
1106 {
1107 SV *old = *svp; 1143 SV *old = *svp;
1108 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1144 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1109 SvREFCNT_dec (old); 1145 SvREFCNT_dec (old);
1110 return 0; 1146 return 0;
1111 }
1112 }
1113
1114 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1115} 1147}
1116 1148
1117static void 1149static void
1118prepare_nop (pTHX_ struct coro_transfer_args *ta) 1150prepare_nop (pTHX_ struct coro_transfer_args *ta)
1119{ 1151{
… …
1130static int 1162static int
1131slf_check_repeat (pTHX_ struct CoroSLF *frame) 1163slf_check_repeat (pTHX_ struct CoroSLF *frame)
1132{ 1164{
1133 return 1; 1165 return 1;
1134} 1166}
1167
1168/** coroutine stack handling ************************************************/
1135 1169
1136static UNOP init_perl_op; 1170static UNOP init_perl_op;
1137 1171
1138ecb_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 */
1139init_perl (pTHX_ struct coro *coro) 1173init_perl (pTHX_ struct coro *coro)
… …
1206 PL_op = (OP *)&init_perl_op; 1240 PL_op = (OP *)&init_perl_op;
1207 1241
1208 /* copy throw, in case it was set before init_perl */ 1242 /* copy throw, in case it was set before init_perl */
1209 CORO_THROW = coro->except; 1243 CORO_THROW = coro->except;
1210 1244
1211 SWAP_SVS (coro); 1245 SWAP_SVS_ENTER (coro);
1212 1246
1213 if (ecb_expect_false (enable_times)) 1247 if (ecb_expect_false (enable_times))
1214 { 1248 {
1215 coro_times_update (); 1249 coro_times_update ();
1216 coro_times_sub (coro); 1250 coro_times_sub (coro);
… …
1254 /* this will cause transfer_check to croak on block*/ 1288 /* this will cause transfer_check to croak on block*/
1255 SvRV_set (coro_current, (SV *)coro->hv); 1289 SvRV_set (coro_current, (SV *)coro->hv);
1256 1290
1257 load_perl (aTHX_ coro); 1291 load_perl (aTHX_ coro);
1258 1292
1293 /* restore swapped sv's */
1294 SWAP_SVS_LEAVE (coro);
1295
1259 coro_unwind_stacks (aTHX); 1296 coro_unwind_stacks (aTHX);
1260
1261 /* restore swapped sv's */
1262 SWAP_SVS (coro);
1263 1297
1264 coro_destruct_stacks (aTHX); 1298 coro_destruct_stacks (aTHX);
1265 1299
1266 /* now save some sv's to be free'd later */ 1300 /* now save some sv's to be free'd later */
1267 svf [0] = GvSV (PL_defgv); 1301 svf [0] = GvSV (PL_defgv);
… …
1382 SAVETMPS; 1416 SAVETMPS;
1383 EXTEND (SP, 3); 1417 EXTEND (SP, 3);
1384 PUSHMARK (SP); 1418 PUSHMARK (SP);
1385 PUSHs (&PL_sv_yes); 1419 PUSHs (&PL_sv_yes);
1386 PUSHs (fullname); 1420 PUSHs (fullname);
1387 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);
1388 PUTBACK; 1422 PUTBACK;
1389 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);
1390 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);
1391 SPAGAIN; 1425 SPAGAIN;
1392 FREETMPS; 1426 FREETMPS;
… …
1514 * 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
1515 * 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.
1516 */ 1550 */
1517 1551
1518 /* 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 /*
1519 * 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
1520 * 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)
1521 * 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
1522 * doing in that case. YMMV. 1563 * doing in that case. YMMV.
1523 */ 1564 */
… …
2402 else 2443 else
2403 { 2444 {
2404 av_clear (GvAV (PL_defgv)); 2445 av_clear (GvAV (PL_defgv));
2405 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);
2406 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
2407 coro->prio = 0; 2455 coro->prio = 0;
2408 2456
2409 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2457 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2410 api_trace (aTHX_ coro_current, 0); 2458 api_trace (aTHX_ coro_current, 0);
2411 2459
2412 frame->prepare = prepare_schedule; 2460 frame->prepare = prepare_schedule;
2413 av_push (av_async_pool, SvREFCNT_inc (hv)); 2461 av_push (av_async_pool, SvREFCNT_inc (hv));
2414 } 2462 }
… …
2870 2918
2871 for (i = AvFILLp (av) - 1; i >= 0; i -= 2) 2919 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2872 if (AvARRAY (av)[i] == (SV *)hook) 2920 if (AvARRAY (av)[i] == (SV *)hook)
2873 { 2921 {
2874 if (execute) 2922 if (execute)
2875 hook ((void *)AvARRAY (av)[i + 1]); 2923 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2876 2924
2877 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1); 2925 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2878 av_pop (av); 2926 av_pop (av);
2879 av_pop (av); 2927 av_pop (av);
2880 break; 2928 break;
… …
2892{ 2940{
2893 struct coro *coro = SvSTATE (coro_sv); 2941 struct coro *coro = SvSTATE (coro_sv);
2894 2942
2895 if (SvSTATE_current == coro) 2943 if (SvSTATE_current == coro)
2896 if (enter) 2944 if (enter)
2897 enter (aTHX enter_arg); 2945 enter (aTHX_ enter_arg);
2898 2946
2899 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg); 2947 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2900 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg); 2948 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2901} 2949}
2902 2950
… …
3543 3591
3544 map_len = load_len + save_len + 16; 3592 map_len = load_len + save_len + 16;
3545 3593
3546 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);
3547 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
3548 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));
3549 3600
3550 load_perl_slots = (load_save_perl_slots_type)map_base; 3601 load_perl_slots = (load_save_perl_slots_type)map_base;
3551 memcpy (map_base, load_ptr, load_len); 3602 memcpy (map_base, load_ptr, load_len);
3552 3603
… …
3588 cctx_current = cctx_new_empty (); 3639 cctx_current = cctx_new_empty ();
3589 3640
3590 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3641 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3591 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3642 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3592 3643
3593 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3644 {
3594 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3645 /*
3595 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 }
3596 3668
3597 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3598 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));
3599 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));
3600 3671
3601 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3672 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3602 3673
… …
3908 if (ecb_expect_false (current == self)) 3979 if (ecb_expect_false (current == self))
3909 coro_times_sub (SvSTATE (coro_current)); 3980 coro_times_sub (SvSTATE (coro_current));
3910} 3981}
3911 3982
3912void 3983void
3913swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3984swap_sv (Coro::State coro, SV *sva, SV *svb)
3914 CODE: 3985 CODE:
3915{ 3986{
3916 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);
3917 3993
3918 if (current == coro) 3994 if (current == coro)
3919 SWAP_SVS (current); 3995 SWAP_SVS_LEAVE (current);
3920 3996
3921 if (!coro->swap_sv) 3997 if (!coro->swap_sv)
3922 coro->swap_sv = newAV (); 3998 coro->swap_sv = newAV ();
3923 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
3924 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4021 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3925 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4022 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4023
4024 removed:
3926 4025
3927 if (current == coro) 4026 if (current == coro)
3928 SWAP_SVS (current); 4027 SWAP_SVS_ENTER (current);
3929} 4028}
3930 4029
3931 4030
3932MODULE = Coro::State PACKAGE = Coro 4031MODULE = Coro::State PACKAGE = Coro
3933 4032
3934BOOT: 4033BOOT:
3935{ 4034{
4035 if (SVt_LAST > 32)
4036 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4037
3936 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4038 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3937 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4039 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3938 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4040 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3939 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4041 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3940 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4042 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
4244 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4346 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4245 OUTPUT: 4347 OUTPUT:
4246 RETVAL 4348 RETVAL
4247 4349
4248void 4350void
4249up (SV *self, int adjust = 1) 4351up (SV *self)
4250 ALIAS:
4251 adjust = 1
4252 CODE: 4352 CODE:
4353 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4354
4355void
4356adjust (SV *self, int adjust)
4357 CODE:
4253 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4358 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4254 4359
4255void 4360void
4256down (...) 4361down (...)
4257 CODE: 4362 CODE:
4258 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