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.449 by root, Sun Jun 21 17:02:49 2015 UTC vs.
Revision 1.471 by root, Fri Jul 14 23:20:07 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/* 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
113static double (*nvtime)(); /* so why doesn't it take void? */ 139static double (*nvtime)(); /* so why doesn't it take void? */
114static void (*u2time)(pTHX_ UV ret[2]); 140static void (*u2time)(pTHX_ UV ret[2]);
115 141
116/* we hijack an hopefully unused CV flag for our purposes */ 142/* we hijack an hopefully unused CV flag for our purposes */
117#define CVf_SLF 0x4000 143#define CVf_SLF 0x4000
… …
132 158
133static GV *irsgv; /* $/ */ 159static GV *irsgv; /* $/ */
134static GV *stdoutgv; /* *STDOUT */ 160static GV *stdoutgv; /* *STDOUT */
135static SV *rv_diehook; 161static SV *rv_diehook;
136static SV *rv_warnhook; 162static SV *rv_warnhook;
137static HV *hv_sig; /* %SIG */
138 163
139/* async_pool helper stuff */ 164/* async_pool helper stuff */
140static SV *sv_pool_rss; 165static SV *sv_pool_rss;
141static SV *sv_pool_size; 166static SV *sv_pool_size;
142static SV *sv_async_pool_idle; /* description string */ 167static SV *sv_async_pool_idle; /* description string */
… …
248 SV *saved_deffh; 273 SV *saved_deffh;
249 SV *invoke_cb; 274 SV *invoke_cb;
250 AV *invoke_av; 275 AV *invoke_av;
251 276
252 /* on_enter/on_leave */ 277 /* on_enter/on_leave */
253 AV *on_enter; 278 AV *on_enter; AV *on_enter_xs;
254 AV *on_leave; 279 AV *on_leave; AV *on_leave_xs;
255 280
256 /* swap_sv */ 281 /* swap_sv */
257 AV *swap_sv; 282 AV *swap_sv;
258 283
259 /* times */ 284 /* times */
… …
495 520
496 return 0; 521 return 0;
497} 522}
498 523
499ecb_inline struct coro * 524ecb_inline struct coro *
500SvSTATE_ (pTHX_ SV *coro) 525SvSTATE_ (pTHX_ SV *coro_sv)
501{ 526{
502 MAGIC *mg; 527 MAGIC *mg;
503 528
504 if (SvROK (coro)) 529 if (SvROK (coro_sv))
505 coro = SvRV (coro); 530 coro_sv = SvRV (coro_sv);
506 531
507 mg = SvSTATEhv_p (aTHX_ coro); 532 mg = SvSTATEhv_p (aTHX_ coro_sv);
508 if (!mg) 533 if (!mg)
509 croak ("Coro::State object required"); 534 croak ("Coro::State object required");
510 535
511 return (struct coro *)mg->mg_ptr; 536 return (struct coro *)mg->mg_ptr;
512} 537}
… …
701 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;
702 727
703 /* 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,
704 * 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.
705 */ 730 */
706 #define svany_in_head(type) \ 731 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))) 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)))
708 737
709 if (svany_in_head (SvTYPE (a))) 738 if (svany_in_head (SvTYPE (a)))
710 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 739 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
711 740
712 if (svany_in_head (SvTYPE (b))) 741 if (svany_in_head (SvTYPE (b)))
… …
715#endif 744#endif
716} 745}
717 746
718/* swap sv heads, at least logically */ 747/* swap sv heads, at least logically */
719static void 748static void
720swap_svs (pTHX_ Coro__State c) 749swap_svs_enter (pTHX_ Coro__State c)
721{ 750{
722 int i; 751 int i;
723 752
724 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 753 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
725 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]);
726} 755}
727 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
728#define SWAP_SVS(coro) \ 766#define SWAP_SVS_ENTER(coro) \
729 if (ecb_expect_false ((coro)->swap_sv)) \ 767 if (ecb_expect_false ((coro)->swap_sv)) \
730 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))
731 773
732static void 774static void
733on_enterleave_call (pTHX_ SV *cb); 775on_enterleave_call (pTHX_ SV *cb);
734 776
735static void 777static void
… …
780 822
781 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 823 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
782 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 824 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
783 } 825 }
784 826
827 if (ecb_expect_false (c->on_enter_xs))
828 {
829 int i;
830
831 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
832 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
833 }
834
785 SWAP_SVS (c); 835 SWAP_SVS_ENTER (c);
786} 836}
787 837
788static void 838static void
789save_perl (pTHX_ Coro__State c) 839save_perl (pTHX_ Coro__State c)
790{ 840{
791 SWAP_SVS (c); 841 SWAP_SVS_LEAVE (c);
842
843 if (ecb_expect_false (c->on_leave_xs))
844 {
845 int i;
846
847 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
848 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
849 }
792 850
793 if (ecb_expect_false (c->on_leave)) 851 if (ecb_expect_false (c->on_leave))
794 { 852 {
795 int i; 853 int i;
796 854
… …
923#endif 981#endif
924 982
925 New(54,PL_savestack,24,ANY); 983 New(54,PL_savestack,24,ANY);
926 PL_savestack_ix = 0; 984 PL_savestack_ix = 0;
927 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
928 991
929#if !PERL_VERSION_ATLEAST (5,10,0) 992#if !PERL_VERSION_ATLEAST (5,10,0)
930 New(54,PL_retstack,4,OP*); 993 New(54,PL_retstack,4,OP*);
931 PL_retstack_ix = 0; 994 PL_retstack_ix = 0;
932 PL_retstack_max = 4; 995 PL_retstack_max = 4;
… …
998 } 1061 }
999 1062
1000 return rss; 1063 return rss;
1001} 1064}
1002 1065
1003/** coroutine stack handling ************************************************/ 1066/** provide custom get/set/clear methods for %SIG elements ******************/
1004
1005static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
1006static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
1007static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
1008 1067
1009/* apparently < 5.8.8 */ 1068/* apparently < 5.8.8 */
1010#ifndef MgPV_nolen_const 1069#ifndef MgPV_nolen_const
1011#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1070#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
1012 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1071 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
1013 (const char*)(mg)->mg_ptr) 1072 (const char*)(mg)->mg_ptr)
1014#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};
1015 1102
1016/* 1103/*
1017 * This overrides the default magic get method of %SIG elements. 1104 * This overrides the default magic get method of %SIG elements.
1018 * 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
1019 * 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),
… …
1021 */ 1108 */
1022static int ecb_cold 1109static int ecb_cold
1023coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1110coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
1024{ 1111{
1025 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;
1026 1115
1027 if (*s == '_') 1116 SV *ssv;
1028 {
1029 SV **svp = 0;
1030 1117
1031 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1032 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1033
1034 if (svp) 1118 if (!*svp)
1035 {
1036 SV *ssv;
1037
1038 if (!*svp)
1039 ssv = &PL_sv_undef; 1119 ssv = &PL_sv_undef;
1040 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. */
1041 ssv = sv_2mortal (newRV_inc (*svp)); 1121 ssv = sv_2mortal (newRV_inc (*svp));
1042 else 1122 else
1043 ssv = *svp; 1123 ssv = *svp;
1044 1124
1045 sv_setsv (sv, ssv); 1125 sv_setsv (sv, ssv);
1046 return 0; 1126 return 0;
1047 }
1048 }
1049
1050 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
1051} 1127}
1052 1128
1053static int ecb_cold 1129static int ecb_cold
1054coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
1055{ 1131{
1056 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;
1057 1135
1058 if (*s == '_')
1059 {
1060 SV **svp = 0;
1061
1062 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1063 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1064
1065 if (svp)
1066 {
1067 SV *old = *svp; 1136 SV *old = *svp;
1068 *svp = 0; 1137 *svp = 0;
1069 SvREFCNT_dec (old); 1138 SvREFCNT_dec (old);
1070 return 0; 1139 return 0;
1071 }
1072 }
1073
1074 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1075} 1140}
1076 1141
1077static int ecb_cold 1142static int ecb_cold
1078coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1143coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1079{ 1144{
1080 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;
1081 1148
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; 1149 SV *old = *svp;
1092 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1150 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1093 SvREFCNT_dec (old); 1151 SvREFCNT_dec (old);
1094 return 0; 1152 return 0;
1095 }
1096 }
1097
1098 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1099} 1153}
1100 1154
1101static void 1155static void
1102prepare_nop (pTHX_ struct coro_transfer_args *ta) 1156prepare_nop (pTHX_ struct coro_transfer_args *ta)
1103{ 1157{
… …
1114static int 1168static int
1115slf_check_repeat (pTHX_ struct CoroSLF *frame) 1169slf_check_repeat (pTHX_ struct CoroSLF *frame)
1116{ 1170{
1117 return 1; 1171 return 1;
1118} 1172}
1173
1174/** coroutine stack handling ************************************************/
1119 1175
1120static UNOP init_perl_op; 1176static UNOP init_perl_op;
1121 1177
1122ecb_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 */
1123init_perl (pTHX_ struct coro *coro) 1179init_perl (pTHX_ struct coro *coro)
… …
1190 PL_op = (OP *)&init_perl_op; 1246 PL_op = (OP *)&init_perl_op;
1191 1247
1192 /* copy throw, in case it was set before init_perl */ 1248 /* copy throw, in case it was set before init_perl */
1193 CORO_THROW = coro->except; 1249 CORO_THROW = coro->except;
1194 1250
1195 SWAP_SVS (coro); 1251 SWAP_SVS_ENTER (coro);
1196 1252
1197 if (ecb_expect_false (enable_times)) 1253 if (ecb_expect_false (enable_times))
1198 { 1254 {
1199 coro_times_update (); 1255 coro_times_update ();
1200 coro_times_sub (coro); 1256 coro_times_sub (coro);
… …
1238 /* this will cause transfer_check to croak on block*/ 1294 /* this will cause transfer_check to croak on block*/
1239 SvRV_set (coro_current, (SV *)coro->hv); 1295 SvRV_set (coro_current, (SV *)coro->hv);
1240 1296
1241 load_perl (aTHX_ coro); 1297 load_perl (aTHX_ coro);
1242 1298
1299 /* restore swapped sv's */
1300 SWAP_SVS_LEAVE (coro);
1301
1243 coro_unwind_stacks (aTHX); 1302 coro_unwind_stacks (aTHX);
1244
1245 /* restore swapped sv's */
1246 SWAP_SVS (coro);
1247 1303
1248 coro_destruct_stacks (aTHX); 1304 coro_destruct_stacks (aTHX);
1249 1305
1250 /* now save some sv's to be free'd later */ 1306 /* now save some sv's to be free'd later */
1251 svf [0] = GvSV (PL_defgv); 1307 svf [0] = GvSV (PL_defgv);
… …
1272 1328
1273 SvREFCNT_dec (coro->saved_deffh); 1329 SvREFCNT_dec (coro->saved_deffh);
1274 SvREFCNT_dec (coro->rouse_cb); 1330 SvREFCNT_dec (coro->rouse_cb);
1275 SvREFCNT_dec (coro->invoke_cb); 1331 SvREFCNT_dec (coro->invoke_cb);
1276 SvREFCNT_dec (coro->invoke_av); 1332 SvREFCNT_dec (coro->invoke_av);
1333 SvREFCNT_dec (coro->on_enter_xs);
1334 SvREFCNT_dec (coro->on_leave_xs);
1277 } 1335 }
1278} 1336}
1279 1337
1280ecb_inline void 1338ecb_inline void
1281free_coro_mortal (pTHX) 1339free_coro_mortal (pTHX)
… …
1364 SAVETMPS; 1422 SAVETMPS;
1365 EXTEND (SP, 3); 1423 EXTEND (SP, 3);
1366 PUSHMARK (SP); 1424 PUSHMARK (SP);
1367 PUSHs (&PL_sv_yes); 1425 PUSHs (&PL_sv_yes);
1368 PUSHs (fullname); 1426 PUSHs (fullname);
1369 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);
1370 PUTBACK; 1428 PUTBACK;
1371 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);
1372 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);
1373 SPAGAIN; 1431 SPAGAIN;
1374 FREETMPS; 1432 FREETMPS;
… …
1496 * 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
1497 * 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.
1498 */ 1556 */
1499 1557
1500 /* 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 /*
1501 * 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
1502 * 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)
1503 * 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
1504 * doing in that case. YMMV. 1569 * doing in that case. YMMV.
1505 */ 1570 */
… …
2384 else 2449 else
2385 { 2450 {
2386 av_clear (GvAV (PL_defgv)); 2451 av_clear (GvAV (PL_defgv));
2387 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);
2388 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
2389 coro->prio = 0; 2461 coro->prio = 0;
2390 2462
2391 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2463 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2392 api_trace (aTHX_ coro_current, 0); 2464 api_trace (aTHX_ coro_current, 0);
2393 2465
2394 frame->prepare = prepare_schedule; 2466 frame->prepare = prepare_schedule;
2395 av_push (av_async_pool, SvREFCNT_inc (hv)); 2467 av_push (av_async_pool, SvREFCNT_inc (hv));
2396 } 2468 }
… …
2821static void 2893static void
2822coro_pop_on_leave (pTHX_ void *coro) 2894coro_pop_on_leave (pTHX_ void *coro)
2823{ 2895{
2824 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2896 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2825 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2897 on_enterleave_call (aTHX_ sv_2mortal (cb));
2898}
2899
2900static void
2901enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2902{
2903 if (!hook)
2904 return;
2905
2906 if (!*avp)
2907 {
2908 *avp = newAV ();
2909 AvREAL_off (*avp);
2910 }
2911
2912 av_push (*avp, (SV *)hook);
2913 av_push (*avp, (SV *)arg);
2914}
2915
2916static void
2917enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2918{
2919 AV *av = *avp;
2920 int i;
2921
2922 if (!av)
2923 return;
2924
2925 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2926 if (AvARRAY (av)[i] == (SV *)hook)
2927 {
2928 if (execute)
2929 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2930
2931 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2932 av_pop (av);
2933 av_pop (av);
2934 break;
2935 }
2936
2937 if (AvFILLp (av) >= 0)
2938 {
2939 *avp = 0;
2940 SvREFCNT_dec_NN (av);
2941 }
2942}
2943
2944static void
2945api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2946{
2947 struct coro *coro = SvSTATE (coro_sv);
2948
2949 if (SvSTATE_current == coro)
2950 if (enter)
2951 enter (aTHX_ enter_arg);
2952
2953 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2954 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2955}
2956
2957static void
2958api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2959{
2960 struct coro *coro = SvSTATE (coro_sv);
2961
2962 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2963 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2964}
2965
2966static void
2967savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2968{
2969 struct coro *coro = SvSTATE_current;
2970
2971 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2972}
2973
2974static void
2975savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2976{
2977 struct coro *coro = SvSTATE_current;
2978
2979 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2980}
2981
2982static void
2983api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2984{
2985 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2986
2987 /* this ought to be much cheaper than malloc + a single destructor call */
2988 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2989 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2826} 2990}
2827 2991
2828/*****************************************************************************/ 2992/*****************************************************************************/
2829/* PerlIO::cede */ 2993/* PerlIO::cede */
2830 2994
… …
2960 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3124 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2961 PUTBACK; 3125 PUTBACK;
2962 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3126 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2963 } 3127 }
2964 3128
2965 SvREFCNT_dec (cb); 3129 SvREFCNT_dec_NN (cb);
2966 } 3130 }
2967} 3131}
2968 3132
2969static void 3133static void
2970coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3134coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
3110 { 3274 {
3111 api_ready (aTHX_ cb); 3275 api_ready (aTHX_ cb);
3112 sv_setiv (cb, 0); /* signal waiter */ 3276 sv_setiv (cb, 0); /* signal waiter */
3113 } 3277 }
3114 3278
3115 SvREFCNT_dec (cb); 3279 SvREFCNT_dec_NN (cb);
3116 3280
3117 --count; 3281 --count;
3118 } 3282 }
3119} 3283}
3120 3284
… …
3205 } 3369 }
3206 3370
3207 av_push (state, data_sv); 3371 av_push (state, data_sv);
3208 3372
3209 api_ready (aTHX_ coro); 3373 api_ready (aTHX_ coro);
3210 SvREFCNT_dec (coro); 3374 SvREFCNT_dec_NN (coro);
3211 SvREFCNT_dec ((AV *)state); 3375 SvREFCNT_dec_NN ((AV *)state);
3212} 3376}
3213 3377
3214static int 3378static int
3215slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3379slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3216{ 3380{
… …
3234 errno = data->errorno; 3398 errno = data->errorno;
3235 PL_laststype = data->laststype; 3399 PL_laststype = data->laststype;
3236 PL_laststatval = data->laststatval; 3400 PL_laststatval = data->laststatval;
3237 PL_statcache = data->statcache; 3401 PL_statcache = data->statcache;
3238 3402
3239 SvREFCNT_dec (data_sv); 3403 SvREFCNT_dec_NN (data_sv);
3240 } 3404 }
3241 3405
3242 /* push result values */ 3406 /* push result values */
3243 { 3407 {
3244 dSP; 3408 dSP;
… …
3433 3597
3434 map_len = load_len + save_len + 16; 3598 map_len = load_len + save_len + 16;
3435 3599
3436 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);
3437 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
3438 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));
3439 3606
3440 load_perl_slots = (load_save_perl_slots_type)map_base; 3607 load_perl_slots = (load_save_perl_slots_type)map_base;
3441 memcpy (map_base, load_ptr, load_len); 3608 memcpy (map_base, load_ptr, load_len);
3442 3609
… …
3478 cctx_current = cctx_new_empty (); 3645 cctx_current = cctx_new_empty ();
3479 3646
3480 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3647 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3481 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3648 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3482 3649
3483 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3650 {
3484 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3651 /*
3485 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 }
3486 3674
3487 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3488 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));
3489 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));
3490 3677
3491 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3678 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3492 3679
… …
3798 if (ecb_expect_false (current == self)) 3985 if (ecb_expect_false (current == self))
3799 coro_times_sub (SvSTATE (coro_current)); 3986 coro_times_sub (SvSTATE (coro_current));
3800} 3987}
3801 3988
3802void 3989void
3803swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3990swap_sv (Coro::State coro, SV *sva, SV *svb)
3804 CODE: 3991 CODE:
3805{ 3992{
3806 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);
3807 3999
3808 if (current == coro) 4000 if (current == coro)
3809 SWAP_SVS (current); 4001 SWAP_SVS_LEAVE (current);
3810 4002
3811 if (!coro->swap_sv) 4003 if (!coro->swap_sv)
3812 coro->swap_sv = newAV (); 4004 coro->swap_sv = newAV ();
3813 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
3814 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4027 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3815 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4028 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4029
4030 removed:
3816 4031
3817 if (current == coro) 4032 if (current == coro)
3818 SWAP_SVS (current); 4033 SWAP_SVS_ENTER (current);
3819} 4034}
3820 4035
3821 4036
3822MODULE = Coro::State PACKAGE = Coro 4037MODULE = Coro::State PACKAGE = Coro
3823 4038
3824BOOT: 4039BOOT:
3825{ 4040{
4041 if (SVt_LAST > 32)
4042 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4043
3826 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4044 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3827 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4045 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3828 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4046 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3829 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);
3830 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4048 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3856 coroapi.ready = api_ready; 4074 coroapi.ready = api_ready;
3857 coroapi.is_ready = api_is_ready; 4075 coroapi.is_ready = api_is_ready;
3858 coroapi.nready = coro_nready; 4076 coroapi.nready = coro_nready;
3859 coroapi.current = coro_current; 4077 coroapi.current = coro_current;
3860 4078
4079 coroapi.enterleave_hook = api_enterleave_hook;
4080 coroapi.enterleave_unhook = api_enterleave_unhook;
4081 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4082
3861 /*GCoroAPI = &coroapi;*/ 4083 /*GCoroAPI = &coroapi;*/
3862 sv_setiv (sv, (IV)&coroapi); 4084 sv_setiv (sv, PTR2IV (&coroapi));
3863 SvREADONLY_on (sv); 4085 SvREADONLY_on (sv);
3864 } 4086 }
3865} 4087}
3866 4088
3867SV * 4089SV *
… …
3930 4152
3931void 4153void
3932_set_current (SV *current) 4154_set_current (SV *current)
3933 PROTOTYPE: $ 4155 PROTOTYPE: $
3934 CODE: 4156 CODE:
3935 SvREFCNT_dec (SvRV (coro_current)); 4157 SvREFCNT_dec_NN (SvRV (coro_current));
3936 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4158 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3937 4159
3938void 4160void
3939_set_readyhook (SV *hook) 4161_set_readyhook (SV *hook)
3940 PROTOTYPE: $ 4162 PROTOTYPE: $
… …
4024 4246
4025 if ((SV *)hv == &PL_sv_undef) 4247 if ((SV *)hv == &PL_sv_undef)
4026 { 4248 {
4027 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4249 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
4028 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4250 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4029 SvREFCNT_dec (sv); 4251 SvREFCNT_dec_NN (sv);
4030 } 4252 }
4031 4253
4032 { 4254 {
4033 struct coro *coro = SvSTATE_hv (hv); 4255 struct coro *coro = SvSTATE_hv (hv);
4034 4256
… …
4041 api_ready (aTHX_ (SV *)hv); 4263 api_ready (aTHX_ (SV *)hv);
4042 4264
4043 if (GIMME_V != G_VOID) 4265 if (GIMME_V != G_VOID)
4044 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4266 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4045 else 4267 else
4046 SvREFCNT_dec (hv); 4268 SvREFCNT_dec_NN (hv);
4047} 4269}
4048 4270
4049SV * 4271SV *
4050rouse_cb () 4272rouse_cb ()
4051 PROTOTYPE: 4273 PROTOTYPE:
… …
4130 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4352 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4131 OUTPUT: 4353 OUTPUT:
4132 RETVAL 4354 RETVAL
4133 4355
4134void 4356void
4135up (SV *self, int adjust = 1) 4357up (SV *self)
4136 ALIAS:
4137 adjust = 1
4138 CODE: 4358 CODE:
4359 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4360
4361void
4362adjust (SV *self, int adjust)
4363 CODE:
4139 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4364 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4140 4365
4141void 4366void
4142down (...) 4367down (...)
4143 CODE: 4368 CODE:
4144 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