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.439 by root, Tue Nov 19 05:16:01 2013 UTC vs.
Revision 1.481 by root, Thu Aug 19 22:43:02 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"
… …
14#include "perliol.h" 34#include "perliol.h"
15 35
16#include "schmorp.h" 36#include "schmorp.h"
17 37
18#define ECB_NO_THREADS 1 38#define ECB_NO_THREADS 1
39#define ECB_NO_LIBM 1
19#include "ecb.h" 40#include "ecb.h"
20 41
21#include <stddef.h> 42#include <stddef.h>
22#include <stdio.h> 43#include <stdio.h>
23#include <errno.h> 44#include <errno.h>
24#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
25 54
26#ifndef SVs_PADSTALE 55#ifndef SVs_PADSTALE
27# define SVs_PADSTALE 0 56# define SVs_PADSTALE 0
28#endif 57#endif
29 58
… …
41# define PadlistNAMES(pl) (*PadlistARRAY (pl)) 70# define PadlistNAMES(pl) (*PadlistARRAY (pl))
42# define PadARRAY AvARRAY 71# define PadARRAY AvARRAY
43# define PadMAX AvFILLp 72# define PadMAX AvFILLp
44# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1)) 73# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
45#endif 74#endif
75#ifndef PadnamelistREFCNT
76# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
77#endif
78#ifndef PadnamelistREFCNT_dec
79# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
80#endif
46 81
47/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */ 82/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
48/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */ 83/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
49#if PERL_VERSION_ATLEAST(5,19,0) 84#if PERL_VERSION_ATLEAST(5,19,0)
50# define SVt_BIND SVt_IV 85# define SVt_BIND SVt_IV
… …
101# define CORO_CLOCK_MONOTONIC 1 136# define CORO_CLOCK_MONOTONIC 1
102# define CORO_CLOCK_THREAD_CPUTIME_ID 3 137# define CORO_CLOCK_THREAD_CPUTIME_ID 3
103# endif 138# endif
104#endif 139#endif
105 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
106static double (*nvtime)(); /* so why doesn't it take void? */ 159static double (*nvtime)(); /* so why doesn't it take void? */
107static void (*u2time)(pTHX_ UV ret[2]); 160static void (*u2time)(pTHX_ UV ret[2]);
108 161
109/* we hijack an hopefully unused CV flag for our purposes */ 162/* we hijack an hopefully unused CV flag for our purposes */
110#define CVf_SLF 0x4000 163#define CVf_SLF 0x4000
… …
125 178
126static GV *irsgv; /* $/ */ 179static GV *irsgv; /* $/ */
127static GV *stdoutgv; /* *STDOUT */ 180static GV *stdoutgv; /* *STDOUT */
128static SV *rv_diehook; 181static SV *rv_diehook;
129static SV *rv_warnhook; 182static SV *rv_warnhook;
130static HV *hv_sig; /* %SIG */
131 183
132/* async_pool helper stuff */ 184/* async_pool helper stuff */
133static SV *sv_pool_rss; 185static SV *sv_pool_rss;
134static SV *sv_pool_size; 186static SV *sv_pool_size;
135static SV *sv_async_pool_idle; /* description string */ 187static SV *sv_async_pool_idle; /* description string */
… …
231 int usecount; /* number of transfers to this coro */ 283 int usecount; /* number of transfers to this coro */
232 284
233 /* coro process data */ 285 /* coro process data */
234 int prio; 286 int prio;
235 SV *except; /* exception to be thrown */ 287 SV *except; /* exception to be thrown */
236 SV *rouse_cb; /* last rouse callback */ 288 SV *rouse_cb; /* most recently created rouse callback */
237 AV *on_destroy; /* callbacks or coros to notify on destroy */ 289 AV *on_destroy; /* callbacks or coros to notify on destroy */
238 AV *status; /* the exit status list */ 290 AV *status; /* the exit status list */
239 291
240 /* async_pool */ 292 /* async_pool */
241 SV *saved_deffh; 293 SV *saved_deffh;
242 SV *invoke_cb; 294 SV *invoke_cb;
243 AV *invoke_av; 295 AV *invoke_av;
244 296
245 /* on_enter/on_leave */ 297 /* on_enter/on_leave */
246 AV *on_enter; 298 AV *on_enter; AV *on_enter_xs;
247 AV *on_leave; 299 AV *on_leave; AV *on_leave_xs;
248 300
249 /* swap_sv */ 301 /* swap_sv */
250 AV *swap_sv; 302 AV *swap_sv;
251 303
252 /* times */ 304 /* times */
… …
488 540
489 return 0; 541 return 0;
490} 542}
491 543
492ecb_inline struct coro * 544ecb_inline struct coro *
493SvSTATE_ (pTHX_ SV *coro) 545SvSTATE_ (pTHX_ SV *coro_sv)
494{ 546{
495 MAGIC *mg; 547 MAGIC *mg;
496 548
497 if (SvROK (coro)) 549 if (SvROK (coro_sv))
498 coro = SvRV (coro); 550 coro_sv = SvRV (coro_sv);
499 551
500 mg = SvSTATEhv_p (aTHX_ coro); 552 mg = SvSTATEhv_p (aTHX_ coro_sv);
501 if (!mg) 553 if (!mg)
502 croak ("Coro::State object required"); 554 croak ("Coro::State object required");
503 555
504 return (struct coro *)mg->mg_ptr; 556 return (struct coro *)mg->mg_ptr;
505} 557}
… …
516ecb_inline PADLIST * 568ecb_inline PADLIST *
517coro_derive_padlist (pTHX_ CV *cv) 569coro_derive_padlist (pTHX_ CV *cv)
518{ 570{
519 PADLIST *padlist = CvPADLIST (cv); 571 PADLIST *padlist = CvPADLIST (cv);
520 PADLIST *newpadlist; 572 PADLIST *newpadlist;
573 PADNAMELIST *padnames;
521 PAD *newpad; 574 PAD *newpad;
522 PADOFFSET off = PadlistMAX (padlist) + 1; 575 PADOFFSET off = PadlistMAX (padlist) + 1;
523 576
524#if NEWPADAPI 577#if NEWPADAPI
525 578
… …
552 AvREAL_off (newpadlist); 605 AvREAL_off (newpadlist);
553#endif 606#endif
554 607
555 /* Already extended to 2 elements by newPADLIST. */ 608 /* Already extended to 2 elements by newPADLIST. */
556 PadlistMAX (newpadlist) = 1; 609 PadlistMAX (newpadlist) = 1;
557 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist)); 610
611 padnames = PadlistNAMES (padlist);
612 ++PadnamelistREFCNT (padnames);
613 PadlistNAMES (newpadlist) = padnames;
614
558 PadlistARRAY (newpadlist)[1] = newpad; 615 PadlistARRAY (newpadlist)[1] = newpad;
559 616
560 return newpadlist; 617 return newpadlist;
561} 618}
562 619
… …
583 PadMAX (pad) = -1; 640 PadMAX (pad) = -1;
584 SvREFCNT_dec (pad); 641 SvREFCNT_dec (pad);
585 } 642 }
586 } 643 }
587 644
588 SvREFCNT_dec (PadlistNAMES (padlist)); 645 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
589 646
590#if NEWPADAPI 647#if NEWPADAPI
591 Safefree (PadlistARRAY (padlist)); 648 Safefree (PadlistARRAY (padlist));
592 Safefree (padlist); 649 Safefree (padlist);
593#else 650#else
… …
689 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;
690 747
691 /* 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,
692 * 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.
693 */ 750 */
694 #define svany_in_head(type) \ 751 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
695 (((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)))
696 757
697 if (svany_in_head (SvTYPE (a))) 758 if (svany_in_head (SvTYPE (a)))
698 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 759 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
699 760
700 if (svany_in_head (SvTYPE (b))) 761 if (svany_in_head (SvTYPE (b)))
… …
703#endif 764#endif
704} 765}
705 766
706/* swap sv heads, at least logically */ 767/* swap sv heads, at least logically */
707static void 768static void
708swap_svs (pTHX_ Coro__State c) 769swap_svs_enter (pTHX_ Coro__State c)
709{ 770{
710 int i; 771 int i;
711 772
712 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 773 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
713 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]);
714} 775}
715 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
716#define SWAP_SVS(coro) \ 786#define SWAP_SVS_ENTER(coro) \
717 if (ecb_expect_false ((coro)->swap_sv)) \ 787 if (ecb_expect_false ((coro)->swap_sv)) \
718 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))
719 793
720static void 794static void
721on_enterleave_call (pTHX_ SV *cb); 795on_enterleave_call (pTHX_ SV *cb);
722 796
723static void 797static void
… …
768 842
769 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 843 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
770 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 844 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
771 } 845 }
772 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
773 SWAP_SVS (c); 855 SWAP_SVS_ENTER (c);
774} 856}
775 857
776static void 858static void
777save_perl (pTHX_ Coro__State c) 859save_perl (pTHX_ Coro__State c)
778{ 860{
779 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 }
780 870
781 if (ecb_expect_false (c->on_leave)) 871 if (ecb_expect_false (c->on_leave))
782 { 872 {
783 int i; 873 int i;
784 874
… …
911#endif 1001#endif
912 1002
913 New(54,PL_savestack,24,ANY); 1003 New(54,PL_savestack,24,ANY);
914 PL_savestack_ix = 0; 1004 PL_savestack_ix = 0;
915 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
916 1011
917#if !PERL_VERSION_ATLEAST (5,10,0) 1012#if !PERL_VERSION_ATLEAST (5,10,0)
918 New(54,PL_retstack,4,OP*); 1013 New(54,PL_retstack,4,OP*);
919 PL_retstack_ix = 0; 1014 PL_retstack_ix = 0;
920 PL_retstack_max = 4; 1015 PL_retstack_max = 4;
… …
986 } 1081 }
987 1082
988 return rss; 1083 return rss;
989} 1084}
990 1085
991/** coroutine stack handling ************************************************/ 1086/** provide custom get/set/clear methods for %SIG elements ******************/
992
993static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
994static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
995static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
996 1087
997/* apparently < 5.8.8 */ 1088/* apparently < 5.8.8 */
998#ifndef MgPV_nolen_const 1089#ifndef MgPV_nolen_const
999#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1090#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
1000 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1091 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
1001 (const char*)(mg)->mg_ptr) 1092 (const char*)(mg)->mg_ptr)
1002#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};
1003 1122
1004/* 1123/*
1005 * This overrides the default magic get method of %SIG elements. 1124 * This overrides the default magic get method of %SIG elements.
1006 * 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
1007 * 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),
… …
1009 */ 1128 */
1010static int ecb_cold 1129static int ecb_cold
1011coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
1012{ 1131{
1013 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;
1014 1135
1015 if (*s == '_') 1136 SV *ssv;
1016 {
1017 SV **svp = 0;
1018 1137
1019 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1020 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1021
1022 if (svp) 1138 if (!*svp)
1023 {
1024 SV *ssv;
1025
1026 if (!*svp)
1027 ssv = &PL_sv_undef; 1139 ssv = &PL_sv_undef;
1028 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. */
1029 ssv = sv_2mortal (newRV_inc (*svp)); 1141 ssv = sv_2mortal (newRV_inc (*svp));
1030 else 1142 else
1031 ssv = *svp; 1143 ssv = *svp;
1032 1144
1033 sv_setsv (sv, ssv); 1145 sv_setsv (sv, ssv);
1034 return 0; 1146 return 0;
1035 }
1036 }
1037
1038 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
1039} 1147}
1040 1148
1041static int ecb_cold 1149static int ecb_cold
1042coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1150coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
1043{ 1151{
1044 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;
1045 1155
1046 if (*s == '_')
1047 {
1048 SV **svp = 0;
1049
1050 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1051 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1052
1053 if (svp)
1054 {
1055 SV *old = *svp; 1156 SV *old = *svp;
1056 *svp = 0; 1157 *svp = 0;
1057 SvREFCNT_dec (old); 1158 SvREFCNT_dec (old);
1058 return 0; 1159 return 0;
1059 }
1060 }
1061
1062 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1063} 1160}
1064 1161
1065static int ecb_cold 1162static int ecb_cold
1066coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1163coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1067{ 1164{
1068 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;
1069 1168
1070 if (*s == '_')
1071 {
1072 SV **svp = 0;
1073
1074 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1075 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1076
1077 if (svp)
1078 {
1079 SV *old = *svp; 1169 SV *old = *svp;
1080 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1170 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1081 SvREFCNT_dec (old); 1171 SvREFCNT_dec (old);
1082 return 0; 1172 return 0;
1083 }
1084 }
1085
1086 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1087} 1173}
1088 1174
1089static void 1175static void
1090prepare_nop (pTHX_ struct coro_transfer_args *ta) 1176prepare_nop (pTHX_ struct coro_transfer_args *ta)
1091{ 1177{
… …
1102static int 1188static int
1103slf_check_repeat (pTHX_ struct CoroSLF *frame) 1189slf_check_repeat (pTHX_ struct CoroSLF *frame)
1104{ 1190{
1105 return 1; 1191 return 1;
1106} 1192}
1193
1194/** coroutine stack handling ************************************************/
1107 1195
1108static UNOP init_perl_op; 1196static UNOP init_perl_op;
1109 1197
1110ecb_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 */
1111init_perl (pTHX_ struct coro *coro) 1199init_perl (pTHX_ struct coro *coro)
… …
1137 1225
1138 GvSV (PL_defgv) = newSV (0); 1226 GvSV (PL_defgv) = newSV (0);
1139 GvAV (PL_defgv) = coro->args; coro->args = 0; 1227 GvAV (PL_defgv) = coro->args; coro->args = 0;
1140 GvSV (PL_errgv) = newSV (0); 1228 GvSV (PL_errgv) = newSV (0);
1141 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1229 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1142 GvHV (PL_hintgv) = 0; 1230 GvHV (PL_hintgv) = newHV ();
1231#if PERL_VERSION_ATLEAST (5,10,0)
1232 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1233#endif
1143 PL_rs = newSVsv (GvSV (irsgv)); 1234 PL_rs = newSVsv (GvSV (irsgv));
1144 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1235 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1145 1236
1146 { 1237 {
1147 dSP; 1238 dSP;
… …
1151 myop.op_next = Nullop; 1242 myop.op_next = Nullop;
1152 myop.op_type = OP_ENTERSUB; 1243 myop.op_type = OP_ENTERSUB;
1153 myop.op_flags = OPf_WANT_VOID; 1244 myop.op_flags = OPf_WANT_VOID;
1154 1245
1155 PUSHMARK (SP); 1246 PUSHMARK (SP);
1156 PUSHs ((SV *)coro->startcv); 1247 XPUSHs ((SV *)coro->startcv);
1157 PUTBACK; 1248 PUTBACK;
1158 PL_op = (OP *)&myop; 1249 PL_op = (OP *)&myop;
1159 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1250 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1160 } 1251 }
1161 1252
… …
1175 PL_op = (OP *)&init_perl_op; 1266 PL_op = (OP *)&init_perl_op;
1176 1267
1177 /* copy throw, in case it was set before init_perl */ 1268 /* copy throw, in case it was set before init_perl */
1178 CORO_THROW = coro->except; 1269 CORO_THROW = coro->except;
1179 1270
1180 SWAP_SVS (coro); 1271 SWAP_SVS_ENTER (coro);
1181 1272
1182 if (ecb_expect_false (enable_times)) 1273 if (ecb_expect_false (enable_times))
1183 { 1274 {
1184 coro_times_update (); 1275 coro_times_update ();
1185 coro_times_sub (coro); 1276 coro_times_sub (coro);
… …
1218 1309
1219 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));
1220 1311
1221 save_perl (aTHX_ current); 1312 save_perl (aTHX_ current);
1222 1313
1223 /* this will cause transfer_check to croak on block*/ 1314 /* this will cause transfer_check to croak on block */
1224 SvRV_set (coro_current, (SV *)coro->hv); 1315 SvRV_set (coro_current, (SV *)coro->hv);
1225 1316
1226 load_perl (aTHX_ coro); 1317 load_perl (aTHX_ coro);
1227 1318
1319 /* restore swapped sv's */
1320 SWAP_SVS_LEAVE (coro);
1321
1228 coro_unwind_stacks (aTHX); 1322 coro_unwind_stacks (aTHX);
1229
1230 /* restore swapped sv's */
1231 SWAP_SVS (coro);
1232 1323
1233 coro_destruct_stacks (aTHX); 1324 coro_destruct_stacks (aTHX);
1234 1325
1235 /* now save some sv's to be free'd later */ 1326 /* now save some sv's to be free'd later */
1236 svf [0] = GvSV (PL_defgv); 1327 svf [0] = GvSV (PL_defgv);
… …
1257 1348
1258 SvREFCNT_dec (coro->saved_deffh); 1349 SvREFCNT_dec (coro->saved_deffh);
1259 SvREFCNT_dec (coro->rouse_cb); 1350 SvREFCNT_dec (coro->rouse_cb);
1260 SvREFCNT_dec (coro->invoke_cb); 1351 SvREFCNT_dec (coro->invoke_cb);
1261 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);
1262 } 1355 }
1263} 1356}
1264 1357
1265ecb_inline void 1358ecb_inline void
1266free_coro_mortal (pTHX) 1359free_coro_mortal (pTHX)
… …
1307 av_push (av, SvREFCNT_inc_NN (*bot++)); 1400 av_push (av, SvREFCNT_inc_NN (*bot++));
1308 1401
1309 PL_runops = RUNOPS_DEFAULT; 1402 PL_runops = RUNOPS_DEFAULT;
1310 ENTER; 1403 ENTER;
1311 SAVETMPS; 1404 SAVETMPS;
1405 PUSHMARK (SP);
1312 EXTEND (SP, 3); 1406 EXTEND (SP, 3);
1313 PUSHMARK (SP);
1314 PUSHs (&PL_sv_no); 1407 PUSHs (&PL_sv_no);
1315 PUSHs (fullname); 1408 PUSHs (fullname);
1316 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 1409 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
1317 PUTBACK; 1410 PUTBACK;
1318 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);
… …
1329 1422
1330 if (PL_curcop != &PL_compiling) 1423 if (PL_curcop != &PL_compiling)
1331 { 1424 {
1332 SV **cb; 1425 SV **cb;
1333 1426
1334 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1427 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1335 { 1428 {
1336 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1429 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1337 1430
1338 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1431 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1339 { 1432 {
… …
1345 gv_efullname3 (fullname, gv, 0); 1438 gv_efullname3 (fullname, gv, 0);
1346 1439
1347 PL_runops = RUNOPS_DEFAULT; 1440 PL_runops = RUNOPS_DEFAULT;
1348 ENTER; 1441 ENTER;
1349 SAVETMPS; 1442 SAVETMPS;
1443 PUSHMARK (SP);
1350 EXTEND (SP, 3); 1444 EXTEND (SP, 3);
1351 PUSHMARK (SP);
1352 PUSHs (&PL_sv_yes); 1445 PUSHs (&PL_sv_yes);
1353 PUSHs (fullname); 1446 PUSHs (fullname);
1354 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);
1355 PUTBACK; 1448 PUTBACK;
1356 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);
1357 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);
1358 SPAGAIN; 1451 SPAGAIN;
1359 FREETMPS; 1452 FREETMPS;
… …
1369 dSP; 1462 dSP;
1370 1463
1371 PL_runops = RUNOPS_DEFAULT; 1464 PL_runops = RUNOPS_DEFAULT;
1372 ENTER; 1465 ENTER;
1373 SAVETMPS; 1466 SAVETMPS;
1374 EXTEND (SP, 3);
1375 PL_runops = RUNOPS_DEFAULT;
1376 PUSHMARK (SP); 1467 PUSHMARK (SP);
1468 EXTEND (SP, 2);
1377 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 1469 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
1378 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 1470 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
1379 PUTBACK; 1471 PUTBACK;
1380 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);
1381 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);
… …
1481 * 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
1482 * 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.
1483 */ 1575 */
1484 1576
1485 /* 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 /*
1486 * 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
1487 * 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)
1488 * 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
1489 * doing in that case. YMMV. 1588 * doing in that case. YMMV.
1490 */ 1589 */
… …
1745 1844
1746static int 1845static int
1747coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1846coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1748{ 1847{
1749 struct coro *coro = (struct coro *)mg->mg_ptr; 1848 struct coro *coro = (struct coro *)mg->mg_ptr;
1849
1850 coro_state_destroy (aTHX_ coro);
1750 mg->mg_ptr = 0; 1851 mg->mg_ptr = 0;
1751 1852
1752 coro_state_destroy (aTHX_ coro);
1753 SvREFCNT_dec (coro->on_destroy); 1853 SvREFCNT_dec (coro->on_destroy);
1754 SvREFCNT_dec (coro->status); 1854 SvREFCNT_dec (coro->status);
1755 1855
1756 Safefree (coro); 1856 Safefree (coro);
1757 1857
… …
1760 1860
1761static int ecb_cold 1861static int ecb_cold
1762coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1862coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1763{ 1863{
1764 /* 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) */
1765 /* 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 */
1766 mg->mg_ptr = 0; 1866 mg->mg_ptr = 0;
1767 mg->mg_virtual = 0; 1867 mg->mg_virtual = 0;
1768 1868
1769 return 0; 1869 return 0;
1770} 1870}
… …
1926 2026
1927 ENTER; 2027 ENTER;
1928 SAVETMPS; 2028 SAVETMPS;
1929 2029
1930 PUSHMARK (SP); 2030 PUSHMARK (SP);
1931 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught", 0))); 2031 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1932 PUTBACK; 2032 PUTBACK;
1933 call_pv ("Carp::confess", G_VOID | G_DISCARD); 2033 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1934 2034
1935 FREETMPS; 2035 FREETMPS;
1936 LEAVE; 2036 LEAVE;
… …
2247 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2347 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2248 } 2348 }
2249 else 2349 else
2250 { 2350 {
2251 struct coro *self = SvSTATE_current; 2351 struct coro *self = SvSTATE_current;
2352
2353 if (!self)
2354 croak ("Coro::cancel called outside of thread content,");
2252 2355
2253 /* otherwise we cancel directly, purely for speed reasons 2356 /* otherwise we cancel directly, purely for speed reasons
2254 * unfortunately, this requires some magic trickery, as 2357 * unfortunately, this requires some magic trickery, as
2255 * somebody else could cancel us, so we have to fight the cancellation. 2358 * somebody else could cancel us, so we have to fight the cancellation.
2256 * this is ugly, and hopefully fully worth the extra speed. 2359 * this is ugly, and hopefully fully worth the extra speed.
… …
2289safe_cancel (pTHX_ struct coro *coro, SV **arg, int items) 2392safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2290{ 2393{
2291 if (coro->cctx) 2394 if (coro->cctx)
2292 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");
2293 2396
2294 if (coro->flags & CF_NEW) 2397 if (coro->flags & (CF_NEW | CF_ZOMBIE))
2295 { 2398 {
2296 coro_set_status (aTHX_ coro, arg, items); 2399 coro_set_status (aTHX_ coro, arg, items);
2297 coro_state_destroy (aTHX_ coro); 2400 coro_state_destroy (aTHX_ coro);
2298 } 2401 }
2299 else 2402 else
… …
2366 else 2469 else
2367 { 2470 {
2368 av_clear (GvAV (PL_defgv)); 2471 av_clear (GvAV (PL_defgv));
2369 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);
2370 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
2371 coro->prio = 0; 2481 coro->prio = 0;
2372 2482
2373 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2483 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2374 api_trace (aTHX_ coro_current, 0); 2484 api_trace (aTHX_ coro_current, 0);
2375 2485
2376 frame->prepare = prepare_schedule; 2486 frame->prepare = prepare_schedule;
2377 av_push (av_async_pool, SvREFCNT_inc (hv)); 2487 av_push (av_async_pool, SvREFCNT_inc_NN (hv));
2378 } 2488 }
2379 } 2489 }
2380 else 2490 else
2381 { 2491 {
2382 /* first iteration, simply fall through */ 2492 /* first iteration, simply fall through */
… …
2395static void 2505static void
2396coro_rouse_callback (pTHX_ CV *cv) 2506coro_rouse_callback (pTHX_ CV *cv)
2397{ 2507{
2398 dXSARGS; 2508 dXSARGS;
2399 SV *data = (SV *)S_GENSUB_ARG; 2509 SV *data = (SV *)S_GENSUB_ARG;
2510 SV *coro = SvRV (data);
2400 2511
2512 /* data starts being either undef or a coro, and is replaced by the results when done */
2401 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2513 if (SvTYPE (coro) != SVt_PVAV)
2402 { 2514 {
2403 /* first call, set args */ 2515 /* first call, set args */
2404 SV *coro = SvRV (data);
2405 AV *av = newAV ();
2406 2516
2407 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 */
2408 2519
2409 /* better take a full copy of the arguments */ 2520 if (coro != &PL_sv_undef)
2410 while (items--) 2521 {
2411 av_store (av, items, newSVsv (ST (items)));
2412
2413 api_ready (aTHX_ coro); 2522 api_ready (aTHX_ coro);
2414 SvREFCNT_dec (coro); 2523 SvREFCNT_dec_NN (coro);
2524 }
2415 } 2525 }
2416 2526
2417 XSRETURN_EMPTY; 2527 XSRETURN_EMPTY;
2418} 2528}
2419 2529
… …
2436 2546
2437 EXTEND (SP, AvFILLp (av) + 1); 2547 EXTEND (SP, AvFILLp (av) + 1);
2438 for (i = 0; i <= AvFILLp (av); ++i) 2548 for (i = 0; i <= AvFILLp (av); ++i)
2439 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2549 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2440 2550
2441 /* we have stolen the elements, so set length to zero and free */ 2551 /* we have stolen the elements, make it unreal and free */
2442 AvFILLp (av) = -1; 2552 AvREAL_off (av);
2443 av_undef (av); 2553 av_undef (av);
2444 2554
2445 PUTBACK; 2555 PUTBACK;
2446 } 2556 }
2447 2557
… …
2472 croak ("Coro::rouse_wait called with illegal callback argument,"); 2582 croak ("Coro::rouse_wait called with illegal callback argument,");
2473 2583
2474 { 2584 {
2475 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2585 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2476 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)));
2477 2595
2478 frame->data = (void *)data; 2596 frame->data = (void *)data;
2479 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2597 frame->prepare = data_ready ? prepare_nop : prepare_schedule;
2480 frame->check = slf_check_rouse_wait; 2598 frame->check = slf_check_rouse_wait;
2481 } 2599 }
2482} 2600}
2483 2601
2484static SV * 2602static SV *
2485coro_new_rouse_cb (pTHX) 2603coro_new_rouse_cb (pTHX)
2486{ 2604{
2487 HV *hv = (HV *)SvRV (coro_current); 2605 HV *hv = (HV *)SvRV (coro_current);
2488 struct coro *coro = SvSTATE_hv (hv); 2606 struct coro *coro = SvSTATE_hv (hv);
2489 SV *data = newRV_inc ((SV *)hv); 2607 SV *data = newRV_noinc (&PL_sv_undef);
2490 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data); 2608 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2491 2609
2492 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);
2493 SvREFCNT_dec (data); /* magicext increases the refcount */ 2611 SvREFCNT_dec_NN (data); /* magicext increases the refcount */
2494 2612
2495 SvREFCNT_dec (coro->rouse_cb); 2613 SvREFCNT_dec (coro->rouse_cb);
2496 coro->rouse_cb = SvREFCNT_inc_NN (cb); 2614 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2497 2615
2498 return cb; 2616 return cb;
… …
2598 2716
2599/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2717/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2600static void 2718static void
2601slf_destroy (pTHX_ struct coro *coro) 2719slf_destroy (pTHX_ struct coro *coro)
2602{ 2720{
2603 /* this callback is reserved for slf functions needing to do cleanup */ 2721 struct CoroSLF frame = coro->slf_frame;
2604 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2605 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2606 2722
2607 /* 2723 /*
2608 * The on_destroy above most likely is from an SLF call. 2724 * The on_destroy below most likely is from an SLF call.
2609 * Since by definition the SLF call will not finish when we destroy 2725 * Since by definition the SLF call will not finish when we destroy
2610 * the coro, we will have to force-finish it here, otherwise 2726 * the coro, we will have to force-finish it here, otherwise
2611 * cleanup functions cannot call SLF functions. 2727 * cleanup functions cannot call SLF functions.
2612 */ 2728 */
2613 coro->slf_frame.prepare = 0; 2729 coro->slf_frame.prepare = 0;
2730
2731 /* this callback is reserved for slf functions needing to do cleanup */
2732 if (frame.destroy && frame.prepare && !PL_dirty)
2733 frame.destroy (aTHX_ &frame);
2614} 2734}
2615 2735
2616/* 2736/*
2617 * these not obviously related functions are all rolled into one 2737 * these not obviously related functions are all rolled into one
2618 * function to increase chances that they all will call transfer with the same 2738 * function to increase chances that they all will call transfer with the same
… …
2801static void 2921static void
2802coro_pop_on_leave (pTHX_ void *coro) 2922coro_pop_on_leave (pTHX_ void *coro)
2803{ 2923{
2804 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);
2805 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);
2806} 3018}
2807 3019
2808/*****************************************************************************/ 3020/*****************************************************************************/
2809/* PerlIO::cede */ 3021/* PerlIO::cede */
2810 3022
… …
2940 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3152 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2941 PUTBACK; 3153 PUTBACK;
2942 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3154 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2943 } 3155 }
2944 3156
2945 SvREFCNT_dec (cb); 3157 SvREFCNT_dec_NN (cb);
2946 } 3158 }
2947} 3159}
2948 3160
2949static void 3161static void
2950coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3162coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
2958{ 3170{
2959 AV *av = (AV *)frame->data; 3171 AV *av = (AV *)frame->data;
2960 SV *count_sv = AvARRAY (av)[0]; 3172 SV *count_sv = AvARRAY (av)[0];
2961 SV *coro_hv = SvRV (coro_current); 3173 SV *coro_hv = SvRV (coro_current);
2962 3174
3175 frame->destroy = 0;
3176
2963 /* if we are about to throw, don't actually acquire the lock, just throw */ 3177 /* if we are about to throw, don't actually acquire the lock, just throw */
2964 if (CORO_THROW) 3178 if (ecb_expect_false (CORO_THROW))
3179 {
3180 /* we still might be responsible for the semaphore, so wake up others */
3181 coro_semaphore_adjust (aTHX_ av, 0);
3182
2965 return 0; 3183 return 0;
3184 }
2966 else if (SvIVX (count_sv) > 0) 3185 else if (SvIVX (count_sv) > 0)
2967 { 3186 {
2968 frame->destroy = 0;
2969
2970 if (acquire) 3187 if (acquire)
2971 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3188 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2972 else 3189 else
2973 coro_semaphore_adjust (aTHX_ av, 0); 3190 coro_semaphore_adjust (aTHX_ av, 0);
2974 3191
… …
3085 { 3302 {
3086 api_ready (aTHX_ cb); 3303 api_ready (aTHX_ cb);
3087 sv_setiv (cb, 0); /* signal waiter */ 3304 sv_setiv (cb, 0); /* signal waiter */
3088 } 3305 }
3089 3306
3090 SvREFCNT_dec (cb); 3307 SvREFCNT_dec_NN (cb);
3091 3308
3092 --count; 3309 --count;
3093 } 3310 }
3094} 3311}
3095 3312
… …
3180 } 3397 }
3181 3398
3182 av_push (state, data_sv); 3399 av_push (state, data_sv);
3183 3400
3184 api_ready (aTHX_ coro); 3401 api_ready (aTHX_ coro);
3185 SvREFCNT_dec (coro); 3402 SvREFCNT_dec_NN (coro);
3186 SvREFCNT_dec ((AV *)state); 3403 SvREFCNT_dec_NN ((AV *)state);
3187} 3404}
3188 3405
3189static int 3406static int
3190slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3407slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3191{ 3408{
… …
3209 errno = data->errorno; 3426 errno = data->errorno;
3210 PL_laststype = data->laststype; 3427 PL_laststype = data->laststype;
3211 PL_laststatval = data->laststatval; 3428 PL_laststatval = data->laststatval;
3212 PL_statcache = data->statcache; 3429 PL_statcache = data->statcache;
3213 3430
3214 SvREFCNT_dec (data_sv); 3431 SvREFCNT_dec_NN (data_sv);
3215 } 3432 }
3216 3433
3217 /* push result values */ 3434 /* push result values */
3218 { 3435 {
3219 dSP; 3436 dSP;
… …
3406 save = POPs; save_ptr = SvPVbyte (save, save_len); 3623 save = POPs; save_ptr = SvPVbyte (save, save_len);
3407 load = POPs; load_ptr = SvPVbyte (load, load_len); 3624 load = POPs; load_ptr = SvPVbyte (load, load_len);
3408 3625
3409 map_len = load_len + save_len + 16; 3626 map_len = load_len + save_len + 16;
3410 3627
3411 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, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3412 3629
3413 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3630 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3414 3631
3415 load_perl_slots = (load_save_perl_slots_type)map_base; 3632 load_perl_slots = (load_save_perl_slots_type)map_base;
3416 memcpy (map_base, load_ptr, load_len); 3633 memcpy (load_perl_slots, load_ptr, load_len);
3417 3634
3418 map_base += (load_len + 15) & ~15;
3419
3420 save_perl_slots = (load_save_perl_slots_type)map_base; 3635 save_perl_slots = (load_save_perl_slots_type)(map_base + ((load_len + 15) & ~15));
3421 memcpy (map_base, save_ptr, save_len); 3636 memcpy (save_perl_slots, save_ptr, save_len);
3422 3637
3423 /* we are good citizens and try to make the page read-only, so the evil evil */ 3638 /* we are good citizens and try to make the page read-only, so the evil evil */
3424 /* hackers might have it a bit more difficult */ 3639 /* hackers might have it a bit more difficult */
3640 /* we do this in two steps, to potentially appease some security frameworks */
3641 mprotect (map_base, map_len, PROT_READ);
3425 mprotect (map_base, map_len, PROT_READ | PROT_EXEC); 3642 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3426 3643
3427 PUTBACK; 3644 PUTBACK;
3428 eval_pv ("undef &Coro::State::_jit", 1); 3645 eval_pv ("undef &Coro::State::_jit", 1);
3429} 3646}
… …
3434 3651
3435PROTOTYPES: DISABLE 3652PROTOTYPES: DISABLE
3436 3653
3437BOOT: 3654BOOT:
3438{ 3655{
3656#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3657#include "state.h"
3439#ifdef USE_ITHREADS 3658#ifdef USE_ITHREADS
3440# if CORO_PTHREAD 3659# if CORO_PTHREAD
3441 coro_thx = PERL_GET_CONTEXT; 3660 coro_thx = PERL_GET_CONTEXT;
3442# endif 3661# endif
3443#endif 3662#endif
… …
3451 cctx_current = cctx_new_empty (); 3670 cctx_current = cctx_new_empty ();
3452 3671
3453 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3672 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3454 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3673 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3455 3674
3456 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3675 {
3457 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3676 /*
3458 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3677 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3678 * by coro_sig_vtbl in hash values.
3679 */
3680 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3681
3682 /* this only works if perl doesn't have a vtbl for %SIG */
3683 assert (!mg->mg_virtual);
3684
3685 /*
3686 * The irony is that the perl API itself asserts that mg_virtual
3687 * must be non-const, yet perl5porters insisted on marking their
3688 * vtbls as read-only, just to thwart perl modules from patching
3689 * them.
3690 */
3691 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3692 mg->mg_flags |= MGf_COPY;
3693
3694 coro_sigelem_vtbl = PL_vtbl_sigelem;
3695 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3696 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3697 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3698 }
3459 3699
3460 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3461 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3700 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3462 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3701 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3463 3702
3464 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3703 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3704
3705 newCONSTSUB (coro_state_stash, "BACKEND", newSVpv (CORO_BACKEND, 0)); /* undocumented */
3465 3706
3466 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 3707 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
3467 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 3708 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
3468 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 3709 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
3469 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 3710 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
… …
3594call (Coro::State coro, SV *coderef) 3835call (Coro::State coro, SV *coderef)
3595 ALIAS: 3836 ALIAS:
3596 eval = 1 3837 eval = 1
3597 CODE: 3838 CODE:
3598{ 3839{
3840 struct coro *current = SvSTATE_current;
3841
3599 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3842 if ((coro == current) || (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)))
3600 { 3843 {
3601 struct coro *current = SvSTATE_current;
3602 struct CoroSLF slf_save; 3844 struct CoroSLF slf_save;
3603 3845
3604 if (current != coro) 3846 if (current != coro)
3605 { 3847 {
3606 PUTBACK; 3848 PUTBACK;
… …
3771 if (ecb_expect_false (current == self)) 4013 if (ecb_expect_false (current == self))
3772 coro_times_sub (SvSTATE (coro_current)); 4014 coro_times_sub (SvSTATE (coro_current));
3773} 4015}
3774 4016
3775void 4017void
3776swap_sv (Coro::State coro, SV *sv, SV *swapsv) 4018swap_sv (Coro::State coro, SV *sva, SV *svb)
3777 CODE: 4019 CODE:
3778{ 4020{
3779 struct coro *current = SvSTATE_current; 4021 struct coro *current = SvSTATE_current;
4022 AV *swap_sv;
4023 int i;
4024
4025 sva = SvRV (sva);
4026 svb = SvRV (svb);
3780 4027
3781 if (current == coro) 4028 if (current == coro)
3782 SWAP_SVS (current); 4029 SWAP_SVS_LEAVE (current);
3783 4030
3784 if (!coro->swap_sv) 4031 if (!coro->swap_sv)
3785 coro->swap_sv = newAV (); 4032 coro->swap_sv = newAV ();
3786 4033
4034 swap_sv = coro->swap_sv;
4035
4036 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4037 {
4038 SV *a = AvARRAY (swap_sv)[i ];
4039 SV *b = AvARRAY (swap_sv)[i + 1];
4040
4041 if (a == sva && b == svb)
4042 {
4043 SvREFCNT_dec_NN (a);
4044 SvREFCNT_dec_NN (b);
4045
4046 for (; i <= AvFILLp (swap_sv) - 2; i++)
4047 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4048
4049 AvFILLp (swap_sv) -= 2;
4050
4051 goto removed;
4052 }
4053 }
4054
3787 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4055 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3788 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4056 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4057
4058 removed:
3789 4059
3790 if (current == coro) 4060 if (current == coro)
3791 SWAP_SVS (current); 4061 SWAP_SVS_ENTER (current);
3792} 4062}
3793 4063
3794 4064
3795MODULE = Coro::State PACKAGE = Coro 4065MODULE = Coro::State PACKAGE = Coro
3796 4066
3797BOOT: 4067BOOT:
3798{ 4068{
4069 if (SVt_LAST > 32)
4070 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4071
3799 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4072 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3800 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4073 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3801 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4074 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3802 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4075 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3803 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4076 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3829 coroapi.ready = api_ready; 4102 coroapi.ready = api_ready;
3830 coroapi.is_ready = api_is_ready; 4103 coroapi.is_ready = api_is_ready;
3831 coroapi.nready = coro_nready; 4104 coroapi.nready = coro_nready;
3832 coroapi.current = coro_current; 4105 coroapi.current = coro_current;
3833 4106
4107 coroapi.enterleave_hook = api_enterleave_hook;
4108 coroapi.enterleave_unhook = api_enterleave_unhook;
4109 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4110
3834 /*GCoroAPI = &coroapi;*/ 4111 /*GCoroAPI = &coroapi;*/
3835 sv_setiv (sv, (IV)&coroapi); 4112 sv_setiv (sv, PTR2IV (&coroapi));
3836 SvREADONLY_on (sv); 4113 SvREADONLY_on (sv);
3837 } 4114 }
3838} 4115}
3839 4116
3840SV * 4117SV *
… …
3903 4180
3904void 4181void
3905_set_current (SV *current) 4182_set_current (SV *current)
3906 PROTOTYPE: $ 4183 PROTOTYPE: $
3907 CODE: 4184 CODE:
3908 SvREFCNT_dec (SvRV (coro_current)); 4185 SvREFCNT_dec_NN (SvRV (coro_current));
3909 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4186 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3910 4187
3911void 4188void
3912_set_readyhook (SV *hook) 4189_set_readyhook (SV *hook)
3913 PROTOTYPE: $ 4190 PROTOTYPE: $
… …
3997 4274
3998 if ((SV *)hv == &PL_sv_undef) 4275 if ((SV *)hv == &PL_sv_undef)
3999 { 4276 {
4000 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4277 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
4001 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4278 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4002 SvREFCNT_dec (sv); 4279 SvREFCNT_dec_NN (sv);
4003 } 4280 }
4004 4281
4005 { 4282 {
4006 struct coro *coro = SvSTATE_hv (hv); 4283 struct coro *coro = SvSTATE_hv (hv);
4007 4284
… …
4014 api_ready (aTHX_ (SV *)hv); 4291 api_ready (aTHX_ (SV *)hv);
4015 4292
4016 if (GIMME_V != G_VOID) 4293 if (GIMME_V != G_VOID)
4017 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4294 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4018 else 4295 else
4019 SvREFCNT_dec (hv); 4296 SvREFCNT_dec_NN (hv);
4020} 4297}
4021 4298
4022SV * 4299SV *
4023rouse_cb () 4300rouse_cb ()
4024 PROTOTYPE: 4301 PROTOTYPE:
… …
4103 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4380 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4104 OUTPUT: 4381 OUTPUT:
4105 RETVAL 4382 RETVAL
4106 4383
4107void 4384void
4108up (SV *self, int adjust = 1) 4385up (SV *self)
4109 ALIAS:
4110 adjust = 1
4111 CODE: 4386 CODE:
4387 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4388
4389void
4390adjust (SV *self, int adjust)
4391 CODE:
4112 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4392 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4113 4393
4114void 4394void
4115down (...) 4395down (...)
4116 CODE: 4396 CODE:
4117 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4397 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);

Diff Legend

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