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.435 by root, Sat Nov 2 19:49:33 2013 UTC vs.
Revision 1.478 by root, Mon Mar 16 11:12:52 2020 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
81
82/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
83/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
84#if PERL_VERSION_ATLEAST(5,19,0)
85# define SVt_BIND SVt_IV
86#endif
46 87
47#if defined(_WIN32) 88#if defined(_WIN32)
48# undef HAS_GETTIMEOFDAY 89# undef HAS_GETTIMEOFDAY
49# undef setjmp 90# undef setjmp
50# undef longjmp 91# undef longjmp
… …
95# define CORO_CLOCK_MONOTONIC 1 136# define CORO_CLOCK_MONOTONIC 1
96# define CORO_CLOCK_THREAD_CPUTIME_ID 3 137# define CORO_CLOCK_THREAD_CPUTIME_ID 3
97# endif 138# endif
98#endif 139#endif
99 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
100static double (*nvtime)(); /* so why doesn't it take void? */ 159static double (*nvtime)(); /* so why doesn't it take void? */
101static void (*u2time)(pTHX_ UV ret[2]); 160static void (*u2time)(pTHX_ UV ret[2]);
102 161
103/* we hijack an hopefully unused CV flag for our purposes */ 162/* we hijack an hopefully unused CV flag for our purposes */
104#define CVf_SLF 0x4000 163#define CVf_SLF 0x4000
… …
119 178
120static GV *irsgv; /* $/ */ 179static GV *irsgv; /* $/ */
121static GV *stdoutgv; /* *STDOUT */ 180static GV *stdoutgv; /* *STDOUT */
122static SV *rv_diehook; 181static SV *rv_diehook;
123static SV *rv_warnhook; 182static SV *rv_warnhook;
124static HV *hv_sig; /* %SIG */
125 183
126/* async_pool helper stuff */ 184/* async_pool helper stuff */
127static SV *sv_pool_rss; 185static SV *sv_pool_rss;
128static SV *sv_pool_size; 186static SV *sv_pool_size;
129static SV *sv_async_pool_idle; /* description string */ 187static SV *sv_async_pool_idle; /* description string */
… …
225 int usecount; /* number of transfers to this coro */ 283 int usecount; /* number of transfers to this coro */
226 284
227 /* coro process data */ 285 /* coro process data */
228 int prio; 286 int prio;
229 SV *except; /* exception to be thrown */ 287 SV *except; /* exception to be thrown */
230 SV *rouse_cb; /* last rouse callback */ 288 SV *rouse_cb; /* most recently created rouse callback */
231 AV *on_destroy; /* callbacks or coros to notify on destroy */ 289 AV *on_destroy; /* callbacks or coros to notify on destroy */
232 AV *status; /* the exit status list */ 290 AV *status; /* the exit status list */
233 291
234 /* async_pool */ 292 /* async_pool */
235 SV *saved_deffh; 293 SV *saved_deffh;
236 SV *invoke_cb; 294 SV *invoke_cb;
237 AV *invoke_av; 295 AV *invoke_av;
238 296
239 /* on_enter/on_leave */ 297 /* on_enter/on_leave */
240 AV *on_enter; 298 AV *on_enter; AV *on_enter_xs;
241 AV *on_leave; 299 AV *on_leave; AV *on_leave_xs;
242 300
243 /* swap_sv */ 301 /* swap_sv */
244 AV *swap_sv; 302 AV *swap_sv;
245 303
246 /* times */ 304 /* times */
… …
482 540
483 return 0; 541 return 0;
484} 542}
485 543
486ecb_inline struct coro * 544ecb_inline struct coro *
487SvSTATE_ (pTHX_ SV *coro) 545SvSTATE_ (pTHX_ SV *coro_sv)
488{ 546{
489 MAGIC *mg; 547 MAGIC *mg;
490 548
491 if (SvROK (coro)) 549 if (SvROK (coro_sv))
492 coro = SvRV (coro); 550 coro_sv = SvRV (coro_sv);
493 551
494 mg = SvSTATEhv_p (aTHX_ coro); 552 mg = SvSTATEhv_p (aTHX_ coro_sv);
495 if (!mg) 553 if (!mg)
496 croak ("Coro::State object required"); 554 croak ("Coro::State object required");
497 555
498 return (struct coro *)mg->mg_ptr; 556 return (struct coro *)mg->mg_ptr;
499} 557}
… …
510ecb_inline PADLIST * 568ecb_inline PADLIST *
511coro_derive_padlist (pTHX_ CV *cv) 569coro_derive_padlist (pTHX_ CV *cv)
512{ 570{
513 PADLIST *padlist = CvPADLIST (cv); 571 PADLIST *padlist = CvPADLIST (cv);
514 PADLIST *newpadlist; 572 PADLIST *newpadlist;
573 PADNAMELIST *padnames;
515 PAD *newpad; 574 PAD *newpad;
516 PADOFFSET off = PadlistMAX (padlist) + 1; 575 PADOFFSET off = PadlistMAX (padlist) + 1;
517 576
518#if NEWPADAPI 577#if NEWPADAPI
519 578
579 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
580 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
520 while (!PadlistARRAY (padlist)[off - 1]) 581 while (!PadlistARRAY (padlist)[off - 1])
521 --off; 582 --off;
522 583
523 Perl_pad_push (aTHX_ padlist, off); 584 Perl_pad_push (aTHX_ padlist, off);
524 585
… …
544 AvREAL_off (newpadlist); 605 AvREAL_off (newpadlist);
545#endif 606#endif
546 607
547 /* Already extended to 2 elements by newPADLIST. */ 608 /* Already extended to 2 elements by newPADLIST. */
548 PadlistMAX (newpadlist) = 1; 609 PadlistMAX (newpadlist) = 1;
549 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist)); 610
611 padnames = PadlistNAMES (padlist);
612 ++PadnamelistREFCNT (padnames);
613 PadlistNAMES (newpadlist) = padnames;
614
550 PadlistARRAY (newpadlist)[1] = newpad; 615 PadlistARRAY (newpadlist)[1] = newpad;
551 616
552 return newpadlist; 617 return newpadlist;
553} 618}
554 619
… …
562 627
563 while (i > 0) /* special-case index 0 */ 628 while (i > 0) /* special-case index 0 */
564 { 629 {
565 /* we try to be extra-careful here */ 630 /* we try to be extra-careful here */
566 PAD *pad = PadlistARRAY (padlist)[i--]; 631 PAD *pad = PadlistARRAY (padlist)[i--];
632
633 if (pad)
634 {
567 I32 j = PadMAX (pad); 635 I32 j = PadMAX (pad);
568 636
569 while (j >= 0) 637 while (j >= 0)
570 SvREFCNT_dec (PadARRAY (pad)[j--]); 638 SvREFCNT_dec (PadARRAY (pad)[j--]);
571 639
572 PadMAX (pad) = -1; 640 PadMAX (pad) = -1;
573 SvREFCNT_dec (pad); 641 SvREFCNT_dec (pad);
642 }
574 } 643 }
575 644
576 SvREFCNT_dec (PadlistNAMES (padlist)); 645 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
577 646
578#if NEWPADAPI 647#if NEWPADAPI
579 Safefree (PadlistARRAY (padlist)); 648 Safefree (PadlistARRAY (padlist));
580 Safefree (padlist); 649 Safefree (padlist);
581#else 650#else
… …
677 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;
678 747
679 /* 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,
680 * 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.
681 */ 750 */
682 #define svany_in_head(type) \ 751 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
683 (((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)))
684 757
685 if (svany_in_head (SvTYPE (a))) 758 if (svany_in_head (SvTYPE (a)))
686 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 759 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
687 760
688 if (svany_in_head (SvTYPE (b))) 761 if (svany_in_head (SvTYPE (b)))
… …
691#endif 764#endif
692} 765}
693 766
694/* swap sv heads, at least logically */ 767/* swap sv heads, at least logically */
695static void 768static void
696swap_svs (pTHX_ Coro__State c) 769swap_svs_enter (pTHX_ Coro__State c)
697{ 770{
698 int i; 771 int i;
699 772
700 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 773 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
701 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]);
702} 775}
703 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
704#define SWAP_SVS(coro) \ 786#define SWAP_SVS_ENTER(coro) \
705 if (ecb_expect_false ((coro)->swap_sv)) \ 787 if (ecb_expect_false ((coro)->swap_sv)) \
706 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))
707 793
708static void 794static void
709on_enterleave_call (pTHX_ SV *cb); 795on_enterleave_call (pTHX_ SV *cb);
710 796
711static void 797static void
… …
756 842
757 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 843 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
758 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 844 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
759 } 845 }
760 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
761 SWAP_SVS (c); 855 SWAP_SVS_ENTER (c);
762} 856}
763 857
764static void 858static void
765save_perl (pTHX_ Coro__State c) 859save_perl (pTHX_ Coro__State c)
766{ 860{
767 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 }
768 870
769 if (ecb_expect_false (c->on_leave)) 871 if (ecb_expect_false (c->on_leave))
770 { 872 {
771 int i; 873 int i;
772 874
… …
899#endif 1001#endif
900 1002
901 New(54,PL_savestack,24,ANY); 1003 New(54,PL_savestack,24,ANY);
902 PL_savestack_ix = 0; 1004 PL_savestack_ix = 0;
903 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
904 1011
905#if !PERL_VERSION_ATLEAST (5,10,0) 1012#if !PERL_VERSION_ATLEAST (5,10,0)
906 New(54,PL_retstack,4,OP*); 1013 New(54,PL_retstack,4,OP*);
907 PL_retstack_ix = 0; 1014 PL_retstack_ix = 0;
908 PL_retstack_max = 4; 1015 PL_retstack_max = 4;
… …
974 } 1081 }
975 1082
976 return rss; 1083 return rss;
977} 1084}
978 1085
979/** coroutine stack handling ************************************************/ 1086/** provide custom get/set/clear methods for %SIG elements ******************/
980
981static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
982static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
983static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
984 1087
985/* apparently < 5.8.8 */ 1088/* apparently < 5.8.8 */
986#ifndef MgPV_nolen_const 1089#ifndef MgPV_nolen_const
987#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1090#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
988 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1091 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
989 (const char*)(mg)->mg_ptr) 1092 (const char*)(mg)->mg_ptr)
990#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};
991 1122
992/* 1123/*
993 * This overrides the default magic get method of %SIG elements. 1124 * This overrides the default magic get method of %SIG elements.
994 * 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
995 * 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),
… …
997 */ 1128 */
998static int ecb_cold 1129static int ecb_cold
999coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
1000{ 1131{
1001 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;
1002 1135
1003 if (*s == '_') 1136 SV *ssv;
1004 {
1005 SV **svp = 0;
1006 1137
1007 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1008 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1009
1010 if (svp) 1138 if (!*svp)
1011 {
1012 SV *ssv;
1013
1014 if (!*svp)
1015 ssv = &PL_sv_undef; 1139 ssv = &PL_sv_undef;
1016 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. */
1017 ssv = sv_2mortal (newRV_inc (*svp)); 1141 ssv = sv_2mortal (newRV_inc (*svp));
1018 else 1142 else
1019 ssv = *svp; 1143 ssv = *svp;
1020 1144
1021 sv_setsv (sv, ssv); 1145 sv_setsv (sv, ssv);
1022 return 0; 1146 return 0;
1023 }
1024 }
1025
1026 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
1027} 1147}
1028 1148
1029static int ecb_cold 1149static int ecb_cold
1030coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1150coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
1031{ 1151{
1032 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;
1033 1155
1034 if (*s == '_')
1035 {
1036 SV **svp = 0;
1037
1038 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1039 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1040
1041 if (svp)
1042 {
1043 SV *old = *svp; 1156 SV *old = *svp;
1044 *svp = 0; 1157 *svp = 0;
1045 SvREFCNT_dec (old); 1158 SvREFCNT_dec (old);
1046 return 0; 1159 return 0;
1047 }
1048 }
1049
1050 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1051} 1160}
1052 1161
1053static int ecb_cold 1162static int ecb_cold
1054coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1163coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1055{ 1164{
1056 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;
1057 1168
1058 if (*s == '_')
1059 {
1060 SV **svp = 0;
1061
1062 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1063 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1064
1065 if (svp)
1066 {
1067 SV *old = *svp; 1169 SV *old = *svp;
1068 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1170 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1069 SvREFCNT_dec (old); 1171 SvREFCNT_dec (old);
1070 return 0; 1172 return 0;
1071 }
1072 }
1073
1074 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1075} 1173}
1076 1174
1077static void 1175static void
1078prepare_nop (pTHX_ struct coro_transfer_args *ta) 1176prepare_nop (pTHX_ struct coro_transfer_args *ta)
1079{ 1177{
… …
1090static int 1188static int
1091slf_check_repeat (pTHX_ struct CoroSLF *frame) 1189slf_check_repeat (pTHX_ struct CoroSLF *frame)
1092{ 1190{
1093 return 1; 1191 return 1;
1094} 1192}
1193
1194/** coroutine stack handling ************************************************/
1095 1195
1096static UNOP init_perl_op; 1196static UNOP init_perl_op;
1097 1197
1098ecb_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 */
1099init_perl (pTHX_ struct coro *coro) 1199init_perl (pTHX_ struct coro *coro)
… …
1125 1225
1126 GvSV (PL_defgv) = newSV (0); 1226 GvSV (PL_defgv) = newSV (0);
1127 GvAV (PL_defgv) = coro->args; coro->args = 0; 1227 GvAV (PL_defgv) = coro->args; coro->args = 0;
1128 GvSV (PL_errgv) = newSV (0); 1228 GvSV (PL_errgv) = newSV (0);
1129 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);
1130 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
1131 PL_rs = newSVsv (GvSV (irsgv)); 1234 PL_rs = newSVsv (GvSV (irsgv));
1132 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1235 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1133 1236
1134 { 1237 {
1135 dSP; 1238 dSP;
… …
1139 myop.op_next = Nullop; 1242 myop.op_next = Nullop;
1140 myop.op_type = OP_ENTERSUB; 1243 myop.op_type = OP_ENTERSUB;
1141 myop.op_flags = OPf_WANT_VOID; 1244 myop.op_flags = OPf_WANT_VOID;
1142 1245
1143 PUSHMARK (SP); 1246 PUSHMARK (SP);
1144 PUSHs ((SV *)coro->startcv); 1247 XPUSHs ((SV *)coro->startcv);
1145 PUTBACK; 1248 PUTBACK;
1146 PL_op = (OP *)&myop; 1249 PL_op = (OP *)&myop;
1147 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1250 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1148 } 1251 }
1149 1252
… …
1163 PL_op = (OP *)&init_perl_op; 1266 PL_op = (OP *)&init_perl_op;
1164 1267
1165 /* copy throw, in case it was set before init_perl */ 1268 /* copy throw, in case it was set before init_perl */
1166 CORO_THROW = coro->except; 1269 CORO_THROW = coro->except;
1167 1270
1168 SWAP_SVS (coro); 1271 SWAP_SVS_ENTER (coro);
1169 1272
1170 if (ecb_expect_false (enable_times)) 1273 if (ecb_expect_false (enable_times))
1171 { 1274 {
1172 coro_times_update (); 1275 coro_times_update ();
1173 coro_times_sub (coro); 1276 coro_times_sub (coro);
… …
1211 /* this will cause transfer_check to croak on block*/ 1314 /* this will cause transfer_check to croak on block*/
1212 SvRV_set (coro_current, (SV *)coro->hv); 1315 SvRV_set (coro_current, (SV *)coro->hv);
1213 1316
1214 load_perl (aTHX_ coro); 1317 load_perl (aTHX_ coro);
1215 1318
1319 /* restore swapped sv's */
1320 SWAP_SVS_LEAVE (coro);
1321
1216 coro_unwind_stacks (aTHX); 1322 coro_unwind_stacks (aTHX);
1217
1218 /* restore swapped sv's */
1219 SWAP_SVS (coro);
1220 1323
1221 coro_destruct_stacks (aTHX); 1324 coro_destruct_stacks (aTHX);
1222 1325
1223 /* now save some sv's to be free'd later */ 1326 /* now save some sv's to be free'd later */
1224 svf [0] = GvSV (PL_defgv); 1327 svf [0] = GvSV (PL_defgv);
… …
1245 1348
1246 SvREFCNT_dec (coro->saved_deffh); 1349 SvREFCNT_dec (coro->saved_deffh);
1247 SvREFCNT_dec (coro->rouse_cb); 1350 SvREFCNT_dec (coro->rouse_cb);
1248 SvREFCNT_dec (coro->invoke_cb); 1351 SvREFCNT_dec (coro->invoke_cb);
1249 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);
1250 } 1355 }
1251} 1356}
1252 1357
1253ecb_inline void 1358ecb_inline void
1254free_coro_mortal (pTHX) 1359free_coro_mortal (pTHX)
… …
1295 av_push (av, SvREFCNT_inc_NN (*bot++)); 1400 av_push (av, SvREFCNT_inc_NN (*bot++));
1296 1401
1297 PL_runops = RUNOPS_DEFAULT; 1402 PL_runops = RUNOPS_DEFAULT;
1298 ENTER; 1403 ENTER;
1299 SAVETMPS; 1404 SAVETMPS;
1405 PUSHMARK (SP);
1300 EXTEND (SP, 3); 1406 EXTEND (SP, 3);
1301 PUSHMARK (SP);
1302 PUSHs (&PL_sv_no); 1407 PUSHs (&PL_sv_no);
1303 PUSHs (fullname); 1408 PUSHs (fullname);
1304 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 1409 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
1305 PUTBACK; 1410 PUTBACK;
1306 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);
… …
1317 1422
1318 if (PL_curcop != &PL_compiling) 1423 if (PL_curcop != &PL_compiling)
1319 { 1424 {
1320 SV **cb; 1425 SV **cb;
1321 1426
1322 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1427 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1323 { 1428 {
1324 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1429 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1325 1430
1326 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1431 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1327 { 1432 {
… …
1333 gv_efullname3 (fullname, gv, 0); 1438 gv_efullname3 (fullname, gv, 0);
1334 1439
1335 PL_runops = RUNOPS_DEFAULT; 1440 PL_runops = RUNOPS_DEFAULT;
1336 ENTER; 1441 ENTER;
1337 SAVETMPS; 1442 SAVETMPS;
1443 PUSHMARK (SP);
1338 EXTEND (SP, 3); 1444 EXTEND (SP, 3);
1339 PUSHMARK (SP);
1340 PUSHs (&PL_sv_yes); 1445 PUSHs (&PL_sv_yes);
1341 PUSHs (fullname); 1446 PUSHs (fullname);
1342 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);
1343 PUTBACK; 1448 PUTBACK;
1344 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);
1345 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);
1346 SPAGAIN; 1451 SPAGAIN;
1347 FREETMPS; 1452 FREETMPS;
… …
1357 dSP; 1462 dSP;
1358 1463
1359 PL_runops = RUNOPS_DEFAULT; 1464 PL_runops = RUNOPS_DEFAULT;
1360 ENTER; 1465 ENTER;
1361 SAVETMPS; 1466 SAVETMPS;
1362 EXTEND (SP, 3);
1363 PL_runops = RUNOPS_DEFAULT;
1364 PUSHMARK (SP); 1467 PUSHMARK (SP);
1468 EXTEND (SP, 2);
1365 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 1469 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
1366 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 1470 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
1367 PUTBACK; 1471 PUTBACK;
1368 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);
1369 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);
… …
1469 * 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
1470 * 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.
1471 */ 1575 */
1472 1576
1473 /* 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 /*
1474 * 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
1475 * 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)
1476 * 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
1477 * doing in that case. YMMV. 1588 * doing in that case. YMMV.
1478 */ 1589 */
… …
1748 1859
1749static int ecb_cold 1860static int ecb_cold
1750coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1861coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1751{ 1862{
1752 /* 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) */
1753 /* 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 */
1754 mg->mg_ptr = 0; 1865 mg->mg_ptr = 0;
1755 mg->mg_virtual = 0; 1866 mg->mg_virtual = 0;
1756 1867
1757 return 0; 1868 return 0;
1758} 1869}
… …
1904 /* nothing to schedule: call the idle handler */ 2015 /* nothing to schedule: call the idle handler */
1905 if (SvROK (sv_idle) 2016 if (SvROK (sv_idle)
1906 && SvOBJECT (SvRV (sv_idle))) 2017 && SvOBJECT (SvRV (sv_idle)))
1907 { 2018 {
1908 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);
1909 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 }
1910 2038
1911 ++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 */
1912 api_ready (aTHX_ SvRV (sv_idle)); 2040 api_ready (aTHX_ SvRV (sv_idle));
1913 --coro_nready; 2041 --coro_nready;
1914 } 2042 }
… …
2218 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2346 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2219 } 2347 }
2220 else 2348 else
2221 { 2349 {
2222 struct coro *self = SvSTATE_current; 2350 struct coro *self = SvSTATE_current;
2351
2352 if (!self)
2353 croak ("Coro::cancel called outside of thread content,");
2223 2354
2224 /* otherwise we cancel directly, purely for speed reasons 2355 /* otherwise we cancel directly, purely for speed reasons
2225 * unfortunately, this requires some magic trickery, as 2356 * unfortunately, this requires some magic trickery, as
2226 * 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.
2227 * this is ugly, and hopefully fully worth the extra speed. 2358 * this is ugly, and hopefully fully worth the extra speed.
… …
2260safe_cancel (pTHX_ struct coro *coro, SV **arg, int items) 2391safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2261{ 2392{
2262 if (coro->cctx) 2393 if (coro->cctx)
2263 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");
2264 2395
2265 if (coro->flags & CF_NEW) 2396 if (coro->flags & (CF_NEW | CF_ZOMBIE))
2266 { 2397 {
2267 coro_set_status (aTHX_ coro, arg, items); 2398 coro_set_status (aTHX_ coro, arg, items);
2268 coro_state_destroy (aTHX_ coro); 2399 coro_state_destroy (aTHX_ coro);
2269 } 2400 }
2270 else 2401 else
… …
2337 else 2468 else
2338 { 2469 {
2339 av_clear (GvAV (PL_defgv)); 2470 av_clear (GvAV (PL_defgv));
2340 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);
2341 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
2342 coro->prio = 0; 2480 coro->prio = 0;
2343 2481
2344 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2482 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2345 api_trace (aTHX_ coro_current, 0); 2483 api_trace (aTHX_ coro_current, 0);
2346 2484
2347 frame->prepare = prepare_schedule; 2485 frame->prepare = prepare_schedule;
2348 av_push (av_async_pool, SvREFCNT_inc (hv)); 2486 av_push (av_async_pool, SvREFCNT_inc_NN (hv));
2349 } 2487 }
2350 } 2488 }
2351 else 2489 else
2352 { 2490 {
2353 /* first iteration, simply fall through */ 2491 /* first iteration, simply fall through */
… …
2366static void 2504static void
2367coro_rouse_callback (pTHX_ CV *cv) 2505coro_rouse_callback (pTHX_ CV *cv)
2368{ 2506{
2369 dXSARGS; 2507 dXSARGS;
2370 SV *data = (SV *)S_GENSUB_ARG; 2508 SV *data = (SV *)S_GENSUB_ARG;
2509 SV *coro = SvRV (data);
2371 2510
2511 /* data starts being either undef or a coro, and is replaced by the results when done */
2372 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2512 if (SvTYPE (coro) != SVt_PVAV)
2373 { 2513 {
2374 /* first call, set args */ 2514 /* first call, set args */
2375 SV *coro = SvRV (data);
2376 AV *av = newAV ();
2377 2515
2378 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 */
2379 2518
2380 /* better take a full copy of the arguments */ 2519 if (coro != &PL_sv_undef)
2381 while (items--) 2520 {
2382 av_store (av, items, newSVsv (ST (items)));
2383
2384 api_ready (aTHX_ coro); 2521 api_ready (aTHX_ coro);
2385 SvREFCNT_dec (coro); 2522 SvREFCNT_dec_NN (coro);
2523 }
2386 } 2524 }
2387 2525
2388 XSRETURN_EMPTY; 2526 XSRETURN_EMPTY;
2389} 2527}
2390 2528
… …
2407 2545
2408 EXTEND (SP, AvFILLp (av) + 1); 2546 EXTEND (SP, AvFILLp (av) + 1);
2409 for (i = 0; i <= AvFILLp (av); ++i) 2547 for (i = 0; i <= AvFILLp (av); ++i)
2410 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2548 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2411 2549
2412 /* we have stolen the elements, so set length to zero and free */ 2550 /* we have stolen the elements, make it unreal and free */
2413 AvFILLp (av) = -1; 2551 AvREAL_off (av);
2414 av_undef (av); 2552 av_undef (av);
2415 2553
2416 PUTBACK; 2554 PUTBACK;
2417 } 2555 }
2418 2556
… …
2443 croak ("Coro::rouse_wait called with illegal callback argument,"); 2581 croak ("Coro::rouse_wait called with illegal callback argument,");
2444 2582
2445 { 2583 {
2446 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2584 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2447 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)));
2448 2594
2449 frame->data = (void *)data; 2595 frame->data = (void *)data;
2450 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2596 frame->prepare = data_ready ? prepare_nop : prepare_schedule;
2451 frame->check = slf_check_rouse_wait; 2597 frame->check = slf_check_rouse_wait;
2452 } 2598 }
2453} 2599}
2454 2600
2455static SV * 2601static SV *
2456coro_new_rouse_cb (pTHX) 2602coro_new_rouse_cb (pTHX)
2457{ 2603{
2458 HV *hv = (HV *)SvRV (coro_current); 2604 HV *hv = (HV *)SvRV (coro_current);
2459 struct coro *coro = SvSTATE_hv (hv); 2605 struct coro *coro = SvSTATE_hv (hv);
2460 SV *data = newRV_inc ((SV *)hv); 2606 SV *data = newRV_noinc (&PL_sv_undef);
2461 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data); 2607 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2462 2608
2463 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);
2464 SvREFCNT_dec (data); /* magicext increases the refcount */ 2610 SvREFCNT_dec_NN (data); /* magicext increases the refcount */
2465 2611
2466 SvREFCNT_dec (coro->rouse_cb); 2612 SvREFCNT_dec (coro->rouse_cb);
2467 coro->rouse_cb = SvREFCNT_inc_NN (cb); 2613 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2468 2614
2469 return cb; 2615 return cb;
… …
2569 2715
2570/* "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 */
2571static void 2717static void
2572slf_destroy (pTHX_ struct coro *coro) 2718slf_destroy (pTHX_ struct coro *coro)
2573{ 2719{
2574 /* this callback is reserved for slf functions needing to do cleanup */ 2720 struct CoroSLF frame = coro->slf_frame;
2575 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2576 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2577 2721
2578 /* 2722 /*
2579 * The on_destroy above most likely is from an SLF call. 2723 * The on_destroy below most likely is from an SLF call.
2580 * 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
2581 * the coro, we will have to force-finish it here, otherwise 2725 * the coro, we will have to force-finish it here, otherwise
2582 * cleanup functions cannot call SLF functions. 2726 * cleanup functions cannot call SLF functions.
2583 */ 2727 */
2584 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);
2585} 2733}
2586 2734
2587/* 2735/*
2588 * these not obviously related functions are all rolled into one 2736 * these not obviously related functions are all rolled into one
2589 * 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
… …
2772static void 2920static void
2773coro_pop_on_leave (pTHX_ void *coro) 2921coro_pop_on_leave (pTHX_ void *coro)
2774{ 2922{
2775 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);
2776 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);
2777} 3017}
2778 3018
2779/*****************************************************************************/ 3019/*****************************************************************************/
2780/* PerlIO::cede */ 3020/* PerlIO::cede */
2781 3021
… …
2911 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3151 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2912 PUTBACK; 3152 PUTBACK;
2913 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3153 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2914 } 3154 }
2915 3155
2916 SvREFCNT_dec (cb); 3156 SvREFCNT_dec_NN (cb);
2917 } 3157 }
2918} 3158}
2919 3159
2920static void 3160static void
2921coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3161coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
2929{ 3169{
2930 AV *av = (AV *)frame->data; 3170 AV *av = (AV *)frame->data;
2931 SV *count_sv = AvARRAY (av)[0]; 3171 SV *count_sv = AvARRAY (av)[0];
2932 SV *coro_hv = SvRV (coro_current); 3172 SV *coro_hv = SvRV (coro_current);
2933 3173
3174 frame->destroy = 0;
3175
2934 /* 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 */
2935 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
2936 return 0; 3182 return 0;
3183 }
2937 else if (SvIVX (count_sv) > 0) 3184 else if (SvIVX (count_sv) > 0)
2938 { 3185 {
2939 frame->destroy = 0;
2940
2941 if (acquire) 3186 if (acquire)
2942 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3187 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2943 else 3188 else
2944 coro_semaphore_adjust (aTHX_ av, 0); 3189 coro_semaphore_adjust (aTHX_ av, 0);
2945 3190
… …
3056 { 3301 {
3057 api_ready (aTHX_ cb); 3302 api_ready (aTHX_ cb);
3058 sv_setiv (cb, 0); /* signal waiter */ 3303 sv_setiv (cb, 0); /* signal waiter */
3059 } 3304 }
3060 3305
3061 SvREFCNT_dec (cb); 3306 SvREFCNT_dec_NN (cb);
3062 3307
3063 --count; 3308 --count;
3064 } 3309 }
3065} 3310}
3066 3311
… …
3151 } 3396 }
3152 3397
3153 av_push (state, data_sv); 3398 av_push (state, data_sv);
3154 3399
3155 api_ready (aTHX_ coro); 3400 api_ready (aTHX_ coro);
3156 SvREFCNT_dec (coro); 3401 SvREFCNT_dec_NN (coro);
3157 SvREFCNT_dec ((AV *)state); 3402 SvREFCNT_dec_NN ((AV *)state);
3158} 3403}
3159 3404
3160static int 3405static int
3161slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3406slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3162{ 3407{
… …
3180 errno = data->errorno; 3425 errno = data->errorno;
3181 PL_laststype = data->laststype; 3426 PL_laststype = data->laststype;
3182 PL_laststatval = data->laststatval; 3427 PL_laststatval = data->laststatval;
3183 PL_statcache = data->statcache; 3428 PL_statcache = data->statcache;
3184 3429
3185 SvREFCNT_dec (data_sv); 3430 SvREFCNT_dec_NN (data_sv);
3186 } 3431 }
3187 3432
3188 /* push result values */ 3433 /* push result values */
3189 { 3434 {
3190 dSP; 3435 dSP;
… …
3379 3624
3380 map_len = load_len + save_len + 16; 3625 map_len = load_len + save_len + 16;
3381 3626
3382 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);
3383 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
3384 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));
3385 3633
3386 load_perl_slots = (load_save_perl_slots_type)map_base; 3634 load_perl_slots = (load_save_perl_slots_type)map_base;
3387 memcpy (map_base, load_ptr, load_len); 3635 memcpy (map_base, load_ptr, load_len);
3388 3636
… …
3405 3653
3406PROTOTYPES: DISABLE 3654PROTOTYPES: DISABLE
3407 3655
3408BOOT: 3656BOOT:
3409{ 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"
3410#ifdef USE_ITHREADS 3660#ifdef USE_ITHREADS
3411# if CORO_PTHREAD 3661# if CORO_PTHREAD
3412 coro_thx = PERL_GET_CONTEXT; 3662 coro_thx = PERL_GET_CONTEXT;
3413# endif 3663# endif
3414#endif 3664#endif
… …
3422 cctx_current = cctx_new_empty (); 3672 cctx_current = cctx_new_empty ();
3423 3673
3424 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3674 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3425 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3675 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3426 3676
3427 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3677 {
3428 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3678 /*
3429 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 }
3430 3701
3431 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3432 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));
3433 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));
3434 3704
3435 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 */
3436 3708
3437 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 3709 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
3438 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 3710 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
3439 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 3711 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
3440 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 3712 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
… …
3565call (Coro::State coro, SV *coderef) 3837call (Coro::State coro, SV *coderef)
3566 ALIAS: 3838 ALIAS:
3567 eval = 1 3839 eval = 1
3568 CODE: 3840 CODE:
3569{ 3841{
3842 struct coro *current = SvSTATE_current;
3843
3570 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3844 if ((coro == current) || (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)))
3571 { 3845 {
3572 struct coro *current = SvSTATE_current;
3573 struct CoroSLF slf_save; 3846 struct CoroSLF slf_save;
3574 3847
3575 if (current != coro) 3848 if (current != coro)
3576 { 3849 {
3577 PUTBACK; 3850 PUTBACK;
… …
3742 if (ecb_expect_false (current == self)) 4015 if (ecb_expect_false (current == self))
3743 coro_times_sub (SvSTATE (coro_current)); 4016 coro_times_sub (SvSTATE (coro_current));
3744} 4017}
3745 4018
3746void 4019void
3747swap_sv (Coro::State coro, SV *sv, SV *swapsv) 4020swap_sv (Coro::State coro, SV *sva, SV *svb)
3748 CODE: 4021 CODE:
3749{ 4022{
3750 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);
3751 4029
3752 if (current == coro) 4030 if (current == coro)
3753 SWAP_SVS (current); 4031 SWAP_SVS_LEAVE (current);
3754 4032
3755 if (!coro->swap_sv) 4033 if (!coro->swap_sv)
3756 coro->swap_sv = newAV (); 4034 coro->swap_sv = newAV ();
3757 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
3758 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4057 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3759 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4058 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4059
4060 removed:
3760 4061
3761 if (current == coro) 4062 if (current == coro)
3762 SWAP_SVS (current); 4063 SWAP_SVS_ENTER (current);
3763} 4064}
3764 4065
3765 4066
3766MODULE = Coro::State PACKAGE = Coro 4067MODULE = Coro::State PACKAGE = Coro
3767 4068
3768BOOT: 4069BOOT:
3769{ 4070{
4071 if (SVt_LAST > 32)
4072 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4073
3770 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4074 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3771 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4075 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3772 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4076 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3773 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);
3774 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4078 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3800 coroapi.ready = api_ready; 4104 coroapi.ready = api_ready;
3801 coroapi.is_ready = api_is_ready; 4105 coroapi.is_ready = api_is_ready;
3802 coroapi.nready = coro_nready; 4106 coroapi.nready = coro_nready;
3803 coroapi.current = coro_current; 4107 coroapi.current = coro_current;
3804 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
3805 /*GCoroAPI = &coroapi;*/ 4113 /*GCoroAPI = &coroapi;*/
3806 sv_setiv (sv, (IV)&coroapi); 4114 sv_setiv (sv, PTR2IV (&coroapi));
3807 SvREADONLY_on (sv); 4115 SvREADONLY_on (sv);
3808 } 4116 }
3809} 4117}
3810 4118
3811SV * 4119SV *
… …
3874 4182
3875void 4183void
3876_set_current (SV *current) 4184_set_current (SV *current)
3877 PROTOTYPE: $ 4185 PROTOTYPE: $
3878 CODE: 4186 CODE:
3879 SvREFCNT_dec (SvRV (coro_current)); 4187 SvREFCNT_dec_NN (SvRV (coro_current));
3880 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4188 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3881 4189
3882void 4190void
3883_set_readyhook (SV *hook) 4191_set_readyhook (SV *hook)
3884 PROTOTYPE: $ 4192 PROTOTYPE: $
… …
3968 4276
3969 if ((SV *)hv == &PL_sv_undef) 4277 if ((SV *)hv == &PL_sv_undef)
3970 { 4278 {
3971 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);
3972 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4280 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3973 SvREFCNT_dec (sv); 4281 SvREFCNT_dec_NN (sv);
3974 } 4282 }
3975 4283
3976 { 4284 {
3977 struct coro *coro = SvSTATE_hv (hv); 4285 struct coro *coro = SvSTATE_hv (hv);
3978 4286
… …
3985 api_ready (aTHX_ (SV *)hv); 4293 api_ready (aTHX_ (SV *)hv);
3986 4294
3987 if (GIMME_V != G_VOID) 4295 if (GIMME_V != G_VOID)
3988 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4296 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3989 else 4297 else
3990 SvREFCNT_dec (hv); 4298 SvREFCNT_dec_NN (hv);
3991} 4299}
3992 4300
3993SV * 4301SV *
3994rouse_cb () 4302rouse_cb ()
3995 PROTOTYPE: 4303 PROTOTYPE:
… …
4074 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4382 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4075 OUTPUT: 4383 OUTPUT:
4076 RETVAL 4384 RETVAL
4077 4385
4078void 4386void
4079up (SV *self, int adjust = 1) 4387up (SV *self)
4080 ALIAS:
4081 adjust = 1
4082 CODE: 4388 CODE:
4389 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4390
4391void
4392adjust (SV *self, int adjust)
4393 CODE:
4083 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4394 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4084 4395
4085void 4396void
4086down (...) 4397down (...)
4087 CODE: 4398 CODE:
4088 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