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.437 by root, Tue Nov 5 15:13:42 2013 UTC vs.
Revision 1.479 by root, Thu Jun 24 19:10:06 2021 UTC

… …
2#define USE_NO_MINGW_SETJMP_TWO_ARGS 2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3 3
4#define NDEBUG 1 /* perl usually disables NDEBUG later */ 4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5 5
6#include "libcoro/coro.c" 6#include "libcoro/coro.c"
7
8#if CORO_UCONTEXT
9 #define CORO_BACKEND "ucontext"
10#elif CORO_SJLJ
11 #define CORO_BACKEND "sjlj"
12#elif CORO_LINUX
13 #define CORO_BACKEND "linux"
14#elif CORO_LOSER
15 #define CORO_BACKEND "loser"
16#elif CORO_FIBER
17 #define CORO_BACKEND "fiber"
18#elif CORO_IRIX
19 #define CORO_BACKEND "irix"
20#elif CORO_ASM
21 #define CORO_BACKEND "asm"
22#elif CORO_PTHREAD
23 #define CORO_BACKEND "pthread"
24#else
25 #define CORO_BACKEND "unknown"
26#endif
7 27
8#define PERL_NO_GET_CONTEXT 28#define PERL_NO_GET_CONTEXT
9#define PERL_EXT 29#define PERL_EXT
10 30
11#include "EXTERN.h" 31#include "EXTERN.h"
… …
14#include "perliol.h" 34#include "perliol.h"
15 35
16#include "schmorp.h" 36#include "schmorp.h"
17 37
18#define ECB_NO_THREADS 1 38#define ECB_NO_THREADS 1
39#define ECB_NO_LIBM 1
19#include "ecb.h" 40#include "ecb.h"
20 41
21#include <stddef.h> 42#include <stddef.h>
22#include <stdio.h> 43#include <stdio.h>
23#include <errno.h> 44#include <errno.h>
24#include <assert.h> 45#include <assert.h>
46
47#ifndef SvREFCNT_dec_NN
48 #define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
49#endif
50
51#ifndef SvREFCNT_inc_NN
52 #define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
53#endif
25 54
26#ifndef SVs_PADSTALE 55#ifndef SVs_PADSTALE
27# define SVs_PADSTALE 0 56# define SVs_PADSTALE 0
28#endif 57#endif
29 58
… …
41# define PadlistNAMES(pl) (*PadlistARRAY (pl)) 70# define PadlistNAMES(pl) (*PadlistARRAY (pl))
42# define PadARRAY AvARRAY 71# define PadARRAY AvARRAY
43# define PadMAX AvFILLp 72# define PadMAX AvFILLp
44# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1)) 73# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
45#endif 74#endif
75#ifndef PadnamelistREFCNT
76# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
77#endif
78#ifndef PadnamelistREFCNT_dec
79# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
80#endif
46 81
47/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */ 82/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
48/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */ 83/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
49#if PERL_VERSION_ATLEAST(5,19,0) 84#if PERL_VERSION_ATLEAST(5,19,0)
50# define SVt_BIND SVt_IV 85# define SVt_BIND SVt_IV
… …
101# define CORO_CLOCK_MONOTONIC 1 136# define CORO_CLOCK_MONOTONIC 1
102# define CORO_CLOCK_THREAD_CPUTIME_ID 3 137# define CORO_CLOCK_THREAD_CPUTIME_ID 3
103# endif 138# endif
104#endif 139#endif
105 140
141/* one off bugfix for perl 5.22 */
142#if PERL_VERSION_ATLEAST(5,22,0) && !PERL_VERSION_ATLEAST(5,24,0)
143# undef PadlistNAMES
144# define PadlistNAMES(pl) *((PADNAMELIST **)PadlistARRAY (pl))
145#endif
146
147#if PERL_VERSION_ATLEAST(5,24,0)
148# define SUB_ARGARRAY PL_curpad[0]
149#else
150# define SUB_ARGARRAY (SV *)cx->blk_sub.argarray
151#endif
152
153/* perl usually suppresses asserts. for debugging, we sometimes force it to be on */
154#if 0
155# undef NDEBUG
156# include <assert.h>
157#endif
158
106static double (*nvtime)(); /* so why doesn't it take void? */ 159static double (*nvtime)(); /* so why doesn't it take void? */
107static void (*u2time)(pTHX_ UV ret[2]); 160static void (*u2time)(pTHX_ UV ret[2]);
108 161
109/* we hijack an hopefully unused CV flag for our purposes */ 162/* we hijack an hopefully unused CV flag for our purposes */
110#define CVf_SLF 0x4000 163#define CVf_SLF 0x4000
… …
125 178
126static GV *irsgv; /* $/ */ 179static GV *irsgv; /* $/ */
127static GV *stdoutgv; /* *STDOUT */ 180static GV *stdoutgv; /* *STDOUT */
128static SV *rv_diehook; 181static SV *rv_diehook;
129static SV *rv_warnhook; 182static SV *rv_warnhook;
130static HV *hv_sig; /* %SIG */
131 183
132/* async_pool helper stuff */ 184/* async_pool helper stuff */
133static SV *sv_pool_rss; 185static SV *sv_pool_rss;
134static SV *sv_pool_size; 186static SV *sv_pool_size;
135static SV *sv_async_pool_idle; /* description string */ 187static SV *sv_async_pool_idle; /* description string */
… …
231 int usecount; /* number of transfers to this coro */ 283 int usecount; /* number of transfers to this coro */
232 284
233 /* coro process data */ 285 /* coro process data */
234 int prio; 286 int prio;
235 SV *except; /* exception to be thrown */ 287 SV *except; /* exception to be thrown */
236 SV *rouse_cb; /* last rouse callback */ 288 SV *rouse_cb; /* most recently created rouse callback */
237 AV *on_destroy; /* callbacks or coros to notify on destroy */ 289 AV *on_destroy; /* callbacks or coros to notify on destroy */
238 AV *status; /* the exit status list */ 290 AV *status; /* the exit status list */
239 291
240 /* async_pool */ 292 /* async_pool */
241 SV *saved_deffh; 293 SV *saved_deffh;
242 SV *invoke_cb; 294 SV *invoke_cb;
243 AV *invoke_av; 295 AV *invoke_av;
244 296
245 /* on_enter/on_leave */ 297 /* on_enter/on_leave */
246 AV *on_enter; 298 AV *on_enter; AV *on_enter_xs;
247 AV *on_leave; 299 AV *on_leave; AV *on_leave_xs;
248 300
249 /* swap_sv */ 301 /* swap_sv */
250 AV *swap_sv; 302 AV *swap_sv;
251 303
252 /* times */ 304 /* times */
… …
488 540
489 return 0; 541 return 0;
490} 542}
491 543
492ecb_inline struct coro * 544ecb_inline struct coro *
493SvSTATE_ (pTHX_ SV *coro) 545SvSTATE_ (pTHX_ SV *coro_sv)
494{ 546{
495 MAGIC *mg; 547 MAGIC *mg;
496 548
497 if (SvROK (coro)) 549 if (SvROK (coro_sv))
498 coro = SvRV (coro); 550 coro_sv = SvRV (coro_sv);
499 551
500 mg = SvSTATEhv_p (aTHX_ coro); 552 mg = SvSTATEhv_p (aTHX_ coro_sv);
501 if (!mg) 553 if (!mg)
502 croak ("Coro::State object required"); 554 croak ("Coro::State object required");
503 555
504 return (struct coro *)mg->mg_ptr; 556 return (struct coro *)mg->mg_ptr;
505} 557}
… …
516ecb_inline PADLIST * 568ecb_inline PADLIST *
517coro_derive_padlist (pTHX_ CV *cv) 569coro_derive_padlist (pTHX_ CV *cv)
518{ 570{
519 PADLIST *padlist = CvPADLIST (cv); 571 PADLIST *padlist = CvPADLIST (cv);
520 PADLIST *newpadlist; 572 PADLIST *newpadlist;
573 PADNAMELIST *padnames;
521 PAD *newpad; 574 PAD *newpad;
522 PADOFFSET off = PadlistMAX (padlist) + 1; 575 PADOFFSET off = PadlistMAX (padlist) + 1;
523 576
524#if NEWPADAPI 577#if NEWPADAPI
525 578
… …
552 AvREAL_off (newpadlist); 605 AvREAL_off (newpadlist);
553#endif 606#endif
554 607
555 /* Already extended to 2 elements by newPADLIST. */ 608 /* Already extended to 2 elements by newPADLIST. */
556 PadlistMAX (newpadlist) = 1; 609 PadlistMAX (newpadlist) = 1;
557 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist)); 610
611 padnames = PadlistNAMES (padlist);
612 ++PadnamelistREFCNT (padnames);
613 PadlistNAMES (newpadlist) = padnames;
614
558 PadlistARRAY (newpadlist)[1] = newpad; 615 PadlistARRAY (newpadlist)[1] = newpad;
559 616
560 return newpadlist; 617 return newpadlist;
561} 618}
562 619
… …
570 627
571 while (i > 0) /* special-case index 0 */ 628 while (i > 0) /* special-case index 0 */
572 { 629 {
573 /* we try to be extra-careful here */ 630 /* we try to be extra-careful here */
574 PAD *pad = PadlistARRAY (padlist)[i--]; 631 PAD *pad = PadlistARRAY (padlist)[i--];
632
633 if (pad)
634 {
575 I32 j = PadMAX (pad); 635 I32 j = PadMAX (pad);
576 636
577 while (j >= 0) 637 while (j >= 0)
578 SvREFCNT_dec (PadARRAY (pad)[j--]); 638 SvREFCNT_dec (PadARRAY (pad)[j--]);
579 639
580 PadMAX (pad) = -1; 640 PadMAX (pad) = -1;
581 SvREFCNT_dec (pad); 641 SvREFCNT_dec (pad);
642 }
582 } 643 }
583 644
584 SvREFCNT_dec (PadlistNAMES (padlist)); 645 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
585 646
586#if NEWPADAPI 647#if NEWPADAPI
587 Safefree (PadlistARRAY (padlist)); 648 Safefree (PadlistARRAY (padlist));
588 Safefree (padlist); 649 Safefree (padlist);
589#else 650#else
… …
685 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u; 746 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
686 747
687 /* if SvANY points to the head, we need to adjust the pointers, 748 /* if SvANY points to the head, we need to adjust the pointers,
688 * as the pointer for a still points to b, and maybe vice versa. 749 * as the pointer for a still points to b, and maybe vice versa.
689 */ 750 */
690 #define svany_in_head(type) \ 751 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
691 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type))) 752 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
753 svany_in_head_set |= 1 << SVt_NV;
754 #endif
755
756 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
692 757
693 if (svany_in_head (SvTYPE (a))) 758 if (svany_in_head (SvTYPE (a)))
694 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 759 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
695 760
696 if (svany_in_head (SvTYPE (b))) 761 if (svany_in_head (SvTYPE (b)))
… …
699#endif 764#endif
700} 765}
701 766
702/* swap sv heads, at least logically */ 767/* swap sv heads, at least logically */
703static void 768static void
704swap_svs (pTHX_ Coro__State c) 769swap_svs_enter (pTHX_ Coro__State c)
705{ 770{
706 int i; 771 int i;
707 772
708 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 773 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
709 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]); 774 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
710} 775}
711 776
777static void
778swap_svs_leave (pTHX_ Coro__State c)
779{
780 int i;
781
782 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
783 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
784}
785
712#define SWAP_SVS(coro) \ 786#define SWAP_SVS_ENTER(coro) \
713 if (ecb_expect_false ((coro)->swap_sv)) \ 787 if (ecb_expect_false ((coro)->swap_sv)) \
714 swap_svs (aTHX_ (coro)) 788 swap_svs_enter (aTHX_ (coro))
789
790#define SWAP_SVS_LEAVE(coro) \
791 if (ecb_expect_false ((coro)->swap_sv)) \
792 swap_svs_leave (aTHX_ (coro))
715 793
716static void 794static void
717on_enterleave_call (pTHX_ SV *cb); 795on_enterleave_call (pTHX_ SV *cb);
718 796
719static void 797static void
… …
764 842
765 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 843 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
766 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 844 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
767 } 845 }
768 846
847 if (ecb_expect_false (c->on_enter_xs))
848 {
849 int i;
850
851 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
852 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
853 }
854
769 SWAP_SVS (c); 855 SWAP_SVS_ENTER (c);
770} 856}
771 857
772static void 858static void
773save_perl (pTHX_ Coro__State c) 859save_perl (pTHX_ Coro__State c)
774{ 860{
775 SWAP_SVS (c); 861 SWAP_SVS_LEAVE (c);
862
863 if (ecb_expect_false (c->on_leave_xs))
864 {
865 int i;
866
867 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
868 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
869 }
776 870
777 if (ecb_expect_false (c->on_leave)) 871 if (ecb_expect_false (c->on_leave))
778 { 872 {
779 int i; 873 int i;
780 874
… …
907#endif 1001#endif
908 1002
909 New(54,PL_savestack,24,ANY); 1003 New(54,PL_savestack,24,ANY);
910 PL_savestack_ix = 0; 1004 PL_savestack_ix = 0;
911 PL_savestack_max = 24; 1005 PL_savestack_max = 24;
1006#if PERL_VERSION_ATLEAST (5,24,0)
1007 /* perl 5.24 moves SS_MAXPUSH optimisation from */
1008 /* the header macros to PL_savestack_max */
1009 PL_savestack_max -= SS_MAXPUSH;
1010#endif
912 1011
913#if !PERL_VERSION_ATLEAST (5,10,0) 1012#if !PERL_VERSION_ATLEAST (5,10,0)
914 New(54,PL_retstack,4,OP*); 1013 New(54,PL_retstack,4,OP*);
915 PL_retstack_ix = 0; 1014 PL_retstack_ix = 0;
916 PL_retstack_max = 4; 1015 PL_retstack_max = 4;
… …
982 } 1081 }
983 1082
984 return rss; 1083 return rss;
985} 1084}
986 1085
987/** coroutine stack handling ************************************************/ 1086/** provide custom get/set/clear methods for %SIG elements ******************/
988
989static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
990static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
991static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
992 1087
993/* apparently < 5.8.8 */ 1088/* apparently < 5.8.8 */
994#ifndef MgPV_nolen_const 1089#ifndef MgPV_nolen_const
995#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1090#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
996 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1091 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
997 (const char*)(mg)->mg_ptr) 1092 (const char*)(mg)->mg_ptr)
998#endif 1093#endif
1094
1095/* this will be a patched copy of PL_vtbl_sigelem */
1096static MGVTBL coro_sigelem_vtbl;
1097
1098static int ecb_cold
1099coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
1100{
1101 char *key = SvPV_nolen ((SV *)name);
1102
1103 /* do what mg_copy normally does */
1104 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1105 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1106
1107 /* patch sigelem vtbl, but only for __WARN__ and __DIE__ */
1108 if (*key == '_'
1109 && (strEQ (key, "__DIE__")
1110 || strEQ (key, "__WARN__")))
1111 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1112
1113 return 1;
1114}
1115
1116/* perl does not have a %SIG vtbl, we provide one so we can override */
1117/* the magic vtbl for the __DIE__ and __WARN__ members */
1118static const MGVTBL coro_sig_vtbl = {
1119 0, 0, 0, 0, 0,
1120 coro_sig_copy
1121};
999 1122
1000/* 1123/*
1001 * This overrides the default magic get method of %SIG elements. 1124 * This overrides the default magic get method of %SIG elements.
1002 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1125 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
1003 * and instead of trying to save and restore the hash elements (extremely slow), 1126 * and instead of trying to save and restore the hash elements (extremely slow),
… …
1005 */ 1128 */
1006static int ecb_cold 1129static int ecb_cold
1007coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
1008{ 1131{
1009 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;
1010 1135
1011 if (*s == '_') 1136 SV *ssv;
1012 {
1013 SV **svp = 0;
1014 1137
1015 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1016 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1017
1018 if (svp) 1138 if (!*svp)
1019 {
1020 SV *ssv;
1021
1022 if (!*svp)
1023 ssv = &PL_sv_undef; 1139 ssv = &PL_sv_undef;
1024 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */ 1140 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1025 ssv = sv_2mortal (newRV_inc (*svp)); 1141 ssv = sv_2mortal (newRV_inc (*svp));
1026 else 1142 else
1027 ssv = *svp; 1143 ssv = *svp;
1028 1144
1029 sv_setsv (sv, ssv); 1145 sv_setsv (sv, ssv);
1030 return 0; 1146 return 0;
1031 }
1032 }
1033
1034 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
1035} 1147}
1036 1148
1037static int ecb_cold 1149static int ecb_cold
1038coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1150coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
1039{ 1151{
1040 const char *s = MgPV_nolen_const (mg); 1152 const char *s = MgPV_nolen_const (mg);
1153 /* the key must be either __DIE__ or __WARN__ here */
1154 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1041 1155
1042 if (*s == '_')
1043 {
1044 SV **svp = 0;
1045
1046 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1047 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1048
1049 if (svp)
1050 {
1051 SV *old = *svp; 1156 SV *old = *svp;
1052 *svp = 0; 1157 *svp = 0;
1053 SvREFCNT_dec (old); 1158 SvREFCNT_dec (old);
1054 return 0; 1159 return 0;
1055 }
1056 }
1057
1058 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1059} 1160}
1060 1161
1061static int ecb_cold 1162static int ecb_cold
1062coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1163coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1063{ 1164{
1064 const char *s = MgPV_nolen_const (mg); 1165 const char *s = MgPV_nolen_const (mg);
1166 /* the key must be either __DIE__ or __WARN__ here */
1167 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1065 1168
1066 if (*s == '_')
1067 {
1068 SV **svp = 0;
1069
1070 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1071 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1072
1073 if (svp)
1074 {
1075 SV *old = *svp; 1169 SV *old = *svp;
1076 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1170 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1077 SvREFCNT_dec (old); 1171 SvREFCNT_dec (old);
1078 return 0; 1172 return 0;
1079 }
1080 }
1081
1082 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1083} 1173}
1084 1174
1085static void 1175static void
1086prepare_nop (pTHX_ struct coro_transfer_args *ta) 1176prepare_nop (pTHX_ struct coro_transfer_args *ta)
1087{ 1177{
… …
1098static int 1188static int
1099slf_check_repeat (pTHX_ struct CoroSLF *frame) 1189slf_check_repeat (pTHX_ struct CoroSLF *frame)
1100{ 1190{
1101 return 1; 1191 return 1;
1102} 1192}
1193
1194/** coroutine stack handling ************************************************/
1103 1195
1104static UNOP init_perl_op; 1196static UNOP init_perl_op;
1105 1197
1106ecb_noinline static void /* noinline to keep it out of the transfer fast path */ 1198ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1107init_perl (pTHX_ struct coro *coro) 1199init_perl (pTHX_ struct coro *coro)
… …
1133 1225
1134 GvSV (PL_defgv) = newSV (0); 1226 GvSV (PL_defgv) = newSV (0);
1135 GvAV (PL_defgv) = coro->args; coro->args = 0; 1227 GvAV (PL_defgv) = coro->args; coro->args = 0;
1136 GvSV (PL_errgv) = newSV (0); 1228 GvSV (PL_errgv) = newSV (0);
1137 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1229 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1138 GvHV (PL_hintgv) = 0; 1230 GvHV (PL_hintgv) = newHV ();
1231#if PERL_VERSION_ATLEAST (5,10,0)
1232 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1233#endif
1139 PL_rs = newSVsv (GvSV (irsgv)); 1234 PL_rs = newSVsv (GvSV (irsgv));
1140 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1235 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1141 1236
1142 { 1237 {
1143 dSP; 1238 dSP;
… …
1147 myop.op_next = Nullop; 1242 myop.op_next = Nullop;
1148 myop.op_type = OP_ENTERSUB; 1243 myop.op_type = OP_ENTERSUB;
1149 myop.op_flags = OPf_WANT_VOID; 1244 myop.op_flags = OPf_WANT_VOID;
1150 1245
1151 PUSHMARK (SP); 1246 PUSHMARK (SP);
1152 PUSHs ((SV *)coro->startcv); 1247 XPUSHs ((SV *)coro->startcv);
1153 PUTBACK; 1248 PUTBACK;
1154 PL_op = (OP *)&myop; 1249 PL_op = (OP *)&myop;
1155 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1250 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1156 } 1251 }
1157 1252
… …
1171 PL_op = (OP *)&init_perl_op; 1266 PL_op = (OP *)&init_perl_op;
1172 1267
1173 /* copy throw, in case it was set before init_perl */ 1268 /* copy throw, in case it was set before init_perl */
1174 CORO_THROW = coro->except; 1269 CORO_THROW = coro->except;
1175 1270
1176 SWAP_SVS (coro); 1271 SWAP_SVS_ENTER (coro);
1177 1272
1178 if (ecb_expect_false (enable_times)) 1273 if (ecb_expect_false (enable_times))
1179 { 1274 {
1180 coro_times_update (); 1275 coro_times_update ();
1181 coro_times_sub (coro); 1276 coro_times_sub (coro);
… …
1214 1309
1215 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1310 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1216 1311
1217 save_perl (aTHX_ current); 1312 save_perl (aTHX_ current);
1218 1313
1219 /* this will cause transfer_check to croak on block*/ 1314 /* this will cause transfer_check to croak on block */
1220 SvRV_set (coro_current, (SV *)coro->hv); 1315 SvRV_set (coro_current, (SV *)coro->hv);
1221 1316
1222 load_perl (aTHX_ coro); 1317 load_perl (aTHX_ coro);
1223 1318
1319 /* restore swapped sv's */
1320 SWAP_SVS_LEAVE (coro);
1321
1224 coro_unwind_stacks (aTHX); 1322 coro_unwind_stacks (aTHX);
1225
1226 /* restore swapped sv's */
1227 SWAP_SVS (coro);
1228 1323
1229 coro_destruct_stacks (aTHX); 1324 coro_destruct_stacks (aTHX);
1230 1325
1231 /* now save some sv's to be free'd later */ 1326 /* now save some sv's to be free'd later */
1232 svf [0] = GvSV (PL_defgv); 1327 svf [0] = GvSV (PL_defgv);
… …
1253 1348
1254 SvREFCNT_dec (coro->saved_deffh); 1349 SvREFCNT_dec (coro->saved_deffh);
1255 SvREFCNT_dec (coro->rouse_cb); 1350 SvREFCNT_dec (coro->rouse_cb);
1256 SvREFCNT_dec (coro->invoke_cb); 1351 SvREFCNT_dec (coro->invoke_cb);
1257 SvREFCNT_dec (coro->invoke_av); 1352 SvREFCNT_dec (coro->invoke_av);
1353 SvREFCNT_dec (coro->on_enter_xs);
1354 SvREFCNT_dec (coro->on_leave_xs);
1258 } 1355 }
1259} 1356}
1260 1357
1261ecb_inline void 1358ecb_inline void
1262free_coro_mortal (pTHX) 1359free_coro_mortal (pTHX)
… …
1303 av_push (av, SvREFCNT_inc_NN (*bot++)); 1400 av_push (av, SvREFCNT_inc_NN (*bot++));
1304 1401
1305 PL_runops = RUNOPS_DEFAULT; 1402 PL_runops = RUNOPS_DEFAULT;
1306 ENTER; 1403 ENTER;
1307 SAVETMPS; 1404 SAVETMPS;
1405 PUSHMARK (SP);
1308 EXTEND (SP, 3); 1406 EXTEND (SP, 3);
1309 PUSHMARK (SP);
1310 PUSHs (&PL_sv_no); 1407 PUSHs (&PL_sv_no);
1311 PUSHs (fullname); 1408 PUSHs (fullname);
1312 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 1409 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
1313 PUTBACK; 1410 PUTBACK;
1314 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1411 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
… …
1325 1422
1326 if (PL_curcop != &PL_compiling) 1423 if (PL_curcop != &PL_compiling)
1327 { 1424 {
1328 SV **cb; 1425 SV **cb;
1329 1426
1330 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1427 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1331 { 1428 {
1332 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1429 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1333 1430
1334 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1431 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1335 { 1432 {
… …
1341 gv_efullname3 (fullname, gv, 0); 1438 gv_efullname3 (fullname, gv, 0);
1342 1439
1343 PL_runops = RUNOPS_DEFAULT; 1440 PL_runops = RUNOPS_DEFAULT;
1344 ENTER; 1441 ENTER;
1345 SAVETMPS; 1442 SAVETMPS;
1443 PUSHMARK (SP);
1346 EXTEND (SP, 3); 1444 EXTEND (SP, 3);
1347 PUSHMARK (SP);
1348 PUSHs (&PL_sv_yes); 1445 PUSHs (&PL_sv_yes);
1349 PUSHs (fullname); 1446 PUSHs (fullname);
1350 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1447 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc (SUB_ARGARRAY)) : &PL_sv_undef);
1351 PUTBACK; 1448 PUTBACK;
1352 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1449 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1353 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1450 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1354 SPAGAIN; 1451 SPAGAIN;
1355 FREETMPS; 1452 FREETMPS;
… …
1365 dSP; 1462 dSP;
1366 1463
1367 PL_runops = RUNOPS_DEFAULT; 1464 PL_runops = RUNOPS_DEFAULT;
1368 ENTER; 1465 ENTER;
1369 SAVETMPS; 1466 SAVETMPS;
1370 EXTEND (SP, 3);
1371 PL_runops = RUNOPS_DEFAULT;
1372 PUSHMARK (SP); 1467 PUSHMARK (SP);
1468 EXTEND (SP, 2);
1373 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 1469 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
1374 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 1470 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
1375 PUTBACK; 1471 PUTBACK;
1376 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0); 1472 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
1377 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1473 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
… …
1477 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1573 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1478 * runtime errors here, as this is just a random interpreter, not a thread. 1574 * runtime errors here, as this is just a random interpreter, not a thread.
1479 */ 1575 */
1480 1576
1481 /* 1577 /*
1578 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1579 * requires PL_scopestack_ix, so do it here if required.
1580 */
1581 if (!PL_scopestack_ix)
1582 ENTER;
1583
1584 /*
1482 * If perl-run returns we assume exit() was being called or the coro 1585 * If perl-run returns we assume exit() was being called or the coro
1483 * fell off the end, which seems to be the only valid (non-bug) 1586 * fell off the end, which seems to be the only valid (non-bug)
1484 * reason for perl_run to return. We try to mimic whatever perl is normally 1587 * reason for perl_run to return. We try to mimic whatever perl is normally
1485 * doing in that case. YMMV. 1588 * doing in that case. YMMV.
1486 */ 1589 */
… …
1756 1859
1757static int ecb_cold 1860static int ecb_cold
1758coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1861coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1759{ 1862{
1760 /* called when perl clones the current process the slow way (windows process emulation) */ 1863 /* called when perl clones the current process the slow way (windows process emulation) */
1761 /* WE SIMply nuke the pointers in the copy, causing perl to croak */ 1864 /* we simply nuke the pointers in the copy, causing perl to croak */
1762 mg->mg_ptr = 0; 1865 mg->mg_ptr = 0;
1763 mg->mg_virtual = 0; 1866 mg->mg_virtual = 0;
1764 1867
1765 return 0; 1868 return 0;
1766} 1869}
… …
1912 /* nothing to schedule: call the idle handler */ 2015 /* nothing to schedule: call the idle handler */
1913 if (SvROK (sv_idle) 2016 if (SvROK (sv_idle)
1914 && SvOBJECT (SvRV (sv_idle))) 2017 && SvOBJECT (SvRV (sv_idle)))
1915 { 2018 {
1916 if (SvRV (sv_idle) == SvRV (coro_current)) 2019 if (SvRV (sv_idle) == SvRV (coro_current))
2020 {
2021 require_pv ("Carp");
2022
2023 {
2024 dSP;
2025
2026 ENTER;
2027 SAVETMPS;
2028
2029 PUSHMARK (SP);
1917 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 2030 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2031 PUTBACK;
2032 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2033
2034 FREETMPS;
2035 LEAVE;
2036 }
2037 }
1918 2038
1919 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2039 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1920 api_ready (aTHX_ SvRV (sv_idle)); 2040 api_ready (aTHX_ SvRV (sv_idle));
1921 --coro_nready; 2041 --coro_nready;
1922 } 2042 }
… …
2226 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2346 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2227 } 2347 }
2228 else 2348 else
2229 { 2349 {
2230 struct coro *self = SvSTATE_current; 2350 struct coro *self = SvSTATE_current;
2351
2352 if (!self)
2353 croak ("Coro::cancel called outside of thread content,");
2231 2354
2232 /* otherwise we cancel directly, purely for speed reasons 2355 /* otherwise we cancel directly, purely for speed reasons
2233 * unfortunately, this requires some magic trickery, as 2356 * unfortunately, this requires some magic trickery, as
2234 * somebody else could cancel us, so we have to fight the cancellation. 2357 * somebody else could cancel us, so we have to fight the cancellation.
2235 * this is ugly, and hopefully fully worth the extra speed. 2358 * this is ugly, and hopefully fully worth the extra speed.
… …
2268safe_cancel (pTHX_ struct coro *coro, SV **arg, int items) 2391safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2269{ 2392{
2270 if (coro->cctx) 2393 if (coro->cctx)
2271 croak ("coro inside C callback, unable to cancel at this time, caught"); 2394 croak ("coro inside C callback, unable to cancel at this time, caught");
2272 2395
2273 if (coro->flags & CF_NEW) 2396 if (coro->flags & (CF_NEW | CF_ZOMBIE))
2274 { 2397 {
2275 coro_set_status (aTHX_ coro, arg, items); 2398 coro_set_status (aTHX_ coro, arg, items);
2276 coro_state_destroy (aTHX_ coro); 2399 coro_state_destroy (aTHX_ coro);
2277 } 2400 }
2278 else 2401 else
… …
2345 else 2468 else
2346 { 2469 {
2347 av_clear (GvAV (PL_defgv)); 2470 av_clear (GvAV (PL_defgv));
2348 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2471 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2349 2472
2473 if (ecb_expect_false (coro->swap_sv))
2474 {
2475 SWAP_SVS_LEAVE (coro);
2476 SvREFCNT_dec_NN (coro->swap_sv);
2477 coro->swap_sv = 0;
2478 }
2479
2350 coro->prio = 0; 2480 coro->prio = 0;
2351 2481
2352 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2482 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2353 api_trace (aTHX_ coro_current, 0); 2483 api_trace (aTHX_ coro_current, 0);
2354 2484
2355 frame->prepare = prepare_schedule; 2485 frame->prepare = prepare_schedule;
2356 av_push (av_async_pool, SvREFCNT_inc (hv)); 2486 av_push (av_async_pool, SvREFCNT_inc_NN (hv));
2357 } 2487 }
2358 } 2488 }
2359 else 2489 else
2360 { 2490 {
2361 /* first iteration, simply fall through */ 2491 /* first iteration, simply fall through */
… …
2374static void 2504static void
2375coro_rouse_callback (pTHX_ CV *cv) 2505coro_rouse_callback (pTHX_ CV *cv)
2376{ 2506{
2377 dXSARGS; 2507 dXSARGS;
2378 SV *data = (SV *)S_GENSUB_ARG; 2508 SV *data = (SV *)S_GENSUB_ARG;
2509 SV *coro = SvRV (data);
2379 2510
2511 /* data starts being either undef or a coro, and is replaced by the results when done */
2380 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2512 if (SvTYPE (coro) != SVt_PVAV)
2381 { 2513 {
2382 /* first call, set args */ 2514 /* first call, set args */
2383 SV *coro = SvRV (data);
2384 AV *av = newAV ();
2385 2515
2386 SvRV_set (data, (SV *)av); 2516 assert (&ST (0) < &ST (1)); /* ensure the stack is in the order we expect it to be */
2517 SvRV_set (data, (SV *)av_make (items, &ST (0))); /* av_make copies the SVs */
2387 2518
2388 /* better take a full copy of the arguments */ 2519 if (coro != &PL_sv_undef)
2389 while (items--) 2520 {
2390 av_store (av, items, newSVsv (ST (items)));
2391
2392 api_ready (aTHX_ coro); 2521 api_ready (aTHX_ coro);
2393 SvREFCNT_dec (coro); 2522 SvREFCNT_dec_NN (coro);
2523 }
2394 } 2524 }
2395 2525
2396 XSRETURN_EMPTY; 2526 XSRETURN_EMPTY;
2397} 2527}
2398 2528
… …
2415 2545
2416 EXTEND (SP, AvFILLp (av) + 1); 2546 EXTEND (SP, AvFILLp (av) + 1);
2417 for (i = 0; i <= AvFILLp (av); ++i) 2547 for (i = 0; i <= AvFILLp (av); ++i)
2418 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2548 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2419 2549
2420 /* we have stolen the elements, so set length to zero and free */ 2550 /* we have stolen the elements, make it unreal and free */
2421 AvFILLp (av) = -1; 2551 AvREAL_off (av);
2422 av_undef (av); 2552 av_undef (av);
2423 2553
2424 PUTBACK; 2554 PUTBACK;
2425 } 2555 }
2426 2556
… …
2451 croak ("Coro::rouse_wait called with illegal callback argument,"); 2581 croak ("Coro::rouse_wait called with illegal callback argument,");
2452 2582
2453 { 2583 {
2454 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2584 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2455 SV *data = (SV *)S_GENSUB_ARG; 2585 SV *data = (SV *)S_GENSUB_ARG;
2586 int data_ready = SvTYPE (SvRV (data)) == SVt_PVAV;
2587
2588 /* if there is no data, we need to store the current coro in the reference so we can be woken up */
2589 if (!data_ready)
2590 if (SvRV (data) != &PL_sv_undef)
2591 croak ("Coro::rouse_wait was called on a calback that is already being waited for - only one thread can wait for a rouse callback, caught");
2592 else
2593 SvRV_set (data, SvREFCNT_inc_NN (SvRV (coro_current)));
2456 2594
2457 frame->data = (void *)data; 2595 frame->data = (void *)data;
2458 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2596 frame->prepare = data_ready ? prepare_nop : prepare_schedule;
2459 frame->check = slf_check_rouse_wait; 2597 frame->check = slf_check_rouse_wait;
2460 } 2598 }
2461} 2599}
2462 2600
2463static SV * 2601static SV *
2464coro_new_rouse_cb (pTHX) 2602coro_new_rouse_cb (pTHX)
2465{ 2603{
2466 HV *hv = (HV *)SvRV (coro_current); 2604 HV *hv = (HV *)SvRV (coro_current);
2467 struct coro *coro = SvSTATE_hv (hv); 2605 struct coro *coro = SvSTATE_hv (hv);
2468 SV *data = newRV_inc ((SV *)hv); 2606 SV *data = newRV_noinc (&PL_sv_undef);
2469 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data); 2607 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2470 2608
2471 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2609 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2472 SvREFCNT_dec (data); /* magicext increases the refcount */ 2610 SvREFCNT_dec_NN (data); /* magicext increases the refcount */
2473 2611
2474 SvREFCNT_dec (coro->rouse_cb); 2612 SvREFCNT_dec (coro->rouse_cb);
2475 coro->rouse_cb = SvREFCNT_inc_NN (cb); 2613 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2476 2614
2477 return cb; 2615 return cb;
… …
2577 2715
2578/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2716/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2579static void 2717static void
2580slf_destroy (pTHX_ struct coro *coro) 2718slf_destroy (pTHX_ struct coro *coro)
2581{ 2719{
2582 /* this callback is reserved for slf functions needing to do cleanup */ 2720 struct CoroSLF frame = coro->slf_frame;
2583 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2584 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2585 2721
2586 /* 2722 /*
2587 * The on_destroy above most likely is from an SLF call. 2723 * The on_destroy below most likely is from an SLF call.
2588 * Since by definition the SLF call will not finish when we destroy 2724 * Since by definition the SLF call will not finish when we destroy
2589 * the coro, we will have to force-finish it here, otherwise 2725 * the coro, we will have to force-finish it here, otherwise
2590 * cleanup functions cannot call SLF functions. 2726 * cleanup functions cannot call SLF functions.
2591 */ 2727 */
2592 coro->slf_frame.prepare = 0; 2728 coro->slf_frame.prepare = 0;
2729
2730 /* this callback is reserved for slf functions needing to do cleanup */
2731 if (frame.destroy && frame.prepare && !PL_dirty)
2732 frame.destroy (aTHX_ &frame);
2593} 2733}
2594 2734
2595/* 2735/*
2596 * these not obviously related functions are all rolled into one 2736 * these not obviously related functions are all rolled into one
2597 * function to increase chances that they all will call transfer with the same 2737 * function to increase chances that they all will call transfer with the same
… …
2780static void 2920static void
2781coro_pop_on_leave (pTHX_ void *coro) 2921coro_pop_on_leave (pTHX_ void *coro)
2782{ 2922{
2783 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2923 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2784 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2924 on_enterleave_call (aTHX_ sv_2mortal (cb));
2925}
2926
2927static void
2928enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2929{
2930 if (!hook)
2931 return;
2932
2933 if (!*avp)
2934 {
2935 *avp = newAV ();
2936 AvREAL_off (*avp);
2937 }
2938
2939 av_push (*avp, (SV *)hook);
2940 av_push (*avp, (SV *)arg);
2941}
2942
2943static void
2944enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2945{
2946 AV *av = *avp;
2947 int i;
2948
2949 if (!av)
2950 return;
2951
2952 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2953 if (AvARRAY (av)[i] == (SV *)hook)
2954 {
2955 if (execute)
2956 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2957
2958 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2959 av_pop (av);
2960 av_pop (av);
2961 break;
2962 }
2963
2964 if (AvFILLp (av) >= 0)
2965 {
2966 *avp = 0;
2967 SvREFCNT_dec_NN (av);
2968 }
2969}
2970
2971static void
2972api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2973{
2974 struct coro *coro = SvSTATE (coro_sv);
2975
2976 if (SvSTATE_current == coro)
2977 if (enter)
2978 enter (aTHX_ enter_arg);
2979
2980 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2981 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2982}
2983
2984static void
2985api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2986{
2987 struct coro *coro = SvSTATE (coro_sv);
2988
2989 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2990 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2991}
2992
2993static void
2994savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2995{
2996 struct coro *coro = SvSTATE_current;
2997
2998 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2999}
3000
3001static void
3002savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
3003{
3004 struct coro *coro = SvSTATE_current;
3005
3006 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
3007}
3008
3009static void
3010api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
3011{
3012 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
3013
3014 /* this ought to be much cheaper than malloc + a single destructor call */
3015 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
3016 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2785} 3017}
2786 3018
2787/*****************************************************************************/ 3019/*****************************************************************************/
2788/* PerlIO::cede */ 3020/* PerlIO::cede */
2789 3021
… …
2919 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3151 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2920 PUTBACK; 3152 PUTBACK;
2921 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3153 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2922 } 3154 }
2923 3155
2924 SvREFCNT_dec (cb); 3156 SvREFCNT_dec_NN (cb);
2925 } 3157 }
2926} 3158}
2927 3159
2928static void 3160static void
2929coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3161coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
2937{ 3169{
2938 AV *av = (AV *)frame->data; 3170 AV *av = (AV *)frame->data;
2939 SV *count_sv = AvARRAY (av)[0]; 3171 SV *count_sv = AvARRAY (av)[0];
2940 SV *coro_hv = SvRV (coro_current); 3172 SV *coro_hv = SvRV (coro_current);
2941 3173
3174 frame->destroy = 0;
3175
2942 /* if we are about to throw, don't actually acquire the lock, just throw */ 3176 /* if we are about to throw, don't actually acquire the lock, just throw */
2943 if (CORO_THROW) 3177 if (ecb_expect_false (CORO_THROW))
3178 {
3179 /* we still might be responsible for the semaphore, so wake up others */
3180 coro_semaphore_adjust (aTHX_ av, 0);
3181
2944 return 0; 3182 return 0;
3183 }
2945 else if (SvIVX (count_sv) > 0) 3184 else if (SvIVX (count_sv) > 0)
2946 { 3185 {
2947 frame->destroy = 0;
2948
2949 if (acquire) 3186 if (acquire)
2950 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3187 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2951 else 3188 else
2952 coro_semaphore_adjust (aTHX_ av, 0); 3189 coro_semaphore_adjust (aTHX_ av, 0);
2953 3190
… …
3064 { 3301 {
3065 api_ready (aTHX_ cb); 3302 api_ready (aTHX_ cb);
3066 sv_setiv (cb, 0); /* signal waiter */ 3303 sv_setiv (cb, 0); /* signal waiter */
3067 } 3304 }
3068 3305
3069 SvREFCNT_dec (cb); 3306 SvREFCNT_dec_NN (cb);
3070 3307
3071 --count; 3308 --count;
3072 } 3309 }
3073} 3310}
3074 3311
… …
3159 } 3396 }
3160 3397
3161 av_push (state, data_sv); 3398 av_push (state, data_sv);
3162 3399
3163 api_ready (aTHX_ coro); 3400 api_ready (aTHX_ coro);
3164 SvREFCNT_dec (coro); 3401 SvREFCNT_dec_NN (coro);
3165 SvREFCNT_dec ((AV *)state); 3402 SvREFCNT_dec_NN ((AV *)state);
3166} 3403}
3167 3404
3168static int 3405static int
3169slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3406slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3170{ 3407{
… …
3188 errno = data->errorno; 3425 errno = data->errorno;
3189 PL_laststype = data->laststype; 3426 PL_laststype = data->laststype;
3190 PL_laststatval = data->laststatval; 3427 PL_laststatval = data->laststatval;
3191 PL_statcache = data->statcache; 3428 PL_statcache = data->statcache;
3192 3429
3193 SvREFCNT_dec (data_sv); 3430 SvREFCNT_dec_NN (data_sv);
3194 } 3431 }
3195 3432
3196 /* push result values */ 3433 /* push result values */
3197 { 3434 {
3198 dSP; 3435 dSP;
… …
3387 3624
3388 map_len = load_len + save_len + 16; 3625 map_len = load_len + save_len + 16;
3389 3626
3390 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 3627 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3391 3628
3629 if (map_base == (char *)MAP_FAILED)
3630 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3631
3392 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3632 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3393 3633
3394 load_perl_slots = (load_save_perl_slots_type)map_base; 3634 load_perl_slots = (load_save_perl_slots_type)map_base;
3395 memcpy (map_base, load_ptr, load_len); 3635 memcpy (map_base, load_ptr, load_len);
3396 3636
… …
3413 3653
3414PROTOTYPES: DISABLE 3654PROTOTYPES: DISABLE
3415 3655
3416BOOT: 3656BOOT:
3417{ 3657{
3658#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3659#include "state.h"
3418#ifdef USE_ITHREADS 3660#ifdef USE_ITHREADS
3419# if CORO_PTHREAD 3661# if CORO_PTHREAD
3420 coro_thx = PERL_GET_CONTEXT; 3662 coro_thx = PERL_GET_CONTEXT;
3421# endif 3663# endif
3422#endif 3664#endif
… …
3430 cctx_current = cctx_new_empty (); 3672 cctx_current = cctx_new_empty ();
3431 3673
3432 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3674 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3433 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3675 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3434 3676
3435 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3677 {
3436 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3678 /*
3437 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3679 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3680 * by coro_sig_vtbl in hash values.
3681 */
3682 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3683
3684 /* this only works if perl doesn't have a vtbl for %SIG */
3685 assert (!mg->mg_virtual);
3686
3687 /*
3688 * The irony is that the perl API itself asserts that mg_virtual
3689 * must be non-const, yet perl5porters insisted on marking their
3690 * vtbls as read-only, just to thwart perl modules from patching
3691 * them.
3692 */
3693 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3694 mg->mg_flags |= MGf_COPY;
3695
3696 coro_sigelem_vtbl = PL_vtbl_sigelem;
3697 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3698 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3699 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3700 }
3438 3701
3439 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3440 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3702 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3441 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3703 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3442 3704
3443 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3705 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3706
3707 newCONSTSUB (coro_state_stash, "BACKEND", newSVpv (CORO_BACKEND, 0)); /* undocumented */
3444 3708
3445 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 3709 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
3446 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 3710 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
3447 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 3711 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
3448 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 3712 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
… …
3573call (Coro::State coro, SV *coderef) 3837call (Coro::State coro, SV *coderef)
3574 ALIAS: 3838 ALIAS:
3575 eval = 1 3839 eval = 1
3576 CODE: 3840 CODE:
3577{ 3841{
3842 struct coro *current = SvSTATE_current;
3843
3578 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3844 if ((coro == current) || (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)))
3579 { 3845 {
3580 struct coro *current = SvSTATE_current;
3581 struct CoroSLF slf_save; 3846 struct CoroSLF slf_save;
3582 3847
3583 if (current != coro) 3848 if (current != coro)
3584 { 3849 {
3585 PUTBACK; 3850 PUTBACK;
… …
3750 if (ecb_expect_false (current == self)) 4015 if (ecb_expect_false (current == self))
3751 coro_times_sub (SvSTATE (coro_current)); 4016 coro_times_sub (SvSTATE (coro_current));
3752} 4017}
3753 4018
3754void 4019void
3755swap_sv (Coro::State coro, SV *sv, SV *swapsv) 4020swap_sv (Coro::State coro, SV *sva, SV *svb)
3756 CODE: 4021 CODE:
3757{ 4022{
3758 struct coro *current = SvSTATE_current; 4023 struct coro *current = SvSTATE_current;
4024 AV *swap_sv;
4025 int i;
4026
4027 sva = SvRV (sva);
4028 svb = SvRV (svb);
3759 4029
3760 if (current == coro) 4030 if (current == coro)
3761 SWAP_SVS (current); 4031 SWAP_SVS_LEAVE (current);
3762 4032
3763 if (!coro->swap_sv) 4033 if (!coro->swap_sv)
3764 coro->swap_sv = newAV (); 4034 coro->swap_sv = newAV ();
3765 4035
4036 swap_sv = coro->swap_sv;
4037
4038 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4039 {
4040 SV *a = AvARRAY (swap_sv)[i ];
4041 SV *b = AvARRAY (swap_sv)[i + 1];
4042
4043 if (a == sva && b == svb)
4044 {
4045 SvREFCNT_dec_NN (a);
4046 SvREFCNT_dec_NN (b);
4047
4048 for (; i <= AvFILLp (swap_sv) - 2; i++)
4049 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4050
4051 AvFILLp (swap_sv) -= 2;
4052
4053 goto removed;
4054 }
4055 }
4056
3766 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4057 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3767 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4058 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4059
4060 removed:
3768 4061
3769 if (current == coro) 4062 if (current == coro)
3770 SWAP_SVS (current); 4063 SWAP_SVS_ENTER (current);
3771} 4064}
3772 4065
3773 4066
3774MODULE = Coro::State PACKAGE = Coro 4067MODULE = Coro::State PACKAGE = Coro
3775 4068
3776BOOT: 4069BOOT:
3777{ 4070{
4071 if (SVt_LAST > 32)
4072 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4073
3778 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4074 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3779 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4075 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3780 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4076 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3781 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4077 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3782 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4078 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3808 coroapi.ready = api_ready; 4104 coroapi.ready = api_ready;
3809 coroapi.is_ready = api_is_ready; 4105 coroapi.is_ready = api_is_ready;
3810 coroapi.nready = coro_nready; 4106 coroapi.nready = coro_nready;
3811 coroapi.current = coro_current; 4107 coroapi.current = coro_current;
3812 4108
4109 coroapi.enterleave_hook = api_enterleave_hook;
4110 coroapi.enterleave_unhook = api_enterleave_unhook;
4111 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4112
3813 /*GCoroAPI = &coroapi;*/ 4113 /*GCoroAPI = &coroapi;*/
3814 sv_setiv (sv, (IV)&coroapi); 4114 sv_setiv (sv, PTR2IV (&coroapi));
3815 SvREADONLY_on (sv); 4115 SvREADONLY_on (sv);
3816 } 4116 }
3817} 4117}
3818 4118
3819SV * 4119SV *
… …
3882 4182
3883void 4183void
3884_set_current (SV *current) 4184_set_current (SV *current)
3885 PROTOTYPE: $ 4185 PROTOTYPE: $
3886 CODE: 4186 CODE:
3887 SvREFCNT_dec (SvRV (coro_current)); 4187 SvREFCNT_dec_NN (SvRV (coro_current));
3888 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4188 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3889 4189
3890void 4190void
3891_set_readyhook (SV *hook) 4191_set_readyhook (SV *hook)
3892 PROTOTYPE: $ 4192 PROTOTYPE: $
… …
3976 4276
3977 if ((SV *)hv == &PL_sv_undef) 4277 if ((SV *)hv == &PL_sv_undef)
3978 { 4278 {
3979 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4279 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3980 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4280 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3981 SvREFCNT_dec (sv); 4281 SvREFCNT_dec_NN (sv);
3982 } 4282 }
3983 4283
3984 { 4284 {
3985 struct coro *coro = SvSTATE_hv (hv); 4285 struct coro *coro = SvSTATE_hv (hv);
3986 4286
… …
3993 api_ready (aTHX_ (SV *)hv); 4293 api_ready (aTHX_ (SV *)hv);
3994 4294
3995 if (GIMME_V != G_VOID) 4295 if (GIMME_V != G_VOID)
3996 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4296 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3997 else 4297 else
3998 SvREFCNT_dec (hv); 4298 SvREFCNT_dec_NN (hv);
3999} 4299}
4000 4300
4001SV * 4301SV *
4002rouse_cb () 4302rouse_cb ()
4003 PROTOTYPE: 4303 PROTOTYPE:
… …
4082 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4382 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4083 OUTPUT: 4383 OUTPUT:
4084 RETVAL 4384 RETVAL
4085 4385
4086void 4386void
4087up (SV *self, int adjust = 1) 4387up (SV *self)
4088 ALIAS:
4089 adjust = 1
4090 CODE: 4388 CODE:
4389 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4390
4391void
4392adjust (SV *self, int adjust)
4393 CODE:
4091 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4394 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4092 4395
4093void 4396void
4094down (...) 4397down (...)
4095 CODE: 4398 CODE:
4096 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4399 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);

Diff Legend

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