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.438 by root, Mon Nov 18 10:27:53 2013 UTC vs.
Revision 1.473 by root, Sun Sep 3 23:36:01 2017 UTC

14#include "perliol.h" 14#include "perliol.h"
15 15
16#include "schmorp.h" 16#include "schmorp.h"
17 17
18#define ECB_NO_THREADS 1 18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
19#include "ecb.h" 20#include "ecb.h"
20 21
21#include <stddef.h> 22#include <stddef.h>
22#include <stdio.h> 23#include <stdio.h>
23#include <errno.h> 24#include <errno.h>
24#include <assert.h> 25#include <assert.h>
26
27#ifndef SvREFCNT_dec_NN
28 #define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
29#endif
30
31#ifndef SvREFCNT_inc_NN
32 #define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
33#endif
25 34
26#ifndef SVs_PADSTALE 35#ifndef SVs_PADSTALE
27# define SVs_PADSTALE 0 36# define SVs_PADSTALE 0
28#endif 37#endif
29 38
41# define PadlistNAMES(pl) (*PadlistARRAY (pl)) 50# define PadlistNAMES(pl) (*PadlistARRAY (pl))
42# define PadARRAY AvARRAY 51# define PadARRAY AvARRAY
43# define PadMAX AvFILLp 52# define PadMAX AvFILLp
44# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1)) 53# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
45#endif 54#endif
55#ifndef PadnamelistREFCNT
56# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
57#endif
58#ifndef PadnamelistREFCNT_dec
59# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
60#endif
46 61
47/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */ 62/* 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 */ 63/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
49#if PERL_VERSION_ATLEAST(5,19,0) 64#if PERL_VERSION_ATLEAST(5,19,0)
50# define SVt_BIND SVt_IV 65# define SVt_BIND SVt_IV
101# define CORO_CLOCK_MONOTONIC 1 116# define CORO_CLOCK_MONOTONIC 1
102# define CORO_CLOCK_THREAD_CPUTIME_ID 3 117# define CORO_CLOCK_THREAD_CPUTIME_ID 3
103# endif 118# endif
104#endif 119#endif
105 120
121/* one off bugfix for perl 5.22 */
122#if PERL_VERSION_ATLEAST(5,22,0) && !PERL_VERSION_ATLEAST(5,24,0)
123# undef PadlistNAMES
124# define PadlistNAMES(pl) *((PADNAMELIST **)PadlistARRAY (pl))
125#endif
126
127#if PERL_VERSION_ATLEAST(5,24,0)
128# define SUB_ARGARRAY PL_curpad[0]
129#else
130# define SUB_ARGARRAY (SV *)cx->blk_sub.argarray
131#endif
132
133/* perl usually suppresses asserts. for debugging, we sometimes force it to be on */
134#if 0
135# undef NDEBUG
136# include <assert.h>
137#endif
138
106static double (*nvtime)(); /* so why doesn't it take void? */ 139static double (*nvtime)(); /* so why doesn't it take void? */
107static void (*u2time)(pTHX_ UV ret[2]); 140static void (*u2time)(pTHX_ UV ret[2]);
108 141
109/* we hijack an hopefully unused CV flag for our purposes */ 142/* we hijack an hopefully unused CV flag for our purposes */
110#define CVf_SLF 0x4000 143#define CVf_SLF 0x4000
125 158
126static GV *irsgv; /* $/ */ 159static GV *irsgv; /* $/ */
127static GV *stdoutgv; /* *STDOUT */ 160static GV *stdoutgv; /* *STDOUT */
128static SV *rv_diehook; 161static SV *rv_diehook;
129static SV *rv_warnhook; 162static SV *rv_warnhook;
130static HV *hv_sig; /* %SIG */
131 163
132/* async_pool helper stuff */ 164/* async_pool helper stuff */
133static SV *sv_pool_rss; 165static SV *sv_pool_rss;
134static SV *sv_pool_size; 166static SV *sv_pool_size;
135static SV *sv_async_pool_idle; /* description string */ 167static SV *sv_async_pool_idle; /* description string */
241 SV *saved_deffh; 273 SV *saved_deffh;
242 SV *invoke_cb; 274 SV *invoke_cb;
243 AV *invoke_av; 275 AV *invoke_av;
244 276
245 /* on_enter/on_leave */ 277 /* on_enter/on_leave */
246 AV *on_enter; 278 AV *on_enter; AV *on_enter_xs;
247 AV *on_leave; 279 AV *on_leave; AV *on_leave_xs;
248 280
249 /* swap_sv */ 281 /* swap_sv */
250 AV *swap_sv; 282 AV *swap_sv;
251 283
252 /* times */ 284 /* times */
488 520
489 return 0; 521 return 0;
490} 522}
491 523
492ecb_inline struct coro * 524ecb_inline struct coro *
493SvSTATE_ (pTHX_ SV *coro) 525SvSTATE_ (pTHX_ SV *coro_sv)
494{ 526{
495 MAGIC *mg; 527 MAGIC *mg;
496 528
497 if (SvROK (coro)) 529 if (SvROK (coro_sv))
498 coro = SvRV (coro); 530 coro_sv = SvRV (coro_sv);
499 531
500 mg = SvSTATEhv_p (aTHX_ coro); 532 mg = SvSTATEhv_p (aTHX_ coro_sv);
501 if (!mg) 533 if (!mg)
502 croak ("Coro::State object required"); 534 croak ("Coro::State object required");
503 535
504 return (struct coro *)mg->mg_ptr; 536 return (struct coro *)mg->mg_ptr;
505} 537}
516ecb_inline PADLIST * 548ecb_inline PADLIST *
517coro_derive_padlist (pTHX_ CV *cv) 549coro_derive_padlist (pTHX_ CV *cv)
518{ 550{
519 PADLIST *padlist = CvPADLIST (cv); 551 PADLIST *padlist = CvPADLIST (cv);
520 PADLIST *newpadlist; 552 PADLIST *newpadlist;
553 PADNAMELIST *padnames;
521 PAD *newpad; 554 PAD *newpad;
522 PADOFFSET off = PadlistMAX (padlist) + 1; 555 PADOFFSET off = PadlistMAX (padlist) + 1;
523 556
524#if NEWPADAPI 557#if NEWPADAPI
525 558
552 AvREAL_off (newpadlist); 585 AvREAL_off (newpadlist);
553#endif 586#endif
554 587
555 /* Already extended to 2 elements by newPADLIST. */ 588 /* Already extended to 2 elements by newPADLIST. */
556 PadlistMAX (newpadlist) = 1; 589 PadlistMAX (newpadlist) = 1;
557 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist)); 590
591 padnames = PadlistNAMES (padlist);
592 ++PadnamelistREFCNT (padnames);
593 PadlistNAMES (newpadlist) = padnames;
594
558 PadlistARRAY (newpadlist)[1] = newpad; 595 PadlistARRAY (newpadlist)[1] = newpad;
559 596
560 return newpadlist; 597 return newpadlist;
561} 598}
562 599
583 PadMAX (pad) = -1; 620 PadMAX (pad) = -1;
584 SvREFCNT_dec (pad); 621 SvREFCNT_dec (pad);
585 } 622 }
586 } 623 }
587 624
588 SvREFCNT_dec (PadlistNAMES (padlist)); 625 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
589 626
590#if NEWPADAPI 627#if NEWPADAPI
591 Safefree (PadlistARRAY (padlist)); 628 Safefree (PadlistARRAY (padlist));
592 Safefree (padlist); 629 Safefree (padlist);
593#else 630#else
689 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u; 726 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
690 727
691 /* if SvANY points to the head, we need to adjust the pointers, 728 /* if SvANY points to the head, we need to adjust the pointers,
692 * as the pointer for a still points to b, and maybe vice versa. 729 * as the pointer for a still points to b, and maybe vice versa.
693 */ 730 */
694 #define svany_in_head(type) \ 731 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))) 732 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
733 svany_in_head_set |= 1 << SVt_NV;
734 #endif
735
736 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
696 737
697 if (svany_in_head (SvTYPE (a))) 738 if (svany_in_head (SvTYPE (a)))
698 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 739 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
699 740
700 if (svany_in_head (SvTYPE (b))) 741 if (svany_in_head (SvTYPE (b)))
703#endif 744#endif
704} 745}
705 746
706/* swap sv heads, at least logically */ 747/* swap sv heads, at least logically */
707static void 748static void
708swap_svs (pTHX_ Coro__State c) 749swap_svs_enter (pTHX_ Coro__State c)
709{ 750{
710 int i; 751 int i;
711 752
712 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 753 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
713 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]); 754 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
714} 755}
715 756
757static void
758swap_svs_leave (pTHX_ Coro__State c)
759{
760 int i;
761
762 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
763 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
764}
765
716#define SWAP_SVS(coro) \ 766#define SWAP_SVS_ENTER(coro) \
717 if (ecb_expect_false ((coro)->swap_sv)) \ 767 if (ecb_expect_false ((coro)->swap_sv)) \
718 swap_svs (aTHX_ (coro)) 768 swap_svs_enter (aTHX_ (coro))
769
770#define SWAP_SVS_LEAVE(coro) \
771 if (ecb_expect_false ((coro)->swap_sv)) \
772 swap_svs_leave (aTHX_ (coro))
719 773
720static void 774static void
721on_enterleave_call (pTHX_ SV *cb); 775on_enterleave_call (pTHX_ SV *cb);
722 776
723static void 777static void
768 822
769 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 823 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
770 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 824 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
771 } 825 }
772 826
827 if (ecb_expect_false (c->on_enter_xs))
828 {
829 int i;
830
831 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
832 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
833 }
834
773 SWAP_SVS (c); 835 SWAP_SVS_ENTER (c);
774} 836}
775 837
776static void 838static void
777save_perl (pTHX_ Coro__State c) 839save_perl (pTHX_ Coro__State c)
778{ 840{
779 SWAP_SVS (c); 841 SWAP_SVS_LEAVE (c);
842
843 if (ecb_expect_false (c->on_leave_xs))
844 {
845 int i;
846
847 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
848 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
849 }
780 850
781 if (ecb_expect_false (c->on_leave)) 851 if (ecb_expect_false (c->on_leave))
782 { 852 {
783 int i; 853 int i;
784 854
911#endif 981#endif
912 982
913 New(54,PL_savestack,24,ANY); 983 New(54,PL_savestack,24,ANY);
914 PL_savestack_ix = 0; 984 PL_savestack_ix = 0;
915 PL_savestack_max = 24; 985 PL_savestack_max = 24;
986#if PERL_VERSION_ATLEAST (5,24,0)
987 /* perl 5.24 moves SS_MAXPUSH optimisation from */
988 /* the header macros to PL_savestack_max */
989 PL_savestack_max -= SS_MAXPUSH;
990#endif
916 991
917#if !PERL_VERSION_ATLEAST (5,10,0) 992#if !PERL_VERSION_ATLEAST (5,10,0)
918 New(54,PL_retstack,4,OP*); 993 New(54,PL_retstack,4,OP*);
919 PL_retstack_ix = 0; 994 PL_retstack_ix = 0;
920 PL_retstack_max = 4; 995 PL_retstack_max = 4;
986 } 1061 }
987 1062
988 return rss; 1063 return rss;
989} 1064}
990 1065
991/** coroutine stack handling ************************************************/ 1066/** 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 1067
997/* apparently < 5.8.8 */ 1068/* apparently < 5.8.8 */
998#ifndef MgPV_nolen_const 1069#ifndef MgPV_nolen_const
999#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1070#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
1000 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1071 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
1001 (const char*)(mg)->mg_ptr) 1072 (const char*)(mg)->mg_ptr)
1002#endif 1073#endif
1074
1075/* this will be a patched copy of PL_vtbl_sigelem */
1076static MGVTBL coro_sigelem_vtbl;
1077
1078static int ecb_cold
1079coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
1080{
1081 char *key = SvPV_nolen ((SV *)name);
1082
1083 /* do what mg_copy normally does */
1084 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1085 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1086
1087 /* patch sigelem vtbl, but only for __WARN__ and __DIE__ */
1088 if (*key == '_'
1089 && (strEQ (key, "__DIE__")
1090 || strEQ (key, "__WARN__")))
1091 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1092
1093 return 1;
1094}
1095
1096/* perl does not have a %SIG vtbl, we provide one so we can override */
1097/* the magic vtbl for the __DIE__ and __WARN__ members */
1098static const MGVTBL coro_sig_vtbl = {
1099 0, 0, 0, 0, 0,
1100 coro_sig_copy
1101};
1003 1102
1004/* 1103/*
1005 * This overrides the default magic get method of %SIG elements. 1104 * 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 1105 * 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), 1106 * and instead of trying to save and restore the hash elements (extremely slow),
1009 */ 1108 */
1010static int ecb_cold 1109static int ecb_cold
1011coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1110coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
1012{ 1111{
1013 const char *s = MgPV_nolen_const (mg); 1112 const char *s = MgPV_nolen_const (mg);
1113 /* the key must be either __DIE__ or __WARN__ here */
1114 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1014 1115
1015 if (*s == '_') 1116 SV *ssv;
1016 {
1017 SV **svp = 0;
1018 1117
1019 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1020 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1021
1022 if (svp) 1118 if (!*svp)
1023 {
1024 SV *ssv;
1025
1026 if (!*svp)
1027 ssv = &PL_sv_undef; 1119 ssv = &PL_sv_undef;
1028 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */ 1120 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1029 ssv = sv_2mortal (newRV_inc (*svp)); 1121 ssv = sv_2mortal (newRV_inc (*svp));
1030 else 1122 else
1031 ssv = *svp; 1123 ssv = *svp;
1032 1124
1033 sv_setsv (sv, ssv); 1125 sv_setsv (sv, ssv);
1034 return 0; 1126 return 0;
1035 }
1036 }
1037
1038 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
1039} 1127}
1040 1128
1041static int ecb_cold 1129static int ecb_cold
1042coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
1043{ 1131{
1044 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;
1045 1135
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; 1136 SV *old = *svp;
1056 *svp = 0; 1137 *svp = 0;
1057 SvREFCNT_dec (old); 1138 SvREFCNT_dec (old);
1058 return 0; 1139 return 0;
1059 }
1060 }
1061
1062 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1063} 1140}
1064 1141
1065static int ecb_cold 1142static int ecb_cold
1066coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1143coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1067{ 1144{
1068 const char *s = MgPV_nolen_const (mg); 1145 const char *s = MgPV_nolen_const (mg);
1146 /* the key must be either __DIE__ or __WARN__ here */
1147 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1069 1148
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; 1149 SV *old = *svp;
1080 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1150 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1081 SvREFCNT_dec (old); 1151 SvREFCNT_dec (old);
1082 return 0; 1152 return 0;
1083 }
1084 }
1085
1086 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1087} 1153}
1088 1154
1089static void 1155static void
1090prepare_nop (pTHX_ struct coro_transfer_args *ta) 1156prepare_nop (pTHX_ struct coro_transfer_args *ta)
1091{ 1157{
1102static int 1168static int
1103slf_check_repeat (pTHX_ struct CoroSLF *frame) 1169slf_check_repeat (pTHX_ struct CoroSLF *frame)
1104{ 1170{
1105 return 1; 1171 return 1;
1106} 1172}
1173
1174/** coroutine stack handling ************************************************/
1107 1175
1108static UNOP init_perl_op; 1176static UNOP init_perl_op;
1109 1177
1110ecb_noinline static void /* noinline to keep it out of the transfer fast path */ 1178ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1111init_perl (pTHX_ struct coro *coro) 1179init_perl (pTHX_ struct coro *coro)
1137 1205
1138 GvSV (PL_defgv) = newSV (0); 1206 GvSV (PL_defgv) = newSV (0);
1139 GvAV (PL_defgv) = coro->args; coro->args = 0; 1207 GvAV (PL_defgv) = coro->args; coro->args = 0;
1140 GvSV (PL_errgv) = newSV (0); 1208 GvSV (PL_errgv) = newSV (0);
1141 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1209 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1142 GvHV (PL_hintgv) = 0; 1210 GvHV (PL_hintgv) = newHV ();
1211#if PERL_VERSION_ATLEAST (5,10,0)
1212 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1213#endif
1143 PL_rs = newSVsv (GvSV (irsgv)); 1214 PL_rs = newSVsv (GvSV (irsgv));
1144 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1215 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1145 1216
1146 { 1217 {
1147 dSP; 1218 dSP;
1151 myop.op_next = Nullop; 1222 myop.op_next = Nullop;
1152 myop.op_type = OP_ENTERSUB; 1223 myop.op_type = OP_ENTERSUB;
1153 myop.op_flags = OPf_WANT_VOID; 1224 myop.op_flags = OPf_WANT_VOID;
1154 1225
1155 PUSHMARK (SP); 1226 PUSHMARK (SP);
1156 PUSHs ((SV *)coro->startcv); 1227 XPUSHs ((SV *)coro->startcv);
1157 PUTBACK; 1228 PUTBACK;
1158 PL_op = (OP *)&myop; 1229 PL_op = (OP *)&myop;
1159 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1230 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1160 } 1231 }
1161 1232
1175 PL_op = (OP *)&init_perl_op; 1246 PL_op = (OP *)&init_perl_op;
1176 1247
1177 /* copy throw, in case it was set before init_perl */ 1248 /* copy throw, in case it was set before init_perl */
1178 CORO_THROW = coro->except; 1249 CORO_THROW = coro->except;
1179 1250
1180 SWAP_SVS (coro); 1251 SWAP_SVS_ENTER (coro);
1181 1252
1182 if (ecb_expect_false (enable_times)) 1253 if (ecb_expect_false (enable_times))
1183 { 1254 {
1184 coro_times_update (); 1255 coro_times_update ();
1185 coro_times_sub (coro); 1256 coro_times_sub (coro);
1223 /* this will cause transfer_check to croak on block*/ 1294 /* this will cause transfer_check to croak on block*/
1224 SvRV_set (coro_current, (SV *)coro->hv); 1295 SvRV_set (coro_current, (SV *)coro->hv);
1225 1296
1226 load_perl (aTHX_ coro); 1297 load_perl (aTHX_ coro);
1227 1298
1299 /* restore swapped sv's */
1300 SWAP_SVS_LEAVE (coro);
1301
1228 coro_unwind_stacks (aTHX); 1302 coro_unwind_stacks (aTHX);
1229
1230 /* restore swapped sv's */
1231 SWAP_SVS (coro);
1232 1303
1233 coro_destruct_stacks (aTHX); 1304 coro_destruct_stacks (aTHX);
1234 1305
1235 /* now save some sv's to be free'd later */ 1306 /* now save some sv's to be free'd later */
1236 svf [0] = GvSV (PL_defgv); 1307 svf [0] = GvSV (PL_defgv);
1257 1328
1258 SvREFCNT_dec (coro->saved_deffh); 1329 SvREFCNT_dec (coro->saved_deffh);
1259 SvREFCNT_dec (coro->rouse_cb); 1330 SvREFCNT_dec (coro->rouse_cb);
1260 SvREFCNT_dec (coro->invoke_cb); 1331 SvREFCNT_dec (coro->invoke_cb);
1261 SvREFCNT_dec (coro->invoke_av); 1332 SvREFCNT_dec (coro->invoke_av);
1333 SvREFCNT_dec (coro->on_enter_xs);
1334 SvREFCNT_dec (coro->on_leave_xs);
1262 } 1335 }
1263} 1336}
1264 1337
1265ecb_inline void 1338ecb_inline void
1266free_coro_mortal (pTHX) 1339free_coro_mortal (pTHX)
1307 av_push (av, SvREFCNT_inc_NN (*bot++)); 1380 av_push (av, SvREFCNT_inc_NN (*bot++));
1308 1381
1309 PL_runops = RUNOPS_DEFAULT; 1382 PL_runops = RUNOPS_DEFAULT;
1310 ENTER; 1383 ENTER;
1311 SAVETMPS; 1384 SAVETMPS;
1385 PUSHMARK (SP);
1312 EXTEND (SP, 3); 1386 EXTEND (SP, 3);
1313 PUSHMARK (SP);
1314 PUSHs (&PL_sv_no); 1387 PUSHs (&PL_sv_no);
1315 PUSHs (fullname); 1388 PUSHs (fullname);
1316 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 1389 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
1317 PUTBACK; 1390 PUTBACK;
1318 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1391 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1329 1402
1330 if (PL_curcop != &PL_compiling) 1403 if (PL_curcop != &PL_compiling)
1331 { 1404 {
1332 SV **cb; 1405 SV **cb;
1333 1406
1334 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1407 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1335 { 1408 {
1336 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1409 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1337 1410
1338 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1411 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1339 { 1412 {
1345 gv_efullname3 (fullname, gv, 0); 1418 gv_efullname3 (fullname, gv, 0);
1346 1419
1347 PL_runops = RUNOPS_DEFAULT; 1420 PL_runops = RUNOPS_DEFAULT;
1348 ENTER; 1421 ENTER;
1349 SAVETMPS; 1422 SAVETMPS;
1423 PUSHMARK (SP);
1350 EXTEND (SP, 3); 1424 EXTEND (SP, 3);
1351 PUSHMARK (SP);
1352 PUSHs (&PL_sv_yes); 1425 PUSHs (&PL_sv_yes);
1353 PUSHs (fullname); 1426 PUSHs (fullname);
1354 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1427 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc (SUB_ARGARRAY)) : &PL_sv_undef);
1355 PUTBACK; 1428 PUTBACK;
1356 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1429 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1357 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1430 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1358 SPAGAIN; 1431 SPAGAIN;
1359 FREETMPS; 1432 FREETMPS;
1369 dSP; 1442 dSP;
1370 1443
1371 PL_runops = RUNOPS_DEFAULT; 1444 PL_runops = RUNOPS_DEFAULT;
1372 ENTER; 1445 ENTER;
1373 SAVETMPS; 1446 SAVETMPS;
1374 EXTEND (SP, 3);
1375 PL_runops = RUNOPS_DEFAULT;
1376 PUSHMARK (SP); 1447 PUSHMARK (SP);
1448 EXTEND (SP, 2);
1377 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 1449 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
1378 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 1450 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
1379 PUTBACK; 1451 PUTBACK;
1380 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0); 1452 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); 1453 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 1553 * 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. 1554 * runtime errors here, as this is just a random interpreter, not a thread.
1483 */ 1555 */
1484 1556
1485 /* 1557 /*
1558 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1559 * requires PL_scopestack_ix, so do it here if required.
1560 */
1561 if (!PL_scopestack_ix)
1562 ENTER;
1563
1564 /*
1486 * If perl-run returns we assume exit() was being called or the coro 1565 * 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) 1566 * 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 1567 * reason for perl_run to return. We try to mimic whatever perl is normally
1489 * doing in that case. YMMV. 1568 * doing in that case. YMMV.
1490 */ 1569 */
1916 /* nothing to schedule: call the idle handler */ 1995 /* nothing to schedule: call the idle handler */
1917 if (SvROK (sv_idle) 1996 if (SvROK (sv_idle)
1918 && SvOBJECT (SvRV (sv_idle))) 1997 && SvOBJECT (SvRV (sv_idle)))
1919 { 1998 {
1920 if (SvRV (sv_idle) == SvRV (coro_current)) 1999 if (SvRV (sv_idle) == SvRV (coro_current))
2000 {
2001 require_pv ("Carp");
2002
2003 {
2004 dSP;
2005
2006 ENTER;
2007 SAVETMPS;
2008
2009 PUSHMARK (SP);
1921 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 2010 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2011 PUTBACK;
2012 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2013
2014 FREETMPS;
2015 LEAVE;
2016 }
2017 }
1922 2018
1923 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2019 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1924 api_ready (aTHX_ SvRV (sv_idle)); 2020 api_ready (aTHX_ SvRV (sv_idle));
1925 --coro_nready; 2021 --coro_nready;
1926 } 2022 }
2230 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2326 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2231 } 2327 }
2232 else 2328 else
2233 { 2329 {
2234 struct coro *self = SvSTATE_current; 2330 struct coro *self = SvSTATE_current;
2331
2332 if (!self)
2333 croak ("Coro::cancel called outside of thread content,");
2235 2334
2236 /* otherwise we cancel directly, purely for speed reasons 2335 /* otherwise we cancel directly, purely for speed reasons
2237 * unfortunately, this requires some magic trickery, as 2336 * unfortunately, this requires some magic trickery, as
2238 * somebody else could cancel us, so we have to fight the cancellation. 2337 * somebody else could cancel us, so we have to fight the cancellation.
2239 * this is ugly, and hopefully fully worth the extra speed. 2338 * this is ugly, and hopefully fully worth the extra speed.
2272safe_cancel (pTHX_ struct coro *coro, SV **arg, int items) 2371safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2273{ 2372{
2274 if (coro->cctx) 2373 if (coro->cctx)
2275 croak ("coro inside C callback, unable to cancel at this time, caught"); 2374 croak ("coro inside C callback, unable to cancel at this time, caught");
2276 2375
2277 if (coro->flags & CF_NEW) 2376 if (coro->flags & (CF_NEW | CF_ZOMBIE))
2278 { 2377 {
2279 coro_set_status (aTHX_ coro, arg, items); 2378 coro_set_status (aTHX_ coro, arg, items);
2280 coro_state_destroy (aTHX_ coro); 2379 coro_state_destroy (aTHX_ coro);
2281 } 2380 }
2282 else 2381 else
2349 else 2448 else
2350 { 2449 {
2351 av_clear (GvAV (PL_defgv)); 2450 av_clear (GvAV (PL_defgv));
2352 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2451 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2353 2452
2453 if (ecb_expect_false (coro->swap_sv))
2454 {
2455 SWAP_SVS_LEAVE (coro);
2456 SvREFCNT_dec_NN (coro->swap_sv);
2457 coro->swap_sv = 0;
2458 }
2459
2354 coro->prio = 0; 2460 coro->prio = 0;
2355 2461
2356 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2462 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2357 api_trace (aTHX_ coro_current, 0); 2463 api_trace (aTHX_ coro_current, 0);
2358 2464
2359 frame->prepare = prepare_schedule; 2465 frame->prepare = prepare_schedule;
2360 av_push (av_async_pool, SvREFCNT_inc (hv)); 2466 av_push (av_async_pool, SvREFCNT_inc (hv));
2361 } 2467 }
2581 2687
2582/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2688/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2583static void 2689static void
2584slf_destroy (pTHX_ struct coro *coro) 2690slf_destroy (pTHX_ struct coro *coro)
2585{ 2691{
2586 /* this callback is reserved for slf functions needing to do cleanup */ 2692 struct CoroSLF frame = coro->slf_frame;
2587 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2588 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2589 2693
2590 /* 2694 /*
2591 * The on_destroy above most likely is from an SLF call. 2695 * The on_destroy below most likely is from an SLF call.
2592 * Since by definition the SLF call will not finish when we destroy 2696 * Since by definition the SLF call will not finish when we destroy
2593 * the coro, we will have to force-finish it here, otherwise 2697 * the coro, we will have to force-finish it here, otherwise
2594 * cleanup functions cannot call SLF functions. 2698 * cleanup functions cannot call SLF functions.
2595 */ 2699 */
2596 coro->slf_frame.prepare = 0; 2700 coro->slf_frame.prepare = 0;
2701
2702 /* this callback is reserved for slf functions needing to do cleanup */
2703 if (frame.destroy && frame.prepare && !PL_dirty)
2704 frame.destroy (aTHX_ &frame);
2597} 2705}
2598 2706
2599/* 2707/*
2600 * these not obviously related functions are all rolled into one 2708 * these not obviously related functions are all rolled into one
2601 * function to increase chances that they all will call transfer with the same 2709 * function to increase chances that they all will call transfer with the same
2784static void 2892static void
2785coro_pop_on_leave (pTHX_ void *coro) 2893coro_pop_on_leave (pTHX_ void *coro)
2786{ 2894{
2787 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2895 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2788 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2896 on_enterleave_call (aTHX_ sv_2mortal (cb));
2897}
2898
2899static void
2900enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2901{
2902 if (!hook)
2903 return;
2904
2905 if (!*avp)
2906 {
2907 *avp = newAV ();
2908 AvREAL_off (*avp);
2909 }
2910
2911 av_push (*avp, (SV *)hook);
2912 av_push (*avp, (SV *)arg);
2913}
2914
2915static void
2916enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2917{
2918 AV *av = *avp;
2919 int i;
2920
2921 if (!av)
2922 return;
2923
2924 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2925 if (AvARRAY (av)[i] == (SV *)hook)
2926 {
2927 if (execute)
2928 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2929
2930 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2931 av_pop (av);
2932 av_pop (av);
2933 break;
2934 }
2935
2936 if (AvFILLp (av) >= 0)
2937 {
2938 *avp = 0;
2939 SvREFCNT_dec_NN (av);
2940 }
2941}
2942
2943static void
2944api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2945{
2946 struct coro *coro = SvSTATE (coro_sv);
2947
2948 if (SvSTATE_current == coro)
2949 if (enter)
2950 enter (aTHX_ enter_arg);
2951
2952 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2953 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2954}
2955
2956static void
2957api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2958{
2959 struct coro *coro = SvSTATE (coro_sv);
2960
2961 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2962 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2963}
2964
2965static void
2966savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2967{
2968 struct coro *coro = SvSTATE_current;
2969
2970 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2971}
2972
2973static void
2974savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2975{
2976 struct coro *coro = SvSTATE_current;
2977
2978 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2979}
2980
2981static void
2982api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2983{
2984 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2985
2986 /* this ought to be much cheaper than malloc + a single destructor call */
2987 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2988 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2789} 2989}
2790 2990
2791/*****************************************************************************/ 2991/*****************************************************************************/
2792/* PerlIO::cede */ 2992/* PerlIO::cede */
2793 2993
2923 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3123 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2924 PUTBACK; 3124 PUTBACK;
2925 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3125 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2926 } 3126 }
2927 3127
2928 SvREFCNT_dec (cb); 3128 SvREFCNT_dec_NN (cb);
2929 } 3129 }
2930} 3130}
2931 3131
2932static void 3132static void
2933coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3133coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2941{ 3141{
2942 AV *av = (AV *)frame->data; 3142 AV *av = (AV *)frame->data;
2943 SV *count_sv = AvARRAY (av)[0]; 3143 SV *count_sv = AvARRAY (av)[0];
2944 SV *coro_hv = SvRV (coro_current); 3144 SV *coro_hv = SvRV (coro_current);
2945 3145
3146 frame->destroy = 0;
3147
2946 /* if we are about to throw, don't actually acquire the lock, just throw */ 3148 /* if we are about to throw, don't actually acquire the lock, just throw */
2947 if (CORO_THROW) 3149 if (ecb_expect_false (CORO_THROW))
3150 {
3151 /* we still might be responsible for the semaphore, so wake up others */
3152 coro_semaphore_adjust (aTHX_ av, 0);
3153
2948 return 0; 3154 return 0;
3155 }
2949 else if (SvIVX (count_sv) > 0) 3156 else if (SvIVX (count_sv) > 0)
2950 { 3157 {
2951 frame->destroy = 0;
2952
2953 if (acquire) 3158 if (acquire)
2954 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3159 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2955 else 3160 else
2956 coro_semaphore_adjust (aTHX_ av, 0); 3161 coro_semaphore_adjust (aTHX_ av, 0);
2957 3162
3068 { 3273 {
3069 api_ready (aTHX_ cb); 3274 api_ready (aTHX_ cb);
3070 sv_setiv (cb, 0); /* signal waiter */ 3275 sv_setiv (cb, 0); /* signal waiter */
3071 } 3276 }
3072 3277
3073 SvREFCNT_dec (cb); 3278 SvREFCNT_dec_NN (cb);
3074 3279
3075 --count; 3280 --count;
3076 } 3281 }
3077} 3282}
3078 3283
3163 } 3368 }
3164 3369
3165 av_push (state, data_sv); 3370 av_push (state, data_sv);
3166 3371
3167 api_ready (aTHX_ coro); 3372 api_ready (aTHX_ coro);
3168 SvREFCNT_dec (coro); 3373 SvREFCNT_dec_NN (coro);
3169 SvREFCNT_dec ((AV *)state); 3374 SvREFCNT_dec_NN ((AV *)state);
3170} 3375}
3171 3376
3172static int 3377static int
3173slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3378slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3174{ 3379{
3192 errno = data->errorno; 3397 errno = data->errorno;
3193 PL_laststype = data->laststype; 3398 PL_laststype = data->laststype;
3194 PL_laststatval = data->laststatval; 3399 PL_laststatval = data->laststatval;
3195 PL_statcache = data->statcache; 3400 PL_statcache = data->statcache;
3196 3401
3197 SvREFCNT_dec (data_sv); 3402 SvREFCNT_dec_NN (data_sv);
3198 } 3403 }
3199 3404
3200 /* push result values */ 3405 /* push result values */
3201 { 3406 {
3202 dSP; 3407 dSP;
3391 3596
3392 map_len = load_len + save_len + 16; 3597 map_len = load_len + save_len + 16;
3393 3598
3394 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 3599 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3395 3600
3601 if (map_base == (char *)MAP_FAILED)
3602 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3603
3396 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3604 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3397 3605
3398 load_perl_slots = (load_save_perl_slots_type)map_base; 3606 load_perl_slots = (load_save_perl_slots_type)map_base;
3399 memcpy (map_base, load_ptr, load_len); 3607 memcpy (map_base, load_ptr, load_len);
3400 3608
3417 3625
3418PROTOTYPES: DISABLE 3626PROTOTYPES: DISABLE
3419 3627
3420BOOT: 3628BOOT:
3421{ 3629{
3630#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3631#include "state.h"
3422#ifdef USE_ITHREADS 3632#ifdef USE_ITHREADS
3423# if CORO_PTHREAD 3633# if CORO_PTHREAD
3424 coro_thx = PERL_GET_CONTEXT; 3634 coro_thx = PERL_GET_CONTEXT;
3425# endif 3635# endif
3426#endif 3636#endif
3434 cctx_current = cctx_new_empty (); 3644 cctx_current = cctx_new_empty ();
3435 3645
3436 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3646 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3437 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3647 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3438 3648
3439 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3649 {
3440 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3650 /*
3441 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3651 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3652 * by coro_sig_vtbl in hash values.
3653 */
3654 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3655
3656 /* this only works if perl doesn't have a vtbl for %SIG */
3657 assert (!mg->mg_virtual);
3658
3659 /*
3660 * The irony is that the perl API itself asserts that mg_virtual
3661 * must be non-const, yet perl5porters insisted on marking their
3662 * vtbls as read-only, just to thwart perl modules from patching
3663 * them.
3664 */
3665 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3666 mg->mg_flags |= MGf_COPY;
3667
3668 coro_sigelem_vtbl = PL_vtbl_sigelem;
3669 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3670 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3671 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3672 }
3442 3673
3443 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3444 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3674 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3445 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3675 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3446 3676
3447 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3677 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3448 3678
3754 if (ecb_expect_false (current == self)) 3984 if (ecb_expect_false (current == self))
3755 coro_times_sub (SvSTATE (coro_current)); 3985 coro_times_sub (SvSTATE (coro_current));
3756} 3986}
3757 3987
3758void 3988void
3759swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3989swap_sv (Coro::State coro, SV *sva, SV *svb)
3760 CODE: 3990 CODE:
3761{ 3991{
3762 struct coro *current = SvSTATE_current; 3992 struct coro *current = SvSTATE_current;
3993 AV *swap_sv;
3994 int i;
3995
3996 sva = SvRV (sva);
3997 svb = SvRV (svb);
3763 3998
3764 if (current == coro) 3999 if (current == coro)
3765 SWAP_SVS (current); 4000 SWAP_SVS_LEAVE (current);
3766 4001
3767 if (!coro->swap_sv) 4002 if (!coro->swap_sv)
3768 coro->swap_sv = newAV (); 4003 coro->swap_sv = newAV ();
3769 4004
4005 swap_sv = coro->swap_sv;
4006
4007 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4008 {
4009 SV *a = AvARRAY (swap_sv)[i ];
4010 SV *b = AvARRAY (swap_sv)[i + 1];
4011
4012 if (a == sva && b == svb)
4013 {
4014 SvREFCNT_dec_NN (a);
4015 SvREFCNT_dec_NN (b);
4016
4017 for (; i <= AvFILLp (swap_sv) - 2; i++)
4018 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4019
4020 AvFILLp (swap_sv) -= 2;
4021
4022 goto removed;
4023 }
4024 }
4025
3770 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4026 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3771 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4027 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4028
4029 removed:
3772 4030
3773 if (current == coro) 4031 if (current == coro)
3774 SWAP_SVS (current); 4032 SWAP_SVS_ENTER (current);
3775} 4033}
3776 4034
3777 4035
3778MODULE = Coro::State PACKAGE = Coro 4036MODULE = Coro::State PACKAGE = Coro
3779 4037
3780BOOT: 4038BOOT:
3781{ 4039{
4040 if (SVt_LAST > 32)
4041 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4042
3782 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4043 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3783 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4044 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3784 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4045 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3785 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4046 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3786 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4047 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3812 coroapi.ready = api_ready; 4073 coroapi.ready = api_ready;
3813 coroapi.is_ready = api_is_ready; 4074 coroapi.is_ready = api_is_ready;
3814 coroapi.nready = coro_nready; 4075 coroapi.nready = coro_nready;
3815 coroapi.current = coro_current; 4076 coroapi.current = coro_current;
3816 4077
4078 coroapi.enterleave_hook = api_enterleave_hook;
4079 coroapi.enterleave_unhook = api_enterleave_unhook;
4080 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4081
3817 /*GCoroAPI = &coroapi;*/ 4082 /*GCoroAPI = &coroapi;*/
3818 sv_setiv (sv, (IV)&coroapi); 4083 sv_setiv (sv, PTR2IV (&coroapi));
3819 SvREADONLY_on (sv); 4084 SvREADONLY_on (sv);
3820 } 4085 }
3821} 4086}
3822 4087
3823SV * 4088SV *
3886 4151
3887void 4152void
3888_set_current (SV *current) 4153_set_current (SV *current)
3889 PROTOTYPE: $ 4154 PROTOTYPE: $
3890 CODE: 4155 CODE:
3891 SvREFCNT_dec (SvRV (coro_current)); 4156 SvREFCNT_dec_NN (SvRV (coro_current));
3892 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4157 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3893 4158
3894void 4159void
3895_set_readyhook (SV *hook) 4160_set_readyhook (SV *hook)
3896 PROTOTYPE: $ 4161 PROTOTYPE: $
3980 4245
3981 if ((SV *)hv == &PL_sv_undef) 4246 if ((SV *)hv == &PL_sv_undef)
3982 { 4247 {
3983 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4248 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3984 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4249 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3985 SvREFCNT_dec (sv); 4250 SvREFCNT_dec_NN (sv);
3986 } 4251 }
3987 4252
3988 { 4253 {
3989 struct coro *coro = SvSTATE_hv (hv); 4254 struct coro *coro = SvSTATE_hv (hv);
3990 4255
3997 api_ready (aTHX_ (SV *)hv); 4262 api_ready (aTHX_ (SV *)hv);
3998 4263
3999 if (GIMME_V != G_VOID) 4264 if (GIMME_V != G_VOID)
4000 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4265 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4001 else 4266 else
4002 SvREFCNT_dec (hv); 4267 SvREFCNT_dec_NN (hv);
4003} 4268}
4004 4269
4005SV * 4270SV *
4006rouse_cb () 4271rouse_cb ()
4007 PROTOTYPE: 4272 PROTOTYPE:
4086 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4351 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4087 OUTPUT: 4352 OUTPUT:
4088 RETVAL 4353 RETVAL
4089 4354
4090void 4355void
4091up (SV *self, int adjust = 1) 4356up (SV *self)
4092 ALIAS:
4093 adjust = 1
4094 CODE: 4357 CODE:
4358 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4359
4360void
4361adjust (SV *self, int adjust)
4362 CODE:
4095 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4363 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4096 4364
4097void 4365void
4098down (...) 4366down (...)
4099 CODE: 4367 CODE:
4100 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4368 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines