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.470 by root, Fri Jul 14 13:14:32 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 suppresses 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 */
… …
248 SV *saved_deffh; 267 SV *saved_deffh;
249 SV *invoke_cb; 268 SV *invoke_cb;
250 AV *invoke_av; 269 AV *invoke_av;
251 270
252 /* on_enter/on_leave */ 271 /* on_enter/on_leave */
253 AV *on_enter; 272 AV *on_enter; AV *on_enter_xs;
254 AV *on_leave; 273 AV *on_leave; AV *on_leave_xs;
255 274
256 /* swap_sv */ 275 /* swap_sv */
257 AV *swap_sv; 276 AV *swap_sv;
258 277
259 /* times */ 278 /* times */
… …
495 514
496 return 0; 515 return 0;
497} 516}
498 517
499ecb_inline struct coro * 518ecb_inline struct coro *
500SvSTATE_ (pTHX_ SV *coro) 519SvSTATE_ (pTHX_ SV *coro_sv)
501{ 520{
502 MAGIC *mg; 521 MAGIC *mg;
503 522
504 if (SvROK (coro)) 523 if (SvROK (coro_sv))
505 coro = SvRV (coro); 524 coro_sv = SvRV (coro_sv);
506 525
507 mg = SvSTATEhv_p (aTHX_ coro); 526 mg = SvSTATEhv_p (aTHX_ coro_sv);
508 if (!mg) 527 if (!mg)
509 croak ("Coro::State object required"); 528 croak ("Coro::State object required");
510 529
511 return (struct coro *)mg->mg_ptr; 530 return (struct coro *)mg->mg_ptr;
512} 531}
… …
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
… …
780 816
781 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 817 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
782 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 818 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
783 } 819 }
784 820
821 if (ecb_expect_false (c->on_enter_xs))
822 {
823 int i;
824
825 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
826 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
827 }
828
785 SWAP_SVS (c); 829 SWAP_SVS_ENTER (c);
786} 830}
787 831
788static void 832static void
789save_perl (pTHX_ Coro__State c) 833save_perl (pTHX_ Coro__State c)
790{ 834{
791 SWAP_SVS (c); 835 SWAP_SVS_LEAVE (c);
836
837 if (ecb_expect_false (c->on_leave_xs))
838 {
839 int i;
840
841 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
842 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
843 }
792 844
793 if (ecb_expect_false (c->on_leave)) 845 if (ecb_expect_false (c->on_leave))
794 { 846 {
795 int i; 847 int i;
796 848
… …
923#endif 975#endif
924 976
925 New(54,PL_savestack,24,ANY); 977 New(54,PL_savestack,24,ANY);
926 PL_savestack_ix = 0; 978 PL_savestack_ix = 0;
927 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
928 985
929#if !PERL_VERSION_ATLEAST (5,10,0) 986#if !PERL_VERSION_ATLEAST (5,10,0)
930 New(54,PL_retstack,4,OP*); 987 New(54,PL_retstack,4,OP*);
931 PL_retstack_ix = 0; 988 PL_retstack_ix = 0;
932 PL_retstack_max = 4; 989 PL_retstack_max = 4;
… …
998 } 1055 }
999 1056
1000 return rss; 1057 return rss;
1001} 1058}
1002 1059
1003/** coroutine stack handling ************************************************/ 1060/** 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 1061
1009/* apparently < 5.8.8 */ 1062/* apparently < 5.8.8 */
1010#ifndef MgPV_nolen_const 1063#ifndef MgPV_nolen_const
1011#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1064#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
1012 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1065 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
1013 (const char*)(mg)->mg_ptr) 1066 (const char*)(mg)->mg_ptr)
1014#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};
1015 1096
1016/* 1097/*
1017 * This overrides the default magic get method of %SIG elements. 1098 * 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 1099 * 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), 1100 * and instead of trying to save and restore the hash elements (extremely slow),
… …
1021 */ 1102 */
1022static int ecb_cold 1103static int ecb_cold
1023coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1104coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
1024{ 1105{
1025 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;
1026 1109
1027 if (*s == '_') 1110 SV *ssv;
1028 {
1029 SV **svp = 0;
1030 1111
1031 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1032 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1033
1034 if (svp) 1112 if (!*svp)
1035 {
1036 SV *ssv;
1037
1038 if (!*svp)
1039 ssv = &PL_sv_undef; 1113 ssv = &PL_sv_undef;
1040 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. */
1041 ssv = sv_2mortal (newRV_inc (*svp)); 1115 ssv = sv_2mortal (newRV_inc (*svp));
1042 else 1116 else
1043 ssv = *svp; 1117 ssv = *svp;
1044 1118
1045 sv_setsv (sv, ssv); 1119 sv_setsv (sv, ssv);
1046 return 0; 1120 return 0;
1047 }
1048 }
1049
1050 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
1051} 1121}
1052 1122
1053static int ecb_cold 1123static int ecb_cold
1054coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1124coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
1055{ 1125{
1056 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;
1057 1129
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; 1130 SV *old = *svp;
1068 *svp = 0; 1131 *svp = 0;
1069 SvREFCNT_dec (old); 1132 SvREFCNT_dec (old);
1070 return 0; 1133 return 0;
1071 }
1072 }
1073
1074 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1075} 1134}
1076 1135
1077static int ecb_cold 1136static int ecb_cold
1078coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1137coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1079{ 1138{
1080 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;
1081 1142
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; 1143 SV *old = *svp;
1092 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1144 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1093 SvREFCNT_dec (old); 1145 SvREFCNT_dec (old);
1094 return 0; 1146 return 0;
1095 }
1096 }
1097
1098 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1099} 1147}
1100 1148
1101static void 1149static void
1102prepare_nop (pTHX_ struct coro_transfer_args *ta) 1150prepare_nop (pTHX_ struct coro_transfer_args *ta)
1103{ 1151{
… …
1114static int 1162static int
1115slf_check_repeat (pTHX_ struct CoroSLF *frame) 1163slf_check_repeat (pTHX_ struct CoroSLF *frame)
1116{ 1164{
1117 return 1; 1165 return 1;
1118} 1166}
1167
1168/** coroutine stack handling ************************************************/
1119 1169
1120static UNOP init_perl_op; 1170static UNOP init_perl_op;
1121 1171
1122ecb_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 */
1123init_perl (pTHX_ struct coro *coro) 1173init_perl (pTHX_ struct coro *coro)
… …
1190 PL_op = (OP *)&init_perl_op; 1240 PL_op = (OP *)&init_perl_op;
1191 1241
1192 /* copy throw, in case it was set before init_perl */ 1242 /* copy throw, in case it was set before init_perl */
1193 CORO_THROW = coro->except; 1243 CORO_THROW = coro->except;
1194 1244
1195 SWAP_SVS (coro); 1245 SWAP_SVS_ENTER (coro);
1196 1246
1197 if (ecb_expect_false (enable_times)) 1247 if (ecb_expect_false (enable_times))
1198 { 1248 {
1199 coro_times_update (); 1249 coro_times_update ();
1200 coro_times_sub (coro); 1250 coro_times_sub (coro);
… …
1238 /* this will cause transfer_check to croak on block*/ 1288 /* this will cause transfer_check to croak on block*/
1239 SvRV_set (coro_current, (SV *)coro->hv); 1289 SvRV_set (coro_current, (SV *)coro->hv);
1240 1290
1241 load_perl (aTHX_ coro); 1291 load_perl (aTHX_ coro);
1242 1292
1293 /* restore swapped sv's */
1294 SWAP_SVS_LEAVE (coro);
1295
1243 coro_unwind_stacks (aTHX); 1296 coro_unwind_stacks (aTHX);
1244
1245 /* restore swapped sv's */
1246 SWAP_SVS (coro);
1247 1297
1248 coro_destruct_stacks (aTHX); 1298 coro_destruct_stacks (aTHX);
1249 1299
1250 /* now save some sv's to be free'd later */ 1300 /* now save some sv's to be free'd later */
1251 svf [0] = GvSV (PL_defgv); 1301 svf [0] = GvSV (PL_defgv);
… …
1272 1322
1273 SvREFCNT_dec (coro->saved_deffh); 1323 SvREFCNT_dec (coro->saved_deffh);
1274 SvREFCNT_dec (coro->rouse_cb); 1324 SvREFCNT_dec (coro->rouse_cb);
1275 SvREFCNT_dec (coro->invoke_cb); 1325 SvREFCNT_dec (coro->invoke_cb);
1276 SvREFCNT_dec (coro->invoke_av); 1326 SvREFCNT_dec (coro->invoke_av);
1327 SvREFCNT_dec (coro->on_enter_xs);
1328 SvREFCNT_dec (coro->on_leave_xs);
1277 } 1329 }
1278} 1330}
1279 1331
1280ecb_inline void 1332ecb_inline void
1281free_coro_mortal (pTHX) 1333free_coro_mortal (pTHX)
… …
1364 SAVETMPS; 1416 SAVETMPS;
1365 EXTEND (SP, 3); 1417 EXTEND (SP, 3);
1366 PUSHMARK (SP); 1418 PUSHMARK (SP);
1367 PUSHs (&PL_sv_yes); 1419 PUSHs (&PL_sv_yes);
1368 PUSHs (fullname); 1420 PUSHs (fullname);
1369 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);
1370 PUTBACK; 1422 PUTBACK;
1371 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);
1372 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);
1373 SPAGAIN; 1425 SPAGAIN;
1374 FREETMPS; 1426 FREETMPS;
… …
1496 * 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
1497 * 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.
1498 */ 1550 */
1499 1551
1500 /* 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 /*
1501 * 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
1502 * 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)
1503 * 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
1504 * doing in that case. YMMV. 1563 * doing in that case. YMMV.
1505 */ 1564 */
… …
2384 else 2443 else
2385 { 2444 {
2386 av_clear (GvAV (PL_defgv)); 2445 av_clear (GvAV (PL_defgv));
2387 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);
2388 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
2389 coro->prio = 0; 2455 coro->prio = 0;
2390 2456
2391 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2457 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2392 api_trace (aTHX_ coro_current, 0); 2458 api_trace (aTHX_ coro_current, 0);
2393 2459
2394 frame->prepare = prepare_schedule; 2460 frame->prepare = prepare_schedule;
2395 av_push (av_async_pool, SvREFCNT_inc (hv)); 2461 av_push (av_async_pool, SvREFCNT_inc (hv));
2396 } 2462 }
… …
2821static void 2887static void
2822coro_pop_on_leave (pTHX_ void *coro) 2888coro_pop_on_leave (pTHX_ void *coro)
2823{ 2889{
2824 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2890 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2825 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2891 on_enterleave_call (aTHX_ sv_2mortal (cb));
2892}
2893
2894static void
2895enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2896{
2897 if (!hook)
2898 return;
2899
2900 if (!*avp)
2901 {
2902 *avp = newAV ();
2903 AvREAL_off (*avp);
2904 }
2905
2906 av_push (*avp, (SV *)hook);
2907 av_push (*avp, (SV *)arg);
2908}
2909
2910static void
2911enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2912{
2913 AV *av = *avp;
2914 int i;
2915
2916 if (!av)
2917 return;
2918
2919 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2920 if (AvARRAY (av)[i] == (SV *)hook)
2921 {
2922 if (execute)
2923 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2924
2925 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2926 av_pop (av);
2927 av_pop (av);
2928 break;
2929 }
2930
2931 if (AvFILLp (av) >= 0)
2932 {
2933 *avp = 0;
2934 SvREFCNT_dec_NN (av);
2935 }
2936}
2937
2938static void
2939api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2940{
2941 struct coro *coro = SvSTATE (coro_sv);
2942
2943 if (SvSTATE_current == coro)
2944 if (enter)
2945 enter (aTHX_ enter_arg);
2946
2947 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2948 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2949}
2950
2951static void
2952api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2953{
2954 struct coro *coro = SvSTATE (coro_sv);
2955
2956 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2957 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2958}
2959
2960static void
2961savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2962{
2963 struct coro *coro = SvSTATE_current;
2964
2965 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2966}
2967
2968static void
2969savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2970{
2971 struct coro *coro = SvSTATE_current;
2972
2973 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2974}
2975
2976static void
2977api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2978{
2979 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2980
2981 /* this ought to be much cheaper than malloc + a single destructor call */
2982 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2983 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2826} 2984}
2827 2985
2828/*****************************************************************************/ 2986/*****************************************************************************/
2829/* PerlIO::cede */ 2987/* PerlIO::cede */
2830 2988
… …
2960 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3118 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2961 PUTBACK; 3119 PUTBACK;
2962 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3120 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2963 } 3121 }
2964 3122
2965 SvREFCNT_dec (cb); 3123 SvREFCNT_dec_NN (cb);
2966 } 3124 }
2967} 3125}
2968 3126
2969static void 3127static void
2970coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3128coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
3110 { 3268 {
3111 api_ready (aTHX_ cb); 3269 api_ready (aTHX_ cb);
3112 sv_setiv (cb, 0); /* signal waiter */ 3270 sv_setiv (cb, 0); /* signal waiter */
3113 } 3271 }
3114 3272
3115 SvREFCNT_dec (cb); 3273 SvREFCNT_dec_NN (cb);
3116 3274
3117 --count; 3275 --count;
3118 } 3276 }
3119} 3277}
3120 3278
… …
3205 } 3363 }
3206 3364
3207 av_push (state, data_sv); 3365 av_push (state, data_sv);
3208 3366
3209 api_ready (aTHX_ coro); 3367 api_ready (aTHX_ coro);
3210 SvREFCNT_dec (coro); 3368 SvREFCNT_dec_NN (coro);
3211 SvREFCNT_dec ((AV *)state); 3369 SvREFCNT_dec_NN ((AV *)state);
3212} 3370}
3213 3371
3214static int 3372static int
3215slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3373slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3216{ 3374{
… …
3234 errno = data->errorno; 3392 errno = data->errorno;
3235 PL_laststype = data->laststype; 3393 PL_laststype = data->laststype;
3236 PL_laststatval = data->laststatval; 3394 PL_laststatval = data->laststatval;
3237 PL_statcache = data->statcache; 3395 PL_statcache = data->statcache;
3238 3396
3239 SvREFCNT_dec (data_sv); 3397 SvREFCNT_dec_NN (data_sv);
3240 } 3398 }
3241 3399
3242 /* push result values */ 3400 /* push result values */
3243 { 3401 {
3244 dSP; 3402 dSP;
… …
3433 3591
3434 map_len = load_len + save_len + 16; 3592 map_len = load_len + save_len + 16;
3435 3593
3436 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);
3437 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
3438 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));
3439 3600
3440 load_perl_slots = (load_save_perl_slots_type)map_base; 3601 load_perl_slots = (load_save_perl_slots_type)map_base;
3441 memcpy (map_base, load_ptr, load_len); 3602 memcpy (map_base, load_ptr, load_len);
3442 3603
… …
3478 cctx_current = cctx_new_empty (); 3639 cctx_current = cctx_new_empty ();
3479 3640
3480 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3641 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3481 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3642 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3482 3643
3483 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3644 {
3484 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3645 /*
3485 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 }
3486 3668
3487 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3488 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));
3489 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));
3490 3671
3491 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3672 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3492 3673
… …
3798 if (ecb_expect_false (current == self)) 3979 if (ecb_expect_false (current == self))
3799 coro_times_sub (SvSTATE (coro_current)); 3980 coro_times_sub (SvSTATE (coro_current));
3800} 3981}
3801 3982
3802void 3983void
3803swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3984swap_sv (Coro::State coro, SV *sva, SV *svb)
3804 CODE: 3985 CODE:
3805{ 3986{
3806 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);
3807 3993
3808 if (current == coro) 3994 if (current == coro)
3809 SWAP_SVS (current); 3995 SWAP_SVS_LEAVE (current);
3810 3996
3811 if (!coro->swap_sv) 3997 if (!coro->swap_sv)
3812 coro->swap_sv = newAV (); 3998 coro->swap_sv = newAV ();
3813 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
3814 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4021 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3815 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4022 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4023
4024 removed:
3816 4025
3817 if (current == coro) 4026 if (current == coro)
3818 SWAP_SVS (current); 4027 SWAP_SVS_ENTER (current);
3819} 4028}
3820 4029
3821 4030
3822MODULE = Coro::State PACKAGE = Coro 4031MODULE = Coro::State PACKAGE = Coro
3823 4032
3824BOOT: 4033BOOT:
3825{ 4034{
4035 if (SVt_LAST > 32)
4036 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4037
3826 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4038 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3827 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4039 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3828 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4040 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3829 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);
3830 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4042 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3856 coroapi.ready = api_ready; 4068 coroapi.ready = api_ready;
3857 coroapi.is_ready = api_is_ready; 4069 coroapi.is_ready = api_is_ready;
3858 coroapi.nready = coro_nready; 4070 coroapi.nready = coro_nready;
3859 coroapi.current = coro_current; 4071 coroapi.current = coro_current;
3860 4072
4073 coroapi.enterleave_hook = api_enterleave_hook;
4074 coroapi.enterleave_unhook = api_enterleave_unhook;
4075 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4076
3861 /*GCoroAPI = &coroapi;*/ 4077 /*GCoroAPI = &coroapi;*/
3862 sv_setiv (sv, (IV)&coroapi); 4078 sv_setiv (sv, (IV)&coroapi);
3863 SvREADONLY_on (sv); 4079 SvREADONLY_on (sv);
3864 } 4080 }
3865} 4081}
… …
3930 4146
3931void 4147void
3932_set_current (SV *current) 4148_set_current (SV *current)
3933 PROTOTYPE: $ 4149 PROTOTYPE: $
3934 CODE: 4150 CODE:
3935 SvREFCNT_dec (SvRV (coro_current)); 4151 SvREFCNT_dec_NN (SvRV (coro_current));
3936 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4152 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3937 4153
3938void 4154void
3939_set_readyhook (SV *hook) 4155_set_readyhook (SV *hook)
3940 PROTOTYPE: $ 4156 PROTOTYPE: $
… …
4024 4240
4025 if ((SV *)hv == &PL_sv_undef) 4241 if ((SV *)hv == &PL_sv_undef)
4026 { 4242 {
4027 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4243 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
4028 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4244 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4029 SvREFCNT_dec (sv); 4245 SvREFCNT_dec_NN (sv);
4030 } 4246 }
4031 4247
4032 { 4248 {
4033 struct coro *coro = SvSTATE_hv (hv); 4249 struct coro *coro = SvSTATE_hv (hv);
4034 4250
… …
4041 api_ready (aTHX_ (SV *)hv); 4257 api_ready (aTHX_ (SV *)hv);
4042 4258
4043 if (GIMME_V != G_VOID) 4259 if (GIMME_V != G_VOID)
4044 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4260 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4045 else 4261 else
4046 SvREFCNT_dec (hv); 4262 SvREFCNT_dec_NN (hv);
4047} 4263}
4048 4264
4049SV * 4265SV *
4050rouse_cb () 4266rouse_cb ()
4051 PROTOTYPE: 4267 PROTOTYPE:
… …
4130 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4346 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4131 OUTPUT: 4347 OUTPUT:
4132 RETVAL 4348 RETVAL
4133 4349
4134void 4350void
4135up (SV *self, int adjust = 1) 4351up (SV *self)
4136 ALIAS:
4137 adjust = 1
4138 CODE: 4352 CODE:
4353 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4354
4355void
4356adjust (SV *self, int adjust)
4357 CODE:
4139 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4358 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4140 4359
4141void 4360void
4142down (...) 4361down (...)
4143 CODE: 4362 CODE:
4144 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