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.470 by root, Fri Jul 14 13:14:32 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#if PERL_VERSION_ATLEAST(5,24,0)
122# define SUB_ARGARRAY PL_curpad[0]
123#else
124# define SUB_ARGARRAY (SV *)cx->blk_sub.argarray
125#endif
126
127/* perl usually suppresses asserts. for debugging, we sometimes force it to be on */
128#if 0
129# undef NDEBUG
130# include <assert.h>
131#endif
132
106static double (*nvtime)(); /* so why doesn't it take void? */ 133static double (*nvtime)(); /* so why doesn't it take void? */
107static void (*u2time)(pTHX_ UV ret[2]); 134static void (*u2time)(pTHX_ UV ret[2]);
108 135
109/* we hijack an hopefully unused CV flag for our purposes */ 136/* we hijack an hopefully unused CV flag for our purposes */
110#define CVf_SLF 0x4000 137#define CVf_SLF 0x4000
125 152
126static GV *irsgv; /* $/ */ 153static GV *irsgv; /* $/ */
127static GV *stdoutgv; /* *STDOUT */ 154static GV *stdoutgv; /* *STDOUT */
128static SV *rv_diehook; 155static SV *rv_diehook;
129static SV *rv_warnhook; 156static SV *rv_warnhook;
130static HV *hv_sig; /* %SIG */
131 157
132/* async_pool helper stuff */ 158/* async_pool helper stuff */
133static SV *sv_pool_rss; 159static SV *sv_pool_rss;
134static SV *sv_pool_size; 160static SV *sv_pool_size;
135static SV *sv_async_pool_idle; /* description string */ 161static SV *sv_async_pool_idle; /* description string */
241 SV *saved_deffh; 267 SV *saved_deffh;
242 SV *invoke_cb; 268 SV *invoke_cb;
243 AV *invoke_av; 269 AV *invoke_av;
244 270
245 /* on_enter/on_leave */ 271 /* on_enter/on_leave */
246 AV *on_enter; 272 AV *on_enter; AV *on_enter_xs;
247 AV *on_leave; 273 AV *on_leave; AV *on_leave_xs;
248 274
249 /* swap_sv */ 275 /* swap_sv */
250 AV *swap_sv; 276 AV *swap_sv;
251 277
252 /* times */ 278 /* times */
488 514
489 return 0; 515 return 0;
490} 516}
491 517
492ecb_inline struct coro * 518ecb_inline struct coro *
493SvSTATE_ (pTHX_ SV *coro) 519SvSTATE_ (pTHX_ SV *coro_sv)
494{ 520{
495 MAGIC *mg; 521 MAGIC *mg;
496 522
497 if (SvROK (coro)) 523 if (SvROK (coro_sv))
498 coro = SvRV (coro); 524 coro_sv = SvRV (coro_sv);
499 525
500 mg = SvSTATEhv_p (aTHX_ coro); 526 mg = SvSTATEhv_p (aTHX_ coro_sv);
501 if (!mg) 527 if (!mg)
502 croak ("Coro::State object required"); 528 croak ("Coro::State object required");
503 529
504 return (struct coro *)mg->mg_ptr; 530 return (struct coro *)mg->mg_ptr;
505} 531}
516ecb_inline PADLIST * 542ecb_inline PADLIST *
517coro_derive_padlist (pTHX_ CV *cv) 543coro_derive_padlist (pTHX_ CV *cv)
518{ 544{
519 PADLIST *padlist = CvPADLIST (cv); 545 PADLIST *padlist = CvPADLIST (cv);
520 PADLIST *newpadlist; 546 PADLIST *newpadlist;
547 PADNAMELIST *padnames;
521 PAD *newpad; 548 PAD *newpad;
522 PADOFFSET off = PadlistMAX (padlist) + 1; 549 PADOFFSET off = PadlistMAX (padlist) + 1;
523 550
524#if NEWPADAPI 551#if NEWPADAPI
525 552
552 AvREAL_off (newpadlist); 579 AvREAL_off (newpadlist);
553#endif 580#endif
554 581
555 /* Already extended to 2 elements by newPADLIST. */ 582 /* Already extended to 2 elements by newPADLIST. */
556 PadlistMAX (newpadlist) = 1; 583 PadlistMAX (newpadlist) = 1;
557 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist)); 584
585 padnames = PadlistNAMES (padlist);
586 ++PadnamelistREFCNT (padnames);
587 PadlistNAMES (newpadlist) = padnames;
588
558 PadlistARRAY (newpadlist)[1] = newpad; 589 PadlistARRAY (newpadlist)[1] = newpad;
559 590
560 return newpadlist; 591 return newpadlist;
561} 592}
562 593
583 PadMAX (pad) = -1; 614 PadMAX (pad) = -1;
584 SvREFCNT_dec (pad); 615 SvREFCNT_dec (pad);
585 } 616 }
586 } 617 }
587 618
588 SvREFCNT_dec (PadlistNAMES (padlist)); 619 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
589 620
590#if NEWPADAPI 621#if NEWPADAPI
591 Safefree (PadlistARRAY (padlist)); 622 Safefree (PadlistARRAY (padlist));
592 Safefree (padlist); 623 Safefree (padlist);
593#else 624#else
689 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u; 720 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
690 721
691 /* if SvANY points to the head, we need to adjust the pointers, 722 /* if SvANY points to the head, we need to adjust the pointers,
692 * as the pointer for a still points to b, and maybe vice versa. 723 * as the pointer for a still points to b, and maybe vice versa.
693 */ 724 */
694 #define svany_in_head(type) \ 725 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))) 726 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
727 svany_in_head_set |= 1 << SVt_NV;
728 #endif
729
730 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
696 731
697 if (svany_in_head (SvTYPE (a))) 732 if (svany_in_head (SvTYPE (a)))
698 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 733 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
699 734
700 if (svany_in_head (SvTYPE (b))) 735 if (svany_in_head (SvTYPE (b)))
703#endif 738#endif
704} 739}
705 740
706/* swap sv heads, at least logically */ 741/* swap sv heads, at least logically */
707static void 742static void
708swap_svs (pTHX_ Coro__State c) 743swap_svs_enter (pTHX_ Coro__State c)
709{ 744{
710 int i; 745 int i;
711 746
712 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 747 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
713 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]); 748 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
714} 749}
715 750
751static void
752swap_svs_leave (pTHX_ Coro__State c)
753{
754 int i;
755
756 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
757 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
758}
759
716#define SWAP_SVS(coro) \ 760#define SWAP_SVS_ENTER(coro) \
717 if (ecb_expect_false ((coro)->swap_sv)) \ 761 if (ecb_expect_false ((coro)->swap_sv)) \
718 swap_svs (aTHX_ (coro)) 762 swap_svs_enter (aTHX_ (coro))
763
764#define SWAP_SVS_LEAVE(coro) \
765 if (ecb_expect_false ((coro)->swap_sv)) \
766 swap_svs_leave (aTHX_ (coro))
719 767
720static void 768static void
721on_enterleave_call (pTHX_ SV *cb); 769on_enterleave_call (pTHX_ SV *cb);
722 770
723static void 771static void
768 816
769 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 817 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
770 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 818 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
771 } 819 }
772 820
821 if (ecb_expect_false (c->on_enter_xs))
822 {
823 int i;
824
825 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
826 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
827 }
828
773 SWAP_SVS (c); 829 SWAP_SVS_ENTER (c);
774} 830}
775 831
776static void 832static void
777save_perl (pTHX_ Coro__State c) 833save_perl (pTHX_ Coro__State c)
778{ 834{
779 SWAP_SVS (c); 835 SWAP_SVS_LEAVE (c);
836
837 if (ecb_expect_false (c->on_leave_xs))
838 {
839 int i;
840
841 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
842 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
843 }
780 844
781 if (ecb_expect_false (c->on_leave)) 845 if (ecb_expect_false (c->on_leave))
782 { 846 {
783 int i; 847 int i;
784 848
911#endif 975#endif
912 976
913 New(54,PL_savestack,24,ANY); 977 New(54,PL_savestack,24,ANY);
914 PL_savestack_ix = 0; 978 PL_savestack_ix = 0;
915 PL_savestack_max = 24; 979 PL_savestack_max = 24;
980#if PERL_VERSION_ATLEAST (5,24,0)
981 /* perl 5.24 moves SS_MAXPUSH optimisation from */
982 /* the header macros to PL_savestack_max */
983 PL_savestack_max -= SS_MAXPUSH;
984#endif
916 985
917#if !PERL_VERSION_ATLEAST (5,10,0) 986#if !PERL_VERSION_ATLEAST (5,10,0)
918 New(54,PL_retstack,4,OP*); 987 New(54,PL_retstack,4,OP*);
919 PL_retstack_ix = 0; 988 PL_retstack_ix = 0;
920 PL_retstack_max = 4; 989 PL_retstack_max = 4;
986 } 1055 }
987 1056
988 return rss; 1057 return rss;
989} 1058}
990 1059
991/** coroutine stack handling ************************************************/ 1060/** 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 1061
997/* apparently < 5.8.8 */ 1062/* apparently < 5.8.8 */
998#ifndef MgPV_nolen_const 1063#ifndef MgPV_nolen_const
999#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1064#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
1000 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1065 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
1001 (const char*)(mg)->mg_ptr) 1066 (const char*)(mg)->mg_ptr)
1002#endif 1067#endif
1068
1069/* this will be a patched copy of PL_vtbl_sigelem */
1070static MGVTBL coro_sigelem_vtbl;
1071
1072static int ecb_cold
1073coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
1074{
1075 char *key = SvPV_nolen ((SV *)name);
1076
1077 /* do what mg_copy normally does */
1078 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1079 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1080
1081 /* patch sigelem vtbl, but only for __WARN__ and __DIE__ */
1082 if (*key == '_'
1083 && (strEQ (key, "__DIE__")
1084 || strEQ (key, "__WARN__")))
1085 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1086
1087 return 1;
1088}
1089
1090/* perl does not have a %SIG vtbl, we provide one so we can override */
1091/* the magic vtbl for the __DIE__ and __WARN__ members */
1092static const MGVTBL coro_sig_vtbl = {
1093 0, 0, 0, 0, 0,
1094 coro_sig_copy
1095};
1003 1096
1004/* 1097/*
1005 * This overrides the default magic get method of %SIG elements. 1098 * 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 1099 * 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), 1100 * and instead of trying to save and restore the hash elements (extremely slow),
1009 */ 1102 */
1010static int ecb_cold 1103static int ecb_cold
1011coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1104coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
1012{ 1105{
1013 const char *s = MgPV_nolen_const (mg); 1106 const char *s = MgPV_nolen_const (mg);
1107 /* the key must be either __DIE__ or __WARN__ here */
1108 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1014 1109
1015 if (*s == '_') 1110 SV *ssv;
1016 {
1017 SV **svp = 0;
1018 1111
1019 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1020 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1021
1022 if (svp) 1112 if (!*svp)
1023 {
1024 SV *ssv;
1025
1026 if (!*svp)
1027 ssv = &PL_sv_undef; 1113 ssv = &PL_sv_undef;
1028 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */ 1114 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1029 ssv = sv_2mortal (newRV_inc (*svp)); 1115 ssv = sv_2mortal (newRV_inc (*svp));
1030 else 1116 else
1031 ssv = *svp; 1117 ssv = *svp;
1032 1118
1033 sv_setsv (sv, ssv); 1119 sv_setsv (sv, ssv);
1034 return 0; 1120 return 0;
1035 }
1036 }
1037
1038 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
1039} 1121}
1040 1122
1041static int ecb_cold 1123static int ecb_cold
1042coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1124coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
1043{ 1125{
1044 const char *s = MgPV_nolen_const (mg); 1126 const char *s = MgPV_nolen_const (mg);
1127 /* the key must be either __DIE__ or __WARN__ here */
1128 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1045 1129
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; 1130 SV *old = *svp;
1056 *svp = 0; 1131 *svp = 0;
1057 SvREFCNT_dec (old); 1132 SvREFCNT_dec (old);
1058 return 0; 1133 return 0;
1059 }
1060 }
1061
1062 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1063} 1134}
1064 1135
1065static int ecb_cold 1136static int ecb_cold
1066coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1137coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1067{ 1138{
1068 const char *s = MgPV_nolen_const (mg); 1139 const char *s = MgPV_nolen_const (mg);
1140 /* the key must be either __DIE__ or __WARN__ here */
1141 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1069 1142
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; 1143 SV *old = *svp;
1080 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1144 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1081 SvREFCNT_dec (old); 1145 SvREFCNT_dec (old);
1082 return 0; 1146 return 0;
1083 }
1084 }
1085
1086 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1087} 1147}
1088 1148
1089static void 1149static void
1090prepare_nop (pTHX_ struct coro_transfer_args *ta) 1150prepare_nop (pTHX_ struct coro_transfer_args *ta)
1091{ 1151{
1102static int 1162static int
1103slf_check_repeat (pTHX_ struct CoroSLF *frame) 1163slf_check_repeat (pTHX_ struct CoroSLF *frame)
1104{ 1164{
1105 return 1; 1165 return 1;
1106} 1166}
1167
1168/** coroutine stack handling ************************************************/
1107 1169
1108static UNOP init_perl_op; 1170static UNOP init_perl_op;
1109 1171
1110ecb_noinline static void /* noinline to keep it out of the transfer fast path */ 1172ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1111init_perl (pTHX_ struct coro *coro) 1173init_perl (pTHX_ struct coro *coro)
1137 1199
1138 GvSV (PL_defgv) = newSV (0); 1200 GvSV (PL_defgv) = newSV (0);
1139 GvAV (PL_defgv) = coro->args; coro->args = 0; 1201 GvAV (PL_defgv) = coro->args; coro->args = 0;
1140 GvSV (PL_errgv) = newSV (0); 1202 GvSV (PL_errgv) = newSV (0);
1141 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1203 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1142 GvHV (PL_hintgv) = 0; 1204 GvHV (PL_hintgv) = newHV ();
1205#if PERL_VERSION_ATLEAST (5,10,0)
1206 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1207#endif
1143 PL_rs = newSVsv (GvSV (irsgv)); 1208 PL_rs = newSVsv (GvSV (irsgv));
1144 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1209 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1145 1210
1146 { 1211 {
1147 dSP; 1212 dSP;
1175 PL_op = (OP *)&init_perl_op; 1240 PL_op = (OP *)&init_perl_op;
1176 1241
1177 /* copy throw, in case it was set before init_perl */ 1242 /* copy throw, in case it was set before init_perl */
1178 CORO_THROW = coro->except; 1243 CORO_THROW = coro->except;
1179 1244
1180 SWAP_SVS (coro); 1245 SWAP_SVS_ENTER (coro);
1181 1246
1182 if (ecb_expect_false (enable_times)) 1247 if (ecb_expect_false (enable_times))
1183 { 1248 {
1184 coro_times_update (); 1249 coro_times_update ();
1185 coro_times_sub (coro); 1250 coro_times_sub (coro);
1223 /* this will cause transfer_check to croak on block*/ 1288 /* this will cause transfer_check to croak on block*/
1224 SvRV_set (coro_current, (SV *)coro->hv); 1289 SvRV_set (coro_current, (SV *)coro->hv);
1225 1290
1226 load_perl (aTHX_ coro); 1291 load_perl (aTHX_ coro);
1227 1292
1293 /* restore swapped sv's */
1294 SWAP_SVS_LEAVE (coro);
1295
1228 coro_unwind_stacks (aTHX); 1296 coro_unwind_stacks (aTHX);
1229
1230 /* restore swapped sv's */
1231 SWAP_SVS (coro);
1232 1297
1233 coro_destruct_stacks (aTHX); 1298 coro_destruct_stacks (aTHX);
1234 1299
1235 /* now save some sv's to be free'd later */ 1300 /* now save some sv's to be free'd later */
1236 svf [0] = GvSV (PL_defgv); 1301 svf [0] = GvSV (PL_defgv);
1257 1322
1258 SvREFCNT_dec (coro->saved_deffh); 1323 SvREFCNT_dec (coro->saved_deffh);
1259 SvREFCNT_dec (coro->rouse_cb); 1324 SvREFCNT_dec (coro->rouse_cb);
1260 SvREFCNT_dec (coro->invoke_cb); 1325 SvREFCNT_dec (coro->invoke_cb);
1261 SvREFCNT_dec (coro->invoke_av); 1326 SvREFCNT_dec (coro->invoke_av);
1327 SvREFCNT_dec (coro->on_enter_xs);
1328 SvREFCNT_dec (coro->on_leave_xs);
1262 } 1329 }
1263} 1330}
1264 1331
1265ecb_inline void 1332ecb_inline void
1266free_coro_mortal (pTHX) 1333free_coro_mortal (pTHX)
1329 1396
1330 if (PL_curcop != &PL_compiling) 1397 if (PL_curcop != &PL_compiling)
1331 { 1398 {
1332 SV **cb; 1399 SV **cb;
1333 1400
1334 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1401 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1335 { 1402 {
1336 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1403 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1337 1404
1338 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1405 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1339 { 1406 {
1349 SAVETMPS; 1416 SAVETMPS;
1350 EXTEND (SP, 3); 1417 EXTEND (SP, 3);
1351 PUSHMARK (SP); 1418 PUSHMARK (SP);
1352 PUSHs (&PL_sv_yes); 1419 PUSHs (&PL_sv_yes);
1353 PUSHs (fullname); 1420 PUSHs (fullname);
1354 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1421 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc (SUB_ARGARRAY)) : &PL_sv_undef);
1355 PUTBACK; 1422 PUTBACK;
1356 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1423 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1357 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1424 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1358 SPAGAIN; 1425 SPAGAIN;
1359 FREETMPS; 1426 FREETMPS;
1481 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1548 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1482 * runtime errors here, as this is just a random interpreter, not a thread. 1549 * runtime errors here, as this is just a random interpreter, not a thread.
1483 */ 1550 */
1484 1551
1485 /* 1552 /*
1553 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1554 * requires PL_scopestack_ix, so do it here if required.
1555 */
1556 if (!PL_scopestack_ix)
1557 ENTER;
1558
1559 /*
1486 * If perl-run returns we assume exit() was being called or the coro 1560 * If perl-run returns we assume exit() was being called or the coro
1487 * fell off the end, which seems to be the only valid (non-bug) 1561 * fell off the end, which seems to be the only valid (non-bug)
1488 * reason for perl_run to return. We try to mimic whatever perl is normally 1562 * reason for perl_run to return. We try to mimic whatever perl is normally
1489 * doing in that case. YMMV. 1563 * doing in that case. YMMV.
1490 */ 1564 */
1916 /* nothing to schedule: call the idle handler */ 1990 /* nothing to schedule: call the idle handler */
1917 if (SvROK (sv_idle) 1991 if (SvROK (sv_idle)
1918 && SvOBJECT (SvRV (sv_idle))) 1992 && SvOBJECT (SvRV (sv_idle)))
1919 { 1993 {
1920 if (SvRV (sv_idle) == SvRV (coro_current)) 1994 if (SvRV (sv_idle) == SvRV (coro_current))
1995 {
1996 require_pv ("Carp");
1997
1998 {
1999 dSP;
2000
2001 ENTER;
2002 SAVETMPS;
2003
2004 PUSHMARK (SP);
1921 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 2005 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2006 PUTBACK;
2007 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2008
2009 FREETMPS;
2010 LEAVE;
2011 }
2012 }
1922 2013
1923 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2014 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1924 api_ready (aTHX_ SvRV (sv_idle)); 2015 api_ready (aTHX_ SvRV (sv_idle));
1925 --coro_nready; 2016 --coro_nready;
1926 } 2017 }
2230 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2321 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2231 } 2322 }
2232 else 2323 else
2233 { 2324 {
2234 struct coro *self = SvSTATE_current; 2325 struct coro *self = SvSTATE_current;
2326
2327 if (!self)
2328 croak ("Coro::cancel called outside of thread content,");
2235 2329
2236 /* otherwise we cancel directly, purely for speed reasons 2330 /* otherwise we cancel directly, purely for speed reasons
2237 * unfortunately, this requires some magic trickery, as 2331 * unfortunately, this requires some magic trickery, as
2238 * somebody else could cancel us, so we have to fight the cancellation. 2332 * somebody else could cancel us, so we have to fight the cancellation.
2239 * this is ugly, and hopefully fully worth the extra speed. 2333 * this is ugly, and hopefully fully worth the extra speed.
2349 else 2443 else
2350 { 2444 {
2351 av_clear (GvAV (PL_defgv)); 2445 av_clear (GvAV (PL_defgv));
2352 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2446 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2353 2447
2448 if (ecb_expect_false (coro->swap_sv))
2449 {
2450 SWAP_SVS_LEAVE (coro);
2451 SvREFCNT_dec_NN (coro->swap_sv);
2452 coro->swap_sv = 0;
2453 }
2454
2354 coro->prio = 0; 2455 coro->prio = 0;
2355 2456
2356 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2457 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2357 api_trace (aTHX_ coro_current, 0); 2458 api_trace (aTHX_ coro_current, 0);
2358 2459
2359 frame->prepare = prepare_schedule; 2460 frame->prepare = prepare_schedule;
2360 av_push (av_async_pool, SvREFCNT_inc (hv)); 2461 av_push (av_async_pool, SvREFCNT_inc (hv));
2361 } 2462 }
2581 2682
2582/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2683/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2583static void 2684static void
2584slf_destroy (pTHX_ struct coro *coro) 2685slf_destroy (pTHX_ struct coro *coro)
2585{ 2686{
2586 /* this callback is reserved for slf functions needing to do cleanup */ 2687 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 2688
2590 /* 2689 /*
2591 * The on_destroy above most likely is from an SLF call. 2690 * The on_destroy below most likely is from an SLF call.
2592 * Since by definition the SLF call will not finish when we destroy 2691 * Since by definition the SLF call will not finish when we destroy
2593 * the coro, we will have to force-finish it here, otherwise 2692 * the coro, we will have to force-finish it here, otherwise
2594 * cleanup functions cannot call SLF functions. 2693 * cleanup functions cannot call SLF functions.
2595 */ 2694 */
2596 coro->slf_frame.prepare = 0; 2695 coro->slf_frame.prepare = 0;
2696
2697 /* this callback is reserved for slf functions needing to do cleanup */
2698 if (frame.destroy && frame.prepare && !PL_dirty)
2699 frame.destroy (aTHX_ &frame);
2597} 2700}
2598 2701
2599/* 2702/*
2600 * these not obviously related functions are all rolled into one 2703 * these not obviously related functions are all rolled into one
2601 * function to increase chances that they all will call transfer with the same 2704 * function to increase chances that they all will call transfer with the same
2784static void 2887static void
2785coro_pop_on_leave (pTHX_ void *coro) 2888coro_pop_on_leave (pTHX_ void *coro)
2786{ 2889{
2787 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2890 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2788 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2891 on_enterleave_call (aTHX_ sv_2mortal (cb));
2892}
2893
2894static void
2895enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2896{
2897 if (!hook)
2898 return;
2899
2900 if (!*avp)
2901 {
2902 *avp = newAV ();
2903 AvREAL_off (*avp);
2904 }
2905
2906 av_push (*avp, (SV *)hook);
2907 av_push (*avp, (SV *)arg);
2908}
2909
2910static void
2911enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2912{
2913 AV *av = *avp;
2914 int i;
2915
2916 if (!av)
2917 return;
2918
2919 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2920 if (AvARRAY (av)[i] == (SV *)hook)
2921 {
2922 if (execute)
2923 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2924
2925 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2926 av_pop (av);
2927 av_pop (av);
2928 break;
2929 }
2930
2931 if (AvFILLp (av) >= 0)
2932 {
2933 *avp = 0;
2934 SvREFCNT_dec_NN (av);
2935 }
2936}
2937
2938static void
2939api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2940{
2941 struct coro *coro = SvSTATE (coro_sv);
2942
2943 if (SvSTATE_current == coro)
2944 if (enter)
2945 enter (aTHX_ enter_arg);
2946
2947 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2948 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2949}
2950
2951static void
2952api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2953{
2954 struct coro *coro = SvSTATE (coro_sv);
2955
2956 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2957 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2958}
2959
2960static void
2961savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2962{
2963 struct coro *coro = SvSTATE_current;
2964
2965 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2966}
2967
2968static void
2969savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2970{
2971 struct coro *coro = SvSTATE_current;
2972
2973 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2974}
2975
2976static void
2977api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2978{
2979 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2980
2981 /* this ought to be much cheaper than malloc + a single destructor call */
2982 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2983 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2789} 2984}
2790 2985
2791/*****************************************************************************/ 2986/*****************************************************************************/
2792/* PerlIO::cede */ 2987/* PerlIO::cede */
2793 2988
2923 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3118 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2924 PUTBACK; 3119 PUTBACK;
2925 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3120 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2926 } 3121 }
2927 3122
2928 SvREFCNT_dec (cb); 3123 SvREFCNT_dec_NN (cb);
2929 } 3124 }
2930} 3125}
2931 3126
2932static void 3127static void
2933coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3128coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2941{ 3136{
2942 AV *av = (AV *)frame->data; 3137 AV *av = (AV *)frame->data;
2943 SV *count_sv = AvARRAY (av)[0]; 3138 SV *count_sv = AvARRAY (av)[0];
2944 SV *coro_hv = SvRV (coro_current); 3139 SV *coro_hv = SvRV (coro_current);
2945 3140
3141 frame->destroy = 0;
3142
2946 /* if we are about to throw, don't actually acquire the lock, just throw */ 3143 /* if we are about to throw, don't actually acquire the lock, just throw */
2947 if (CORO_THROW) 3144 if (ecb_expect_false (CORO_THROW))
3145 {
3146 /* we still might be responsible for the semaphore, so wake up others */
3147 coro_semaphore_adjust (aTHX_ av, 0);
3148
2948 return 0; 3149 return 0;
3150 }
2949 else if (SvIVX (count_sv) > 0) 3151 else if (SvIVX (count_sv) > 0)
2950 { 3152 {
2951 frame->destroy = 0;
2952
2953 if (acquire) 3153 if (acquire)
2954 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3154 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2955 else 3155 else
2956 coro_semaphore_adjust (aTHX_ av, 0); 3156 coro_semaphore_adjust (aTHX_ av, 0);
2957 3157
3068 { 3268 {
3069 api_ready (aTHX_ cb); 3269 api_ready (aTHX_ cb);
3070 sv_setiv (cb, 0); /* signal waiter */ 3270 sv_setiv (cb, 0); /* signal waiter */
3071 } 3271 }
3072 3272
3073 SvREFCNT_dec (cb); 3273 SvREFCNT_dec_NN (cb);
3074 3274
3075 --count; 3275 --count;
3076 } 3276 }
3077} 3277}
3078 3278
3163 } 3363 }
3164 3364
3165 av_push (state, data_sv); 3365 av_push (state, data_sv);
3166 3366
3167 api_ready (aTHX_ coro); 3367 api_ready (aTHX_ coro);
3168 SvREFCNT_dec (coro); 3368 SvREFCNT_dec_NN (coro);
3169 SvREFCNT_dec ((AV *)state); 3369 SvREFCNT_dec_NN ((AV *)state);
3170} 3370}
3171 3371
3172static int 3372static int
3173slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3373slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3174{ 3374{
3192 errno = data->errorno; 3392 errno = data->errorno;
3193 PL_laststype = data->laststype; 3393 PL_laststype = data->laststype;
3194 PL_laststatval = data->laststatval; 3394 PL_laststatval = data->laststatval;
3195 PL_statcache = data->statcache; 3395 PL_statcache = data->statcache;
3196 3396
3197 SvREFCNT_dec (data_sv); 3397 SvREFCNT_dec_NN (data_sv);
3198 } 3398 }
3199 3399
3200 /* push result values */ 3400 /* push result values */
3201 { 3401 {
3202 dSP; 3402 dSP;
3391 3591
3392 map_len = load_len + save_len + 16; 3592 map_len = load_len + save_len + 16;
3393 3593
3394 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 3594 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3395 3595
3596 if (map_base == (char *)MAP_FAILED)
3597 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3598
3396 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3599 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3397 3600
3398 load_perl_slots = (load_save_perl_slots_type)map_base; 3601 load_perl_slots = (load_save_perl_slots_type)map_base;
3399 memcpy (map_base, load_ptr, load_len); 3602 memcpy (map_base, load_ptr, load_len);
3400 3603
3417 3620
3418PROTOTYPES: DISABLE 3621PROTOTYPES: DISABLE
3419 3622
3420BOOT: 3623BOOT:
3421{ 3624{
3625#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3626#include "state.h"
3422#ifdef USE_ITHREADS 3627#ifdef USE_ITHREADS
3423# if CORO_PTHREAD 3628# if CORO_PTHREAD
3424 coro_thx = PERL_GET_CONTEXT; 3629 coro_thx = PERL_GET_CONTEXT;
3425# endif 3630# endif
3426#endif 3631#endif
3434 cctx_current = cctx_new_empty (); 3639 cctx_current = cctx_new_empty ();
3435 3640
3436 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3641 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3437 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3642 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3438 3643
3439 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3644 {
3440 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3645 /*
3441 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3646 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3647 * by coro_sig_vtbl in hash values.
3648 */
3649 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3650
3651 /* this only works if perl doesn't have a vtbl for %SIG */
3652 assert (!mg->mg_virtual);
3653
3654 /*
3655 * The irony is that the perl API itself asserts that mg_virtual
3656 * must be non-const, yet perl5porters insisted on marking their
3657 * vtbls as read-only, just to thwart perl modules from patching
3658 * them.
3659 */
3660 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3661 mg->mg_flags |= MGf_COPY;
3662
3663 coro_sigelem_vtbl = PL_vtbl_sigelem;
3664 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3665 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3666 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3667 }
3442 3668
3443 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3444 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3669 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3445 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3670 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3446 3671
3447 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3672 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3448 3673
3754 if (ecb_expect_false (current == self)) 3979 if (ecb_expect_false (current == self))
3755 coro_times_sub (SvSTATE (coro_current)); 3980 coro_times_sub (SvSTATE (coro_current));
3756} 3981}
3757 3982
3758void 3983void
3759swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3984swap_sv (Coro::State coro, SV *sva, SV *svb)
3760 CODE: 3985 CODE:
3761{ 3986{
3762 struct coro *current = SvSTATE_current; 3987 struct coro *current = SvSTATE_current;
3988 AV *swap_sv;
3989 int i;
3990
3991 sva = SvRV (sva);
3992 svb = SvRV (svb);
3763 3993
3764 if (current == coro) 3994 if (current == coro)
3765 SWAP_SVS (current); 3995 SWAP_SVS_LEAVE (current);
3766 3996
3767 if (!coro->swap_sv) 3997 if (!coro->swap_sv)
3768 coro->swap_sv = newAV (); 3998 coro->swap_sv = newAV ();
3769 3999
4000 swap_sv = coro->swap_sv;
4001
4002 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4003 {
4004 SV *a = AvARRAY (swap_sv)[i ];
4005 SV *b = AvARRAY (swap_sv)[i + 1];
4006
4007 if (a == sva && b == svb)
4008 {
4009 SvREFCNT_dec_NN (a);
4010 SvREFCNT_dec_NN (b);
4011
4012 for (; i <= AvFILLp (swap_sv) - 2; i++)
4013 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4014
4015 AvFILLp (swap_sv) -= 2;
4016
4017 goto removed;
4018 }
4019 }
4020
3770 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4021 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3771 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4022 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4023
4024 removed:
3772 4025
3773 if (current == coro) 4026 if (current == coro)
3774 SWAP_SVS (current); 4027 SWAP_SVS_ENTER (current);
3775} 4028}
3776 4029
3777 4030
3778MODULE = Coro::State PACKAGE = Coro 4031MODULE = Coro::State PACKAGE = Coro
3779 4032
3780BOOT: 4033BOOT:
3781{ 4034{
4035 if (SVt_LAST > 32)
4036 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4037
3782 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4038 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3783 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4039 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3784 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4040 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3785 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4041 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3786 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4042 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3812 coroapi.ready = api_ready; 4068 coroapi.ready = api_ready;
3813 coroapi.is_ready = api_is_ready; 4069 coroapi.is_ready = api_is_ready;
3814 coroapi.nready = coro_nready; 4070 coroapi.nready = coro_nready;
3815 coroapi.current = coro_current; 4071 coroapi.current = coro_current;
3816 4072
4073 coroapi.enterleave_hook = api_enterleave_hook;
4074 coroapi.enterleave_unhook = api_enterleave_unhook;
4075 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4076
3817 /*GCoroAPI = &coroapi;*/ 4077 /*GCoroAPI = &coroapi;*/
3818 sv_setiv (sv, (IV)&coroapi); 4078 sv_setiv (sv, (IV)&coroapi);
3819 SvREADONLY_on (sv); 4079 SvREADONLY_on (sv);
3820 } 4080 }
3821} 4081}
3886 4146
3887void 4147void
3888_set_current (SV *current) 4148_set_current (SV *current)
3889 PROTOTYPE: $ 4149 PROTOTYPE: $
3890 CODE: 4150 CODE:
3891 SvREFCNT_dec (SvRV (coro_current)); 4151 SvREFCNT_dec_NN (SvRV (coro_current));
3892 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4152 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3893 4153
3894void 4154void
3895_set_readyhook (SV *hook) 4155_set_readyhook (SV *hook)
3896 PROTOTYPE: $ 4156 PROTOTYPE: $
3980 4240
3981 if ((SV *)hv == &PL_sv_undef) 4241 if ((SV *)hv == &PL_sv_undef)
3982 { 4242 {
3983 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4243 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3984 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4244 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3985 SvREFCNT_dec (sv); 4245 SvREFCNT_dec_NN (sv);
3986 } 4246 }
3987 4247
3988 { 4248 {
3989 struct coro *coro = SvSTATE_hv (hv); 4249 struct coro *coro = SvSTATE_hv (hv);
3990 4250
3997 api_ready (aTHX_ (SV *)hv); 4257 api_ready (aTHX_ (SV *)hv);
3998 4258
3999 if (GIMME_V != G_VOID) 4259 if (GIMME_V != G_VOID)
4000 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4260 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4001 else 4261 else
4002 SvREFCNT_dec (hv); 4262 SvREFCNT_dec_NN (hv);
4003} 4263}
4004 4264
4005SV * 4265SV *
4006rouse_cb () 4266rouse_cb ()
4007 PROTOTYPE: 4267 PROTOTYPE:
4086 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4346 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4087 OUTPUT: 4347 OUTPUT:
4088 RETVAL 4348 RETVAL
4089 4349
4090void 4350void
4091up (SV *self, int adjust = 1) 4351up (SV *self)
4092 ALIAS:
4093 adjust = 1
4094 CODE: 4352 CODE:
4353 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4354
4355void
4356adjust (SV *self, int adjust)
4357 CODE:
4095 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4358 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4096 4359
4097void 4360void
4098down (...) 4361down (...)
4099 CODE: 4362 CODE:
4100 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4363 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines