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.430 by root, Wed Dec 19 23:36:16 2012 UTC vs.
Revision 1.476 by root, Sun Jan 12 17:27:24 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>
25 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
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
30#ifdef PadARRAY 59#ifdef PadARRAY
31# define NEWPADAPI 60# define NEWPADAPI 1
32# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *)) 61# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
33#else 62#else
34typedef AV PADNAMELIST; 63typedef AV PADNAMELIST;
35# if !PERL_VERSION_ATLEAST(5,8,0) 64# if !PERL_VERSION_ATLEAST(5,8,0)
36typedef AV PADLIST; 65typedef AV PADLIST;
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 */
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 const off = PadlistMAX (padlist) + 1; 575 PADOFFSET off = PadlistMAX (padlist) + 1;
517 576
518 newPADLIST(newpadlist); 577#if NEWPADAPI
519#if !PERL_VERSION_ATLEAST(5,15,3) 578
520 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */ 579 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
521 AvREAL_off (newpadlist); 580 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
522#endif 581 while (!PadlistARRAY (padlist)[off - 1])
582 --off;
583
584 Perl_pad_push (aTHX_ padlist, off);
585
586 newpad = PadlistARRAY (padlist)[off];
587 PadlistARRAY (padlist)[off] = 0;
588
589#else
590
523#if PERL_VERSION_ATLEAST (5,10,0) 591#if PERL_VERSION_ATLEAST (5,10,0)
524 Perl_pad_push (aTHX_ padlist, off); 592 Perl_pad_push (aTHX_ padlist, off);
525#else 593#else
526 Perl_pad_push (aTHX_ padlist, off, 1); 594 Perl_pad_push (aTHX_ padlist, off, 1);
527#endif 595#endif
596
528 newpad = PadlistARRAY (padlist)[off]; 597 newpad = PadlistARRAY (padlist)[off];
529 PadlistMAX (padlist) = off - 1; 598 PadlistMAX (padlist) = off - 1;
530 599
600#endif
601
602 newPADLIST (newpadlist);
603#if !PERL_VERSION_ATLEAST(5,15,3)
604 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
605 AvREAL_off (newpadlist);
606#endif
607
531 /* Already extended to 2 elements by newPADLIST. */ 608 /* Already extended to 2 elements by newPADLIST. */
532 PadlistMAX (newpadlist) = 1; 609 PadlistMAX (newpadlist) = 1;
533 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist)); 610
611 padnames = PadlistNAMES (padlist);
612 ++PadnamelistREFCNT (padnames);
613 PadlistNAMES (newpadlist) = padnames;
614
534 PadlistARRAY (newpadlist)[1] = newpad; 615 PadlistARRAY (newpadlist)[1] = newpad;
535 616
536 return newpadlist; 617 return newpadlist;
537} 618}
538 619
546 627
547 while (i > 0) /* special-case index 0 */ 628 while (i > 0) /* special-case index 0 */
548 { 629 {
549 /* we try to be extra-careful here */ 630 /* we try to be extra-careful here */
550 PAD *pad = PadlistARRAY (padlist)[i--]; 631 PAD *pad = PadlistARRAY (padlist)[i--];
632
633 if (pad)
634 {
551 I32 j = PadMAX (pad); 635 I32 j = PadMAX (pad);
552 636
553 while (j >= 0) 637 while (j >= 0)
554 SvREFCNT_dec (PadARRAY (pad)[j--]); 638 SvREFCNT_dec (PadARRAY (pad)[j--]);
555 639
556 PadMAX (pad) = -1; 640 PadMAX (pad) = -1;
557 SvREFCNT_dec (pad); 641 SvREFCNT_dec (pad);
642 }
558 } 643 }
559 644
560 SvREFCNT_dec (PadlistNAMES (padlist)); 645 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
561 646
562#ifdef NEWPADAPI 647#if NEWPADAPI
563 Safefree (PadlistARRAY (padlist)); 648 Safefree (PadlistARRAY (padlist));
564 Safefree (padlist); 649 Safefree (padlist);
565#else 650#else
566 AvFILLp (padlist) = -1; 651 AvFILLp (padlist) = -1;
567 AvREAL_off (padlist); 652 AvREAL_off (padlist);
661 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;
662 747
663 /* 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,
664 * 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.
665 */ 750 */
666 #define svany_in_head(type) \ 751 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
667 (((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)))
668 757
669 if (svany_in_head (SvTYPE (a))) 758 if (svany_in_head (SvTYPE (a)))
670 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 759 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
671 760
672 if (svany_in_head (SvTYPE (b))) 761 if (svany_in_head (SvTYPE (b)))
675#endif 764#endif
676} 765}
677 766
678/* swap sv heads, at least logically */ 767/* swap sv heads, at least logically */
679static void 768static void
680swap_svs (pTHX_ Coro__State c) 769swap_svs_enter (pTHX_ Coro__State c)
681{ 770{
682 int i; 771 int i;
683 772
684 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 773 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
685 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]);
686} 775}
687 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
688#define SWAP_SVS(coro) \ 786#define SWAP_SVS_ENTER(coro) \
689 if (ecb_expect_false ((coro)->swap_sv)) \ 787 if (ecb_expect_false ((coro)->swap_sv)) \
690 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))
691 793
692static void 794static void
693on_enterleave_call (pTHX_ SV *cb); 795on_enterleave_call (pTHX_ SV *cb);
694 796
695static void 797static void
740 842
741 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 843 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
742 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 844 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
743 } 845 }
744 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
745 SWAP_SVS (c); 855 SWAP_SVS_ENTER (c);
746} 856}
747 857
748static void 858static void
749save_perl (pTHX_ Coro__State c) 859save_perl (pTHX_ Coro__State c)
750{ 860{
751 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 }
752 870
753 if (ecb_expect_false (c->on_leave)) 871 if (ecb_expect_false (c->on_leave))
754 { 872 {
755 int i; 873 int i;
756 874
883#endif 1001#endif
884 1002
885 New(54,PL_savestack,24,ANY); 1003 New(54,PL_savestack,24,ANY);
886 PL_savestack_ix = 0; 1004 PL_savestack_ix = 0;
887 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
888 1011
889#if !PERL_VERSION_ATLEAST (5,10,0) 1012#if !PERL_VERSION_ATLEAST (5,10,0)
890 New(54,PL_retstack,4,OP*); 1013 New(54,PL_retstack,4,OP*);
891 PL_retstack_ix = 0; 1014 PL_retstack_ix = 0;
892 PL_retstack_max = 4; 1015 PL_retstack_max = 4;
958 } 1081 }
959 1082
960 return rss; 1083 return rss;
961} 1084}
962 1085
963/** coroutine stack handling ************************************************/ 1086/** provide custom get/set/clear methods for %SIG elements ******************/
964
965static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
966static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
967static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
968 1087
969/* apparently < 5.8.8 */ 1088/* apparently < 5.8.8 */
970#ifndef MgPV_nolen_const 1089#ifndef MgPV_nolen_const
971#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1090#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
972 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1091 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
973 (const char*)(mg)->mg_ptr) 1092 (const char*)(mg)->mg_ptr)
974#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};
975 1122
976/* 1123/*
977 * This overrides the default magic get method of %SIG elements. 1124 * This overrides the default magic get method of %SIG elements.
978 * 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
979 * 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),
981 */ 1128 */
982static int ecb_cold 1129static int ecb_cold
983coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
984{ 1131{
985 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;
986 1135
987 if (*s == '_') 1136 SV *ssv;
988 {
989 SV **svp = 0;
990 1137
991 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
992 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
993
994 if (svp) 1138 if (!*svp)
995 {
996 SV *ssv;
997
998 if (!*svp)
999 ssv = &PL_sv_undef; 1139 ssv = &PL_sv_undef;
1000 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. */
1001 ssv = sv_2mortal (newRV_inc (*svp)); 1141 ssv = sv_2mortal (newRV_inc (*svp));
1002 else 1142 else
1003 ssv = *svp; 1143 ssv = *svp;
1004 1144
1005 sv_setsv (sv, ssv); 1145 sv_setsv (sv, ssv);
1006 return 0; 1146 return 0;
1007 }
1008 }
1009
1010 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
1011} 1147}
1012 1148
1013static int ecb_cold 1149static int ecb_cold
1014coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1150coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
1015{ 1151{
1016 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;
1017 1155
1018 if (*s == '_')
1019 {
1020 SV **svp = 0;
1021
1022 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1023 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1024
1025 if (svp)
1026 {
1027 SV *old = *svp; 1156 SV *old = *svp;
1028 *svp = 0; 1157 *svp = 0;
1029 SvREFCNT_dec (old); 1158 SvREFCNT_dec (old);
1030 return 0; 1159 return 0;
1031 }
1032 }
1033
1034 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1035} 1160}
1036 1161
1037static int ecb_cold 1162static int ecb_cold
1038coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1163coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1039{ 1164{
1040 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;
1041 1168
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; 1169 SV *old = *svp;
1052 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1170 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1053 SvREFCNT_dec (old); 1171 SvREFCNT_dec (old);
1054 return 0; 1172 return 0;
1055 }
1056 }
1057
1058 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1059} 1173}
1060 1174
1061static void 1175static void
1062prepare_nop (pTHX_ struct coro_transfer_args *ta) 1176prepare_nop (pTHX_ struct coro_transfer_args *ta)
1063{ 1177{
1074static int 1188static int
1075slf_check_repeat (pTHX_ struct CoroSLF *frame) 1189slf_check_repeat (pTHX_ struct CoroSLF *frame)
1076{ 1190{
1077 return 1; 1191 return 1;
1078} 1192}
1193
1194/** coroutine stack handling ************************************************/
1079 1195
1080static UNOP init_perl_op; 1196static UNOP init_perl_op;
1081 1197
1082ecb_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 */
1083init_perl (pTHX_ struct coro *coro) 1199init_perl (pTHX_ struct coro *coro)
1109 1225
1110 GvSV (PL_defgv) = newSV (0); 1226 GvSV (PL_defgv) = newSV (0);
1111 GvAV (PL_defgv) = coro->args; coro->args = 0; 1227 GvAV (PL_defgv) = coro->args; coro->args = 0;
1112 GvSV (PL_errgv) = newSV (0); 1228 GvSV (PL_errgv) = newSV (0);
1113 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);
1114 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
1115 PL_rs = newSVsv (GvSV (irsgv)); 1234 PL_rs = newSVsv (GvSV (irsgv));
1116 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1235 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1117 1236
1118 { 1237 {
1119 dSP; 1238 dSP;
1123 myop.op_next = Nullop; 1242 myop.op_next = Nullop;
1124 myop.op_type = OP_ENTERSUB; 1243 myop.op_type = OP_ENTERSUB;
1125 myop.op_flags = OPf_WANT_VOID; 1244 myop.op_flags = OPf_WANT_VOID;
1126 1245
1127 PUSHMARK (SP); 1246 PUSHMARK (SP);
1128 PUSHs ((SV *)coro->startcv); 1247 XPUSHs ((SV *)coro->startcv);
1129 PUTBACK; 1248 PUTBACK;
1130 PL_op = (OP *)&myop; 1249 PL_op = (OP *)&myop;
1131 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1250 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1132 } 1251 }
1133 1252
1147 PL_op = (OP *)&init_perl_op; 1266 PL_op = (OP *)&init_perl_op;
1148 1267
1149 /* copy throw, in case it was set before init_perl */ 1268 /* copy throw, in case it was set before init_perl */
1150 CORO_THROW = coro->except; 1269 CORO_THROW = coro->except;
1151 1270
1152 SWAP_SVS (coro); 1271 SWAP_SVS_ENTER (coro);
1153 1272
1154 if (ecb_expect_false (enable_times)) 1273 if (ecb_expect_false (enable_times))
1155 { 1274 {
1156 coro_times_update (); 1275 coro_times_update ();
1157 coro_times_sub (coro); 1276 coro_times_sub (coro);
1195 /* this will cause transfer_check to croak on block*/ 1314 /* this will cause transfer_check to croak on block*/
1196 SvRV_set (coro_current, (SV *)coro->hv); 1315 SvRV_set (coro_current, (SV *)coro->hv);
1197 1316
1198 load_perl (aTHX_ coro); 1317 load_perl (aTHX_ coro);
1199 1318
1319 /* restore swapped sv's */
1320 SWAP_SVS_LEAVE (coro);
1321
1200 coro_unwind_stacks (aTHX); 1322 coro_unwind_stacks (aTHX);
1201
1202 /* restore swapped sv's */
1203 SWAP_SVS (coro);
1204 1323
1205 coro_destruct_stacks (aTHX); 1324 coro_destruct_stacks (aTHX);
1206 1325
1207 /* now save some sv's to be free'd later */ 1326 /* now save some sv's to be free'd later */
1208 svf [0] = GvSV (PL_defgv); 1327 svf [0] = GvSV (PL_defgv);
1229 1348
1230 SvREFCNT_dec (coro->saved_deffh); 1349 SvREFCNT_dec (coro->saved_deffh);
1231 SvREFCNT_dec (coro->rouse_cb); 1350 SvREFCNT_dec (coro->rouse_cb);
1232 SvREFCNT_dec (coro->invoke_cb); 1351 SvREFCNT_dec (coro->invoke_cb);
1233 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);
1234 } 1355 }
1235} 1356}
1236 1357
1237ecb_inline void 1358ecb_inline void
1238free_coro_mortal (pTHX) 1359free_coro_mortal (pTHX)
1279 av_push (av, SvREFCNT_inc_NN (*bot++)); 1400 av_push (av, SvREFCNT_inc_NN (*bot++));
1280 1401
1281 PL_runops = RUNOPS_DEFAULT; 1402 PL_runops = RUNOPS_DEFAULT;
1282 ENTER; 1403 ENTER;
1283 SAVETMPS; 1404 SAVETMPS;
1405 PUSHMARK (SP);
1284 EXTEND (SP, 3); 1406 EXTEND (SP, 3);
1285 PUSHMARK (SP);
1286 PUSHs (&PL_sv_no); 1407 PUSHs (&PL_sv_no);
1287 PUSHs (fullname); 1408 PUSHs (fullname);
1288 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 1409 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
1289 PUTBACK; 1410 PUTBACK;
1290 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);
1301 1422
1302 if (PL_curcop != &PL_compiling) 1423 if (PL_curcop != &PL_compiling)
1303 { 1424 {
1304 SV **cb; 1425 SV **cb;
1305 1426
1306 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1427 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1307 { 1428 {
1308 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1429 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1309 1430
1310 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1431 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1311 { 1432 {
1317 gv_efullname3 (fullname, gv, 0); 1438 gv_efullname3 (fullname, gv, 0);
1318 1439
1319 PL_runops = RUNOPS_DEFAULT; 1440 PL_runops = RUNOPS_DEFAULT;
1320 ENTER; 1441 ENTER;
1321 SAVETMPS; 1442 SAVETMPS;
1443 PUSHMARK (SP);
1322 EXTEND (SP, 3); 1444 EXTEND (SP, 3);
1323 PUSHMARK (SP);
1324 PUSHs (&PL_sv_yes); 1445 PUSHs (&PL_sv_yes);
1325 PUSHs (fullname); 1446 PUSHs (fullname);
1326 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);
1327 PUTBACK; 1448 PUTBACK;
1328 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);
1329 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);
1330 SPAGAIN; 1451 SPAGAIN;
1331 FREETMPS; 1452 FREETMPS;
1341 dSP; 1462 dSP;
1342 1463
1343 PL_runops = RUNOPS_DEFAULT; 1464 PL_runops = RUNOPS_DEFAULT;
1344 ENTER; 1465 ENTER;
1345 SAVETMPS; 1466 SAVETMPS;
1346 EXTEND (SP, 3);
1347 PL_runops = RUNOPS_DEFAULT;
1348 PUSHMARK (SP); 1467 PUSHMARK (SP);
1468 EXTEND (SP, 2);
1349 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 1469 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
1350 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 1470 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
1351 PUTBACK; 1471 PUTBACK;
1352 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);
1353 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);
1453 * 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
1454 * 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.
1455 */ 1575 */
1456 1576
1457 /* 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 /*
1458 * 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
1459 * 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)
1460 * 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
1461 * doing in that case. YMMV. 1588 * doing in that case. YMMV.
1462 */ 1589 */
1888 /* nothing to schedule: call the idle handler */ 2015 /* nothing to schedule: call the idle handler */
1889 if (SvROK (sv_idle) 2016 if (SvROK (sv_idle)
1890 && SvOBJECT (SvRV (sv_idle))) 2017 && SvOBJECT (SvRV (sv_idle)))
1891 { 2018 {
1892 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);
1893 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 }
1894 2038
1895 ++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 */
1896 api_ready (aTHX_ SvRV (sv_idle)); 2040 api_ready (aTHX_ SvRV (sv_idle));
1897 --coro_nready; 2041 --coro_nready;
1898 } 2042 }
2096 AV *od = coro->on_destroy; 2240 AV *od = coro->on_destroy;
2097 2241
2098 if (!od) 2242 if (!od)
2099 return; 2243 return;
2100 2244
2245 coro->on_destroy = 0;
2246 sv_2mortal ((SV *)od);
2247
2101 while (AvFILLp (od) >= 0) 2248 while (AvFILLp (od) >= 0)
2102 { 2249 {
2103 SV *cb = sv_2mortal (av_pop (od)); 2250 SV *cb = sv_2mortal (av_pop (od));
2104 2251
2105 /* coro hv's (and only hv's at the moment) are supported as well */ 2252 /* coro hv's (and only hv's at the moment) are supported as well */
2199 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2346 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2200 } 2347 }
2201 else 2348 else
2202 { 2349 {
2203 struct coro *self = SvSTATE_current; 2350 struct coro *self = SvSTATE_current;
2351
2352 if (!self)
2353 croak ("Coro::cancel called outside of thread content,");
2204 2354
2205 /* otherwise we cancel directly, purely for speed reasons 2355 /* otherwise we cancel directly, purely for speed reasons
2206 * unfortunately, this requires some magic trickery, as 2356 * unfortunately, this requires some magic trickery, as
2207 * 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.
2208 * this is ugly, and hopefully fully worth the extra speed. 2358 * this is ugly, and hopefully fully worth the extra speed.
2241safe_cancel (pTHX_ struct coro *coro, SV **arg, int items) 2391safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2242{ 2392{
2243 if (coro->cctx) 2393 if (coro->cctx)
2244 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");
2245 2395
2246 if (coro->flags & CF_NEW) 2396 if (coro->flags & (CF_NEW | CF_ZOMBIE))
2247 { 2397 {
2248 coro_set_status (aTHX_ coro, arg, items); 2398 coro_set_status (aTHX_ coro, arg, items);
2249 coro_state_destroy (aTHX_ coro); 2399 coro_state_destroy (aTHX_ coro);
2250 } 2400 }
2251 else 2401 else
2318 else 2468 else
2319 { 2469 {
2320 av_clear (GvAV (PL_defgv)); 2470 av_clear (GvAV (PL_defgv));
2321 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);
2322 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
2323 coro->prio = 0; 2480 coro->prio = 0;
2324 2481
2325 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2482 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2326 api_trace (aTHX_ coro_current, 0); 2483 api_trace (aTHX_ coro_current, 0);
2327 2484
2328 frame->prepare = prepare_schedule; 2485 frame->prepare = prepare_schedule;
2329 av_push (av_async_pool, SvREFCNT_inc (hv)); 2486 av_push (av_async_pool, SvREFCNT_inc_NN (hv));
2330 } 2487 }
2331 } 2488 }
2332 else 2489 else
2333 { 2490 {
2334 /* first iteration, simply fall through */ 2491 /* first iteration, simply fall through */
2348coro_rouse_callback (pTHX_ CV *cv) 2505coro_rouse_callback (pTHX_ CV *cv)
2349{ 2506{
2350 dXSARGS; 2507 dXSARGS;
2351 SV *data = (SV *)S_GENSUB_ARG; 2508 SV *data = (SV *)S_GENSUB_ARG;
2352 2509
2510 /* data starts being the coro, and is replaced by the results when done */
2353 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2511 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2354 { 2512 {
2355 /* first call, set args */ 2513 /* first call, set args */
2356 SV *coro = SvRV (data); 2514 SV *coro = SvRV (data);
2357 AV *av = newAV (); 2515 AV *av = newAV ();
2361 /* better take a full copy of the arguments */ 2519 /* better take a full copy of the arguments */
2362 while (items--) 2520 while (items--)
2363 av_store (av, items, newSVsv (ST (items))); 2521 av_store (av, items, newSVsv (ST (items)));
2364 2522
2365 api_ready (aTHX_ coro); 2523 api_ready (aTHX_ coro);
2366 SvREFCNT_dec (coro); 2524 SvREFCNT_dec_NN (coro);
2367 } 2525 }
2368 2526
2369 XSRETURN_EMPTY; 2527 XSRETURN_EMPTY;
2370} 2528}
2371 2529
2440 struct coro *coro = SvSTATE_hv (hv); 2598 struct coro *coro = SvSTATE_hv (hv);
2441 SV *data = newRV_inc ((SV *)hv); 2599 SV *data = newRV_inc ((SV *)hv);
2442 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data); 2600 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2443 2601
2444 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2602 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2445 SvREFCNT_dec (data); /* magicext increases the refcount */ 2603 SvREFCNT_dec_NN (data); /* magicext increases the refcount */
2446 2604
2447 SvREFCNT_dec (coro->rouse_cb); 2605 SvREFCNT_dec (coro->rouse_cb);
2448 coro->rouse_cb = SvREFCNT_inc_NN (cb); 2606 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2449 2607
2450 return cb; 2608 return cb;
2550 2708
2551/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2709/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2552static void 2710static void
2553slf_destroy (pTHX_ struct coro *coro) 2711slf_destroy (pTHX_ struct coro *coro)
2554{ 2712{
2555 /* this callback is reserved for slf functions needing to do cleanup */ 2713 struct CoroSLF frame = coro->slf_frame;
2556 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2557 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2558 2714
2559 /* 2715 /*
2560 * The on_destroy above most likely is from an SLF call. 2716 * The on_destroy below most likely is from an SLF call.
2561 * Since by definition the SLF call will not finish when we destroy 2717 * Since by definition the SLF call will not finish when we destroy
2562 * the coro, we will have to force-finish it here, otherwise 2718 * the coro, we will have to force-finish it here, otherwise
2563 * cleanup functions cannot call SLF functions. 2719 * cleanup functions cannot call SLF functions.
2564 */ 2720 */
2565 coro->slf_frame.prepare = 0; 2721 coro->slf_frame.prepare = 0;
2722
2723 /* this callback is reserved for slf functions needing to do cleanup */
2724 if (frame.destroy && frame.prepare && !PL_dirty)
2725 frame.destroy (aTHX_ &frame);
2566} 2726}
2567 2727
2568/* 2728/*
2569 * these not obviously related functions are all rolled into one 2729 * these not obviously related functions are all rolled into one
2570 * function to increase chances that they all will call transfer with the same 2730 * function to increase chances that they all will call transfer with the same
2753static void 2913static void
2754coro_pop_on_leave (pTHX_ void *coro) 2914coro_pop_on_leave (pTHX_ void *coro)
2755{ 2915{
2756 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2916 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2757 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2917 on_enterleave_call (aTHX_ sv_2mortal (cb));
2918}
2919
2920static void
2921enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2922{
2923 if (!hook)
2924 return;
2925
2926 if (!*avp)
2927 {
2928 *avp = newAV ();
2929 AvREAL_off (*avp);
2930 }
2931
2932 av_push (*avp, (SV *)hook);
2933 av_push (*avp, (SV *)arg);
2934}
2935
2936static void
2937enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2938{
2939 AV *av = *avp;
2940 int i;
2941
2942 if (!av)
2943 return;
2944
2945 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2946 if (AvARRAY (av)[i] == (SV *)hook)
2947 {
2948 if (execute)
2949 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2950
2951 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2952 av_pop (av);
2953 av_pop (av);
2954 break;
2955 }
2956
2957 if (AvFILLp (av) >= 0)
2958 {
2959 *avp = 0;
2960 SvREFCNT_dec_NN (av);
2961 }
2962}
2963
2964static void
2965api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2966{
2967 struct coro *coro = SvSTATE (coro_sv);
2968
2969 if (SvSTATE_current == coro)
2970 if (enter)
2971 enter (aTHX_ enter_arg);
2972
2973 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2974 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2975}
2976
2977static void
2978api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2979{
2980 struct coro *coro = SvSTATE (coro_sv);
2981
2982 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2983 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2984}
2985
2986static void
2987savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2988{
2989 struct coro *coro = SvSTATE_current;
2990
2991 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2992}
2993
2994static void
2995savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2996{
2997 struct coro *coro = SvSTATE_current;
2998
2999 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
3000}
3001
3002static void
3003api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
3004{
3005 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
3006
3007 /* this ought to be much cheaper than malloc + a single destructor call */
3008 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
3009 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2758} 3010}
2759 3011
2760/*****************************************************************************/ 3012/*****************************************************************************/
2761/* PerlIO::cede */ 3013/* PerlIO::cede */
2762 3014
2892 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3144 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2893 PUTBACK; 3145 PUTBACK;
2894 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3146 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2895 } 3147 }
2896 3148
2897 SvREFCNT_dec (cb); 3149 SvREFCNT_dec_NN (cb);
2898 } 3150 }
2899} 3151}
2900 3152
2901static void 3153static void
2902coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3154coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2910{ 3162{
2911 AV *av = (AV *)frame->data; 3163 AV *av = (AV *)frame->data;
2912 SV *count_sv = AvARRAY (av)[0]; 3164 SV *count_sv = AvARRAY (av)[0];
2913 SV *coro_hv = SvRV (coro_current); 3165 SV *coro_hv = SvRV (coro_current);
2914 3166
3167 frame->destroy = 0;
3168
2915 /* if we are about to throw, don't actually acquire the lock, just throw */ 3169 /* if we are about to throw, don't actually acquire the lock, just throw */
2916 if (CORO_THROW) 3170 if (ecb_expect_false (CORO_THROW))
3171 {
3172 /* we still might be responsible for the semaphore, so wake up others */
3173 coro_semaphore_adjust (aTHX_ av, 0);
3174
2917 return 0; 3175 return 0;
3176 }
2918 else if (SvIVX (count_sv) > 0) 3177 else if (SvIVX (count_sv) > 0)
2919 { 3178 {
2920 frame->destroy = 0;
2921
2922 if (acquire) 3179 if (acquire)
2923 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3180 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2924 else 3181 else
2925 coro_semaphore_adjust (aTHX_ av, 0); 3182 coro_semaphore_adjust (aTHX_ av, 0);
2926 3183
3037 { 3294 {
3038 api_ready (aTHX_ cb); 3295 api_ready (aTHX_ cb);
3039 sv_setiv (cb, 0); /* signal waiter */ 3296 sv_setiv (cb, 0); /* signal waiter */
3040 } 3297 }
3041 3298
3042 SvREFCNT_dec (cb); 3299 SvREFCNT_dec_NN (cb);
3043 3300
3044 --count; 3301 --count;
3045 } 3302 }
3046} 3303}
3047 3304
3132 } 3389 }
3133 3390
3134 av_push (state, data_sv); 3391 av_push (state, data_sv);
3135 3392
3136 api_ready (aTHX_ coro); 3393 api_ready (aTHX_ coro);
3137 SvREFCNT_dec (coro); 3394 SvREFCNT_dec_NN (coro);
3138 SvREFCNT_dec ((AV *)state); 3395 SvREFCNT_dec_NN ((AV *)state);
3139} 3396}
3140 3397
3141static int 3398static int
3142slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3399slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3143{ 3400{
3148 /* it quickly returns */ 3405 /* it quickly returns */
3149 if (CORO_THROW) 3406 if (CORO_THROW)
3150 return 0; 3407 return 0;
3151 3408
3152 /* one element that is an RV? repeat! */ 3409 /* one element that is an RV? repeat! */
3153 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3410 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3154 return 1; 3411 return 1;
3155 3412
3156 /* restore status */ 3413 /* restore status */
3157 { 3414 {
3158 SV *data_sv = av_pop (state); 3415 SV *data_sv = av_pop (state);
3161 errno = data->errorno; 3418 errno = data->errorno;
3162 PL_laststype = data->laststype; 3419 PL_laststype = data->laststype;
3163 PL_laststatval = data->laststatval; 3420 PL_laststatval = data->laststatval;
3164 PL_statcache = data->statcache; 3421 PL_statcache = data->statcache;
3165 3422
3166 SvREFCNT_dec (data_sv); 3423 SvREFCNT_dec_NN (data_sv);
3167 } 3424 }
3168 3425
3169 /* push result values */ 3426 /* push result values */
3170 { 3427 {
3171 dSP; 3428 dSP;
3360 3617
3361 map_len = load_len + save_len + 16; 3618 map_len = load_len + save_len + 16;
3362 3619
3363 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 3620 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3364 3621
3622 if (map_base == (char *)MAP_FAILED)
3623 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3624
3365 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3625 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3366 3626
3367 load_perl_slots = (load_save_perl_slots_type)map_base; 3627 load_perl_slots = (load_save_perl_slots_type)map_base;
3368 memcpy (map_base, load_ptr, load_len); 3628 memcpy (map_base, load_ptr, load_len);
3369 3629
3386 3646
3387PROTOTYPES: DISABLE 3647PROTOTYPES: DISABLE
3388 3648
3389BOOT: 3649BOOT:
3390{ 3650{
3651#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3652#include "state.h"
3391#ifdef USE_ITHREADS 3653#ifdef USE_ITHREADS
3392# if CORO_PTHREAD 3654# if CORO_PTHREAD
3393 coro_thx = PERL_GET_CONTEXT; 3655 coro_thx = PERL_GET_CONTEXT;
3394# endif 3656# endif
3395#endif 3657#endif
3403 cctx_current = cctx_new_empty (); 3665 cctx_current = cctx_new_empty ();
3404 3666
3405 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3667 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3406 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3668 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3407 3669
3408 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3670 {
3409 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3671 /*
3410 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3672 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3673 * by coro_sig_vtbl in hash values.
3674 */
3675 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3676
3677 /* this only works if perl doesn't have a vtbl for %SIG */
3678 assert (!mg->mg_virtual);
3679
3680 /*
3681 * The irony is that the perl API itself asserts that mg_virtual
3682 * must be non-const, yet perl5porters insisted on marking their
3683 * vtbls as read-only, just to thwart perl modules from patching
3684 * them.
3685 */
3686 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3687 mg->mg_flags |= MGf_COPY;
3688
3689 coro_sigelem_vtbl = PL_vtbl_sigelem;
3690 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3691 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3692 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3693 }
3411 3694
3412 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3413 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3695 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3414 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3696 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3415 3697
3416 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3698 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3699
3700 newCONSTSUB (coro_state_stash, "BACKEND", newSVpv (CORO_BACKEND, 0)); /* undocumented */
3417 3701
3418 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 3702 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
3419 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 3703 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
3420 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 3704 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
3421 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 3705 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
3470void 3754void
3471transfer (...) 3755transfer (...)
3472 PROTOTYPE: $$ 3756 PROTOTYPE: $$
3473 CODE: 3757 CODE:
3474 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3758 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3475
3476void
3477_exit (int code)
3478 PROTOTYPE: $
3479 CODE:
3480 _exit (code);
3481 3759
3482SV * 3760SV *
3483clone (Coro::State coro) 3761clone (Coro::State coro)
3484 CODE: 3762 CODE:
3485{ 3763{
3552call (Coro::State coro, SV *coderef) 3830call (Coro::State coro, SV *coderef)
3553 ALIAS: 3831 ALIAS:
3554 eval = 1 3832 eval = 1
3555 CODE: 3833 CODE:
3556{ 3834{
3835 struct coro *current = SvSTATE_current;
3836
3557 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3837 if ((coro == current) || (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)))
3558 { 3838 {
3559 struct coro *current = SvSTATE_current;
3560 struct CoroSLF slf_save; 3839 struct CoroSLF slf_save;
3561 3840
3562 if (current != coro) 3841 if (current != coro)
3563 { 3842 {
3564 PUTBACK; 3843 PUTBACK;
3729 if (ecb_expect_false (current == self)) 4008 if (ecb_expect_false (current == self))
3730 coro_times_sub (SvSTATE (coro_current)); 4009 coro_times_sub (SvSTATE (coro_current));
3731} 4010}
3732 4011
3733void 4012void
3734swap_sv (Coro::State coro, SV *sv, SV *swapsv) 4013swap_sv (Coro::State coro, SV *sva, SV *svb)
3735 CODE: 4014 CODE:
3736{ 4015{
3737 struct coro *current = SvSTATE_current; 4016 struct coro *current = SvSTATE_current;
4017 AV *swap_sv;
4018 int i;
4019
4020 sva = SvRV (sva);
4021 svb = SvRV (svb);
3738 4022
3739 if (current == coro) 4023 if (current == coro)
3740 SWAP_SVS (current); 4024 SWAP_SVS_LEAVE (current);
3741 4025
3742 if (!coro->swap_sv) 4026 if (!coro->swap_sv)
3743 coro->swap_sv = newAV (); 4027 coro->swap_sv = newAV ();
3744 4028
4029 swap_sv = coro->swap_sv;
4030
4031 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4032 {
4033 SV *a = AvARRAY (swap_sv)[i ];
4034 SV *b = AvARRAY (swap_sv)[i + 1];
4035
4036 if (a == sva && b == svb)
4037 {
4038 SvREFCNT_dec_NN (a);
4039 SvREFCNT_dec_NN (b);
4040
4041 for (; i <= AvFILLp (swap_sv) - 2; i++)
4042 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4043
4044 AvFILLp (swap_sv) -= 2;
4045
4046 goto removed;
4047 }
4048 }
4049
3745 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4050 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3746 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4051 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4052
4053 removed:
3747 4054
3748 if (current == coro) 4055 if (current == coro)
3749 SWAP_SVS (current); 4056 SWAP_SVS_ENTER (current);
3750} 4057}
3751 4058
3752 4059
3753MODULE = Coro::State PACKAGE = Coro 4060MODULE = Coro::State PACKAGE = Coro
3754 4061
3755BOOT: 4062BOOT:
3756{ 4063{
4064 if (SVt_LAST > 32)
4065 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4066
3757 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4067 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3758 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4068 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3759 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4069 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3760 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4070 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3761 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4071 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3787 coroapi.ready = api_ready; 4097 coroapi.ready = api_ready;
3788 coroapi.is_ready = api_is_ready; 4098 coroapi.is_ready = api_is_ready;
3789 coroapi.nready = coro_nready; 4099 coroapi.nready = coro_nready;
3790 coroapi.current = coro_current; 4100 coroapi.current = coro_current;
3791 4101
4102 coroapi.enterleave_hook = api_enterleave_hook;
4103 coroapi.enterleave_unhook = api_enterleave_unhook;
4104 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4105
3792 /*GCoroAPI = &coroapi;*/ 4106 /*GCoroAPI = &coroapi;*/
3793 sv_setiv (sv, (IV)&coroapi); 4107 sv_setiv (sv, PTR2IV (&coroapi));
3794 SvREADONLY_on (sv); 4108 SvREADONLY_on (sv);
3795 } 4109 }
3796} 4110}
3797 4111
3798SV * 4112SV *
3861 4175
3862void 4176void
3863_set_current (SV *current) 4177_set_current (SV *current)
3864 PROTOTYPE: $ 4178 PROTOTYPE: $
3865 CODE: 4179 CODE:
3866 SvREFCNT_dec (SvRV (coro_current)); 4180 SvREFCNT_dec_NN (SvRV (coro_current));
3867 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4181 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3868 4182
3869void 4183void
3870_set_readyhook (SV *hook) 4184_set_readyhook (SV *hook)
3871 PROTOTYPE: $ 4185 PROTOTYPE: $
3955 4269
3956 if ((SV *)hv == &PL_sv_undef) 4270 if ((SV *)hv == &PL_sv_undef)
3957 { 4271 {
3958 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4272 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3959 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4273 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3960 SvREFCNT_dec (sv); 4274 SvREFCNT_dec_NN (sv);
3961 } 4275 }
3962 4276
3963 { 4277 {
3964 struct coro *coro = SvSTATE_hv (hv); 4278 struct coro *coro = SvSTATE_hv (hv);
3965 4279
3972 api_ready (aTHX_ (SV *)hv); 4286 api_ready (aTHX_ (SV *)hv);
3973 4287
3974 if (GIMME_V != G_VOID) 4288 if (GIMME_V != G_VOID)
3975 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4289 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3976 else 4290 else
3977 SvREFCNT_dec (hv); 4291 SvREFCNT_dec_NN (hv);
3978} 4292}
3979 4293
3980SV * 4294SV *
3981rouse_cb () 4295rouse_cb ()
3982 PROTOTYPE: 4296 PROTOTYPE:
4061 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4375 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4062 OUTPUT: 4376 OUTPUT:
4063 RETVAL 4377 RETVAL
4064 4378
4065void 4379void
4066up (SV *self, int adjust = 1) 4380up (SV *self)
4067 ALIAS:
4068 adjust = 1
4069 CODE: 4381 CODE:
4382 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4383
4384void
4385adjust (SV *self, int adjust)
4386 CODE:
4070 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4387 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4071 4388
4072void 4389void
4073down (...) 4390down (...)
4074 CODE: 4391 CODE:
4075 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4392 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
4237 { 4554 {
4238 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4555 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4239 coro_old_pp_sselect = 0; 4556 coro_old_pp_sselect = 0;
4240 } 4557 }
4241 4558
4559MODULE = Coro::State PACKAGE = Coro::Util
4560
4561void
4562_exit (int code)
4563 CODE:
4564 _exit (code);
4565
4566NV
4567time ()
4568 CODE:
4569 RETVAL = nvtime (aTHX);
4570 OUTPUT:
4571 RETVAL
4572
4573NV
4574gettimeofday ()
4575 PPCODE:
4576{
4577 UV tv [2];
4578 u2time (aTHX_ tv);
4579 EXTEND (SP, 2);
4580 PUSHs (sv_2mortal (newSVuv (tv [0])));
4581 PUSHs (sv_2mortal (newSVuv (tv [1])));
4582}
4583

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines