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.480 by root, Fri Jun 25 01:13:21 2021 UTC

… …
2#define USE_NO_MINGW_SETJMP_TWO_ARGS 2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3 3
4#define NDEBUG 1 /* perl usually disables NDEBUG later */ 4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5 5
6#include "libcoro/coro.c" 6#include "libcoro/coro.c"
7
8#if CORO_UCONTEXT
9 #define CORO_BACKEND "ucontext"
10#elif CORO_SJLJ
11 #define CORO_BACKEND "sjlj"
12#elif CORO_LINUX
13 #define CORO_BACKEND "linux"
14#elif CORO_LOSER
15 #define CORO_BACKEND "loser"
16#elif CORO_FIBER
17 #define CORO_BACKEND "fiber"
18#elif CORO_IRIX
19 #define CORO_BACKEND "irix"
20#elif CORO_ASM
21 #define CORO_BACKEND "asm"
22#elif CORO_PTHREAD
23 #define CORO_BACKEND "pthread"
24#else
25 #define CORO_BACKEND "unknown"
26#endif
7 27
8#define PERL_NO_GET_CONTEXT 28#define PERL_NO_GET_CONTEXT
9#define PERL_EXT 29#define PERL_EXT
10 30
11#include "EXTERN.h" 31#include "EXTERN.h"
… …
21 41
22#include <stddef.h> 42#include <stddef.h>
23#include <stdio.h> 43#include <stdio.h>
24#include <errno.h> 44#include <errno.h>
25#include <assert.h> 45#include <assert.h>
46
47#ifndef SvREFCNT_dec_NN
48 #define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
49#endif
50
51#ifndef SvREFCNT_inc_NN
52 #define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
53#endif
26 54
27#ifndef SVs_PADSTALE 55#ifndef SVs_PADSTALE
28# define SVs_PADSTALE 0 56# define SVs_PADSTALE 0
29#endif 57#endif
30 58
… …
108# define CORO_CLOCK_MONOTONIC 1 136# define CORO_CLOCK_MONOTONIC 1
109# define CORO_CLOCK_THREAD_CPUTIME_ID 3 137# define CORO_CLOCK_THREAD_CPUTIME_ID 3
110# endif 138# endif
111#endif 139#endif
112 140
141/* one off bugfix for perl 5.22 */
142#if PERL_VERSION_ATLEAST(5,22,0) && !PERL_VERSION_ATLEAST(5,24,0)
143# undef PadlistNAMES
144# define PadlistNAMES(pl) *((PADNAMELIST **)PadlistARRAY (pl))
145#endif
146
147#if PERL_VERSION_ATLEAST(5,24,0)
148# define SUB_ARGARRAY PL_curpad[0]
149#else
150# define SUB_ARGARRAY (SV *)cx->blk_sub.argarray
151#endif
152
153/* perl usually suppresses asserts. for debugging, we sometimes force it to be on */
154#if 0
155# undef NDEBUG
156# include <assert.h>
157#endif
158
113static double (*nvtime)(); /* so why doesn't it take void? */ 159static double (*nvtime)(); /* so why doesn't it take void? */
114static void (*u2time)(pTHX_ UV ret[2]); 160static void (*u2time)(pTHX_ UV ret[2]);
115 161
116/* we hijack an hopefully unused CV flag for our purposes */ 162/* we hijack an hopefully unused CV flag for our purposes */
117#define CVf_SLF 0x4000 163#define CVf_SLF 0x4000
… …
132 178
133static GV *irsgv; /* $/ */ 179static GV *irsgv; /* $/ */
134static GV *stdoutgv; /* *STDOUT */ 180static GV *stdoutgv; /* *STDOUT */
135static SV *rv_diehook; 181static SV *rv_diehook;
136static SV *rv_warnhook; 182static SV *rv_warnhook;
137static HV *hv_sig; /* %SIG */
138 183
139/* async_pool helper stuff */ 184/* async_pool helper stuff */
140static SV *sv_pool_rss; 185static SV *sv_pool_rss;
141static SV *sv_pool_size; 186static SV *sv_pool_size;
142static SV *sv_async_pool_idle; /* description string */ 187static SV *sv_async_pool_idle; /* description string */
… …
238 int usecount; /* number of transfers to this coro */ 283 int usecount; /* number of transfers to this coro */
239 284
240 /* coro process data */ 285 /* coro process data */
241 int prio; 286 int prio;
242 SV *except; /* exception to be thrown */ 287 SV *except; /* exception to be thrown */
243 SV *rouse_cb; /* last rouse callback */ 288 SV *rouse_cb; /* most recently created rouse callback */
244 AV *on_destroy; /* callbacks or coros to notify on destroy */ 289 AV *on_destroy; /* callbacks or coros to notify on destroy */
245 AV *status; /* the exit status list */ 290 AV *status; /* the exit status list */
246 291
247 /* async_pool */ 292 /* async_pool */
248 SV *saved_deffh; 293 SV *saved_deffh;
249 SV *invoke_cb; 294 SV *invoke_cb;
250 AV *invoke_av; 295 AV *invoke_av;
251 296
252 /* on_enter/on_leave */ 297 /* on_enter/on_leave */
253 AV *on_enter; 298 AV *on_enter; AV *on_enter_xs;
254 AV *on_leave; 299 AV *on_leave; AV *on_leave_xs;
255 300
256 /* swap_sv */ 301 /* swap_sv */
257 AV *swap_sv; 302 AV *swap_sv;
258 303
259 /* times */ 304 /* times */
… …
495 540
496 return 0; 541 return 0;
497} 542}
498 543
499ecb_inline struct coro * 544ecb_inline struct coro *
500SvSTATE_ (pTHX_ SV *coro) 545SvSTATE_ (pTHX_ SV *coro_sv)
501{ 546{
502 MAGIC *mg; 547 MAGIC *mg;
503 548
504 if (SvROK (coro)) 549 if (SvROK (coro_sv))
505 coro = SvRV (coro); 550 coro_sv = SvRV (coro_sv);
506 551
507 mg = SvSTATEhv_p (aTHX_ coro); 552 mg = SvSTATEhv_p (aTHX_ coro_sv);
508 if (!mg) 553 if (!mg)
509 croak ("Coro::State object required"); 554 croak ("Coro::State object required");
510 555
511 return (struct coro *)mg->mg_ptr; 556 return (struct coro *)mg->mg_ptr;
512} 557}
… …
701 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u; 746 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
702 747
703 /* if SvANY points to the head, we need to adjust the pointers, 748 /* 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. 749 * as the pointer for a still points to b, and maybe vice versa.
705 */ 750 */
706 #define svany_in_head(type) \ 751 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))) 752 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
753 svany_in_head_set |= 1 << SVt_NV;
754 #endif
755
756 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
708 757
709 if (svany_in_head (SvTYPE (a))) 758 if (svany_in_head (SvTYPE (a)))
710 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 759 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
711 760
712 if (svany_in_head (SvTYPE (b))) 761 if (svany_in_head (SvTYPE (b)))
… …
715#endif 764#endif
716} 765}
717 766
718/* swap sv heads, at least logically */ 767/* swap sv heads, at least logically */
719static void 768static void
720swap_svs (pTHX_ Coro__State c) 769swap_svs_enter (pTHX_ Coro__State c)
721{ 770{
722 int i; 771 int i;
723 772
724 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 773 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
725 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]); 774 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
726} 775}
727 776
777static void
778swap_svs_leave (pTHX_ Coro__State c)
779{
780 int i;
781
782 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
783 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
784}
785
728#define SWAP_SVS(coro) \ 786#define SWAP_SVS_ENTER(coro) \
729 if (ecb_expect_false ((coro)->swap_sv)) \ 787 if (ecb_expect_false ((coro)->swap_sv)) \
730 swap_svs (aTHX_ (coro)) 788 swap_svs_enter (aTHX_ (coro))
789
790#define SWAP_SVS_LEAVE(coro) \
791 if (ecb_expect_false ((coro)->swap_sv)) \
792 swap_svs_leave (aTHX_ (coro))
731 793
732static void 794static void
733on_enterleave_call (pTHX_ SV *cb); 795on_enterleave_call (pTHX_ SV *cb);
734 796
735static void 797static void
… …
780 842
781 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 843 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
782 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 844 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
783 } 845 }
784 846
847 if (ecb_expect_false (c->on_enter_xs))
848 {
849 int i;
850
851 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
852 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
853 }
854
785 SWAP_SVS (c); 855 SWAP_SVS_ENTER (c);
786} 856}
787 857
788static void 858static void
789save_perl (pTHX_ Coro__State c) 859save_perl (pTHX_ Coro__State c)
790{ 860{
791 SWAP_SVS (c); 861 SWAP_SVS_LEAVE (c);
862
863 if (ecb_expect_false (c->on_leave_xs))
864 {
865 int i;
866
867 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
868 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
869 }
792 870
793 if (ecb_expect_false (c->on_leave)) 871 if (ecb_expect_false (c->on_leave))
794 { 872 {
795 int i; 873 int i;
796 874
… …
923#endif 1001#endif
924 1002
925 New(54,PL_savestack,24,ANY); 1003 New(54,PL_savestack,24,ANY);
926 PL_savestack_ix = 0; 1004 PL_savestack_ix = 0;
927 PL_savestack_max = 24; 1005 PL_savestack_max = 24;
1006#if PERL_VERSION_ATLEAST (5,24,0)
1007 /* perl 5.24 moves SS_MAXPUSH optimisation from */
1008 /* the header macros to PL_savestack_max */
1009 PL_savestack_max -= SS_MAXPUSH;
1010#endif
928 1011
929#if !PERL_VERSION_ATLEAST (5,10,0) 1012#if !PERL_VERSION_ATLEAST (5,10,0)
930 New(54,PL_retstack,4,OP*); 1013 New(54,PL_retstack,4,OP*);
931 PL_retstack_ix = 0; 1014 PL_retstack_ix = 0;
932 PL_retstack_max = 4; 1015 PL_retstack_max = 4;
… …
998 } 1081 }
999 1082
1000 return rss; 1083 return rss;
1001} 1084}
1002 1085
1003/** coroutine stack handling ************************************************/ 1086/** 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 1087
1009/* apparently < 5.8.8 */ 1088/* apparently < 5.8.8 */
1010#ifndef MgPV_nolen_const 1089#ifndef MgPV_nolen_const
1011#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1090#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
1012 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1091 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
1013 (const char*)(mg)->mg_ptr) 1092 (const char*)(mg)->mg_ptr)
1014#endif 1093#endif
1094
1095/* this will be a patched copy of PL_vtbl_sigelem */
1096static MGVTBL coro_sigelem_vtbl;
1097
1098static int ecb_cold
1099coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
1100{
1101 char *key = SvPV_nolen ((SV *)name);
1102
1103 /* do what mg_copy normally does */
1104 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1105 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1106
1107 /* patch sigelem vtbl, but only for __WARN__ and __DIE__ */
1108 if (*key == '_'
1109 && (strEQ (key, "__DIE__")
1110 || strEQ (key, "__WARN__")))
1111 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1112
1113 return 1;
1114}
1115
1116/* perl does not have a %SIG vtbl, we provide one so we can override */
1117/* the magic vtbl for the __DIE__ and __WARN__ members */
1118static const MGVTBL coro_sig_vtbl = {
1119 0, 0, 0, 0, 0,
1120 coro_sig_copy
1121};
1015 1122
1016/* 1123/*
1017 * This overrides the default magic get method of %SIG elements. 1124 * 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 1125 * 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), 1126 * and instead of trying to save and restore the hash elements (extremely slow),
… …
1021 */ 1128 */
1022static int ecb_cold 1129static int ecb_cold
1023coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
1024{ 1131{
1025 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;
1026 1135
1027 if (*s == '_') 1136 SV *ssv;
1028 {
1029 SV **svp = 0;
1030 1137
1031 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1032 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1033
1034 if (svp) 1138 if (!*svp)
1035 {
1036 SV *ssv;
1037
1038 if (!*svp)
1039 ssv = &PL_sv_undef; 1139 ssv = &PL_sv_undef;
1040 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */ 1140 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1041 ssv = sv_2mortal (newRV_inc (*svp)); 1141 ssv = sv_2mortal (newRV_inc (*svp));
1042 else 1142 else
1043 ssv = *svp; 1143 ssv = *svp;
1044 1144
1045 sv_setsv (sv, ssv); 1145 sv_setsv (sv, ssv);
1046 return 0; 1146 return 0;
1047 }
1048 }
1049
1050 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
1051} 1147}
1052 1148
1053static int ecb_cold 1149static int ecb_cold
1054coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1150coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
1055{ 1151{
1056 const char *s = MgPV_nolen_const (mg); 1152 const char *s = MgPV_nolen_const (mg);
1153 /* the key must be either __DIE__ or __WARN__ here */
1154 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1057 1155
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; 1156 SV *old = *svp;
1068 *svp = 0; 1157 *svp = 0;
1069 SvREFCNT_dec (old); 1158 SvREFCNT_dec (old);
1070 return 0; 1159 return 0;
1071 }
1072 }
1073
1074 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1075} 1160}
1076 1161
1077static int ecb_cold 1162static int ecb_cold
1078coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1163coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1079{ 1164{
1080 const char *s = MgPV_nolen_const (mg); 1165 const char *s = MgPV_nolen_const (mg);
1166 /* the key must be either __DIE__ or __WARN__ here */
1167 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1081 1168
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; 1169 SV *old = *svp;
1092 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1170 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1093 SvREFCNT_dec (old); 1171 SvREFCNT_dec (old);
1094 return 0; 1172 return 0;
1095 }
1096 }
1097
1098 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1099} 1173}
1100 1174
1101static void 1175static void
1102prepare_nop (pTHX_ struct coro_transfer_args *ta) 1176prepare_nop (pTHX_ struct coro_transfer_args *ta)
1103{ 1177{
… …
1114static int 1188static int
1115slf_check_repeat (pTHX_ struct CoroSLF *frame) 1189slf_check_repeat (pTHX_ struct CoroSLF *frame)
1116{ 1190{
1117 return 1; 1191 return 1;
1118} 1192}
1193
1194/** coroutine stack handling ************************************************/
1119 1195
1120static UNOP init_perl_op; 1196static UNOP init_perl_op;
1121 1197
1122ecb_noinline static void /* noinline to keep it out of the transfer fast path */ 1198ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1123init_perl (pTHX_ struct coro *coro) 1199init_perl (pTHX_ struct coro *coro)
… …
1166 myop.op_next = Nullop; 1242 myop.op_next = Nullop;
1167 myop.op_type = OP_ENTERSUB; 1243 myop.op_type = OP_ENTERSUB;
1168 myop.op_flags = OPf_WANT_VOID; 1244 myop.op_flags = OPf_WANT_VOID;
1169 1245
1170 PUSHMARK (SP); 1246 PUSHMARK (SP);
1171 PUSHs ((SV *)coro->startcv); 1247 XPUSHs ((SV *)coro->startcv);
1172 PUTBACK; 1248 PUTBACK;
1173 PL_op = (OP *)&myop; 1249 PL_op = (OP *)&myop;
1174 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1250 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1175 } 1251 }
1176 1252
… …
1190 PL_op = (OP *)&init_perl_op; 1266 PL_op = (OP *)&init_perl_op;
1191 1267
1192 /* copy throw, in case it was set before init_perl */ 1268 /* copy throw, in case it was set before init_perl */
1193 CORO_THROW = coro->except; 1269 CORO_THROW = coro->except;
1194 1270
1195 SWAP_SVS (coro); 1271 SWAP_SVS_ENTER (coro);
1196 1272
1197 if (ecb_expect_false (enable_times)) 1273 if (ecb_expect_false (enable_times))
1198 { 1274 {
1199 coro_times_update (); 1275 coro_times_update ();
1200 coro_times_sub (coro); 1276 coro_times_sub (coro);
… …
1233 1309
1234 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1310 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1235 1311
1236 save_perl (aTHX_ current); 1312 save_perl (aTHX_ current);
1237 1313
1238 /* this will cause transfer_check to croak on block*/ 1314 /* this will cause transfer_check to croak on block */
1239 SvRV_set (coro_current, (SV *)coro->hv); 1315 SvRV_set (coro_current, (SV *)coro->hv);
1240 1316
1241 load_perl (aTHX_ coro); 1317 load_perl (aTHX_ coro);
1242 1318
1319 /* restore swapped sv's */
1320 SWAP_SVS_LEAVE (coro);
1321
1243 coro_unwind_stacks (aTHX); 1322 coro_unwind_stacks (aTHX);
1244
1245 /* restore swapped sv's */
1246 SWAP_SVS (coro);
1247 1323
1248 coro_destruct_stacks (aTHX); 1324 coro_destruct_stacks (aTHX);
1249 1325
1250 /* now save some sv's to be free'd later */ 1326 /* now save some sv's to be free'd later */
1251 svf [0] = GvSV (PL_defgv); 1327 svf [0] = GvSV (PL_defgv);
… …
1272 1348
1273 SvREFCNT_dec (coro->saved_deffh); 1349 SvREFCNT_dec (coro->saved_deffh);
1274 SvREFCNT_dec (coro->rouse_cb); 1350 SvREFCNT_dec (coro->rouse_cb);
1275 SvREFCNT_dec (coro->invoke_cb); 1351 SvREFCNT_dec (coro->invoke_cb);
1276 SvREFCNT_dec (coro->invoke_av); 1352 SvREFCNT_dec (coro->invoke_av);
1353 SvREFCNT_dec (coro->on_enter_xs);
1354 SvREFCNT_dec (coro->on_leave_xs);
1277 } 1355 }
1278} 1356}
1279 1357
1280ecb_inline void 1358ecb_inline void
1281free_coro_mortal (pTHX) 1359free_coro_mortal (pTHX)
… …
1322 av_push (av, SvREFCNT_inc_NN (*bot++)); 1400 av_push (av, SvREFCNT_inc_NN (*bot++));
1323 1401
1324 PL_runops = RUNOPS_DEFAULT; 1402 PL_runops = RUNOPS_DEFAULT;
1325 ENTER; 1403 ENTER;
1326 SAVETMPS; 1404 SAVETMPS;
1405 PUSHMARK (SP);
1327 EXTEND (SP, 3); 1406 EXTEND (SP, 3);
1328 PUSHMARK (SP);
1329 PUSHs (&PL_sv_no); 1407 PUSHs (&PL_sv_no);
1330 PUSHs (fullname); 1408 PUSHs (fullname);
1331 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 1409 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
1332 PUTBACK; 1410 PUTBACK;
1333 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1411 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
… …
1360 gv_efullname3 (fullname, gv, 0); 1438 gv_efullname3 (fullname, gv, 0);
1361 1439
1362 PL_runops = RUNOPS_DEFAULT; 1440 PL_runops = RUNOPS_DEFAULT;
1363 ENTER; 1441 ENTER;
1364 SAVETMPS; 1442 SAVETMPS;
1443 PUSHMARK (SP);
1365 EXTEND (SP, 3); 1444 EXTEND (SP, 3);
1366 PUSHMARK (SP);
1367 PUSHs (&PL_sv_yes); 1445 PUSHs (&PL_sv_yes);
1368 PUSHs (fullname); 1446 PUSHs (fullname);
1369 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1447 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc (SUB_ARGARRAY)) : &PL_sv_undef);
1370 PUTBACK; 1448 PUTBACK;
1371 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1449 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); 1450 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1373 SPAGAIN; 1451 SPAGAIN;
1374 FREETMPS; 1452 FREETMPS;
… …
1384 dSP; 1462 dSP;
1385 1463
1386 PL_runops = RUNOPS_DEFAULT; 1464 PL_runops = RUNOPS_DEFAULT;
1387 ENTER; 1465 ENTER;
1388 SAVETMPS; 1466 SAVETMPS;
1389 EXTEND (SP, 3);
1390 PL_runops = RUNOPS_DEFAULT;
1391 PUSHMARK (SP); 1467 PUSHMARK (SP);
1468 EXTEND (SP, 2);
1392 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 1469 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
1393 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 1470 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
1394 PUTBACK; 1471 PUTBACK;
1395 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0); 1472 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
1396 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1473 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
… …
1496 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1573 * 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. 1574 * runtime errors here, as this is just a random interpreter, not a thread.
1498 */ 1575 */
1499 1576
1500 /* 1577 /*
1578 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1579 * requires PL_scopestack_ix, so do it here if required.
1580 */
1581 if (!PL_scopestack_ix)
1582 ENTER;
1583
1584 /*
1501 * If perl-run returns we assume exit() was being called or the coro 1585 * 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) 1586 * 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 1587 * reason for perl_run to return. We try to mimic whatever perl is normally
1504 * doing in that case. YMMV. 1588 * doing in that case. YMMV.
1505 */ 1589 */
… …
1760 1844
1761static int 1845static int
1762coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1846coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1763{ 1847{
1764 struct coro *coro = (struct coro *)mg->mg_ptr; 1848 struct coro *coro = (struct coro *)mg->mg_ptr;
1849
1850 coro_state_destroy (aTHX_ coro);
1765 mg->mg_ptr = 0; 1851 mg->mg_ptr = 0;
1766 1852
1767 coro_state_destroy (aTHX_ coro);
1768 SvREFCNT_dec (coro->on_destroy); 1853 SvREFCNT_dec (coro->on_destroy);
1769 SvREFCNT_dec (coro->status); 1854 SvREFCNT_dec (coro->status);
1770 1855
1771 Safefree (coro); 1856 Safefree (coro);
1772 1857
… …
1775 1860
1776static int ecb_cold 1861static int ecb_cold
1777coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1862coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1778{ 1863{
1779 /* called when perl clones the current process the slow way (windows process emulation) */ 1864 /* called when perl clones the current process the slow way (windows process emulation) */
1780 /* WE SIMply nuke the pointers in the copy, causing perl to croak */ 1865 /* we simply nuke the pointers in the copy, causing perl to croak */
1781 mg->mg_ptr = 0; 1866 mg->mg_ptr = 0;
1782 mg->mg_virtual = 0; 1867 mg->mg_virtual = 0;
1783 1868
1784 return 0; 1869 return 0;
1785} 1870}
… …
2307safe_cancel (pTHX_ struct coro *coro, SV **arg, int items) 2392safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2308{ 2393{
2309 if (coro->cctx) 2394 if (coro->cctx)
2310 croak ("coro inside C callback, unable to cancel at this time, caught"); 2395 croak ("coro inside C callback, unable to cancel at this time, caught");
2311 2396
2312 if (coro->flags & CF_NEW) 2397 if (coro->flags & (CF_NEW | CF_ZOMBIE))
2313 { 2398 {
2314 coro_set_status (aTHX_ coro, arg, items); 2399 coro_set_status (aTHX_ coro, arg, items);
2315 coro_state_destroy (aTHX_ coro); 2400 coro_state_destroy (aTHX_ coro);
2316 } 2401 }
2317 else 2402 else
… …
2384 else 2469 else
2385 { 2470 {
2386 av_clear (GvAV (PL_defgv)); 2471 av_clear (GvAV (PL_defgv));
2387 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2472 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2388 2473
2474 if (ecb_expect_false (coro->swap_sv))
2475 {
2476 SWAP_SVS_LEAVE (coro);
2477 SvREFCNT_dec_NN (coro->swap_sv);
2478 coro->swap_sv = 0;
2479 }
2480
2389 coro->prio = 0; 2481 coro->prio = 0;
2390 2482
2391 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2483 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2392 api_trace (aTHX_ coro_current, 0); 2484 api_trace (aTHX_ coro_current, 0);
2393 2485
2394 frame->prepare = prepare_schedule; 2486 frame->prepare = prepare_schedule;
2395 av_push (av_async_pool, SvREFCNT_inc (hv)); 2487 av_push (av_async_pool, SvREFCNT_inc_NN (hv));
2396 } 2488 }
2397 } 2489 }
2398 else 2490 else
2399 { 2491 {
2400 /* first iteration, simply fall through */ 2492 /* first iteration, simply fall through */
… …
2413static void 2505static void
2414coro_rouse_callback (pTHX_ CV *cv) 2506coro_rouse_callback (pTHX_ CV *cv)
2415{ 2507{
2416 dXSARGS; 2508 dXSARGS;
2417 SV *data = (SV *)S_GENSUB_ARG; 2509 SV *data = (SV *)S_GENSUB_ARG;
2510 SV *coro = SvRV (data);
2418 2511
2512 /* data starts being either undef or a coro, and is replaced by the results when done */
2419 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2513 if (SvTYPE (coro) != SVt_PVAV)
2420 { 2514 {
2421 /* first call, set args */ 2515 /* first call, set args */
2422 SV *coro = SvRV (data);
2423 AV *av = newAV ();
2424 2516
2425 SvRV_set (data, (SV *)av); 2517 assert (&ST (0) < &ST (1)); /* ensure the stack is in the order we expect it to be */
2518 SvRV_set (data, (SV *)av_make (items, &ST (0))); /* av_make copies the SVs */
2426 2519
2427 /* better take a full copy of the arguments */ 2520 if (coro != &PL_sv_undef)
2428 while (items--) 2521 {
2429 av_store (av, items, newSVsv (ST (items)));
2430
2431 api_ready (aTHX_ coro); 2522 api_ready (aTHX_ coro);
2432 SvREFCNT_dec (coro); 2523 SvREFCNT_dec_NN (coro);
2524 }
2433 } 2525 }
2434 2526
2435 XSRETURN_EMPTY; 2527 XSRETURN_EMPTY;
2436} 2528}
2437 2529
… …
2454 2546
2455 EXTEND (SP, AvFILLp (av) + 1); 2547 EXTEND (SP, AvFILLp (av) + 1);
2456 for (i = 0; i <= AvFILLp (av); ++i) 2548 for (i = 0; i <= AvFILLp (av); ++i)
2457 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2549 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2458 2550
2459 /* we have stolen the elements, so set length to zero and free */ 2551 /* we have stolen the elements, make it unreal and free */
2460 AvFILLp (av) = -1; 2552 AvREAL_off (av);
2461 av_undef (av); 2553 av_undef (av);
2462 2554
2463 PUTBACK; 2555 PUTBACK;
2464 } 2556 }
2465 2557
… …
2490 croak ("Coro::rouse_wait called with illegal callback argument,"); 2582 croak ("Coro::rouse_wait called with illegal callback argument,");
2491 2583
2492 { 2584 {
2493 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2585 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2494 SV *data = (SV *)S_GENSUB_ARG; 2586 SV *data = (SV *)S_GENSUB_ARG;
2587 int data_ready = SvTYPE (SvRV (data)) == SVt_PVAV;
2588
2589 /* if there is no data, we need to store the current coro in the reference so we can be woken up */
2590 if (!data_ready)
2591 if (SvRV (data) != &PL_sv_undef)
2592 croak ("Coro::rouse_wait was called on a calback that is already being waited for - only one thread can wait for a rouse callback, caught");
2593 else
2594 SvRV_set (data, SvREFCNT_inc_NN (SvRV (coro_current)));
2495 2595
2496 frame->data = (void *)data; 2596 frame->data = (void *)data;
2497 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2597 frame->prepare = data_ready ? prepare_nop : prepare_schedule;
2498 frame->check = slf_check_rouse_wait; 2598 frame->check = slf_check_rouse_wait;
2499 } 2599 }
2500} 2600}
2501 2601
2502static SV * 2602static SV *
2503coro_new_rouse_cb (pTHX) 2603coro_new_rouse_cb (pTHX)
2504{ 2604{
2505 HV *hv = (HV *)SvRV (coro_current); 2605 HV *hv = (HV *)SvRV (coro_current);
2506 struct coro *coro = SvSTATE_hv (hv); 2606 struct coro *coro = SvSTATE_hv (hv);
2507 SV *data = newRV_inc ((SV *)hv); 2607 SV *data = newRV_noinc (&PL_sv_undef);
2508 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data); 2608 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2509 2609
2510 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2610 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2511 SvREFCNT_dec (data); /* magicext increases the refcount */ 2611 SvREFCNT_dec_NN (data); /* magicext increases the refcount */
2512 2612
2513 SvREFCNT_dec (coro->rouse_cb); 2613 SvREFCNT_dec (coro->rouse_cb);
2514 coro->rouse_cb = SvREFCNT_inc_NN (cb); 2614 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2515 2615
2516 return cb; 2616 return cb;
… …
2821static void 2921static void
2822coro_pop_on_leave (pTHX_ void *coro) 2922coro_pop_on_leave (pTHX_ void *coro)
2823{ 2923{
2824 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2924 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2825 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2925 on_enterleave_call (aTHX_ sv_2mortal (cb));
2926}
2927
2928static void
2929enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2930{
2931 if (!hook)
2932 return;
2933
2934 if (!*avp)
2935 {
2936 *avp = newAV ();
2937 AvREAL_off (*avp);
2938 }
2939
2940 av_push (*avp, (SV *)hook);
2941 av_push (*avp, (SV *)arg);
2942}
2943
2944static void
2945enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2946{
2947 AV *av = *avp;
2948 int i;
2949
2950 if (!av)
2951 return;
2952
2953 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2954 if (AvARRAY (av)[i] == (SV *)hook)
2955 {
2956 if (execute)
2957 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2958
2959 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2960 av_pop (av);
2961 av_pop (av);
2962 break;
2963 }
2964
2965 if (AvFILLp (av) >= 0)
2966 {
2967 *avp = 0;
2968 SvREFCNT_dec_NN (av);
2969 }
2970}
2971
2972static void
2973api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2974{
2975 struct coro *coro = SvSTATE (coro_sv);
2976
2977 if (SvSTATE_current == coro)
2978 if (enter)
2979 enter (aTHX_ enter_arg);
2980
2981 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2982 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2983}
2984
2985static void
2986api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2987{
2988 struct coro *coro = SvSTATE (coro_sv);
2989
2990 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2991 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2992}
2993
2994static void
2995savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2996{
2997 struct coro *coro = SvSTATE_current;
2998
2999 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
3000}
3001
3002static void
3003savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
3004{
3005 struct coro *coro = SvSTATE_current;
3006
3007 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
3008}
3009
3010static void
3011api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
3012{
3013 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
3014
3015 /* this ought to be much cheaper than malloc + a single destructor call */
3016 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
3017 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2826} 3018}
2827 3019
2828/*****************************************************************************/ 3020/*****************************************************************************/
2829/* PerlIO::cede */ 3021/* PerlIO::cede */
2830 3022
… …
2960 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3152 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2961 PUTBACK; 3153 PUTBACK;
2962 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3154 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2963 } 3155 }
2964 3156
2965 SvREFCNT_dec (cb); 3157 SvREFCNT_dec_NN (cb);
2966 } 3158 }
2967} 3159}
2968 3160
2969static void 3161static void
2970coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3162coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
3110 { 3302 {
3111 api_ready (aTHX_ cb); 3303 api_ready (aTHX_ cb);
3112 sv_setiv (cb, 0); /* signal waiter */ 3304 sv_setiv (cb, 0); /* signal waiter */
3113 } 3305 }
3114 3306
3115 SvREFCNT_dec (cb); 3307 SvREFCNT_dec_NN (cb);
3116 3308
3117 --count; 3309 --count;
3118 } 3310 }
3119} 3311}
3120 3312
… …
3205 } 3397 }
3206 3398
3207 av_push (state, data_sv); 3399 av_push (state, data_sv);
3208 3400
3209 api_ready (aTHX_ coro); 3401 api_ready (aTHX_ coro);
3210 SvREFCNT_dec (coro); 3402 SvREFCNT_dec_NN (coro);
3211 SvREFCNT_dec ((AV *)state); 3403 SvREFCNT_dec_NN ((AV *)state);
3212} 3404}
3213 3405
3214static int 3406static int
3215slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3407slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3216{ 3408{
… …
3234 errno = data->errorno; 3426 errno = data->errorno;
3235 PL_laststype = data->laststype; 3427 PL_laststype = data->laststype;
3236 PL_laststatval = data->laststatval; 3428 PL_laststatval = data->laststatval;
3237 PL_statcache = data->statcache; 3429 PL_statcache = data->statcache;
3238 3430
3239 SvREFCNT_dec (data_sv); 3431 SvREFCNT_dec_NN (data_sv);
3240 } 3432 }
3241 3433
3242 /* push result values */ 3434 /* push result values */
3243 { 3435 {
3244 dSP; 3436 dSP;
… …
3433 3625
3434 map_len = load_len + save_len + 16; 3626 map_len = load_len + save_len + 16;
3435 3627
3436 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 3628 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3437 3629
3630 if (map_base == (char *)MAP_FAILED)
3631 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3632
3438 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3633 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3439 3634
3440 load_perl_slots = (load_save_perl_slots_type)map_base; 3635 load_perl_slots = (load_save_perl_slots_type)map_base;
3441 memcpy (map_base, load_ptr, load_len); 3636 memcpy (map_base, load_ptr, load_len);
3442 3637
… …
3478 cctx_current = cctx_new_empty (); 3673 cctx_current = cctx_new_empty ();
3479 3674
3480 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3675 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3481 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3676 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3482 3677
3483 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3678 {
3484 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3679 /*
3485 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3680 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3681 * by coro_sig_vtbl in hash values.
3682 */
3683 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3684
3685 /* this only works if perl doesn't have a vtbl for %SIG */
3686 assert (!mg->mg_virtual);
3687
3688 /*
3689 * The irony is that the perl API itself asserts that mg_virtual
3690 * must be non-const, yet perl5porters insisted on marking their
3691 * vtbls as read-only, just to thwart perl modules from patching
3692 * them.
3693 */
3694 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3695 mg->mg_flags |= MGf_COPY;
3696
3697 coro_sigelem_vtbl = PL_vtbl_sigelem;
3698 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3699 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3700 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3701 }
3486 3702
3487 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3488 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3703 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)); 3704 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3490 3705
3491 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3706 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3707
3708 newCONSTSUB (coro_state_stash, "BACKEND", newSVpv (CORO_BACKEND, 0)); /* undocumented */
3492 3709
3493 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 3710 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
3494 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 3711 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
3495 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 3712 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
3496 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 3713 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
… …
3621call (Coro::State coro, SV *coderef) 3838call (Coro::State coro, SV *coderef)
3622 ALIAS: 3839 ALIAS:
3623 eval = 1 3840 eval = 1
3624 CODE: 3841 CODE:
3625{ 3842{
3843 struct coro *current = SvSTATE_current;
3844
3626 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3845 if ((coro == current) || (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)))
3627 { 3846 {
3628 struct coro *current = SvSTATE_current;
3629 struct CoroSLF slf_save; 3847 struct CoroSLF slf_save;
3630 3848
3631 if (current != coro) 3849 if (current != coro)
3632 { 3850 {
3633 PUTBACK; 3851 PUTBACK;
… …
3798 if (ecb_expect_false (current == self)) 4016 if (ecb_expect_false (current == self))
3799 coro_times_sub (SvSTATE (coro_current)); 4017 coro_times_sub (SvSTATE (coro_current));
3800} 4018}
3801 4019
3802void 4020void
3803swap_sv (Coro::State coro, SV *sv, SV *swapsv) 4021swap_sv (Coro::State coro, SV *sva, SV *svb)
3804 CODE: 4022 CODE:
3805{ 4023{
3806 struct coro *current = SvSTATE_current; 4024 struct coro *current = SvSTATE_current;
4025 AV *swap_sv;
4026 int i;
4027
4028 sva = SvRV (sva);
4029 svb = SvRV (svb);
3807 4030
3808 if (current == coro) 4031 if (current == coro)
3809 SWAP_SVS (current); 4032 SWAP_SVS_LEAVE (current);
3810 4033
3811 if (!coro->swap_sv) 4034 if (!coro->swap_sv)
3812 coro->swap_sv = newAV (); 4035 coro->swap_sv = newAV ();
3813 4036
4037 swap_sv = coro->swap_sv;
4038
4039 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4040 {
4041 SV *a = AvARRAY (swap_sv)[i ];
4042 SV *b = AvARRAY (swap_sv)[i + 1];
4043
4044 if (a == sva && b == svb)
4045 {
4046 SvREFCNT_dec_NN (a);
4047 SvREFCNT_dec_NN (b);
4048
4049 for (; i <= AvFILLp (swap_sv) - 2; i++)
4050 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4051
4052 AvFILLp (swap_sv) -= 2;
4053
4054 goto removed;
4055 }
4056 }
4057
3814 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4058 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3815 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4059 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4060
4061 removed:
3816 4062
3817 if (current == coro) 4063 if (current == coro)
3818 SWAP_SVS (current); 4064 SWAP_SVS_ENTER (current);
3819} 4065}
3820 4066
3821 4067
3822MODULE = Coro::State PACKAGE = Coro 4068MODULE = Coro::State PACKAGE = Coro
3823 4069
3824BOOT: 4070BOOT:
3825{ 4071{
4072 if (SVt_LAST > 32)
4073 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4074
3826 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4075 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3827 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4076 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3828 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4077 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3829 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4078 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); 4079 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3856 coroapi.ready = api_ready; 4105 coroapi.ready = api_ready;
3857 coroapi.is_ready = api_is_ready; 4106 coroapi.is_ready = api_is_ready;
3858 coroapi.nready = coro_nready; 4107 coroapi.nready = coro_nready;
3859 coroapi.current = coro_current; 4108 coroapi.current = coro_current;
3860 4109
4110 coroapi.enterleave_hook = api_enterleave_hook;
4111 coroapi.enterleave_unhook = api_enterleave_unhook;
4112 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4113
3861 /*GCoroAPI = &coroapi;*/ 4114 /*GCoroAPI = &coroapi;*/
3862 sv_setiv (sv, (IV)&coroapi); 4115 sv_setiv (sv, PTR2IV (&coroapi));
3863 SvREADONLY_on (sv); 4116 SvREADONLY_on (sv);
3864 } 4117 }
3865} 4118}
3866 4119
3867SV * 4120SV *
… …
3930 4183
3931void 4184void
3932_set_current (SV *current) 4185_set_current (SV *current)
3933 PROTOTYPE: $ 4186 PROTOTYPE: $
3934 CODE: 4187 CODE:
3935 SvREFCNT_dec (SvRV (coro_current)); 4188 SvREFCNT_dec_NN (SvRV (coro_current));
3936 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4189 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3937 4190
3938void 4191void
3939_set_readyhook (SV *hook) 4192_set_readyhook (SV *hook)
3940 PROTOTYPE: $ 4193 PROTOTYPE: $
… …
4024 4277
4025 if ((SV *)hv == &PL_sv_undef) 4278 if ((SV *)hv == &PL_sv_undef)
4026 { 4279 {
4027 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4280 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
4028 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4281 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4029 SvREFCNT_dec (sv); 4282 SvREFCNT_dec_NN (sv);
4030 } 4283 }
4031 4284
4032 { 4285 {
4033 struct coro *coro = SvSTATE_hv (hv); 4286 struct coro *coro = SvSTATE_hv (hv);
4034 4287
… …
4041 api_ready (aTHX_ (SV *)hv); 4294 api_ready (aTHX_ (SV *)hv);
4042 4295
4043 if (GIMME_V != G_VOID) 4296 if (GIMME_V != G_VOID)
4044 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4297 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4045 else 4298 else
4046 SvREFCNT_dec (hv); 4299 SvREFCNT_dec_NN (hv);
4047} 4300}
4048 4301
4049SV * 4302SV *
4050rouse_cb () 4303rouse_cb ()
4051 PROTOTYPE: 4304 PROTOTYPE:
… …
4130 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4383 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4131 OUTPUT: 4384 OUTPUT:
4132 RETVAL 4385 RETVAL
4133 4386
4134void 4387void
4135up (SV *self, int adjust = 1) 4388up (SV *self)
4136 ALIAS:
4137 adjust = 1
4138 CODE: 4389 CODE:
4390 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4391
4392void
4393adjust (SV *self, int adjust)
4394 CODE:
4139 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4395 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4140 4396
4141void 4397void
4142down (...) 4398down (...)
4143 CODE: 4399 CODE:
4144 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4400 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);

Diff Legend

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