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.436 by root, Tue Nov 5 14:38:46 2013 UTC vs.
Revision 1.471 by root, Fri Jul 14 23:20:07 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
61
62/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
63/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
64#if PERL_VERSION_ATLEAST(5,19,0)
65# define SVt_BIND SVt_IV
66#endif
46 67
47#if defined(_WIN32) 68#if defined(_WIN32)
48# undef HAS_GETTIMEOFDAY 69# undef HAS_GETTIMEOFDAY
49# undef setjmp 70# undef setjmp
50# undef longjmp 71# undef longjmp
95# define CORO_CLOCK_MONOTONIC 1 116# define CORO_CLOCK_MONOTONIC 1
96# define CORO_CLOCK_THREAD_CPUTIME_ID 3 117# define CORO_CLOCK_THREAD_CPUTIME_ID 3
97# endif 118# endif
98#endif 119#endif
99 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
100static double (*nvtime)(); /* so why doesn't it take void? */ 139static double (*nvtime)(); /* so why doesn't it take void? */
101static void (*u2time)(pTHX_ UV ret[2]); 140static void (*u2time)(pTHX_ UV ret[2]);
102 141
103/* we hijack an hopefully unused CV flag for our purposes */ 142/* we hijack an hopefully unused CV flag for our purposes */
104#define CVf_SLF 0x4000 143#define CVf_SLF 0x4000
119 158
120static GV *irsgv; /* $/ */ 159static GV *irsgv; /* $/ */
121static GV *stdoutgv; /* *STDOUT */ 160static GV *stdoutgv; /* *STDOUT */
122static SV *rv_diehook; 161static SV *rv_diehook;
123static SV *rv_warnhook; 162static SV *rv_warnhook;
124static HV *hv_sig; /* %SIG */
125 163
126/* async_pool helper stuff */ 164/* async_pool helper stuff */
127static SV *sv_pool_rss; 165static SV *sv_pool_rss;
128static SV *sv_pool_size; 166static SV *sv_pool_size;
129static SV *sv_async_pool_idle; /* description string */ 167static SV *sv_async_pool_idle; /* description string */
235 SV *saved_deffh; 273 SV *saved_deffh;
236 SV *invoke_cb; 274 SV *invoke_cb;
237 AV *invoke_av; 275 AV *invoke_av;
238 276
239 /* on_enter/on_leave */ 277 /* on_enter/on_leave */
240 AV *on_enter; 278 AV *on_enter; AV *on_enter_xs;
241 AV *on_leave; 279 AV *on_leave; AV *on_leave_xs;
242 280
243 /* swap_sv */ 281 /* swap_sv */
244 AV *swap_sv; 282 AV *swap_sv;
245 283
246 /* times */ 284 /* times */
482 520
483 return 0; 521 return 0;
484} 522}
485 523
486ecb_inline struct coro * 524ecb_inline struct coro *
487SvSTATE_ (pTHX_ SV *coro) 525SvSTATE_ (pTHX_ SV *coro_sv)
488{ 526{
489 MAGIC *mg; 527 MAGIC *mg;
490 528
491 if (SvROK (coro)) 529 if (SvROK (coro_sv))
492 coro = SvRV (coro); 530 coro_sv = SvRV (coro_sv);
493 531
494 mg = SvSTATEhv_p (aTHX_ coro); 532 mg = SvSTATEhv_p (aTHX_ coro_sv);
495 if (!mg) 533 if (!mg)
496 croak ("Coro::State object required"); 534 croak ("Coro::State object required");
497 535
498 return (struct coro *)mg->mg_ptr; 536 return (struct coro *)mg->mg_ptr;
499} 537}
510ecb_inline PADLIST * 548ecb_inline PADLIST *
511coro_derive_padlist (pTHX_ CV *cv) 549coro_derive_padlist (pTHX_ CV *cv)
512{ 550{
513 PADLIST *padlist = CvPADLIST (cv); 551 PADLIST *padlist = CvPADLIST (cv);
514 PADLIST *newpadlist; 552 PADLIST *newpadlist;
553 PADNAMELIST *padnames;
515 PAD *newpad; 554 PAD *newpad;
516 PADOFFSET off = PadlistMAX (padlist) + 1; 555 PADOFFSET off = PadlistMAX (padlist) + 1;
517 556
518#if NEWPADAPI 557#if NEWPADAPI
519 558
546 AvREAL_off (newpadlist); 585 AvREAL_off (newpadlist);
547#endif 586#endif
548 587
549 /* Already extended to 2 elements by newPADLIST. */ 588 /* Already extended to 2 elements by newPADLIST. */
550 PadlistMAX (newpadlist) = 1; 589 PadlistMAX (newpadlist) = 1;
551 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist)); 590
591 padnames = PadlistNAMES (padlist);
592 ++PadnamelistREFCNT (padnames);
593 PadlistNAMES (newpadlist) = padnames;
594
552 PadlistARRAY (newpadlist)[1] = newpad; 595 PadlistARRAY (newpadlist)[1] = newpad;
553 596
554 return newpadlist; 597 return newpadlist;
555} 598}
556 599
564 607
565 while (i > 0) /* special-case index 0 */ 608 while (i > 0) /* special-case index 0 */
566 { 609 {
567 /* we try to be extra-careful here */ 610 /* we try to be extra-careful here */
568 PAD *pad = PadlistARRAY (padlist)[i--]; 611 PAD *pad = PadlistARRAY (padlist)[i--];
612
613 if (pad)
614 {
569 I32 j = PadMAX (pad); 615 I32 j = PadMAX (pad);
570 616
571 while (j >= 0) 617 while (j >= 0)
572 SvREFCNT_dec (PadARRAY (pad)[j--]); 618 SvREFCNT_dec (PadARRAY (pad)[j--]);
573 619
574 PadMAX (pad) = -1; 620 PadMAX (pad) = -1;
575 SvREFCNT_dec (pad); 621 SvREFCNT_dec (pad);
622 }
576 } 623 }
577 624
578 SvREFCNT_dec (PadlistNAMES (padlist)); 625 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
579 626
580#if NEWPADAPI 627#if NEWPADAPI
581 Safefree (PadlistARRAY (padlist)); 628 Safefree (PadlistARRAY (padlist));
582 Safefree (padlist); 629 Safefree (padlist);
583#else 630#else
679 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;
680 727
681 /* 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,
682 * 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.
683 */ 730 */
684 #define svany_in_head(type) \ 731 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
685 (((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)))
686 737
687 if (svany_in_head (SvTYPE (a))) 738 if (svany_in_head (SvTYPE (a)))
688 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 739 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
689 740
690 if (svany_in_head (SvTYPE (b))) 741 if (svany_in_head (SvTYPE (b)))
693#endif 744#endif
694} 745}
695 746
696/* swap sv heads, at least logically */ 747/* swap sv heads, at least logically */
697static void 748static void
698swap_svs (pTHX_ Coro__State c) 749swap_svs_enter (pTHX_ Coro__State c)
699{ 750{
700 int i; 751 int i;
701 752
702 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 753 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
703 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]);
704} 755}
705 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
706#define SWAP_SVS(coro) \ 766#define SWAP_SVS_ENTER(coro) \
707 if (ecb_expect_false ((coro)->swap_sv)) \ 767 if (ecb_expect_false ((coro)->swap_sv)) \
708 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))
709 773
710static void 774static void
711on_enterleave_call (pTHX_ SV *cb); 775on_enterleave_call (pTHX_ SV *cb);
712 776
713static void 777static void
758 822
759 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 823 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
760 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 824 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
761 } 825 }
762 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
763 SWAP_SVS (c); 835 SWAP_SVS_ENTER (c);
764} 836}
765 837
766static void 838static void
767save_perl (pTHX_ Coro__State c) 839save_perl (pTHX_ Coro__State c)
768{ 840{
769 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 }
770 850
771 if (ecb_expect_false (c->on_leave)) 851 if (ecb_expect_false (c->on_leave))
772 { 852 {
773 int i; 853 int i;
774 854
901#endif 981#endif
902 982
903 New(54,PL_savestack,24,ANY); 983 New(54,PL_savestack,24,ANY);
904 PL_savestack_ix = 0; 984 PL_savestack_ix = 0;
905 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
906 991
907#if !PERL_VERSION_ATLEAST (5,10,0) 992#if !PERL_VERSION_ATLEAST (5,10,0)
908 New(54,PL_retstack,4,OP*); 993 New(54,PL_retstack,4,OP*);
909 PL_retstack_ix = 0; 994 PL_retstack_ix = 0;
910 PL_retstack_max = 4; 995 PL_retstack_max = 4;
976 } 1061 }
977 1062
978 return rss; 1063 return rss;
979} 1064}
980 1065
981/** coroutine stack handling ************************************************/ 1066/** provide custom get/set/clear methods for %SIG elements ******************/
982
983static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
984static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
985static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
986 1067
987/* apparently < 5.8.8 */ 1068/* apparently < 5.8.8 */
988#ifndef MgPV_nolen_const 1069#ifndef MgPV_nolen_const
989#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1070#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
990 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1071 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
991 (const char*)(mg)->mg_ptr) 1072 (const char*)(mg)->mg_ptr)
992#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};
993 1102
994/* 1103/*
995 * This overrides the default magic get method of %SIG elements. 1104 * This overrides the default magic get method of %SIG elements.
996 * 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
997 * 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),
999 */ 1108 */
1000static int ecb_cold 1109static int ecb_cold
1001coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1110coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
1002{ 1111{
1003 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;
1004 1115
1005 if (*s == '_') 1116 SV *ssv;
1006 {
1007 SV **svp = 0;
1008 1117
1009 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1010 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1011
1012 if (svp) 1118 if (!*svp)
1013 {
1014 SV *ssv;
1015
1016 if (!*svp)
1017 ssv = &PL_sv_undef; 1119 ssv = &PL_sv_undef;
1018 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. */
1019 ssv = sv_2mortal (newRV_inc (*svp)); 1121 ssv = sv_2mortal (newRV_inc (*svp));
1020 else 1122 else
1021 ssv = *svp; 1123 ssv = *svp;
1022 1124
1023 sv_setsv (sv, ssv); 1125 sv_setsv (sv, ssv);
1024 return 0; 1126 return 0;
1025 }
1026 }
1027
1028 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
1029} 1127}
1030 1128
1031static int ecb_cold 1129static int ecb_cold
1032coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
1033{ 1131{
1034 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;
1035 1135
1036 if (*s == '_')
1037 {
1038 SV **svp = 0;
1039
1040 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1041 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1042
1043 if (svp)
1044 {
1045 SV *old = *svp; 1136 SV *old = *svp;
1046 *svp = 0; 1137 *svp = 0;
1047 SvREFCNT_dec (old); 1138 SvREFCNT_dec (old);
1048 return 0; 1139 return 0;
1049 }
1050 }
1051
1052 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1053} 1140}
1054 1141
1055static int ecb_cold 1142static int ecb_cold
1056coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1143coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1057{ 1144{
1058 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;
1059 1148
1060 if (*s == '_')
1061 {
1062 SV **svp = 0;
1063
1064 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1065 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1066
1067 if (svp)
1068 {
1069 SV *old = *svp; 1149 SV *old = *svp;
1070 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1150 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1071 SvREFCNT_dec (old); 1151 SvREFCNT_dec (old);
1072 return 0; 1152 return 0;
1073 }
1074 }
1075
1076 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1077} 1153}
1078 1154
1079static void 1155static void
1080prepare_nop (pTHX_ struct coro_transfer_args *ta) 1156prepare_nop (pTHX_ struct coro_transfer_args *ta)
1081{ 1157{
1092static int 1168static int
1093slf_check_repeat (pTHX_ struct CoroSLF *frame) 1169slf_check_repeat (pTHX_ struct CoroSLF *frame)
1094{ 1170{
1095 return 1; 1171 return 1;
1096} 1172}
1173
1174/** coroutine stack handling ************************************************/
1097 1175
1098static UNOP init_perl_op; 1176static UNOP init_perl_op;
1099 1177
1100ecb_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 */
1101init_perl (pTHX_ struct coro *coro) 1179init_perl (pTHX_ struct coro *coro)
1127 1205
1128 GvSV (PL_defgv) = newSV (0); 1206 GvSV (PL_defgv) = newSV (0);
1129 GvAV (PL_defgv) = coro->args; coro->args = 0; 1207 GvAV (PL_defgv) = coro->args; coro->args = 0;
1130 GvSV (PL_errgv) = newSV (0); 1208 GvSV (PL_errgv) = newSV (0);
1131 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);
1132 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
1133 PL_rs = newSVsv (GvSV (irsgv)); 1214 PL_rs = newSVsv (GvSV (irsgv));
1134 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1215 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1135 1216
1136 { 1217 {
1137 dSP; 1218 dSP;
1165 PL_op = (OP *)&init_perl_op; 1246 PL_op = (OP *)&init_perl_op;
1166 1247
1167 /* copy throw, in case it was set before init_perl */ 1248 /* copy throw, in case it was set before init_perl */
1168 CORO_THROW = coro->except; 1249 CORO_THROW = coro->except;
1169 1250
1170 SWAP_SVS (coro); 1251 SWAP_SVS_ENTER (coro);
1171 1252
1172 if (ecb_expect_false (enable_times)) 1253 if (ecb_expect_false (enable_times))
1173 { 1254 {
1174 coro_times_update (); 1255 coro_times_update ();
1175 coro_times_sub (coro); 1256 coro_times_sub (coro);
1213 /* this will cause transfer_check to croak on block*/ 1294 /* this will cause transfer_check to croak on block*/
1214 SvRV_set (coro_current, (SV *)coro->hv); 1295 SvRV_set (coro_current, (SV *)coro->hv);
1215 1296
1216 load_perl (aTHX_ coro); 1297 load_perl (aTHX_ coro);
1217 1298
1299 /* restore swapped sv's */
1300 SWAP_SVS_LEAVE (coro);
1301
1218 coro_unwind_stacks (aTHX); 1302 coro_unwind_stacks (aTHX);
1219
1220 /* restore swapped sv's */
1221 SWAP_SVS (coro);
1222 1303
1223 coro_destruct_stacks (aTHX); 1304 coro_destruct_stacks (aTHX);
1224 1305
1225 /* now save some sv's to be free'd later */ 1306 /* now save some sv's to be free'd later */
1226 svf [0] = GvSV (PL_defgv); 1307 svf [0] = GvSV (PL_defgv);
1247 1328
1248 SvREFCNT_dec (coro->saved_deffh); 1329 SvREFCNT_dec (coro->saved_deffh);
1249 SvREFCNT_dec (coro->rouse_cb); 1330 SvREFCNT_dec (coro->rouse_cb);
1250 SvREFCNT_dec (coro->invoke_cb); 1331 SvREFCNT_dec (coro->invoke_cb);
1251 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);
1252 } 1335 }
1253} 1336}
1254 1337
1255ecb_inline void 1338ecb_inline void
1256free_coro_mortal (pTHX) 1339free_coro_mortal (pTHX)
1319 1402
1320 if (PL_curcop != &PL_compiling) 1403 if (PL_curcop != &PL_compiling)
1321 { 1404 {
1322 SV **cb; 1405 SV **cb;
1323 1406
1324 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1407 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1325 { 1408 {
1326 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1409 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1327 1410
1328 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1411 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1329 { 1412 {
1339 SAVETMPS; 1422 SAVETMPS;
1340 EXTEND (SP, 3); 1423 EXTEND (SP, 3);
1341 PUSHMARK (SP); 1424 PUSHMARK (SP);
1342 PUSHs (&PL_sv_yes); 1425 PUSHs (&PL_sv_yes);
1343 PUSHs (fullname); 1426 PUSHs (fullname);
1344 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);
1345 PUTBACK; 1428 PUTBACK;
1346 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);
1347 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);
1348 SPAGAIN; 1431 SPAGAIN;
1349 FREETMPS; 1432 FREETMPS;
1471 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1554 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1472 * runtime errors here, as this is just a random interpreter, not a thread. 1555 * runtime errors here, as this is just a random interpreter, not a thread.
1473 */ 1556 */
1474 1557
1475 /* 1558 /*
1559 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1560 * requires PL_scopestack_ix, so do it here if required.
1561 */
1562 if (!PL_scopestack_ix)
1563 ENTER;
1564
1565 /*
1476 * If perl-run returns we assume exit() was being called or the coro 1566 * If perl-run returns we assume exit() was being called or the coro
1477 * fell off the end, which seems to be the only valid (non-bug) 1567 * fell off the end, which seems to be the only valid (non-bug)
1478 * reason for perl_run to return. We try to mimic whatever perl is normally 1568 * reason for perl_run to return. We try to mimic whatever perl is normally
1479 * doing in that case. YMMV. 1569 * doing in that case. YMMV.
1480 */ 1570 */
1906 /* nothing to schedule: call the idle handler */ 1996 /* nothing to schedule: call the idle handler */
1907 if (SvROK (sv_idle) 1997 if (SvROK (sv_idle)
1908 && SvOBJECT (SvRV (sv_idle))) 1998 && SvOBJECT (SvRV (sv_idle)))
1909 { 1999 {
1910 if (SvRV (sv_idle) == SvRV (coro_current)) 2000 if (SvRV (sv_idle) == SvRV (coro_current))
2001 {
2002 require_pv ("Carp");
2003
2004 {
2005 dSP;
2006
2007 ENTER;
2008 SAVETMPS;
2009
2010 PUSHMARK (SP);
1911 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 2011 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2012 PUTBACK;
2013 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2014
2015 FREETMPS;
2016 LEAVE;
2017 }
2018 }
1912 2019
1913 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2020 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1914 api_ready (aTHX_ SvRV (sv_idle)); 2021 api_ready (aTHX_ SvRV (sv_idle));
1915 --coro_nready; 2022 --coro_nready;
1916 } 2023 }
2220 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2327 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2221 } 2328 }
2222 else 2329 else
2223 { 2330 {
2224 struct coro *self = SvSTATE_current; 2331 struct coro *self = SvSTATE_current;
2332
2333 if (!self)
2334 croak ("Coro::cancel called outside of thread content,");
2225 2335
2226 /* otherwise we cancel directly, purely for speed reasons 2336 /* otherwise we cancel directly, purely for speed reasons
2227 * unfortunately, this requires some magic trickery, as 2337 * unfortunately, this requires some magic trickery, as
2228 * somebody else could cancel us, so we have to fight the cancellation. 2338 * somebody else could cancel us, so we have to fight the cancellation.
2229 * this is ugly, and hopefully fully worth the extra speed. 2339 * this is ugly, and hopefully fully worth the extra speed.
2339 else 2449 else
2340 { 2450 {
2341 av_clear (GvAV (PL_defgv)); 2451 av_clear (GvAV (PL_defgv));
2342 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2452 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2343 2453
2454 if (ecb_expect_false (coro->swap_sv))
2455 {
2456 SWAP_SVS_LEAVE (coro);
2457 SvREFCNT_dec_NN (coro->swap_sv);
2458 coro->swap_sv = 0;
2459 }
2460
2344 coro->prio = 0; 2461 coro->prio = 0;
2345 2462
2346 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2463 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2347 api_trace (aTHX_ coro_current, 0); 2464 api_trace (aTHX_ coro_current, 0);
2348 2465
2349 frame->prepare = prepare_schedule; 2466 frame->prepare = prepare_schedule;
2350 av_push (av_async_pool, SvREFCNT_inc (hv)); 2467 av_push (av_async_pool, SvREFCNT_inc (hv));
2351 } 2468 }
2571 2688
2572/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2689/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2573static void 2690static void
2574slf_destroy (pTHX_ struct coro *coro) 2691slf_destroy (pTHX_ struct coro *coro)
2575{ 2692{
2576 /* this callback is reserved for slf functions needing to do cleanup */ 2693 struct CoroSLF frame = coro->slf_frame;
2577 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2578 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2579 2694
2580 /* 2695 /*
2581 * The on_destroy above most likely is from an SLF call. 2696 * The on_destroy below most likely is from an SLF call.
2582 * Since by definition the SLF call will not finish when we destroy 2697 * Since by definition the SLF call will not finish when we destroy
2583 * the coro, we will have to force-finish it here, otherwise 2698 * the coro, we will have to force-finish it here, otherwise
2584 * cleanup functions cannot call SLF functions. 2699 * cleanup functions cannot call SLF functions.
2585 */ 2700 */
2586 coro->slf_frame.prepare = 0; 2701 coro->slf_frame.prepare = 0;
2702
2703 /* this callback is reserved for slf functions needing to do cleanup */
2704 if (frame.destroy && frame.prepare && !PL_dirty)
2705 frame.destroy (aTHX_ &frame);
2587} 2706}
2588 2707
2589/* 2708/*
2590 * these not obviously related functions are all rolled into one 2709 * these not obviously related functions are all rolled into one
2591 * function to increase chances that they all will call transfer with the same 2710 * function to increase chances that they all will call transfer with the same
2774static void 2893static void
2775coro_pop_on_leave (pTHX_ void *coro) 2894coro_pop_on_leave (pTHX_ void *coro)
2776{ 2895{
2777 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2896 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2778 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2897 on_enterleave_call (aTHX_ sv_2mortal (cb));
2898}
2899
2900static void
2901enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2902{
2903 if (!hook)
2904 return;
2905
2906 if (!*avp)
2907 {
2908 *avp = newAV ();
2909 AvREAL_off (*avp);
2910 }
2911
2912 av_push (*avp, (SV *)hook);
2913 av_push (*avp, (SV *)arg);
2914}
2915
2916static void
2917enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2918{
2919 AV *av = *avp;
2920 int i;
2921
2922 if (!av)
2923 return;
2924
2925 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2926 if (AvARRAY (av)[i] == (SV *)hook)
2927 {
2928 if (execute)
2929 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2930
2931 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2932 av_pop (av);
2933 av_pop (av);
2934 break;
2935 }
2936
2937 if (AvFILLp (av) >= 0)
2938 {
2939 *avp = 0;
2940 SvREFCNT_dec_NN (av);
2941 }
2942}
2943
2944static void
2945api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2946{
2947 struct coro *coro = SvSTATE (coro_sv);
2948
2949 if (SvSTATE_current == coro)
2950 if (enter)
2951 enter (aTHX_ enter_arg);
2952
2953 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2954 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2955}
2956
2957static void
2958api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2959{
2960 struct coro *coro = SvSTATE (coro_sv);
2961
2962 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2963 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2964}
2965
2966static void
2967savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2968{
2969 struct coro *coro = SvSTATE_current;
2970
2971 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2972}
2973
2974static void
2975savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2976{
2977 struct coro *coro = SvSTATE_current;
2978
2979 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2980}
2981
2982static void
2983api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2984{
2985 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2986
2987 /* this ought to be much cheaper than malloc + a single destructor call */
2988 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2989 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2779} 2990}
2780 2991
2781/*****************************************************************************/ 2992/*****************************************************************************/
2782/* PerlIO::cede */ 2993/* PerlIO::cede */
2783 2994
2913 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3124 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2914 PUTBACK; 3125 PUTBACK;
2915 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3126 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2916 } 3127 }
2917 3128
2918 SvREFCNT_dec (cb); 3129 SvREFCNT_dec_NN (cb);
2919 } 3130 }
2920} 3131}
2921 3132
2922static void 3133static void
2923coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3134coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2931{ 3142{
2932 AV *av = (AV *)frame->data; 3143 AV *av = (AV *)frame->data;
2933 SV *count_sv = AvARRAY (av)[0]; 3144 SV *count_sv = AvARRAY (av)[0];
2934 SV *coro_hv = SvRV (coro_current); 3145 SV *coro_hv = SvRV (coro_current);
2935 3146
3147 frame->destroy = 0;
3148
2936 /* if we are about to throw, don't actually acquire the lock, just throw */ 3149 /* if we are about to throw, don't actually acquire the lock, just throw */
2937 if (CORO_THROW) 3150 if (ecb_expect_false (CORO_THROW))
3151 {
3152 /* we still might be responsible for the semaphore, so wake up others */
3153 coro_semaphore_adjust (aTHX_ av, 0);
3154
2938 return 0; 3155 return 0;
3156 }
2939 else if (SvIVX (count_sv) > 0) 3157 else if (SvIVX (count_sv) > 0)
2940 { 3158 {
2941 frame->destroy = 0;
2942
2943 if (acquire) 3159 if (acquire)
2944 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3160 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2945 else 3161 else
2946 coro_semaphore_adjust (aTHX_ av, 0); 3162 coro_semaphore_adjust (aTHX_ av, 0);
2947 3163
3058 { 3274 {
3059 api_ready (aTHX_ cb); 3275 api_ready (aTHX_ cb);
3060 sv_setiv (cb, 0); /* signal waiter */ 3276 sv_setiv (cb, 0); /* signal waiter */
3061 } 3277 }
3062 3278
3063 SvREFCNT_dec (cb); 3279 SvREFCNT_dec_NN (cb);
3064 3280
3065 --count; 3281 --count;
3066 } 3282 }
3067} 3283}
3068 3284
3153 } 3369 }
3154 3370
3155 av_push (state, data_sv); 3371 av_push (state, data_sv);
3156 3372
3157 api_ready (aTHX_ coro); 3373 api_ready (aTHX_ coro);
3158 SvREFCNT_dec (coro); 3374 SvREFCNT_dec_NN (coro);
3159 SvREFCNT_dec ((AV *)state); 3375 SvREFCNT_dec_NN ((AV *)state);
3160} 3376}
3161 3377
3162static int 3378static int
3163slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3379slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3164{ 3380{
3182 errno = data->errorno; 3398 errno = data->errorno;
3183 PL_laststype = data->laststype; 3399 PL_laststype = data->laststype;
3184 PL_laststatval = data->laststatval; 3400 PL_laststatval = data->laststatval;
3185 PL_statcache = data->statcache; 3401 PL_statcache = data->statcache;
3186 3402
3187 SvREFCNT_dec (data_sv); 3403 SvREFCNT_dec_NN (data_sv);
3188 } 3404 }
3189 3405
3190 /* push result values */ 3406 /* push result values */
3191 { 3407 {
3192 dSP; 3408 dSP;
3381 3597
3382 map_len = load_len + save_len + 16; 3598 map_len = load_len + save_len + 16;
3383 3599
3384 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 3600 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3385 3601
3602 if (map_base == (char *)MAP_FAILED)
3603 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3604
3386 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3605 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3387 3606
3388 load_perl_slots = (load_save_perl_slots_type)map_base; 3607 load_perl_slots = (load_save_perl_slots_type)map_base;
3389 memcpy (map_base, load_ptr, load_len); 3608 memcpy (map_base, load_ptr, load_len);
3390 3609
3407 3626
3408PROTOTYPES: DISABLE 3627PROTOTYPES: DISABLE
3409 3628
3410BOOT: 3629BOOT:
3411{ 3630{
3631#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3632#include "state.h"
3412#ifdef USE_ITHREADS 3633#ifdef USE_ITHREADS
3413# if CORO_PTHREAD 3634# if CORO_PTHREAD
3414 coro_thx = PERL_GET_CONTEXT; 3635 coro_thx = PERL_GET_CONTEXT;
3415# endif 3636# endif
3416#endif 3637#endif
3424 cctx_current = cctx_new_empty (); 3645 cctx_current = cctx_new_empty ();
3425 3646
3426 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3647 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3427 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3648 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3428 3649
3429 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3650 {
3430 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3651 /*
3431 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3652 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3653 * by coro_sig_vtbl in hash values.
3654 */
3655 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3656
3657 /* this only works if perl doesn't have a vtbl for %SIG */
3658 assert (!mg->mg_virtual);
3659
3660 /*
3661 * The irony is that the perl API itself asserts that mg_virtual
3662 * must be non-const, yet perl5porters insisted on marking their
3663 * vtbls as read-only, just to thwart perl modules from patching
3664 * them.
3665 */
3666 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3667 mg->mg_flags |= MGf_COPY;
3668
3669 coro_sigelem_vtbl = PL_vtbl_sigelem;
3670 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3671 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3672 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3673 }
3432 3674
3433 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3434 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3675 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3435 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3676 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3436 3677
3437 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3678 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3438 3679
3744 if (ecb_expect_false (current == self)) 3985 if (ecb_expect_false (current == self))
3745 coro_times_sub (SvSTATE (coro_current)); 3986 coro_times_sub (SvSTATE (coro_current));
3746} 3987}
3747 3988
3748void 3989void
3749swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3990swap_sv (Coro::State coro, SV *sva, SV *svb)
3750 CODE: 3991 CODE:
3751{ 3992{
3752 struct coro *current = SvSTATE_current; 3993 struct coro *current = SvSTATE_current;
3994 AV *swap_sv;
3995 int i;
3996
3997 sva = SvRV (sva);
3998 svb = SvRV (svb);
3753 3999
3754 if (current == coro) 4000 if (current == coro)
3755 SWAP_SVS (current); 4001 SWAP_SVS_LEAVE (current);
3756 4002
3757 if (!coro->swap_sv) 4003 if (!coro->swap_sv)
3758 coro->swap_sv = newAV (); 4004 coro->swap_sv = newAV ();
3759 4005
4006 swap_sv = coro->swap_sv;
4007
4008 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4009 {
4010 SV *a = AvARRAY (swap_sv)[i ];
4011 SV *b = AvARRAY (swap_sv)[i + 1];
4012
4013 if (a == sva && b == svb)
4014 {
4015 SvREFCNT_dec_NN (a);
4016 SvREFCNT_dec_NN (b);
4017
4018 for (; i <= AvFILLp (swap_sv) - 2; i++)
4019 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4020
4021 AvFILLp (swap_sv) -= 2;
4022
4023 goto removed;
4024 }
4025 }
4026
3760 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4027 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3761 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4028 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4029
4030 removed:
3762 4031
3763 if (current == coro) 4032 if (current == coro)
3764 SWAP_SVS (current); 4033 SWAP_SVS_ENTER (current);
3765} 4034}
3766 4035
3767 4036
3768MODULE = Coro::State PACKAGE = Coro 4037MODULE = Coro::State PACKAGE = Coro
3769 4038
3770BOOT: 4039BOOT:
3771{ 4040{
4041 if (SVt_LAST > 32)
4042 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4043
3772 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4044 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3773 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4045 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3774 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4046 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3775 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4047 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3776 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4048 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3802 coroapi.ready = api_ready; 4074 coroapi.ready = api_ready;
3803 coroapi.is_ready = api_is_ready; 4075 coroapi.is_ready = api_is_ready;
3804 coroapi.nready = coro_nready; 4076 coroapi.nready = coro_nready;
3805 coroapi.current = coro_current; 4077 coroapi.current = coro_current;
3806 4078
4079 coroapi.enterleave_hook = api_enterleave_hook;
4080 coroapi.enterleave_unhook = api_enterleave_unhook;
4081 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4082
3807 /*GCoroAPI = &coroapi;*/ 4083 /*GCoroAPI = &coroapi;*/
3808 sv_setiv (sv, (IV)&coroapi); 4084 sv_setiv (sv, PTR2IV (&coroapi));
3809 SvREADONLY_on (sv); 4085 SvREADONLY_on (sv);
3810 } 4086 }
3811} 4087}
3812 4088
3813SV * 4089SV *
3876 4152
3877void 4153void
3878_set_current (SV *current) 4154_set_current (SV *current)
3879 PROTOTYPE: $ 4155 PROTOTYPE: $
3880 CODE: 4156 CODE:
3881 SvREFCNT_dec (SvRV (coro_current)); 4157 SvREFCNT_dec_NN (SvRV (coro_current));
3882 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4158 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3883 4159
3884void 4160void
3885_set_readyhook (SV *hook) 4161_set_readyhook (SV *hook)
3886 PROTOTYPE: $ 4162 PROTOTYPE: $
3970 4246
3971 if ((SV *)hv == &PL_sv_undef) 4247 if ((SV *)hv == &PL_sv_undef)
3972 { 4248 {
3973 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4249 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3974 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4250 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3975 SvREFCNT_dec (sv); 4251 SvREFCNT_dec_NN (sv);
3976 } 4252 }
3977 4253
3978 { 4254 {
3979 struct coro *coro = SvSTATE_hv (hv); 4255 struct coro *coro = SvSTATE_hv (hv);
3980 4256
3987 api_ready (aTHX_ (SV *)hv); 4263 api_ready (aTHX_ (SV *)hv);
3988 4264
3989 if (GIMME_V != G_VOID) 4265 if (GIMME_V != G_VOID)
3990 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4266 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3991 else 4267 else
3992 SvREFCNT_dec (hv); 4268 SvREFCNT_dec_NN (hv);
3993} 4269}
3994 4270
3995SV * 4271SV *
3996rouse_cb () 4272rouse_cb ()
3997 PROTOTYPE: 4273 PROTOTYPE:
4076 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4352 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4077 OUTPUT: 4353 OUTPUT:
4078 RETVAL 4354 RETVAL
4079 4355
4080void 4356void
4081up (SV *self, int adjust = 1) 4357up (SV *self)
4082 ALIAS:
4083 adjust = 1
4084 CODE: 4358 CODE:
4359 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4360
4361void
4362adjust (SV *self, int adjust)
4363 CODE:
4085 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4364 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4086 4365
4087void 4366void
4088down (...) 4367down (...)
4089 CODE: 4368 CODE:
4090 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4369 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines